Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: include/gpu/SkGpuDevice.h

Issue 354133002: change gpudevice and pdfdevice to inherit from basedevice (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: pdfdevice needs to override newSurface Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkDevice.h ('k') | include/pdf/SkPDFDevice.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/SkGpuDevice.h
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 0b6bbc18570680584129f3fe086492beb86bc8dd..6451e15c9b6f078b9ce5c68691f75acb2766a008 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -13,7 +13,7 @@
#include "SkGr.h"
#include "SkBitmap.h"
-#include "SkBitmapDevice.h"
+#include "SkDevice.h"
#include "SkPicture.h"
#include "SkRegion.h"
#include "GrContext.h"
@@ -24,10 +24,10 @@ struct GrSkDrawProcs;
class GrTextContext;
/**
- * Subclass of SkBitmapDevice, which directs all drawing to the GrGpu owned by the
+ * Subclass of SkBaseDevice, which directs all drawing to the GrGpu owned by the
* canvas.
*/
-class SK_API SkGpuDevice : public SkBitmapDevice {
+class SK_API SkGpuDevice : public SkBaseDevice {
public:
enum Flags {
kNeedClear_Flag = 1 << 0, //!< Surface requires an initial clear
@@ -161,6 +161,9 @@ private:
GrRenderTarget* fRenderTarget;
bool fNeedClear;
+ // remove when our clients don't rely on accessBitmap()
+ SkBitmap fLegacyBitmap;
+
// called from rt and tex cons
void initFromRenderTarget(GrContext*, GrRenderTarget*, unsigned flags);
@@ -214,7 +217,7 @@ private:
static SkPicture::AccelData::Key ComputeAccelDataKey();
- typedef SkBitmapDevice INHERITED;
+ typedef SkBaseDevice INHERITED;
};
#endif
« no previous file with comments | « include/core/SkDevice.h ('k') | include/pdf/SkPDFDevice.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698