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

Unified Diff: Source/core/paint/FilterPainter.cpp

Issue 1203343002: WIP for display item list backed by ListContainer Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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/core/paint/FloatClipRecorder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/FilterPainter.cpp
diff --git a/Source/core/paint/FilterPainter.cpp b/Source/core/paint/FilterPainter.cpp
index 19116baab9659e819290455abc7f7c601279de76..d2580b6d9e42b738309b5a8a0275259d23aeb388 100644
--- a/Source/core/paint/FilterPainter.cpp
+++ b/Source/core/paint/FilterPainter.cpp
@@ -57,21 +57,22 @@ FilterPainter::FilterPainter(DeprecatedPaintLayer& layer, GraphicsContext* conte
}
ASSERT(m_layoutObject);
- if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
- ASSERT(context->displayItemList());
- if (!context->displayItemList()->displayItemConstructionIsDisabled()) {
- FilterOperations filterOperations(layer.computeFilterOperations(m_layoutObject->styleRef()));
- OwnPtr<WebFilterOperations> webFilterOperations = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
- builder.buildFilterOperations(filterOperations, webFilterOperations.get());
- OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(*m_layoutObject, imageFilter, rootRelativeBounds, webFilterOperations.release());
-
- context->displayItemList()->add(filterDisplayItem.release());
- }
- } else {
- OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(*m_layoutObject, imageFilter, rootRelativeBounds);
-
- filterDisplayItem->replay(*context);
- }
+ ASSERT(m_context);
+ //if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
+ // ASSERT(context->displayItemList());
+ // if (!context->displayItemList()->displayItemConstructionIsDisabled()) {
+ // FilterOperations filterOperations(layer.computeFilterOperations(m_layoutObject->styleRef()));
+ // OwnPtr<WebFilterOperations> webFilterOperations = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
+ // builder.buildFilterOperations(filterOperations, webFilterOperations.get());
+ // OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(*m_layoutObject, imageFilter, rootRelativeBounds, webFilterOperations.release());
+
+ // context->displayItemList()->add(filterDisplayItem.release());
+ // }
+ //} else {
+ // OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(*m_layoutObject, imageFilter, rootRelativeBounds);
+
+ // filterDisplayItem->replay(*context);
+ //}
m_filterInProgress = true;
}
@@ -81,18 +82,18 @@ FilterPainter::~FilterPainter()
if (!m_filterInProgress)
return;
- if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
- ASSERT(m_context->displayItemList());
- if (!m_context->displayItemList()->displayItemConstructionIsDisabled()) {
- if (m_context->displayItemList()->lastDisplayItemIsNoopBegin())
- m_context->displayItemList()->removeLastDisplayItem();
- else
- m_context->displayItemList()->add(EndFilterDisplayItem::create(*m_layoutObject));
- }
- } else {
- OwnPtr<EndFilterDisplayItem> endFilterDisplayItem = EndFilterDisplayItem::create(*m_layoutObject);
- endFilterDisplayItem->replay(*m_context);
- }
+ //if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
+ // ASSERT(m_context->displayItemList());
+ // if (!m_context->displayItemList()->displayItemConstructionIsDisabled()) {
+ // if (m_context->displayItemList()->lastDisplayItemIsNoopBegin())
+ // m_context->displayItemList()->removeLastDisplayItem();
+ // else
+ // m_context->displayItemList()->add(EndFilterDisplayItem::create(*m_layoutObject));
+ // }
+ //} else {
+ // OwnPtr<EndFilterDisplayItem> endFilterDisplayItem = EndFilterDisplayItem::create(*m_layoutObject);
+ // endFilterDisplayItem->replay(*m_context);
+ //}
}
} // namespace blink
« no previous file with comments | « Source/core/paint/DisplayItemListPaintTest.cpp ('k') | Source/core/paint/FloatClipRecorder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698