2 files changed, 2 insertions, 1 deletions
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index ba26d5c081..76cb46e312 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -93,6 +93,7 @@ public:
     }
 
     void setClipStack(const SkClipStack* clipStack, const SkIPoint* origin = NULL) {
+        this->reset();
         if (clipStack->isWideOpen()) {
             fClipType = kWideOpen_ClipType;
             fOrigin.setZero();
diff --git a/src/gpu/GrClip.cpp b/src/gpu/GrClip.cpp
index 15b1fbc811..1dc6edc168 100644
--- a/src/gpu/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
@@ -50,6 +50,6 @@ void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult,
 }
 
 const GrClip& GrClip::WideOpen() {
-    static GrClip clip;
+    static const GrClip clip;
     return clip;
 }