Attachment 227039 Details for Bug 130337 – fixing style

[patch] fixing style

set-blend-mode.diff (text/plain), 4.53 KB, created by Ion Rosca on 2014-03-18 05:17:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ion Rosca

Created: 2014-03-18 05:17:23 PDT

Size: 4.53 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 165806)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2014-03-17  Ion Rosca  <rosca@adobe.com>
>+
>+        Reset main graphicsLayer's blend mode when it has an ancestorClippingLayer
>+        https://bugs.webkit.org/show_bug.cgi?id=130337
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: css3/compositing/blend-mode-ancestor-clipping-layer.html
>+
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::updateBlendMode):
>+        (WebCore::RenderLayerBacking::setBlendMode):
>+
> 2014-03-18  Andreas Kling  <akling@apple.com>
> 
>         Rename ElementDescendantIterator to TypedElementDescendantIterator.
>Index: Source/WebCore/rendering/RenderLayerBacking.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 165806)
>+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
>@@ -391,10 +391,7 @@ void RenderLayerBacking::updateFilters(c
> #if ENABLE(CSS_COMPOSITING)
> void RenderLayerBacking::updateBlendMode(const RenderStyle* style)
> {
>-    if (m_ancestorClippingLayer)
>-        m_ancestorClippingLayer->setBlendMode(style->blendMode());
>-    else
>-        m_graphicsLayer->setBlendMode(style->blendMode());
>+    setBlendMode(style->blendMode());
> }
> #endif
> 
>@@ -2058,7 +2055,11 @@ void RenderLayerBacking::setRequiresOwnB
> #if ENABLE(CSS_COMPOSITING)
> void RenderLayerBacking::setBlendMode(BlendMode blendMode)
> {
>-    m_graphicsLayer->setBlendMode(blendMode);
>+    if (m_ancestorClippingLayer) {
>+        m_ancestorClippingLayer->setBlendMode(blendMode);
>+        m_graphicsLayer->setBlendMode(BlendModeNormal);
>+    } else
>+        m_graphicsLayer->setBlendMode(blendMode);
> }
> #endif
> 
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 165806)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2014-03-17  Ion Rosca  <rosca@adobe.com>
>+
>+        Reset main graphicsLayer's blend mode when it has an ancestorClippingLayer
>+        https://bugs.webkit.org/show_bug.cgi?id=130337
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt: Added.
>+        * css3/compositing/blend-mode-ancestor-clipping-layer.html: Added.
>+
> 2014-03-18  Krzysztof Wolanski  <k.wolanski@samsung.com>
> 
>         [EFL] Update baselines and test expectations
>Index: LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt
>===================================================================
>--- LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt	(revision 0)
>+++ LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer-expected.txt	(working copy)
>@@ -0,0 +1,29 @@
>+(GraphicsLayer
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 1
>+        (GraphicsLayer
>+          (bounds 800.00 600.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 8.00 8.00)
>+              (bounds 100.00 100.00)
>+              (blendMode difference)
>+              (children 1
>+                (GraphicsLayer
>+                  (bounds 200.00 200.00)
>+                  (contentsOpaque 1)
>+                )
>+              )
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>Index: LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html
>===================================================================
>--- LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html	(revision 0)
>+++ LayoutTests/css3/compositing/blend-mode-ancestor-clipping-layer.html	(working copy)
>@@ -0,0 +1,32 @@
>+ <!DOCTYPE HTML>
>+
>+
>+ <style>
>+ 	.parent {
>+ 		width: 100px;
>+ 		height: 100px;
>+ 		background: yellow;
>+ 		overflow: hidden;
>+ 	}
>+
>+ 	.child {
>+ 		width: 200px;
>+ 		height: 200px;
>+ 		background: red;
>+ 		-webkit-transform:translateZ(0px);
>+ 		-webkit-mix-blend-mode: difference;
>+ 	}
>+ </style>
>+
>+ <div class="parent">
>+     <div class="child"></div>
>+ </div>
>+ <pre id="layerTree"></pre>
>+ 
>+ <script>
>+    if (window.testRunner)
>+        window.testRunner.dumpAsText();
>+
>+    var text = document.getElementById("layerTree");
>+    text.innerHTML = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
>+</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 130337: 226920 | 227039 | 227209 | 227685