Add missing return statement.

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

src/gpu/GrGpuGL.cpp

@@ -846,6 +846,7 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc,
     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

@@ -277,7 +277,7 @@ private:
                       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,