minor cleanups in newly privatized device headers
BUG=skia:
Change-Id: Id6ebd54f404b5f0869d96368b98957ac10a2083f
NOTREECHECKS=True
Reviewed-on: https://skia-review.googlesource.com/7369
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
diff --git a/src/core/SkBitmapDevice.h b/src/core/SkBitmapDevice.h
index 2d67271..1f72d8d 100644
--- a/src/core/SkBitmapDevice.h
+++ b/src/core/SkBitmapDevice.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
@@ -19,7 +18,6 @@
#include "SkScalar.h"
#include "SkSize.h"
#include "SkSurfaceProps.h"
-#include "SkTypes.h"
class SkDraw;
class SkImageFilterCache;
diff --git a/src/core/SkDevice.h b/src/core/SkDevice.h
index f38f7ea..ab0fdbd 100644
--- a/src/core/SkDevice.h
+++ b/src/core/SkDevice.h
@@ -14,7 +14,6 @@
#include "SkSurfaceProps.h"
class SkBitmap;
-class SkClipStack;
class SkDraw;
class SkDrawFilter;
class SkImageFilterCache;
@@ -348,10 +347,6 @@
const SkImageInfo fInfo;
const SkSurfaceProps fSurfaceProps;
-#ifdef SK_SUPPORT_LEGACY_ACCESSBITMAP
- SkBitmap fLegacyBitmap;
-#endif
-
typedef SkRefCnt INHERITED;
};