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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1459953002: Fix the reference box computation for CSS filter effects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix another comment Created 5 years, 1 month 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
« third_party/WebKit/Source/core/paint/PaintLayer.h ('K') | « third_party/WebKit/Source/core/paint/PaintLayer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ded24777fc93352efa5270495cbf6fd8340df234..37047f1663cab9b721efd83876da090d0a7a0178 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -1061,7 +1061,7 @@ LayoutRect PaintLayer::transparencyClipBox(const PaintLayer* layer, const PaintL
// paints unfragmented.
LayoutRect clipRect = layer->physicalBoundingBox(layer);
expandClipRectForDescendantsAndReflection(clipRect, layer, layer, transparencyBehavior, subPixelAccumulation, globalPaintFlags);
- clipRect.expand(layer->layoutObject()->style()->filterOutsets());
+ clipRect.expand(layer->filterOutsets());
LayoutRect result = transform.mapRect(clipRect);
if (!paginationLayer)
return result;
@@ -1080,7 +1080,7 @@ LayoutRect PaintLayer::transparencyClipBox(const PaintLayer* layer, const PaintL
LayoutRect clipRect = layer->fragmentsBoundingBox(rootLayer);
expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, transparencyBehavior, subPixelAccumulation, globalPaintFlags);
- clipRect.expand(layer->layoutObject()->style()->filterOutsets());
+ clipRect.expand(layer->filterOutsets());
clipRect.move(subPixelAccumulation);
return clipRect;
}
@@ -2195,7 +2195,7 @@ LayoutRect PaintLayer::boundingBoxForCompositing(const PaintLayer* ancestorLayer
// FIXME: We can optimize the size of the composited layers, by not enlarging
// filtered areas with the outsets if we know that the filter is going to render in hardware.
// https://bugs.webkit.org/show_bug.cgi?id=81239
- result.expand(m_layoutObject->style()->filterOutsets());
+ result.expand(filterOutsets());
}
if (transform() && paintsWithTransform(GlobalPaintNormalPhase) && (this != ancestorLayer || options == MaybeIncludeTransformForAncestorLayer))
@@ -2573,12 +2573,12 @@ FilterOperations computeFilterOperationsHandleReferenceFilters(const FilterOpera
} // unnamed namespace
-FilterOperations PaintLayer::computeFilterOperations(const ComputedStyle& style)
+FilterOperations PaintLayer::computeFilterOperations(const ComputedStyle& style) const
{
return computeFilterOperationsHandleReferenceFilters(style.filter(), style.effectiveZoom(), enclosingElement());
}
-FilterOperations PaintLayer::computeBackdropFilterOperations(const ComputedStyle& style)
+FilterOperations PaintLayer::computeBackdropFilterOperations(const ComputedStyle& style) const
{
return computeFilterOperationsHandleReferenceFilters(style.backdropFilter(), style.effectiveZoom(), enclosingElement());
}
@@ -2596,6 +2596,40 @@ void PaintLayer::updateOrRemoveFilterClients()
filterInfo()->removeReferenceFilterClients();
}
+FilterEffectBuilder* PaintLayer::filterEffectBuilder() const
+{
+ ASSERT(layoutObject()->document().lifecycle().state() >= DocumentLifecycle::CompositingClean);
Stephen White 2015/11/19 19:34:51 Problem: this assert seems to be firing on many te
+
+ if (!paintsWithFilters())
+ return nullptr;
+
+ PaintLayerFilterInfo* filterInfo = this->filterInfo();
+
+ // Should have been added by updateOrRemoveFilterEffectBuilder().
+ ASSERT(filterInfo);
+
+ if (filterInfo->builder())
+ return filterInfo->builder();
+
+ filterInfo->setBuilder(FilterEffectBuilder::create());
+
+ float zoom = layoutObject()->style() ? layoutObject()->style()->effectiveZoom() : 1.0f;
+ if (!filterInfo->builder()->build(toElement(enclosingElement()), computeFilterOperations(layoutObject()->styleRef()), zoom))
+ filterInfo->setBuilder(nullptr);
+
+ return filterInfo->builder();
+}
+
+FilterOutsets PaintLayer::filterOutsets() const
+{
+ if (!layoutObject()->hasFilter())
+ return FilterOutsets();
+
+ // Ensure the filter-chain is refreshed wrt reference filters.
+ filterEffectBuilder();
chrishtr 2015/11/19 19:12:05 The naming is weird here. ensureFilterEffectBuilde
Stephen White 2015/11/19 19:53:28 Changed to updateFilterEffectBuilder() (ensure usu
+ return layoutObject()->style()->filterOutsets();
+}
+
void PaintLayer::updateOrRemoveFilterEffectBuilder()
{
// FilterEffectBuilder is only used to render the filters in software mode,
@@ -2610,15 +2644,7 @@ void PaintLayer::updateOrRemoveFilterEffectBuilder()
return;
}
- PaintLayerFilterInfo* filterInfo = ensureFilterInfo();
- if (!filterInfo->builder())
- filterInfo->setBuilder(FilterEffectBuilder::create());
-
- // If the filter fails to build, remove it from the layer. It will still attempt to
- // go through regular processing (e.g. compositing), but never apply anything.
- float zoom = layoutObject()->style() ? layoutObject()->style()->effectiveZoom() : 1.0f;
- if (!filterInfo->builder()->build(toElement(enclosingElement()), computeFilterOperations(layoutObject()->styleRef()), zoom))
- filterInfo->setBuilder(nullptr);
+ ensureFilterInfo()->setBuilder(nullptr);
}
void PaintLayer::filterNeedsPaintInvalidation()
« third_party/WebKit/Source/core/paint/PaintLayer.h ('K') | « third_party/WebKit/Source/core/paint/PaintLayer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698