CSS filters: fix filtered parent with composited, transformed child.

third_party/WebKit/Source/core/paint/PaintLayer.h

Index: third_party/WebKit/Source/core/paint/PaintLayer.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h
index 469fe7891a25ab120649fccc0ca32b4ebda4c893..7cab7a2fd1bbb3bcda8c4131cd0dfdde87f8edae 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -355,10 +355,18 @@ public:
 
     bool intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const LayoutPoint& offsetFromRoot) const;
 
+    // MaybeIncludeTransformForAncestorLayer means that a transform on |ancestorLayer| may be applied to the bounding box,
+    // in particular if paintsWithTransform() is true.
+    enum CalculateBoundsOptions {
+        MaybeIncludeTransformForAncestorLayer,
+        NeverIncludeTransformForAncestorLayer,
+        IncludeTransformsAndCompositedChildLayers,
+    };
+
     // Bounding box relative to some ancestor layer. Pass offsetFromRoot if known.
     LayoutRect physicalBoundingBox(const LayoutPoint& offsetFromRoot) const;
     LayoutRect physicalBoundingBox(const PaintLayer* ancestorLayer) const;
-    LayoutRect physicalBoundingBoxIncludingReflectionAndStackingChildren(const LayoutPoint& offsetFromRoot) const;
+    LayoutRect physicalBoundingBoxIncludingReflectionAndStackingChildren(const LayoutPoint& offsetFromRoot, CalculateBoundsOptions = MaybeIncludeTransformForAncestorLayer) const;
     LayoutRect fragmentsBoundingBox(const PaintLayer* ancestorLayer) const;
 
     LayoutRect boundingBoxForCompositingOverlapTest() const;
@@ -366,13 +374,6 @@ public:
     // If true, this layer's children are included in its bounds for overlap testing.
     // We can't rely on the children's positions if this layer has a filter that could have moved the children's pixels around.
     bool overlapBoundsIncludeChildren() const;
-
-    // MaybeIncludeTransformForAncestorLayer means that a transform on |ancestorLayer| may be applied to the bounding box,
-    // in particular if paintsWithTransform() is true.
-    enum CalculateBoundsOptions {
-        MaybeIncludeTransformForAncestorLayer,
-        NeverIncludeTransformForAncestorLayer,
-    };
     LayoutRect boundingBoxForCompositing(const PaintLayer* ancestorLayer = 0, CalculateBoundsOptions = MaybeIncludeTransformForAncestorLayer) const;
 
     LayoutUnit staticInlinePosition() const { return m_staticInlinePosition; }