commit 1e0e6079219de9cea6ad4b74b1ca5498fa9d3597
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 28 18:49:37 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 28 18:49:37 2011 +0000
tree fa43210525faa00b5190b624c0d9364793455a4f
parent 136f55b61752e01b0f140f4b7fbc8db00205a06b

Add missing return statement.



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

src/gpu/GrGpuGL.cpp

diff --git a/src/gpu/GrGpuGL.cpp b/src/gpu/GrGpuGL.cpp
index cd1a813..9025c67 100644
--- a/src/gpu/GrGpuGL.cpp
+++ b/src/gpu/GrGpuGL.cpp
@@ -846,6 +846,7 @@
     if (glFlipY) {
         GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
     }
+    return true;
 }
 
 bool GrGpuGL::createRenderTargetObjects(int width, int height,

src/gpu/GrGpuGL.h

diff --git a/src/gpu/GrGpuGL.h b/src/gpu/GrGpuGL.h
index aa32246..e3c7203 100644
--- a/src/gpu/GrGpuGL.h
+++ b/src/gpu/GrGpuGL.h
@@ -277,7 +277,7 @@
                       GrGLenum* externalType);
     // helper for onCreateTexture and writeTexturePixels
     bool uploadTexData(const GrGLTexture::Desc& desc,
-                       bool newTexture,
+                       bool isNewTexture,
                        int left, int top, int width, int height,
                        GrPixelConfig dataConfig,
                        const void* data,