From dda54455a20dcd89de610bdb80e4a8e9137b80a4 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 13 Jul 2016 13:27:16 -0700 Subject: Remove GrLayerHoister This relies on https://codereview.chromium.org/1944013002/ (Add legacy flag to allow Skia to remove Ganesh layer hoister) landing first so as to not break the DEPS roll. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950523002 Review-Url: https://codereview.chromium.org/1950523002 --- src/core/SkRecordedDrawable.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/core/SkRecordedDrawable.cpp') diff --git a/src/core/SkRecordedDrawable.cpp b/src/core/SkRecordedDrawable.cpp index 3bbef833ae..041fdd20f5 100644 --- a/src/core/SkRecordedDrawable.cpp +++ b/src/core/SkRecordedDrawable.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkLayerInfo.h" #include "SkMatrix.h" #include "SkPictureData.h" #include "SkPicturePlayback.h" @@ -33,15 +32,6 @@ SkPicture* SkRecordedDrawable::onNewPictureSnapshot() { pictList = fDrawableList->newDrawableSnapshot(); } - SkAutoTUnref saveLayerData; - if (fBBH && fDoSaveLayerInfo) { - // TODO: can we avoid work by not allocating / filling these bounds? - SkAutoTMalloc 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]); @@ -49,7 +39,7 @@ SkPicture* SkRecordedDrawable::onNewPictureSnapshot() { // 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 { -- cgit v1.2.3