Flush some non-substantive Ganesh changes

include/gpu/GrSurface.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrSurface_DEFINED
 #define GrSurface_DEFINED
@@ skipping 15 matching lines @@
     int width() const { return fDesc.fWidth; }
 
     /**
      * Retrieves the height of the surface.
      */
     int height() const { return fDesc.fHeight; }
 
     /**
      * Helper that gets the width and height of the surface as a bounding rectangle.
      */
-    void getBoundsRect(SkRect* rect) const { rect->setWH(SkIntToScalar(this->width()),
-                                                         SkIntToScalar(this->height())); }
+    SkRect getBoundsRect() const { return SkRect::MakeIWH(this->width(), this->height()); }
 
     GrSurfaceOrigin origin() const {
         SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin);
         return fDesc.fOrigin;
     }
 
     /**
      * Retrieves the pixel config specified when the surface was created.
      * For render targets this can be kUnknown_GrPixelConfig
      * if client asked us to render to a target that has a pixel
@@ skipping 115 matching lines @@
         }
     }
 
     ReleaseProc fReleaseProc;
     ReleaseCtx  fReleaseCtx;
 
     typedef GrGpuResource INHERITED;
 };
 
 #endif