commit 7b11289b4e4d117bbcee6d2460b057d0fcf6e437
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 15:18:21 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 15:18:21 2012 +0000
tree 0dab0504a918dc628859c2bbef319d937440592b
parent a7ffb956cb8358241f11dbb48170cbd7df191c85

Added dev- & canv- prefixes to Ganesh bounding boxes to indicate coordinate space

http://codereview.appspot.com/6457061/



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

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index dcfb57b..ec8f26c 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -371,26 +371,27 @@
                          int renderTargetWidth,
                          int renderTargetHeight) {
 
-    SkIRect bound;
+    SkIRect devBound;
+
+    devBound.setLTRB(0, 0, renderTargetWidth, renderTargetHeight);
+
     SkClipStack::BoundsType boundType;
-    SkRect temp;
+    SkRect canvTemp;
 
-    bound.setLTRB(0, 0, renderTargetWidth, renderTargetHeight);
-
-    clipStack.getBounds(&temp, &boundType);
+    clipStack.getBounds(&canvTemp, &boundType);
     if (SkClipStack::kNormal_BoundsType == boundType) {
-        SkIRect temp2;
+        SkIRect devTemp;
 
-        temp.roundOut(&temp2);
+        canvTemp.roundOut(&devTemp);
 
-        temp2.offset(-origin.fX, -origin.fY);
+        devTemp.offset(-origin.fX, -origin.fY);
 
-        if (!bound.intersect(temp2)) {
-            bound.setEmpty();
+        if (!devBound.intersect(devTemp)) {
+            devBound.setEmpty();
         }
     }
 
-//    GrAssert(bound.contains(clipRegion.getBounds()));
+//    GrAssert(devBound.contains(clipRegion.getBounds()));
 }
 #endif
 
@@ -413,15 +414,15 @@
                  renderTargetWidth, renderTargetHeight);
 #endif
 
-    SkRect bounds;
+    SkRect devClipBounds;
     bool isIntersectionOfRects = false;
     clipStack.getConservativeBounds(0, 0,
                                     renderTargetWidth,
                                     renderTargetHeight,
-                                    &bounds,
+                                    &devClipBounds,
                                     &isIntersectionOfRects);
 
-    result->setFromIterator(&iter, bounds);
+    result->setFromIterator(&iter, devClipBounds);
 
     GrAssert(result->isRect() == isIntersectionOfRects);