Expose FillBounds to allow GrPictureUtils::CollectLayers to be layered on top of it

src/core/SkMultiPictureDraw.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.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
@@ skipping 53 matching lines @@
                              const SkPaint* paint) {
     if (NULL == canvas || NULL == picture) {
         SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-NULL");
         return;
     }
 
     SkTDArray<DrawData>& array = canvas->getGrContext() ? fGPUDrawData : fThreadSafeDrawData;
     array.append()->init(canvas, picture, matrix, paint);
 }
 
+#define SK_IGNORE_GPU_LAYER_HOISTING 1

[mtklein, 2014/11/03 19:46:02]

This change was intentional?

[robertphillips, 2014/11/06 16:50:32]

Done. Gone now - always on inside Skia.

 #undef SK_IGNORE_GPU_LAYER_HOISTING
-#define SK_IGNORE_GPU_LAYER_HOISTING 1
 
 class AutoMPDReset : SkNoncopyable {
     SkMultiPictureDraw* fMPD;
 public:
     AutoMPDReset(SkMultiPictureDraw* mpd) : fMPD(mpd) {}
     ~AutoMPDReset() { fMPD->reset(); }
 };
 
 void SkMultiPictureDraw::draw() {
     AutoMPDReset mpdreset(this);
@@ skipping 93 matching lines @@
 
 #ifndef SK_IGNORE_GPU_LAYER_HOISTING
     GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
     GrLayerHoister::UnlockLayers(context, atlasedRecycled);
 #if !GR_CACHE_HOISTED_LAYERS
     GrLayerHoister::PurgeCache(context);
 #endif
 #endif
 }