Remove GrLayerHoister

src/core/SkRecordedDrawable.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkLayerInfo.h"
 #include "SkMatrix.h"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
 #include "SkPictureUtils.h"
 #include "SkRecordedDrawable.h"
 #include "SkRecordDraw.h"
 
 void SkRecordedDrawable::onDraw(SkCanvas* canvas) {
     SkDrawable* const* drawables = nullptr;
     int drawableCount = 0;
     if (fDrawableList) {
         drawables = fDrawableList->begin();
         drawableCount = fDrawableList->count();
     }
     SkRecordDraw(*fRecord, canvas, nullptr, drawables, drawableCount, fBBH, nullptr/*callback*/);
 }
 
 SkPicture* SkRecordedDrawable::onNewPictureSnapshot() {
     SkBigPicture::SnapshotArray* pictList = nullptr;
     if (fDrawableList) {
         // TODO: should we plumb-down the BBHFactory and recordFlags from our host
         //       PictureRecorder?
         pictList = fDrawableList->newDrawableSnapshot();
     }
 
-    SkAutoTUnref<SkLayerInfo> saveLayerData;
-    if (fBBH && fDoSaveLayerInfo) {
-        // TODO: can we avoid work by not allocating / filling these bounds?
-        SkAutoTMalloc<SkRect> scratchBounds(fRecord->count());
-        saveLayerData.reset(new SkLayerInfo);
-
-        SkRecordComputeLayers(fBounds, *fRecord, scratchBounds, pictList, saveLayerData);
-    }
-
     size_t subPictureBytes = 0;
     for (int i = 0; pictList && i < pictList->count(); i++) {
         subPictureBytes += SkPictureUtils::ApproximateBytesUsed(pictList->begin()[i]);
     }
     // SkBigPicture will take ownership of a ref on both fRecord and fBBH.
     // We're not willing to give up our ownership, so we must ref them for SkPicture.
     return new SkBigPicture(fBounds, SkRef(fRecord.get()), pictList, SkSafeRef(fBBH.get()),
-                            saveLayerData.release(), subPictureBytes);
+                            subPictureBytes);
 }
 
 void SkRecordedDrawable::flatten(SkWriteBuffer& buffer) const {
     // Write the bounds.
     buffer.writeRect(fBounds);
 
     // Create an SkPictureRecord to record the draw commands.
     SkPictInfo info;
     SkPictureRecord pictureRecord(SkISize::Make(fBounds.width(), fBounds.height()), 0);
 
@@ skipping 30 matching lines @@
     if (!pictureData) {
         return nullptr;
     }
 
     // Create a drawable.
     SkPicturePlayback playback(pictureData);
     SkPictureRecorder recorder;
     playback.draw(recorder.beginRecording(bounds), nullptr, &buffer);
     return recorder.finishRecordingAsDrawable();
 }