commit ae6b777ba6d37b5330cdadc15ccff796fe172ca2
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 18:07:39 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 18:07:39 2013 +0000
tree 76c1ed3df03212c8a98297ac02cd7baf78e2e0e0
parent d6543e5edae5d2fe9f364a563f41c1654b14e5f4

Fix build breakages due to r10148



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

src/gpu/gl/GrGLCreateNullInterface.cpp

diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 0fa2b9e..f011334 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -21,7 +21,7 @@
     }
     ~GrBufferObj() { SkDELETE_ARRAY(fDataPtr); }
 
-    void allocate(GrGLint size, const GrGLchar* dataPtr) {
+    void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) {
         if (NULL != fDataPtr) {
             GrAssert(0 != fSize);
             SkDELETE_ARRAY(fDataPtr);
@@ -33,7 +33,7 @@
 
     GrGLuint id() const          { return fID; }
     GrGLchar* dataPtr()          { return fDataPtr; }
-    GrGLint size() const         { return fSize; }
+    GrGLsizeiptr size() const    { return fSize; }
 
     void setMapped(bool mapped)  { fMapped = mapped; }
     bool mapped() const          { return fMapped; }
@@ -41,7 +41,7 @@
 private:
     GrGLuint     fID;
     GrGLchar*    fDataPtr;
-    GrGLint      fSize;         // size in bytes
+    GrGLsizeiptr fSize;         // size in bytes
     bool         fMapped;
 };
 
@@ -73,7 +73,7 @@
         gBuffers.append(1, &buffer);
     } else {
         // recycle a slot from the free list
-        id = (GrGLuint) gBuffers[0];
+        id = SkTCast<GrGLuint>(gBuffers[0]);
         gBuffers[0] = gBuffers[id];
 
         buffer = SkNEW_ARGS(GrBufferObj, (id));