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

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

Issue 1326183002: Merge ReferenceFilter into Filter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Touchups; Rebase. Created 5 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 | « Source/core/paint/FilterEffectBuilder.h ('k') | Source/core/paint/SVGFilterPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/FilterEffectBuilder.cpp
diff --git a/Source/core/paint/FilterEffectBuilder.cpp b/Source/core/paint/FilterEffectBuilder.cpp
index 90157dc8cbc5fb40c3b402d2759092660dad078e..dd7124407d0dcd09bc8ef195f751853fe70ed796 100644
--- a/Source/core/paint/FilterEffectBuilder.cpp
+++ b/Source/core/paint/FilterEffectBuilder.cpp
@@ -74,14 +74,14 @@ DEFINE_TRACE(FilterEffectBuilder)
bool FilterEffectBuilder::build(Element* element, const FilterOperations& operations, float zoom)
{
// Create a parent filter for shorthand filters. These have already been scaled by the CSS code for page zoom, so scale is 1.0 here.
- RefPtrWillBeRawPtr<ReferenceFilter> parentFilter = ReferenceFilter::create(1.0f);
- RefPtrWillBeRawPtr<FilterEffect> previousEffect = SourceGraphic::create(parentFilter.get());
+ RefPtrWillBeRawPtr<Filter> parentFilter = Filter::create(1.0f);
+ RefPtrWillBeRawPtr<FilterEffect> previousEffect = parentFilter->sourceGraphic();
for (size_t i = 0; i < operations.operations().size(); ++i) {
RefPtrWillBeRawPtr<FilterEffect> effect = nullptr;
FilterOperation* filterOperation = operations.operations().at(i).get();
switch (filterOperation->type()) {
case FilterOperation::REFERENCE: {
- RefPtrWillBeRawPtr<ReferenceFilter> referenceFilter = ReferenceFilterBuilder::build(zoom, element, previousEffect.get(), toReferenceFilterOperation(*filterOperation));
+ RefPtrWillBeRawPtr<Filter> referenceFilter = ReferenceFilterBuilder::build(zoom, element, previousEffect.get(), toReferenceFilterOperation(*filterOperation));
if (referenceFilter) {
effect = referenceFilter->lastEffect();
m_referenceFilters.append(referenceFilter);
« no previous file with comments | « Source/core/paint/FilterEffectBuilder.h ('k') | Source/core/paint/SVGFilterPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698