Diff
Modified: branches/safari-534.51-branch/LayoutTests/ChangeLog (91506 => 91507)
--- branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-07-21 21:46:43 UTC (rev 91506)
+++ branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-07-21 21:48:27 UTC (rev 91507)
@@ -1,5 +1,21 @@
2011-07-21 Lucas Forschler <[email protected]>
+ Merged 89474.
+
+ 2011-06-22 Matthew Delaney <[email protected]>
+
+ Reviewed by Oliver Hunt.
+
+ Canvas in layer obscures overlapping span
+ https://bugs.webkit.org/show_bug.cgi?id=63161
+
+ * compositing/layer-creation/spanOverlapsCanvas.html: Added.
+ * platform/mac/compositing/layer-creation: Added.
+ * platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt: Added.
+ * platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.png: Added.
+
+2011-07-21 Lucas Forschler <[email protected]>
+
Merged 89397.
2011-06-21 Matthew Delaney <[email protected]>
Copied: branches/safari-534.51-branch/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html (from rev 89474, trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html) (0 => 91507)
--- branches/safari-534.51-branch/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html 2011-07-21 21:48:27 UTC (rev 91507)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="viewport" content="width=480"/>
+
+ <script>
+ window.layoutTestController && window.layoutTestController.layerTreeAsText();
+
+ function init() {
+ var ctx = document.getElementById("world").getContext("2d");
+ ctx.fillStyle = "red";
+ ctx.fillRect(0,0,ctx.canvas.width,ctx.canvas.height);
+ }
+ </script>
+
+ <style>
+ #headerbar {
+ width: 100px;
+ height: 50px;
+ background-color: green;
+ position: absolute;
+ }
+ </style>
+</head>
+<body _onLoad_="init()">
+ <div id="headerbar"></div>
+ <canvas id="world" width="100" height="50"></canvas>
+</body>
+</html>
Deleted: branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.png
(Binary files differ)
Copied: branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.png (from rev 89474, trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.png)
(Binary files differ)
Deleted: branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt (89474 => 91507)
--- trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-22 20:39:01 UTC (rev 89474)
+++ branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-07-21 21:48:27 UTC (rev 91507)
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
- RenderBlock {HTML} at (0,0) size 800x70
- RenderBody {BODY} at (8,8) size 784x54
- RenderText {#text} at (0,0) size 0x0
-layer at (8,8) size 100x50
- RenderHTMLCanvas {CANVAS} at (0,0) size 100x50
-layer at (8,8) size 100x50
- RenderBlock (positioned) {DIV} at (8,8) size 100x50 [bgcolor=#008000]
Copied: branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt (from rev 89474, trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt) (0 => 91507)
--- branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-07-21 21:48:27 UTC (rev 91507)
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x70
+ RenderBlock {HTML} at (0,0) size 800x70
+ RenderBody {BODY} at (8,8) size 784x54
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 100x50
+ RenderHTMLCanvas {CANVAS} at (0,0) size 100x50
+layer at (8,8) size 100x50
+ RenderBlock (positioned) {DIV} at (8,8) size 100x50 [bgcolor=#008000]
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91506 => 91507)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-21 21:46:43 UTC (rev 91506)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-21 21:48:27 UTC (rev 91507)
@@ -1,5 +1,22 @@
2011-07-21 Lucas Forschler <[email protected]>
+ Merged 89474.
+
+ 2011-06-22 Matthew Delaney <[email protected]>
+
+ Reviewed by Oliver Hunt.
+
+ Canvas in layer obscures overlapping span
+ https://bugs.webkit.org/show_bug.cgi?id=63161
+
+ Test: compositing/layer-creation/spanOverlapsCanvas.html
+
+ * rendering/RenderLayer.cpp: Added checks for canvas to be layered properly.
+ (WebCore::RenderLayer::shouldBeNormalFlowOnly):
+ (WebCore::RenderLayer::isSelfPaintingLayer):
+
+2011-07-21 Lucas Forschler <[email protected]>
+
Merged 89397.
2011-06-21 Matthew Delaney <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp (91506 => 91507)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-07-21 21:46:43 UTC (rev 91506)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-07-21 21:48:27 UTC (rev 91507)
@@ -3989,6 +3989,7 @@
return (renderer()->hasOverflowClip()
|| renderer()->hasReflection()
|| renderer()->hasMask()
+ || renderer()->isCanvas()
|| renderer()->isVideo()
|| renderer()->isEmbeddedObject()
|| renderer()->isApplet()
@@ -4006,6 +4007,7 @@
|| renderer()->hasReflection()
|| renderer()->hasMask()
|| renderer()->isTableRow()
+ || renderer()->isCanvas()
|| renderer()->isVideo()
|| renderer()->isEmbeddedObject()
|| renderer()->isApplet()
