commit 17b78946096265d80215a6c946286ecaa35ea7ed
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 26 14:40:38 2011 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 26 14:40:38 2011 +0000
tree 3af45529670451a9df0bd13ca71fa6a4a98d0eae
parent 5f226572b3b6e1a6fea11f5f3c862a47158f66fe

rolling back the experimental rollbacks in r2178-2179

git-svn-id: http://skia.googlecode.com/svn/trunk@2180 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrBinHashKey.h

diff --git a/gpu/src/GrBinHashKey.h b/gpu/src/GrBinHashKey.h
index 936eab0..ceaef7a 100644
--- a/gpu/src/GrBinHashKey.h
+++ b/gpu/src/GrBinHashKey.h
@@ -36,7 +36,7 @@
         return *this;
     }
 
-    virtual ~GrBinHashKey() {
+    ~GrBinHashKey() {
     }
 
     void setKeyData(const uint32_t *data) {

gpu/src/GrClip.cpp

diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp
index 7ccec26..ade8c2b 100644
--- a/gpu/src/GrClip.cpp
+++ b/gpu/src/GrClip.cpp
@@ -138,13 +138,9 @@
         }
     }
     fConservativeBoundsValid = false;
-    if (isectRectValid) {
+    if (isectRectValid && rectCount) {
+        fConservativeBounds = fList[0].fRect;
         fConservativeBoundsValid = true;
-        if (rectCount > 0) {
-            fConservativeBounds = fList[0].fRect;
-        } else {
-            fConservativeBounds.setEmpty();
-        }
     } else if (NULL != conservativeBounds) {
         fConservativeBounds = *conservativeBounds;
         fConservativeBoundsValid = true;

gpu/src/GrGpuFactory.cpp

diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp
index c3b0242..071e67c 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;
+    const GrGLInterface* glInterface = NULL;
 
     if (kOpenGL_Shaders_GrEngine == engine ||
         kOpenGL_Fixed_GrEngine == engine) {

gpu/src/GrPathRendererChain.cpp

diff --git a/gpu/src/GrPathRendererChain.cpp b/gpu/src/GrPathRendererChain.cpp
index afae912..4c76720 100644
--- a/gpu/src/GrPathRendererChain.cpp
+++ b/gpu/src/GrPathRendererChain.cpp
@@ -15,8 +15,8 @@
 
 GrPathRendererChain::GrPathRendererChain(GrContext* context, UsageFlags flags)
     : fInit(false)
-    , fFlags(flags)
     , fOwner(context)
+    , fFlags(flags)
     , fChain(fStorage.get(), kPreAllocCount) {
     fInit = false;
 }