Change where layer hoisting data is gathered

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 "SkBBoxHierarchy.h"
 #include "SkPaintPriv.h"
 #include "SkPatchUtils.h"
 #include "SkRecord.h"
 #include "SkRecords.h"
 
 SkPicture::AccelData::Key GrAccelData::ComputeAccelDataKey() {
     static const SkPicture::AccelData::Key gGPUID = SkPicture::AccelData::GenerateDomain();
 
     return gGPUID;
 }
@@ skipping 34 matching lines @@
         // Any control ops not part of any Save/Restore block draw everywhere.
         while (!fControlIndices.isEmpty()) {
             this->popControl(kUnbounded);
         }
 
         //--------- LAYER HOISTING
         while (!fSaveLayerStack.isEmpty()) {
             this->popSaveLayerInfo();
         }
         //--------- LAYER HOISTING
+
+        // Finally feed all stored bounds into the BBH.  They'll be returned in this order.
+        SkASSERT(bbh);
+        bbh->insert(&fBounds, record.count());
     }
 
     template <typename T> void operator()(const T& op) {
         this->updateCTM(op);
         this->updateClipBounds(op);
         this->trackBounds(op);
         //--------- LAYER HOISTING
         this->trackSaveLayers(op);
         //--------- LAYER HOISTING
     }
@@ skipping 344 matching lines @@
     }
     void trackSaveLayers(const Restore& r) { this->popSaveLayerInfo(); }
     void trackSaveLayers(const DrawPicture& dp) {
         // For sub-pictures, we wrap their layer information within the parent
         // picture's rendering hierarchy
         SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
         const GrAccelData* childData = 
             static_cast<const GrAccelData*>(dp.picture->EXPERIMENTAL_getAccelData(key));
         if (!childData) {
-            childData = GPUOptimize(dp.picture);
+            // If the child layer hasn't been generated with saveLayer data we
+            // assume the worst (i.e., that it does contain layers which nest
+            // inside existing layers). Layers within sub-pictures that don't
+            // have saveLayer data cannot be hoisted.
+            // TODO: could the analysis data be use to fine tune this?
+            this->updateStackForSaveLayer();
+            return;
         }
 
         for (int i = 0; i < childData->numSaveLayers(); ++i) {
             const GrAccelData::SaveLayerInfo& src = childData->saveLayerInfo(i);
 
             Bounds newClip(fCurrentClipBounds);
 
             if (!newClip.intersect(this->adjustAndMap(src.fBounds, dp.paint))) {
                 continue;
             }
@@ skipping 141 matching lines @@
     //--------- LAYER HOISTING
     // Used to collect saveLayer information for layer hoisting
     int                   fSaveLayersInStack;
     SkTDArray<SaveLayerInfo> fSaveLayerStack;
     GrAccelData*          fAccelData;
     //--------- LAYER HOISTING
 };
 
 } // namespace SkRecords
 
-
 void SkRecordComputeLayers(const SkRect& cullRect, const SkRecord& record,
                            SkBBoxHierarchy* bbh, GrAccelData* data) {
-
     SkRecords::CollectLayers collector(cullRect, record, bbh, data);
 }
 
-const GrAccelData* GPUOptimize(const SkPicture* pict) {
-    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 (existing) {
-        return existing;
-    }
-
-    SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
-
-    pict->EXPERIMENTAL_addAccelData(data);
-
-    SkRecordComputeLayers(pict->cullRect(), *pict->fRecord, NULL, data);
-
-    return data;
-}