Change where layer hoisting data is gathered

tools/PictureRenderer.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 "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SamplePipeControllers.h"
@@ skipping 205 matching lines @@
 
 /** Converts fPicture to a picture that uses a BBoxHierarchy.
  *  PictureRenderer subclasses that are used to test picture playback
  *  should call this method during init.
  */
 void PictureRenderer::buildBBoxHierarchy() {
     SkASSERT(fPicture);
     if (kNone_BBoxHierarchyType != fBBoxHierarchyType && fPicture) {
         SkAutoTDelete<SkBBHFactory> factory(this->getFactory());
         SkPictureRecorder recorder;
+        uint32_t flags = this->recordFlags();
+        if (fUseMultiPictureDraw) {
+            flags |= SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag;
+        }
         SkCanvas* canvas = recorder.beginRecording(fPicture->cullRect().width(), 
                                                    fPicture->cullRect().height(),
                                                    factory.get(),
-                                                   this->recordFlags());
+                                                   flags);
         fPicture->playback(canvas);
         fPicture.reset(recorder.endRecording());
     }
 }
 
 void PictureRenderer::resetState(bool callFinish) {
 #if SK_SUPPORT_GPU
     SkGLContext* glContext = this->getGLContext();
     if (NULL == glContext) {
         SkASSERT(kBitmap_DeviceType == fDeviceType);
@@ skipping 460 matching lines @@
         // Create a separate SkSurface/SkCanvas for each tile along with a
         // translated version of the skp (to mimic Chrome's behavior) and
         // feed all such pairs to the MultiPictureDraw.
         for (int i = 0; i < fTileRects.count(); ++i) {
             SkImageInfo ii = fCanvas->imageInfo().makeWH(fTileRects[i].width(),
                                                          fTileRects[i].height());
             *surfaces.append() = fCanvas->newSurface(ii);
             surfaces[i]->getCanvas()->setMatrix(fCanvas->getTotalMatrix());
 
             SkPictureRecorder recorder;
+            SkRTreeFactory bbhFactory;
+
             SkCanvas* c = recorder.beginRecording(SkIntToScalar(fTileRects[i].width()),
-                                                  SkIntToScalar(fTileRects[i].height()));
+                                                  SkIntToScalar(fTileRects[i].height()),
+                                                  &bbhFactory,
+                                                  SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag);
             c->save();
             SkMatrix mat;
             mat.setTranslate(-SkIntToScalar(fTileRects[i].fLeft),
                              -SkIntToScalar(fTileRects[i].fTop));
             c->setMatrix(mat);
             c->drawPicture(fPicture);
             c->restore();
 
             SkAutoTUnref<SkPicture> xlatedPicture(recorder.endRecording());
 
@@ skipping 123 matching lines @@
 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) {
     return SkNEW_ARGS(GatherRenderer, (opts));
 }
 #else
 PictureRenderer* CreateGatherPixelRefsRenderer() {
     return SkNEW(GatherRenderer);
 }
 #endif
 
 } // namespace sk_tools