Title: [185204] tags/Safari-601.1.34.1
- Revision
- 185204
- Author
- bshaf...@apple.com
- Date
- 2015-06-04 11:09:54 -0700 (Thu, 04 Jun 2015)
Log Message
Merged r185187. rdar://problem/21223358
Modified Paths
Added Paths
Diff
Modified: tags/Safari-601.1.34.1/LayoutTests/ChangeLog (185203 => 185204)
--- tags/Safari-601.1.34.1/LayoutTests/ChangeLog 2015-06-04 18:08:37 UTC (rev 185203)
+++ tags/Safari-601.1.34.1/LayoutTests/ChangeLog 2015-06-04 18:09:54 UTC (rev 185204)
@@ -1,3 +1,19 @@
+2015-06-04 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r185187.
+
+ 2015-06-03 Simon Fraser <simon.fra...@apple.com>
+
+ REGRESSION (r184968): missing media player buttons (control bar exists, but no buttons)
+ https://bugs.webkit.org/show_bug.cgi?id=145630
+
+ Reviewed by Zalan Bujtas.
+
+ Test that dumps coverage info for a layer with a mask.
+
+ * compositing/visible-rect/mask-layer-coverage-expected.txt: Added.
+ * compositing/visible-rect/mask-layer-coverage.html: Added.
+
2015-06-02 Dean Jackson <d...@apple.com>
Skip webgl/useWhilePending.html on WebKit 1.
Copied: tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt (from rev 185187, trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt) (0 => 185204)
--- tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt (rev 0)
+++ tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt 2015-06-04 18:09:54 UTC (rev 185204)
@@ -0,0 +1,40 @@
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 44.00 42.00)
+ (contentsOpaque 1)
+ (mask layer)
+ (GraphicsLayer
+ (bounds 44.00 42.00)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 44.00 x 42.00)
+ (coverage rect -8.00, -8.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ )
+ (visible rect 0.00, 0.00 44.00 x 42.00)
+ (coverage rect -8.00, -8.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (contents layer 0.00, 0.00 44.00 x 42.00)
+ )
+ )
+ )
+ )
+)
+
Copied: tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage.html (from rev 185187, trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage.html) (0 => 185204)
--- tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage.html (rev 0)
+++ tags/Safari-601.1.34.1/LayoutTests/compositing/visible-rect/mask-layer-coverage.html 2015-06-04 18:09:54 UTC (rev 185204)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ height: 42px;
+ width: 44px;
+ background-color: blue;
+ -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAsCAYAAAATmipGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUZJREFUeNrU2S8sRWEYgPFzD7PZbDYbQSAoBBKFwgQTmKRpJE3SaBKFRKJJJphiCslNt1AERRBsNpvN/DmeL7ybGfLzne3Xn517d873vqcsimIOtSKDq0Id0zmEhktM5hAazjGWQ2g4xUgOocknjjFkDw0fOMSAPfR78AH67KHhDXvotYeGV+yg2x4aXrCFLntoeMYGOuyh4QnraLeHhkesos0eGh6wglZ7aLjHMlrsoeEOi2i2h4ZbLKC0h4ZrzP8XXMk0MPvbeFRJXf0cjyq5NB5NlIX/qsX/1non6/afvvHXrsESeGN/PMUDv8n8Cl0yv0L1hxL9MU9/cE6jyJp5FNEPd2lc3kSneQGxbV5ApJXOLnqsK5137JuXZLF27Dcvco8waF7knmDYvBo/w6j5Y8MFxs2fb9LEN2UfnmaKDD4xfgkwANpCXZrruKGvAAAAAElFTkSuQmCC);
+ }
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function doTest()
+ {
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS)
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="composited box"></div>
+<pre id="layers">Layer tree goes here when testing</pre>
+</body>
+</html>
Modified: tags/Safari-601.1.34.1/Source/WebCore/ChangeLog (185203 => 185204)
--- tags/Safari-601.1.34.1/Source/WebCore/ChangeLog 2015-06-04 18:08:37 UTC (rev 185203)
+++ tags/Safari-601.1.34.1/Source/WebCore/ChangeLog 2015-06-04 18:09:54 UTC (rev 185204)
@@ -1,3 +1,26 @@
+2015-06-04 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r185187.
+
+ 2015-06-03 Simon Fraser <simon.fra...@apple.com>
+
+ REGRESSION (r184968): missing media player buttons (control bar exists, but no buttons)
+ https://bugs.webkit.org/show_bug.cgi?id=145630
+
+ Reviewed by Zalan Bujtas.
+
+ r184968 changed the initial value of m_intersectsCoverageRect to false. However,
+ this triggered a bug with mask layers, whose value of m_intersectsCoverageRect was never
+ updated.
+
+ Fix by copying the value of m_intersectsCoverageRect from the main layer to its
+ mask layer, just as we do for m_visibleRect and m_coverageRect.
+
+ Test: compositing/visible-rect/mask-layer-coverage.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+
2015-06-02 Jon Lee <jon...@apple.com>
Build fix when building with internal SDKs
Modified: tags/Safari-601.1.34.1/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (185203 => 185204)
--- tags/Safari-601.1.34.1/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-06-04 18:08:37 UTC (rev 185203)
+++ tags/Safari-601.1.34.1/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-06-04 18:09:54 UTC (rev 185204)
@@ -1284,6 +1284,11 @@
if (intersectsCoverageRect != m_intersectsCoverageRect) {
m_uncommittedChanges |= CoverageRectChanged;
m_intersectsCoverageRect = intersectsCoverageRect;
+
+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
+ maskLayer->m_uncommittedChanges |= CoverageRectChanged;
+ maskLayer->m_intersectsCoverageRect = intersectsCoverageRect;
+ }
}
if (visibleRectChanged) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
