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

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

Issue 2230593002: CSS filters: fix filtered parent with composited, transformed child. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove extraneous style from layout test. Created 4 years, 4 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/FilterEffectBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
index 63b6bb9bce4ca40de0f3f7be61e20dd642f2be50..c1fafc8092dbc528dc9aa8931d9ea81d2f6439bf 100644
--- a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp
@@ -122,14 +122,14 @@ Vector<float> sepiaMatrix(double amount)
FloatRect computeReferenceBox(const Element& element, const FloatSize* zoomedReferenceBoxSize, float zoom)
{
- FloatSize size;
+ FloatRect box;
if (zoomedReferenceBoxSize) {
- size = *zoomedReferenceBoxSize;
+ box = FloatRect(FloatPoint(), *zoomedReferenceBoxSize);
} else if (element.isConnected() && element.layoutObject() && element.layoutObject()->enclosingLayer()) {
- size = FloatSize(element.layoutObject()->enclosingLayer()->physicalBoundingBoxIncludingReflectionAndStackingChildren(LayoutPoint()).size());
+ box = FloatRect(element.layoutObject()->enclosingLayer()->physicalBoundingBoxIncludingReflectionAndStackingChildren(LayoutPoint(), PaintLayer::CalculateBoundsOptions::IncludeTransformsAndCompositedChildLayers));
}
- size.scale(1.0f / zoom);
- return FloatRect(FloatPoint(), size);
+ box.scale(1.0f / zoom);
+ return box;
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698