commit f8d904a7eed435b9de68fd2eef6d7f3c59fcc9cc
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 12:18:16 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 12:18:16 2012 +0000
tree be009cf03b833cd6e0400bf4bc5ef65de203daf6
parent c23a63b9e24ac2384466bc4f24ad10f010f25c75

GrClip no longer translates its clips (to better mimic SkClipStack's behavior)

http://codereview.appspot.com/6445052/



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

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 3e5bba0..dcfb57b 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -415,17 +415,13 @@
 
     SkRect bounds;
     bool isIntersectionOfRects = false;
-    clipStack.getConservativeBounds(-origin.fX,
-                                    -origin.fY,
+    clipStack.getConservativeBounds(0, 0,
                                     renderTargetWidth,
                                     renderTargetHeight,
                                     &bounds,
                                     &isIntersectionOfRects);
 
-    result->setFromIterator(&iter,
-                            GrIntToScalar(-origin.x()),
-                            GrIntToScalar(-origin.y()),
-                            bounds);
+    result->setFromIterator(&iter, bounds);
 
     GrAssert(result->isRect() == isIntersectionOfRects);