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 "SkPaintPriv.h"
 #include "SkRecord.h"
 #include "SkRecords.h"
 
 SkPicture::AccelData::Key GrAccelData::ComputeAccelDataKey() {
     static const SkPicture::AccelData::Key gGPUID = SkPicture::AccelData::GenerateDomain();
 
     return gGPUID;
 }
 
 // SkRecord visitor to gather saveLayer/restore information.
 class CollectLayers {
 public:
     CollectLayers(const SkPicture* pict, GrAccelData* accelData)
         : fPictureID(pict->uniqueID())
         , fCTM(&SkMatrix::I())
-        , fCurrentClipBounds(SkIRect::MakeXYWH(0, 0, pict->width(), pict->height()))
         , fSaveLayersInStack(0)
         , fAccelData(accelData) {
 
+        pict->cullRect().roundOut(&fCurrentClipBounds);
+
         if (NULL == pict->fRecord.get()) {
             return;
         }
 
         for (fCurrentOp = 0; fCurrentOp < pict->fRecord->count(); ++fCurrentOp) {
             pict->fRecord->visit<void>(fCurrentOp, *this);
         }
 
         while (!fSaveStack.isEmpty()) {
             this->popSaveBlock();
@@ skipping 208 matching lines @@
         // (Only bounded ops call into this method, so oddballs like Clear don't matter here.)
         devRect.intersect(fCurrentClipBounds);
         return devRect;
     }
 };
 
 
 // GPUOptimize is only intended to be called within the context of SkGpuDevice's
 // EXPERIMENTAL_optimize method.
 const GrAccelData* GPUOptimize(const SkPicture* pict) {
-    if (NULL == pict || 0 == pict->width() || 0 == pict->height()) {
+    if (NULL == pict || pict->cullRect().isEmpty()) {
         return NULL;
     }
 
     SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
     const GrAccelData* existing = 
                             static_cast<const GrAccelData*>(pict->EXPERIMENTAL_getAccelData(key));
     if (NULL != existing) {
         return existing;
     }
 
     SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
 
     pict->EXPERIMENTAL_addAccelData(data);
 
     CollectLayers collector(pict, data);
 
     return data;
 }