commit cd9d69b9ce7eb301a9fd8d91b9f95fd99b07bae5
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 14 20:30:14 2011 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Mar 14 20:30:14 2011 +0000
tree 699c584b39fd1e30022bb05ce58dad15fcd9b4c7
parent 260db92d4975c50fd929399e8d6875a4c854cd5d

Upstreaming changes from android.

- fix compile warnings in the GPU code
- upstream android specific code (ifdef protected)
- fail gracefully when a custom allocator fails



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

gpu/include/GrClip.h

diff --git a/gpu/include/GrClip.h b/gpu/include/GrClip.h
index 00da110..54082b7 100644
--- a/gpu/include/GrClip.h
+++ b/gpu/include/GrClip.h
@@ -64,7 +64,7 @@
         return fList[i].fRect;
     }
 
-    const GrSetOp getOp(int i) const { return fList[i].fOp; }
+    GrSetOp getOp(int i) const { return fList[i].fOp; }
 
     bool isRect() const {
         if (1 == fList.count() && kRect_ClipType == fList[0].fType) {

gpu/include/GrDrawTarget.h

diff --git a/gpu/include/GrDrawTarget.h b/gpu/include/GrDrawTarget.h
index 285665b..aef5937 100644
--- a/gpu/include/GrDrawTarget.h
+++ b/gpu/include/GrDrawTarget.h
@@ -245,7 +245,7 @@
      * @param stage     the stage of sampler set
      * @param matrix    the matrix to set
      */
-    const void setSamplerMatrix(int stage, const GrMatrix& matrix) {
+    void setSamplerMatrix(int stage, const GrMatrix& matrix) {
         fCurrDrawState.fSamplerStates[stage].setMatrix(matrix);
     }