Change where layer hoisting data is gathered

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxHierarchy.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
@@ skipping 882 matching lines @@
         // optimize away
         SkScalar blueToRedMatrix[20] = { 0 };
         blueToRedMatrix[2] = blueToRedMatrix[18] = SK_Scalar1;
         SkAutoTUnref<SkColorFilter> blueToRed(SkColorMatrixFilter::Create(blueToRedMatrix));
         SkAutoTUnref<SkImageFilter> filter(SkColorFilterImageFilter::Create(blueToRed.get()));
 
         SkPaint complexPaint;
         complexPaint.setImageFilter(filter);
 
         SkAutoTUnref<SkPicture> pict, child;
+        SkRTreeFactory bbhFactory;
 
         {
             SkPictureRecorder recorder;
 
-            SkCanvas* c = recorder.beginRecording(SkIntToScalar(kWidth), SkIntToScalar(kHeight));
+            SkCanvas* c = recorder.beginRecording(SkIntToScalar(kWidth), SkIntToScalar(kHeight),
+                                                  &bbhFactory,
+                                                  SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag);
 
             c->saveLayer(NULL, &complexPaint);
             c->restore();
 
             child.reset(recorder.endRecording());
         }
 
         // create a picture with the structure:
         // 1)
         //      SaveLayer
@@ skipping 12 matching lines @@
         //          DrawPicture (which has a SaveLayer/Restore pair)
         //      Restore
         // 5)
         //      SaveLayer
         //          DrawPicture with Matrix & Paint (with SaveLayer/Restore pair)
         //      Restore
         {
             SkPictureRecorder recorder;
 
             SkCanvas* c = recorder.beginRecording(SkIntToScalar(kWidth),
-                                                  SkIntToScalar(kHeight));
+                                                  SkIntToScalar(kHeight),
+                                                  &bbhFactory,
+                                                  SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag);
             // 1)
             c->saveLayer(NULL, &complexPaint); // layer #0
             c->restore();
 
             // 2)
             c->saveLayer(NULL, NULL); // layer #1
                 c->translate(kWidth/2.0f, kHeight/2.0f);
                 SkRect r = SkRect::MakeXYWH(0, 0, kWidth/2, kHeight/2);
                 c->saveLayer(&r, &complexPaint); // layer #2
                 c->restore();
@@ skipping 22 matching lines @@
                 c->saveLayer(NULL, &layerPaint);  // layer #6
                     c->drawPicture(child, &trans, &picturePaint); // layer #7 inside picture
                 c->restore();
             }
 
             pict.reset(recorder.endRecording());
         }
 
         // Now test out the SaveLayer extraction
         {
-            SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
-
-            SkAutoTUnref<SkSurface> surface(SkSurface::NewScratchRenderTarget(context, info));
-
-            SkCanvas* canvas = surface->getCanvas();
-
-            canvas->EXPERIMENTAL_optimize(pict);
-
             SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
             const SkPicture::AccelData* data = pict->EXPERIMENTAL_getAccelData(key);
             REPORTER_ASSERT(reporter, data);
 
             const GrAccelData *gpuData = static_cast<const GrAccelData*>(data);
             REPORTER_ASSERT(reporter, 8 == gpuData->numSaveLayers());
 
             const GrAccelData::SaveLayerInfo& info0 = gpuData->saveLayerInfo(0);
             // The parent/child layers appear in reverse order
@@ skipping 908 matching lines @@
 
     // The picture shares the immutable pixels but copies the mutable ones.
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, !immut.pixelRef()->unique());
 
     // When the picture goes away, it's just our bitmaps holding the refs.
     pic.reset(NULL);
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, immut.pixelRef()->unique());
 }