Chromium Code Reviews| Index: include/core/SkDevice.h |
| diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h |
| index 4a61321ff76203b2e2264de518d6bd1cadefa753..8a5db5e0c3cb51550decb98d6cf6631adc54c72d 100644 |
| --- a/include/core/SkDevice.h |
| +++ b/include/core/SkDevice.h |
| @@ -33,7 +33,7 @@ public: |
| SkBaseDevice(); |
| virtual ~SkBaseDevice(); |
| - SkBaseDevice* createCompatibleDevice(const SkImageInfo&); |
| +// SkBaseDevice* createCompatibleDevice(const SkImageInfo&); |
| SkMetaData& getMetaData(); |
| @@ -118,6 +118,8 @@ public: |
| #endif |
| }; |
| + bool disableLCD(const SkPaint&) const; |
|
f(malita)
2014/11/12 20:49:14
This sounds imperative. Maybe canHandleLCD or supp
|
| + |
| protected: |
| enum Usage { |
| kGeneral_Usage, |
| @@ -129,13 +131,7 @@ protected: |
| uint32_t fFlags; // SkPaint::getFlags() |
| }; |
| - /** |
| - * Device may filter the text flags for drawing text here. If it wants to |
| - * make a change to the specified values, it should write them into the |
| - * textflags parameter (output) and return true. If the paint is fine as |
| - * is, then ignore the textflags parameter and return false. |
| - */ |
| - virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) { return false; } |
| + virtual bool onDisableLCD(const SkPaint&) const { return false; } |
| /** |
| * |
| @@ -361,12 +357,10 @@ private: |
| // just called by SkCanvas when built as a layer |
| void setOrigin(int x, int y) { fOrigin.set(x, y); } |
| - // just called by SkCanvas for saveLayer |
| - SkBaseDevice* createCompatibleDeviceForSaveLayer(const SkImageInfo&); |
| - // just called by SkCanvas for imagefilter |
| - SkBaseDevice* createCompatibleDeviceForImageFilter(const SkImageInfo&); |
| - virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) { |
| + void setup(SkPixelGeometry, Usage); |
| + |
| + virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage = kGeneral_Usage) { |
| return NULL; |
| } |