From 5d01bec07a0740b30e4ebc51eec9057009a09bc2 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 2 Apr 2013 20:48:38 +0000 Subject: Fix for effect cache key. Adds the additional shift needed to incorporate the attribKeyBits. Also simplifies the creation of the static globals for the edge effects. Author: jvanverth@google.com Reviewed By: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/13465019 git-svn-id: http://skia.googlecode.com/svn/trunk@8498 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrAAHairLinePathRenderer.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/gpu/GrAAHairLinePathRenderer.cpp') diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index fdb6009857..08a4111a24 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -509,11 +509,10 @@ public: static GrEffectRef* Create() { // we go through this so we only have one copy of each effect - static GrEffectRef* gHairQuadEdgeEffectRef = - CreateEffectRef(AutoEffectUnref(SkNEW(HairQuadEdgeEffect))); - static SkAutoTUnref gUnref(gHairQuadEdgeEffectRef); - - gHairQuadEdgeEffectRef->ref(); + static SkAutoTUnref gHairQuadEdgeEffectRef( + CreateEffectRef(AutoEffectUnref(SkNEW(HairQuadEdgeEffect)))); + + gHairQuadEdgeEffectRef.get()->ref(); return gHairQuadEdgeEffectRef; } @@ -611,11 +610,10 @@ public: static GrEffectRef* Create() { // we go through this so we only have one copy of each effect - static GrEffectRef* gHairLineEdgeEffectRef = - CreateEffectRef(AutoEffectUnref(SkNEW(HairLineEdgeEffect))); - static SkAutoTUnref gUnref(gHairLineEdgeEffectRef); - - gHairLineEdgeEffectRef->ref(); + static SkAutoTUnref gHairLineEdgeEffectRef( + CreateEffectRef(AutoEffectUnref(SkNEW(HairLineEdgeEffect)))); + + gHairLineEdgeEffectRef.get()->ref(); return gHairLineEdgeEffectRef; } -- cgit v1.2.3