Title: [165804] trunk
- Revision
- 165804
- Author
- [email protected]
- Date
- 2014-03-18 01:51:55 -0700 (Tue, 18 Mar 2014)
Log Message
Add blend mode property to dumped information in GraphicsLayer.
https://bugs.webkit.org/show_bug.cgi?id=130331
Patch by Ion Rosca <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (165803 => 165804)
--- trunk/LayoutTests/ChangeLog 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/LayoutTests/ChangeLog 2014-03-18 08:51:55 UTC (rev 165804)
@@ -1,3 +1,14 @@
+2014-03-18 Ion Rosca <[email protected]>
+
+ 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 <[email protected]>
Implement Math.hypot
Modified: trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt (165803 => 165804)
--- trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/LayoutTests/css3/compositing/blend-mode-blended-element-overlapping-composited-sibling-should-have-compositing-layer-expected.txt 2014-03-18 08:51:55 UTC (rev 165804)
@@ -16,6 +16,7 @@
(GraphicsLayer
(position 8.00 78.00)
(bounds 100.00 100.00)
+ (blendMode difference)
)
)
)
Modified: trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt (165803 => 165804)
--- trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/LayoutTests/css3/compositing/blend-mode-parent-of-composited-blended-has-layer-expected.txt 2014-03-18 08:51:55 UTC (rev 165804)
@@ -12,6 +12,7 @@
(GraphicsLayer
(position 18.00 10.00)
(bounds 100.00 100.00)
+ (blendMode difference)
)
)
)
Modified: trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt (165803 => 165804)
--- trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/LayoutTests/css3/compositing/blend-mode-with-composited-descendant-should-have-layer-expected.txt 2014-03-18 08:51:55 UTC (rev 165804)
@@ -12,6 +12,7 @@
(GraphicsLayer
(position 8.00 10.00)
(bounds 100.00 100.00)
+ (blendMode difference)
(children 1
(GraphicsLayer
(position 10.00 0.00)
Modified: trunk/Source/WebCore/ChangeLog (165803 => 165804)
--- trunk/Source/WebCore/ChangeLog 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 08:51:55 UTC (rev 165804)
@@ -1,3 +1,16 @@
+2014-03-18 Ion Rosca <[email protected]>
+
+ 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 <[email protected]>
webdatabase: Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed<T>
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (165803 => 165804)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-03-18 08:50:52 UTC (rev 165803)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-03-18 08:51:55 UTC (rev 165804)
@@ -614,7 +614,14 @@
writeIndent(ts, indent + 1);
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);
ts << "(usingTiledLayer " << m_usingTiledBacking << ")\n";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
