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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2044153002: Move ReferenceFilterBuilder::build to FilterEffectBuilder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@filter-remove-reffilter-vector-feb
Patch Set: zoomedReferenceBoxSize Created 4 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
Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index e8298b6a75c22d627e35bf71ece225baed188a53..f4eeee797ae5a8b7ea851523977fe9e47e919e80 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -66,7 +66,6 @@
#include "core/layout/compositing/PaintLayerCompositor.h"
#include "core/layout/svg/LayoutSVGResourceClipper.h"
#include "core/layout/svg/LayoutSVGRoot.h"
-#include "core/layout/svg/ReferenceFilterBuilder.h"
#include "core/page/Page.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
#include "core/paint/BoxReflectionUtils.h"
@@ -2655,11 +2654,10 @@ FilterOperations computeFilterOperationsHandleReferenceFilters(const FilterOpera
continue;
ReferenceFilterOperation& referenceOperation = toReferenceFilterOperation(*filterOperation);
// FIXME: Cache the Filter if it didn't change.
- Filter* referenceFilter = ReferenceFilterBuilder::build(effectiveZoom, toElement(enclosingNode), nullptr, referenceOperation);
+ Filter* referenceFilter = FilterEffectBuilder::buildReferenceFilter(referenceOperation, nullptr, nullptr, nullptr, *toElement(enclosingNode), nullptr, effectiveZoom);
referenceOperation.setFilter(referenceFilter);
}
}
-
return filters;
}
@@ -2735,8 +2733,8 @@ FilterEffectBuilder* PaintLayer::updateFilterEffectBuilder() const
filterInfo->setBuilder(FilterEffectBuilder::create());
- float zoom = layoutObject()->style() ? layoutObject()->style()->effectiveZoom() : 1.0f;
- if (!filterInfo->builder()->build(toElement(enclosingNode()), computeFilterOperations(layoutObject()->styleRef()), zoom))
+ const ComputedStyle& style = layoutObject()->styleRef();
+ if (!filterInfo->builder()->build(toElement(enclosingNode()), computeFilterOperations(style), style.effectiveZoom()))
filterInfo->setBuilder(nullptr);
return filterInfo->builder();

Powered by Google App Engine
This is Rietveld 408576698