commit 9a7677273a3f270e6137d396e972c83c036a47a7
author Brian Salomon <bsalomon@google.com> Mon Mar 13 17:57:28 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 13 22:01:06 2017 +0000
tree adbb840ffebb12282ac4a59bba7105ded9838afb
parent 301c69c9167c9b7f4dd147e27d720f05522fe263

Remove origin from GrClipStackClip and GrWindowRectsState.

Change-Id: I993f426fee0f21cf1f529f58d242de3017253678
Reviewed-on: https://skia-review.googlesource.com/9623
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>

src/gpu/effects/GrConvexPolyEffect.cpp

diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index 838dff8..d07d591 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -234,8 +234,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-sk_sp<GrFragmentProcessor> GrConvexPolyEffect::Make(GrPrimitiveEdgeType type, const SkPath& path,
-                                                    const SkVector* offset) {
+sk_sp<GrFragmentProcessor> GrConvexPolyEffect::Make(GrPrimitiveEdgeType type, const SkPath& path) {
     if (kHairlineAA_GrProcessorEdgeType == type) {
         return nullptr;
     }
@@ -261,13 +260,6 @@
                                            GrConstColorProcessor::kModulateRGBA_InputMode);
     }
 
-    SkVector t;
-    if (nullptr == offset) {
-        t.set(0, 0);
-    } else {
-        t = *offset;
-    }
-
     SkScalar        edges[3 * kMaxEdges];
     SkPoint         pts[4];
     SkPath::Verb    verb;
@@ -297,8 +289,7 @@
                     edges[3 * n] = -v.fY;
                     edges[3 * n + 1] = v.fX;
                 }
-                SkPoint p = pts[1] + t;
-                edges[3 * n + 2] = -(edges[3 * n] * p.fX + edges[3 * n + 1] * p.fY);
+                edges[3 * n + 2] = -(edges[3 * n] * pts[1].fX + edges[3 * n + 1] * pts[1].fY);
                 ++n;
                 break;
             }