Try out scalar picture sizes

src/gpu/GrPictureUtils.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPictureUtils.h"
 #include "SkCanvasPriv.h"
 #include "SkDevice.h"
@@ skipping 219 matching lines @@
     virtual void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
         this->updateClipConservativelyUsingBounds(path.getBounds(), op,
                                                   path.isInverseFillType());
     }
     virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
         this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
     }
 
     virtual void onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
                                const SkPaint* paint) SK_OVERRIDE {
-        SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->width(), picture->height());
+        SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
 
         if (NULL != picture->fData.get()) {
             // Disable the BBH for the old path so all the draw calls
             // will be seen. The stock SkPicture::draw method can't be
             // invoked since it just uses a vanilla SkPicturePlayback.
             SkPicturePlayback playback(picture);
             playback.setUseBBH(false);
             playback.draw(this, NULL);
         } else {
             // Since we know this is the SkRecord path we can just call
             // SkPicture::draw.
             picture->draw(this);
         }
     }
 
 private:
     typedef SkCanvas INHERITED;
 };
 
 // GatherGPUInfo is only intended to be called within the context of SkGpuDevice's
 // EXPERIMENTAL_optimize method.
 void GatherGPUInfo(const SkPicture* pict, GrAccelData* accelData) {
-    if (NULL == pict || 0 == pict->width() || 0 == pict->height()) {
+    if (NULL == pict || pict->cullRect().isEmpty()) { 
         return ;
     }
 
     // BBH-based rendering doesn't re-issue many of the operations the gather
     // process cares about (e.g., saves and restores) so it must be disabled.
     SkPicturePlayback playback(pict);
     playback.setUseBBH(false);
 
-    GrGatherDevice device(pict->width(), pict->height(), &playback, accelData, 0);
+    GrGatherDevice device(SkScalarCeilToInt(pict->cullRect().width()), 
+                          SkScalarCeilToInt(pict->cullRect().height()), 
+                          &playback, accelData, 0);
     GrGatherCanvas canvas(&device);
 
-    canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                   SkIntToScalar(pict->height())),
-                    SkRegion::kIntersect_Op, false);
+    canvas.clipRect(pict->cullRect(), SkRegion::kIntersect_Op, false);
     playback.draw(&canvas, NULL);
 }