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

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

Issue 880203006: Oilpan: fix build after r189148. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tidy up call site a bit further Created 5 years, 11 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 | « no previous file | Source/platform/graphics/paint/FilterDisplayItem.h » ('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 6c7710a008355b1a0b7c3cb0af88134eedea2c67..68cede026da33b4b0f88afab1487aa4dc2e73c17 100644
--- a/Source/core/paint/FilterPainter.cpp
+++ b/Source/core/paint/FilterPainter.cpp
@@ -56,16 +56,16 @@ FilterPainter::FilterPainter(RenderLayer& renderLayer, GraphicsContext* context,
}
ASSERT(m_renderer);
- OwnPtr<FilterOperations> filterOperations;
if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
// FIXME: verify whether this FilterOperations object and the ImageFilter object constructed above represent the same effect.
- filterOperations = adoptPtr(new FilterOperations(renderLayer.computeFilterOperations(m_renderer->style())));
- }
- OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(m_renderer->displayItemClient(), DisplayItem::BeginFilter, imageFilter, filterOperations.get(), rootRelativeBounds);
- if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
+ FilterOperations filterOperations(renderLayer.computeFilterOperations(m_renderer->style()));
+ OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(m_renderer->displayItemClient(), DisplayItem::BeginFilter, imageFilter, rootRelativeBounds, filterOperations);
+
ASSERT(context->displayItemList());
context->displayItemList()->add(filterDisplayItem.release());
} else {
+ OwnPtr<BeginFilterDisplayItem> filterDisplayItem = BeginFilterDisplayItem::create(m_renderer->displayItemClient(), DisplayItem::BeginFilter, imageFilter, rootRelativeBounds);
+
filterDisplayItem->replay(context);
}
« no previous file with comments | « no previous file | Source/platform/graphics/paint/FilterDisplayItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698