Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / compositing / CompositingLayerAssigner.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingLayerAssigner.cpp b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
index 1708a98..c183bb9 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingLayerAssigner.cpp
@@ -166,8 +166,8 @@ CompositingReasons CompositingLayerAssigner::getReasonsPreventingSquashing(const
     if (compositingInputs.transformAncestor != squashingLayerCompositingInputs.transformAncestor)
         return CompositingReasonSquashingTransformAncestorMismatch;
 
-    if (compositingInputs.filterAncestor != squashingLayerCompositingInputs.filterAncestor)
-        return CompositingReasonSquashingFilterAncestorMismatch;
+    if (layer->hasFilter() || compositingInputs.filterAncestor != squashingLayerCompositingInputs.filterAncestor)
+        return CompositingReasonSquashingFilterMismatch;
 
     return CompositingReasonNone;
 }