3 files changed, 8 insertions, 4 deletions
diff --git a/gpu/src/GrBinHashKey.h b/gpu/src/GrBinHashKey.h
index ceaef7aa6f..936eab0c14 100644
--- a/gpu/src/GrBinHashKey.h
+++ b/gpu/src/GrBinHashKey.h
@@ -36,7 +36,7 @@ public:
         return *this;
     }
 
-    ~GrBinHashKey() {
+    virtual ~GrBinHashKey() {
     }
 
     void setKeyData(const uint32_t *data) {
diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp
index ade8c2b971..7ccec261a1 100644
--- a/gpu/src/GrClip.cpp
+++ b/gpu/src/GrClip.cpp
@@ -138,9 +138,13 @@ void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty,
         }
     }
     fConservativeBoundsValid = false;
-    if (isectRectValid && rectCount) {
-        fConservativeBounds = fList[0].fRect;
+    if (isectRectValid) {
         fConservativeBoundsValid = true;
+        if (rectCount > 0) {
+            fConservativeBounds = fList[0].fRect;
+        } else {
+            fConservativeBounds.setEmpty();
+        }
     } else if (NULL != conservativeBounds) {
         fConservativeBounds = *conservativeBounds;
         fConservativeBoundsValid = true;
diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp
index 071e67cecb..c3b0242f32 100644
--- a/gpu/src/GrGpuFactory.cpp
+++ b/gpu/src/GrGpuFactory.cpp
@@ -22,7 +22,7 @@
 
 GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
 
-    const GrGLInterface* glInterface = NULL;
+    const GrGLInterface* glInterface;
 
     if (kOpenGL_Shaders_GrEngine == engine ||
         kOpenGL_Fixed_GrEngine == engine) {