commit 114eb9e69942c11635380284deb9cc91eaab3632
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 10 13:16:13 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 10 13:16:13 2013 +0000
tree 88adfd20e5d567ddce982d17c67353a68b7775fe
parent 18136d1cf284bea42ae574e491fa8032aef4e7dd

Update shader rect drawing path for r9087 (removal of isIRect "opt")

https://codereview.chromium.org/14972013/

(SkipBuildbotRuns)



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

src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 883305e..cae3b6f 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -487,8 +487,7 @@
 void GrAARectRenderer::shaderFillAARect(GrGpu* gpu,
                                         GrDrawTarget* target,
                                         const GrRect& rect,
-                                        const SkMatrix& combinedMatrix,
-                                        const GrRect& devRect) {
+                                        const SkMatrix& combinedMatrix) {
     GrDrawState* drawState = target->drawState();
 
     SkPoint center = SkPoint::Make(rect.centerX(), rect.centerY());
@@ -536,6 +535,9 @@
         verts[i].fWidthHeight.fY = newHeight;
     }
 
+    SkRect devRect;
+    combinedMatrix.mapRect(&devRect, rect);
+
     SkRect devBounds = {
         devRect.fLeft   - SK_ScalarHalf,
         devRect.fTop    - SK_ScalarHalf,
@@ -556,8 +558,7 @@
 void GrAARectRenderer::shaderFillAlignedAARect(GrGpu* gpu,
                                                GrDrawTarget* target,
                                                const GrRect& rect,
-                                               const SkMatrix& combinedMatrix,
-                                               const GrRect& devRect) {
+                                               const SkMatrix& combinedMatrix) {
     GrDrawState* drawState = target->drawState();
     SkASSERT(combinedMatrix.rectStaysRect());
 
@@ -583,6 +584,9 @@
     static const int kOffsetIndex = 1;
     drawState->setEffect(kEdgeEffectStage, effect, kOffsetIndex)->unref();
 
+    SkRect devRect;
+    combinedMatrix.mapRect(&devRect, rect);
+
     SkRect devBounds = {
         devRect.fLeft   - SK_ScalarHalf,
         devRect.fTop    - SK_ScalarHalf,