Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: src/gpu/SkGpuDevice.cpp

Issue 539693002: Remove use of EXPERIMENTAL_getActiveOps from layer hoisting code (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove the SkPicture entry point entirely Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrLayerHoister.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 1b6558ce433a12288fe91773a5b25c0d97049075..6a7748f88b09e95b66e812fa0be00c836b1948ad 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1871,10 +1871,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture
return true;
}
- SkAutoTDelete<const SkPicture::OperationList> ops(
- picture->EXPERIMENTAL_getActiveOps(clipBounds));
-
- if (!GrLayerHoister::FindLayersToHoist(gpuData, ops.get(), clipBounds, pullForward.get())) {
+ if (!GrLayerHoister::FindLayersToHoist(gpuData, clipBounds, pullForward.get())) {
return false;
}
@@ -1939,7 +1936,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture
GrLayerHoister::DrawLayers(picture, atlased, nonAtlased);
// Render the entire picture using new layers
- SkPictureReplacementPlayback playback(picture, &replacements, ops.get());
+ SkPictureReplacementPlayback playback(picture, &replacements, NULL);
playback.draw(mainCanvas, NULL);
« no previous file with comments | « src/gpu/GrLayerHoister.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698