commit ab2f44cbfab6d2e0e09c93c41932f464a061742d
author joshualitt <joshualitt@chromium.org> Tue Feb 24 06:47:14 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 24 06:47:14 2015 -0800
tree 6d4f0eff70369ca2c22ffc1b050f43adfda87289
parent e59bbf1cd5dcce66181083821c43a157998bc78b

probable fix for asan bot

NOTREECHECKS=True
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/956583002

include/gpu/GrClip.h

diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index ba26d5c..76cb46e 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -93,6 +93,7 @@
     }
 
     void setClipStack(const SkClipStack* clipStack, const SkIPoint* origin = NULL) {
+        this->reset();
         if (clipStack->isWideOpen()) {
             fClipType = kWideOpen_ClipType;
             fOrigin.setZero();

src/gpu/GrClip.cpp

diff --git a/src/gpu/GrClip.cpp b/src/gpu/GrClip.cpp
index 15b1fbc8..1dc6edc 100644
--- a/src/gpu/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
@@ -50,6 +50,6 @@
 }
 
 const GrClip& GrClip::WideOpen() {
-    static GrClip clip;
+    static const GrClip clip;
     return clip;
 }