diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkDevice.h | 33 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 4 | ||||
| -rw-r--r-- | include/pdf/SkPDFDevice.h | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 30f0dec103..d4afd696a7 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -73,14 +73,14 @@ public: kVector_Capability = 0x2, //!< mask indicating a vector representation kAll_Capabilities = 0x3 }; - virtual uint32_t getDeviceCapabilities(); + virtual uint32_t getDeviceCapabilities() { return 0; } /** Return the width of the device (in pixels). */ - virtual int width() const; + virtual int width() const { return fBitmap.width(); } /** Return the height of the device (in pixels). */ - virtual int height() const; + virtual int height() const { return fBitmap.height(); } /** * Return the bounds of the device in the coordinate space of the root @@ -154,22 +154,25 @@ protected: virtual bool filterTextFlags(const SkPaint& paint, TextFlags*); /** - * Let the device know that its matrix has changed; it can query the - * matrix when it needs it. - */ - virtual void markMatrixDirty(); - - /** - * Let the device know that its clip has changed; it can query the - * clip (region or stack) when or if it needs it. - */ - virtual void markClipDirty(); + * Called with the correct matrix and clip before this device is drawn + * to using those settings. If your subclass overrides this, be sure to + * call through to the base class as well. + * + * The clipstack is another view of the clip. It records the actual + * geometry that went into building the region. It is present for devices + * that want to parse it, but is not required: the region is a complete + * picture of the current clip. (i.e. if you regionize all of the geometry + * in the clipstack, you will arrive at an equivalent region to the one + * passed in). + */ + virtual void setMatrixClip(const SkMatrix&, const SkRegion&, + const SkClipStack&); /** Called when this device gains focus (i.e becomes the current device for drawing). */ virtual void gainFocus(SkCanvas*, const SkMatrix&, const SkRegion&, - const SkClipStack&); + const SkClipStack&) {} /** Clears the entire device to the specified color (including alpha). * Ignores the clip. @@ -287,7 +290,7 @@ private: /** Causes any deferred drawing to the device to be completed. */ - virtual void flush(); + virtual void flush() {} SkBitmap fBitmap; SkIPoint fOrigin; diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 181ea9f8f9..f5613a7fd8 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -71,8 +71,8 @@ public: virtual bool readPixels(const SkIRect& srcRect, SkBitmap* bitmap); virtual void writePixels(const SkBitmap& bitmap, int x, int y); - virtual void markMatrixDirty(); - virtual void markClipDirty(); + virtual void setMatrixClip(const SkMatrix& matrix, const SkRegion& clip, + const SkClipStack&); virtual void drawPaint(const SkDraw&, const SkPaint& paint); virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h index 4080d5612d..395968b5ac 100644 --- a/include/pdf/SkPDFDevice.h +++ b/include/pdf/SkPDFDevice.h @@ -163,6 +163,8 @@ public: // TODO(vandebo): Remove this as soon as Chrome's Platform device goes away. void setOrigin(int x, int y); + virtual void setMatrixClip(const SkMatrix& m, const SkRegion& r, + const SkClipStack& c); private: typedef SkDevice INHERITED; |