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

Unified Diff: Source/platform/graphics/ContentLayerDelegate.cpp

Issue 1287093004: Slimming Paint phase 2 compositing algorithm plumbing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase from space Created 5 years, 4 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 | « Source/core/paint/DisplayItemListPaintTest.cpp ('k') | Source/platform/graphics/paint/DisplayItemList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/ContentLayerDelegate.cpp
diff --git a/Source/platform/graphics/ContentLayerDelegate.cpp b/Source/platform/graphics/ContentLayerDelegate.cpp
index 657ecb92854104a0c810de448a4d56e21085ef67..765943e1b712b0215d0ec6eabe13d472df68b388 100644
--- a/Source/platform/graphics/ContentLayerDelegate.cpp
+++ b/Source/platform/graphics/ContentLayerDelegate.cpp
@@ -90,6 +90,14 @@ void ContentLayerDelegate::paintContents(
ASSERT(RuntimeEnabledFeatures::slimmingPaintEnabled());
+ // TODO(pdr): Remove when slimming paint v2 is further along. This is only
+ // here so the browser is usable during development and does not crash due
+ // to committing the new display items twice.
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ m_painter->displayItemList()->appendToWebDisplayItemList(webDisplayItemList);
+ return;
+ }
+
DisplayItemList* displayItemList = m_painter->displayItemList();
ASSERT(displayItemList);
displayItemList->setDisplayItemConstructionIsDisabled(
« no previous file with comments | « Source/core/paint/DisplayItemListPaintTest.cpp ('k') | Source/platform/graphics/paint/DisplayItemList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698