Replaces SkDevice::setMatrixClip() with markMatrixDirty() and markClipDirty(),

which require no arguments and so may be called without requiring the matrix
and clip to be completely evaluated.

De-inlines virtual functions in SkDevice interface.



git-svn-id: http://skia.googlecode.com/svn/trunk@2250 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 7 insertions, 4 deletions

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index ecdcd7a080..32ac5af39c 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -338,10 +338,13 @@ void SkGpuDevice::prepareRenderTarget(const SkDraw& draw) {
     }
 }
 
-void SkGpuDevice::setMatrixClip(const SkMatrix& matrix, const SkRegion& clip,
-                                const SkClipStack& clipStack) {
-    this->INHERITED::setMatrixClip(matrix, clip, clipStack);
-    // We don't need to set them now because the context may not reflect this device.
+void SkGpuDevice::markMatrixDirty() {
+    INHERITED::markMatrixDirty();
+    fNeedPrepareRenderTarget = true;
+}
+
+void SkGpuDevice::markClipDirty() {
+    INHERITED::markClipDirty();
     fNeedPrepareRenderTarget = true;
 }