Changeset 165804 in webkit

Timestamp:

Mar 18, 2014 1:51:55 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Add blend mode property to dumped information in GraphicsLayer.
​https://bugs.webkit.org/show_bug.cgi?id=130331

Patch by Ion Rosca <Ion Rosca> on 2014-03-18
Reviewed by Simon Fraser.

Source/WebCore:

Functionality is not changed, therefore no new tests added.
I adjusted the affected test results generated with layerTreeAsText.

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::dumpProperties):

LayoutTests:

• css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt:
• css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt:
• css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt (modified) (1 diff)
• LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt (modified) (1 diff)
• LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-18  Ion Rosca  <rosca@adobe.com>
+
+        Add blend mode property to dumped information in GraphicsLayer.
+        https://bugs.webkit.org/show_bug.cgi?id=130331
+
+        Reviewed by Simon Fraser.
+
+        * css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt:
+        * css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt:
+        * css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt:
+
 2014-03-17  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
 

trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt

@@ -17 +17 @@
               (position 8.00 78.00)
               (bounds 100.00 100.00)
+              (blendMode difference)
             )
           )

trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt

@@ -13 +13 @@
               (position 18.00 10.00)
               (bounds 100.00 100.00)
+              (blendMode difference)
             )
           )

trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt

@@ -13 +13 @@
               (position 8.00 10.00)
               (bounds 100.00 100.00)
+              (blendMode difference)
               (children 1
                 (GraphicsLayer

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-18  Ion Rosca  <rosca@adobe.com>
+
+        Add blend mode property to dumped information in GraphicsLayer.
+        https://bugs.webkit.org/show_bug.cgi?id=130331
+
+        Reviewed by Simon Fraser.
+
+        Functionality is not changed, therefore no new tests added.
+        I adjusted the affected test results generated with layerTreeAsText.
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::dumpProperties):
+
 2014-03-17  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -615 +615 @@
         ts << "(opacity " << m_opacity << ")\n";
     }
-    
+
+#if ENABLE(CSS_COMPOSITING)
+    if (m_blendMode != BlendModeNormal) {
+        writeIndent(ts, indent + 1);
+        ts << "(blendMode " << compositeOperatorName(CompositeSourceOver, m_blendMode) << ")\n";
+    }
+#endif
+
     if (m_usingTiledBacking) {
         writeIndent(ts, indent + 1);