WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-48454-20121025123109.patch (text/plain), 46.19 KB, created by
Simon Fraser (smfr)
on 2012-10-25 12:32:35 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2012-10-25 12:32:35 PDT
Size:
46.19 KB
patch
obsolete
>Subversion Revision: 132504 >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 5333ab42fd8eba184d759dae026598e165f4a428..c47fa1a6dd04b5e622ccf170b22cd37c375eb95f 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,45 @@ >+2012-10-25 Simon Fraser <simon.fraser@apple.com> >+ >+ compositing/tiling/huge-layer* flakey >+ https://bugs.webkit.org/show_bug.cgi?id=48454 >+ >+ Reviewed by Dan Bernstein. >+ >+ In r131009 I fixed layerTreeAsText() to not be flakey with tiled layers, by ensuring that >+ we flush layer state before dumping the layer tree. That makes these tests non-flakey. I was >+ also able to remove all the setTimeouts() from these tests. >+ >+ The 'usingTiledLayer' property is only dumped on Mac, so made cross-platform results without >+ this flag, and added Mac-specific results with it. >+ >+ Unskipped some tests on non-Mac platforms that should now pass. >+ >+ * compositing/tiling/backface-preserve-3d-tiled-expected.txt: >+ * compositing/tiling/crash-reparent-tiled-layer-expected.txt: >+ * compositing/tiling/huge-layer-add-remove-child-expected.txt: >+ * compositing/tiling/huge-layer-add-remove-child.html: Added. >+ * compositing/tiling/huge-layer-add-remove-child.html-disabled: Removed. >+ * compositing/tiling/huge-layer-expected.txt: >+ * compositing/tiling/huge-layer-img-expected.txt: >+ * compositing/tiling/huge-layer-img.html: Renamed from LayoutTests/compositing/tiling/huge-layer-img.html-disabled. >+ * compositing/tiling/huge-layer-resize-expected.txt: >+ * compositing/tiling/huge-layer-with-layer-children-expected.txt: >+ * compositing/tiling/huge-layer-with-layer-children-resize-expected.txt: >+ * compositing/tiling/huge-layer-with-layer-children-resize.html: Added. >+ * compositing/tiling/huge-layer-with-layer-children-resize.html-disabled: Removed. >+ * compositing/tiling/huge-layer-with-layer-children.html: Renamed from LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled. >+ * platform/chromium/TestExpectations: >+ * platform/efl/TestExpectations: >+ * platform/mac/compositing/tiling/backface-preserve-3d-tiled-expected.txt: Copied from LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt. >+ * platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt: Copied from LayoutTests/compositing/tiling/crash-reparent-tiled-layer-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-add-remove-child-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-img-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-img-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-resize-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-resize-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-with-layer-children-expected.txt. >+ * platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt: Copied from LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt. >+ * platform/qt-5.0-wk2/TestExpectations: >+ > 2012-10-25 Csaba Osztrogonác <ossy@webkit.org> > > [Qt] Unreviewed gardening, skip failing tests to speedup testing. >diff --git a/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt b/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt >index 298fc2064bb6314af82e0cfaa724d0f744f49bb3..636fd6c43994d32ef471186a0e14c89780458ece 100644 >--- a/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt >+++ b/LayoutTests/compositing/tiling/backface-preserve-3d-tiled-expected.txt >@@ -35,7 +35,6 @@ > (children 1 > (GraphicsLayer > (bounds 202.00 2502.00) >- (usingTiledLayer 1) > (preserves3D 1) > (drawsContent 1) > (backfaceVisibility hidden) >diff --git a/LayoutTests/compositing/tiling/crash-reparent-tiled-layer-expected.txt b/LayoutTests/compositing/tiling/crash-reparent-tiled-layer-expected.txt >index 67e8015f9acb8aedd5b6de8d0c2ffe4e60dc0b08..24843f2296c9b60c1bebc468bcbf99c872466a04 100644 >--- a/LayoutTests/compositing/tiling/crash-reparent-tiled-layer-expected.txt >+++ b/LayoutTests/compositing/tiling/crash-reparent-tiled-layer-expected.txt >@@ -9,13 +9,11 @@ From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. > (GraphicsLayer > (position 8.00 68.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 1 > (GraphicsLayer > (position 51.00 101.00) > (bounds 200.00 4800.00) >- (usingTiledLayer 1) > (drawsContent 1) > ) > ) >diff --git a/LayoutTests/compositing/tiling/huge-layer-add-remove-child-expected.txt b/LayoutTests/compositing/tiling/huge-layer-add-remove-child-expected.txt >index 606f7d66cf87a9cb83733b58239641eed9137f16..df6174ac8ca50f4762a43fcba9cbee9f7c202dfb 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-add-remove-child-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-add-remove-child-expected.txt >@@ -10,7 +10,6 @@ First (no children): > (GraphicsLayer > (position 8.00 86.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > ) > ) >@@ -29,7 +28,6 @@ Second (child added): > (GraphicsLayer > (position 8.00 86.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 1 > (GraphicsLayer >@@ -55,7 +53,6 @@ Third (child removed): > (GraphicsLayer > (position 8.00 86.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > ) > ) >diff --git a/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html b/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html >new file mode 100644 >index 0000000000000000000000000000000000000000..c790782ec6c9f3c09f4558ca2023e4d171362f8e >--- /dev/null >+++ b/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html >@@ -0,0 +1,68 @@ >+<!DOCTYPE html> >+<html> >+ <head> >+ <style> >+ #container { >+ width: 500px; >+ height: 5000px; >+ border: 1px solid black; >+ background-color: yellow; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .box { >+ position: absolute; >+ left:50px; >+ width: 200px; >+ height: 200px; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .at-the-top { >+ top: 400px; >+ background-color: red; >+ } >+ </style> >+ <script> >+ if (window.testRunner) >+ testRunner.dumpAsText(); >+ >+ var result = ""; >+ >+ function testOnLoad() >+ { >+ // First with no kids >+ if (window.testRunner) >+ result = "First (no children):<br>" + window.internals.layerTreeAsText(document); >+ >+ // Second add kid >+ var box = document.createElement("div"); >+ box.className = "box at-the-top"; >+ document.getElementById('container').appendChild(box); >+ if (window.testRunner) >+ result += "<br><br>Second (child added):<br>" + window.internals.layerTreeAsText(document); >+ >+ // Third remove kid >+ var container = document.getElementById('container'); >+ container.removeChild(container.lastChild); >+ if (window.testRunner) { >+ result += "<br><br>Third (child removed):<br>" + window.internals.layerTreeAsText(document); >+ document.getElementById('layers').innerHTML = result; >+ } >+ } >+ >+ window.addEventListener('load', testOnLoad, false); >+ </script> >+ </head> >+ <body> >+ <p> >+ The yellow box should be large enough to scroll off the bottom. >+ At the start there should be no child. After 100ms a red box is >+ added and after 100ms more it should be removed. This tests that >+ we can support very large compositing layers with dynamically added >+ and removed child compositing layers. >+ </p> >+ <div id="container"></div> >+ <pre id="layers">Layer tree appears here in DRT.</pre> >+ </body> >+</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html-disabled b/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html-disabled >deleted file mode 100644 >index 45ca80e0b0e43bbcdd2ca4dd9245ed2efb705e62..0000000000000000000000000000000000000000 >--- a/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html-disabled >+++ /dev/null >@@ -1,88 +0,0 @@ >-<!DOCTYPE html> >-<html> >- <head> >- <title>Test of very large layer with added and removed child</title> >- >- <style type="text/css" media="screen"> >- >- #container { >- width: 500px; >- height: 5000px; >- border: 1px solid black; >- background-color: yellow; >- -webkit-transform:translateZ(0); >- } >- >- .box { >- position: absolute; >- left:50px; >- width: 200px; >- height: 200px; >- } >- >- .at-the-top { >- top: 400px; >- background-color: red; >- } >- >- </style> >- <script type="text/javascript" charset="utf-8"> >- if (window.testRunner) { >- testRunner.dumpAsText(); >- testRunner.waitUntilDone(); >- } >- >- result = ""; >- >- function testOnLoad() >- { >- // First with no kids >- window.setTimeout(function() { >- if (window.testRunner) >- result = "First (no children):<br>" + window.internals.layerTreeAsText(document); >- }, 0); >- >- // Second add kid >- window.setTimeout(function() { >- var box = document.createElement("div"); >- box.className = "box at-the-top"; >- document.getElementById('container').appendChild(box); >- >- // Let it render >- window.setTimeout(function() { >- if (window.testRunner) >- result += "<br><br>Second (child added):<br>" + window.internals.layerTreeAsText(document); >- }, 0); >- }, 100); >- >- // Third remove kid >- window.setTimeout(function() { >- var container = document.getElementById('container'); >- container.removeChild(container.lastChild); >- >- // Let it render >- window.setTimeout(function() { >- if (window.testRunner) { >- result += "<br><br>Third (child removed):<br>" + window.internals.layerTreeAsText(document); >- document.getElementById('layers').innerHTML = result; >- testRunner.notifyDone(); >- } >- }, 0); >- }, 200); >- } >- >- window.addEventListener('load', testOnLoad, false); >- </script> >- </head> >- <body> >- <p> >- The yellow box should be large enough to scroll off the bottom. >- At the start there should be no child. After 100ms a red box is >- added and after 100ms more it should be removed. This tests that >- we can support very large compositing layers with dynamically added >- and removed child compositing layers. >- </p> >- <div id="container"></div> >- <pre id="layers">Layer tree appears here in DRT.</pre> >- </body> >-</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-expected.txt b/LayoutTests/compositing/tiling/huge-layer-expected.txt >index 8cfc3f9aa85140d34e9d89b000a0853324c9dcf5..9e7fcdfd26b0446b44df251b7c7703bf61d79ebb 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-expected.txt >@@ -9,7 +9,6 @@ The yellow box should be large enough to scroll off the bottom. There should be > (GraphicsLayer > (position 8.00 68.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 2 > (GraphicsLayer >diff --git a/LayoutTests/compositing/tiling/huge-layer-img-expected.txt b/LayoutTests/compositing/tiling/huge-layer-img-expected.txt >index 73d9a1a935b2347c447742da9d0a1cb8da7b35f8..0bbeec726f0c86f485b5eb2984da17808c8307bb 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-img-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-img-expected.txt >@@ -8,7 +8,6 @@ > (GraphicsLayer > (position 8.00 8.00) > (bounds 500.00 20000.00) >- (usingTiledLayer 1) > (drawsContent 1) > ) > ) >diff --git a/LayoutTests/compositing/tiling/huge-layer-img.html b/LayoutTests/compositing/tiling/huge-layer-img.html >new file mode 100644 >index 0000000000000000000000000000000000000000..f29fc3af7ce045953f0af68c7824782ade4df169 >--- /dev/null >+++ b/LayoutTests/compositing/tiling/huge-layer-img.html >@@ -0,0 +1,47 @@ >+<!DOCTYPE html> >+<html> >+ <head> >+ <style> >+ #container { >+ width: 500px; >+ height: 20000px; >+ -webkit-transform:translateZ(0); >+ } >+ body { >+ overflow: hidden; >+ } >+ </style> >+ <script type="text/javascript" charset="utf-8"> >+ if (window.testRunner) >+ testRunner.dumpAsText(true); >+ >+ function testOnLoad() >+ { >+ var canvas = document.createElement('canvas'); >+ var img = document.getElementById("container") >+ canvas.width = img.width; >+ canvas.height = img.height; >+ var context = canvas.getContext('2d'); >+ context.fillStyle = "yellow"; >+ context.fillRect(0, 0, canvas.width, canvas.height); >+ context.fillStyle = "red"; >+ context.fillRect(50, 50, 200, 200); >+ img.src = canvas.toDataURL(); >+ >+ if (window.testRunner) >+ document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document); >+ } >+ >+ window.addEventListener('load', testOnLoad, false); >+ </script> >+ </head> >+ <body> >+ <!-- >+ The yellow box should be large enough to scroll off the bottom. >+ There should be a red box within the yellow box. >+ This tests that we can support very large composited image layers. >+ --> >+ <img id="container"> >+ <pre id="layers">Layer tree appears here in DRT.</pre> >+ </body> >+</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-img.html-disabled b/LayoutTests/compositing/tiling/huge-layer-img.html-disabled >deleted file mode 100644 >index 802244237a1fa8505dd48e485514cacacfa0bd57..0000000000000000000000000000000000000000 >--- a/LayoutTests/compositing/tiling/huge-layer-img.html-disabled >+++ /dev/null >@@ -1,55 +0,0 @@ >-<!DOCTYPE html> >-<html> >- <head> >- <title>Test of very large image layer</title> >- >- <style type="text/css" media="screen"> >- #container { >- width: 500px; >- height: 20000px; >- -webkit-transform:translateZ(0); >- } >- body { >- overflow:hidden; >- } >- </style> >- <script type="text/javascript" charset="utf-8"> >- if (window.testRunner) { >- testRunner.dumpAsText(true); >- testRunner.waitUntilDone(); >- } >- >- function testOnLoad() >- { >- var canvas = document.createElement('canvas'); >- var img = document.getElementById("container") >- canvas.width = img.width; >- canvas.height = img.height; >- var context = canvas.getContext('2d'); >- context.fillStyle = "yellow"; >- context.fillRect(0, 0, canvas.width, canvas.height); >- context.fillStyle = "red"; >- context.fillRect(50, 50, 200, 200); >- img.src = canvas.toDataURL(); >- >- window.setTimeout(function() { >- if (window.testRunner) { >- document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document); >- testRunner.notifyDone(); >- } >- }, 0); >- } >- >- window.addEventListener('load', testOnLoad, false); >- </script> >- </head> >- <body> >- <!-- >- The yellow box should be large enough to scroll off the bottom. >- There should be a red box within the yellow box. >- This tests that we can support very large composited image layers. >- --> >- <img id="container"> >- <pre id="layers">Layer tree appears here in DRT.</pre> >- </body> >-</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-resize-expected.txt b/LayoutTests/compositing/tiling/huge-layer-resize-expected.txt >index 91eaea76bb78e6d8076ba8204b7668be422727c0..ee31e0b48de2d262d1bd6ffe3f864f180bd2345f 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-resize-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-resize-expected.txt >@@ -35,7 +35,6 @@ Second (huge layer): > (GraphicsLayer > (position 8.00 68.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 1 > (GraphicsLayer >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-expected.txt b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-expected.txt >index 87daf186abdab7bcef842dcb06618f5e9e46cee1..0f230ce8d4940e57e2457320f5f1f33c0da07847 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-expected.txt >@@ -10,7 +10,6 @@ This is some text > (GraphicsLayer > (position 8.00 86.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 2 > (GraphicsLayer >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt >index 5af103fe3dad9184d37f80c47eca00a9bb8013f7..6105025202677cf96e681a12e6c7914278325e43 100644 >--- a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt >+++ b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt >@@ -40,7 +40,6 @@ Second (huge layer): > (GraphicsLayer > (position 8.00 68.00) > (bounds 502.00 5002.00) >- (usingTiledLayer 1) > (drawsContent 1) > (children 2 > (GraphicsLayer >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html >new file mode 100644 >index 0000000000000000000000000000000000000000..54e9ba543c9739c6bbbd1c6ad43c685391ce6d3f >--- /dev/null >+++ b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html >@@ -0,0 +1,75 @@ >+<!DOCTYPE html> >+<html> >+ <head> >+ <style> >+ #container { >+ width: 500px; >+ height: 500px; >+ border: 1px solid black; >+ background-color: yellow; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .box { >+ position: absolute; >+ left:50px; >+ width: 200px; >+ height: 200px; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .at-the-top { >+ top: 100px; >+ background-color: red; >+ } >+ >+ .at-the-bottom { >+ top:200px; >+ left: 275px; >+ background-color: blue; >+ } >+ </style> >+ <script> >+ if (window.testRunner) >+ testRunner.dumpAsText(); >+ >+ var result = ""; >+ >+ function testOnLoad() >+ { >+ // Small layer first >+ if (window.testRunner) >+ result = "First (small layer):<br>" + window.internals.layerTreeAsText(document); >+ >+ // Huge layer second >+ document.getElementById('container').style.height = "5000px"; >+ document.getElementById('blue-box').style.top = "4700px"; >+ if (window.testRunner) >+ result += "<br><br>Second (huge layer):<br>" + window.internals.layerTreeAsText(document); >+ >+ // Small layer third >+ document.getElementById('container').style.height = "500px"; >+ document.getElementById('blue-box').style.top = "200px"; >+ if (window.testRunner) { >+ result += "<br><br>Third (small layer):<br>" + window.internals.layerTreeAsText(document); >+ document.getElementById('layers').innerHTML = result; >+ } >+ } >+ >+ window.addEventListener('load', testOnLoad, false); >+ </script> >+ </head> >+ <body> >+ <p> >+ The yellow box should be 500 x 500 on startup. Then it should >+ stretch to be 500 x 5000, then shrink back down to 500 x 500. >+ This tests that we can resize to a huge layer and back again >+ and still maintain integrity of the layer tree. >+ </p> >+ <div id="container"> >+ <div class="box at-the-top"></div> >+ <div id="blue-box" class="box at-the-bottom"></div> >+ </div> >+ <pre id="layers">Layer tree appears here in DRT.</pre> >+ </body> >+</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html-disabled b/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html-disabled >deleted file mode 100644 >index cc575a46f5b7266a73598621bee4aa4c4544629c..0000000000000000000000000000000000000000 >--- a/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html-disabled >+++ /dev/null >@@ -1,95 +0,0 @@ >-<!DOCTYPE html> >-<html> >- <head> >- <title>Test of very large layer resizing with layer children</title> >- >- <style type="text/css" media="screen"> >- >- #container { >- width: 500px; >- height: 500px; >- border: 1px solid black; >- background-color: yellow; >- -webkit-transform:translateZ(0); >- } >- >- .box { >- position: absolute; >- left:50px; >- width: 200px; >- height: 200px; >- -webkit-transform:translateZ(0); >- } >- >- .at-the-top { >- top: 100px; >- background-color: red; >- } >- >- .at-the-bottom { >- top:200px; >- left: 275px; >- background-color: blue; >- } >- </style> >- <script type="text/javascript" charset="utf-8"> >- if (window.testRunner) { >- testRunner.dumpAsText(); >- testRunner.waitUntilDone(); >- } >- >- result = ""; >- >- function testOnLoad() >- { >- // Small layer first >- window.setTimeout(function() { >- if (window.testRunner) >- result = "First (small layer):<br>" + window.internals.layerTreeAsText(document); >- }, 0); >- >- // Huge layer second >- window.setTimeout(function() { >- document.getElementById('container').style.height = "5000px"; >- document.getElementById('blue-box').style.top = "4700px"; >- >- // Let it render >- window.setTimeout(function() { >- if (window.testRunner) >- result += "<br><br>Second (huge layer):<br>" + testRunner.layerTreeAsText(); >- }, 0); >- }, 100); >- >- // Small layer third >- window.setTimeout(function() { >- document.getElementById('container').style.height = "500px"; >- document.getElementById('blue-box').style.top = "200px"; >- >- // Let it render >- window.setTimeout(function() { >- if (window.testRunner) { >- result += "<br><br>Third (small layer):<br>" + testRunner.layerTreeAsText(); >- document.getElementById('layers').innerHTML = result; >- testRunner.notifyDone(); >- } >- }, 0); >- }, 200); >- } >- >- window.addEventListener('load', testOnLoad, false); >- </script> >- </head> >- <body> >- <p> >- The yellow box should be 500 x 500 on startup. Then it should >- stretch to be 500 x 5000, then shrink back down to 500 x 500. >- This tests that we can resize to a huge layer and back again >- and still maintain integrity of the layer tree. >- </p> >- <div id="container"> >- <div class="box at-the-top"></div> >- <div id="blue-box" class="box at-the-bottom"></div> >- </div> >- <pre id="layers">Layer tree appears here in DRT.</pre> >- </body> >-</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html b/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html >new file mode 100644 >index 0000000000000000000000000000000000000000..6b34670c6bd1594888df8a5e247bc64f4ed38baa >--- /dev/null >+++ b/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html >@@ -0,0 +1,61 @@ >+<!DOCTYPE html> >+<html> >+ <head> >+ <title>Test of very large layer with layer children</title> >+ >+ <style type="text/css" media="screen"> >+ >+ #container { >+ width: 500px; >+ height: 5000px; >+ border: 1px solid black; >+ background-color: yellow; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .box { >+ position: absolute; >+ left:50px; >+ width: 200px; >+ height: 200px; >+ -webkit-transform:translateZ(0); >+ } >+ >+ .at-the-top { >+ top: 100px; >+ background-color: red; >+ } >+ >+ .at-the-bottom { >+ top:4700px; >+ background-color: blue; >+ } >+ </style> >+ <script type="text/javascript" charset="utf-8"> >+ if (window.testRunner) >+ testRunner.dumpAsText(); >+ >+ function testOnLoad() >+ { >+ if (window.testRunner) >+ document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document); >+ } >+ >+ window.addEventListener('load', testOnLoad, false); >+ </script> >+ </head> >+ <body> >+ <p> >+ The yellow box should be large enough to scroll off the bottom. >+ There should be a red box on the first page and a blue box >+ near the bottom of the yellow box. This tests that we can support >+ very large compositing layers with child compositing layers. >+ </p> >+ <div id="container"> >+ This is some text >+ <div class="box at-the-top"></div> >+ <div class="box at-the-bottom"></div> >+ </div> >+ <pre id="layers">Layer tree appears here in DRT.</pre> >+ </body> >+</html> >diff --git a/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled b/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled >deleted file mode 100644 >index d12656f832677ed5032297286ee1e1cf73db5945..0000000000000000000000000000000000000000 >--- a/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled >+++ /dev/null >@@ -1,70 +0,0 @@ >-<!DOCTYPE html> >-<html> >- <head> >- <title>Test of very large layer with layer children</title> >- >- <style type="text/css" media="screen"> >- >- #container { >- width: 500px; >- height: 5000px; >- border: 1px solid black; >- background-color: yellow; >- -webkit-transform:translateZ(0); >- } >- >- .box { >- position: absolute; >- left:50px; >- width: 200px; >- height: 200px; >- -webkit-transform:translateZ(0); >- } >- >- .at-the-top { >- top: 100px; >- background-color: red; >- } >- >- .at-the-bottom { >- top:4700px; >- background-color: blue; >- } >- </style> >- <script type="text/javascript" charset="utf-8"> >- if (window.testRunner) { >- testRunner.dumpAsText(); >- testRunner.waitUntilDone(); >- } >- >- function testOnLoad() >- { >- // Wait for a layer update and the tiled layer to fill in. >- window.setTimeout(function() { >- window.setTimeout(function() { >- if (window.testRunner) { >- document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document); >- testRunner.notifyDone(); >- } >- }, 0); >- }, 0); >- } >- >- window.addEventListener('load', testOnLoad, false); >- </script> >- </head> >- <body> >- <p> >- The yellow box should be large enough to scroll off the bottom. >- There should be a red box on the first page and a blue box >- near the bottom of the yellow box. This tests that we can support >- very large compositing layers with child compositing layers. >- </p> >- <div id="container"> >- This is some text >- <div class="box at-the-top"></div> >- <div class="box at-the-bottom"></div> >- </div> >- <pre id="layers">Layer tree appears here in DRT.</pre> >- </body> >-</html> >diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations >index 6125e1101206c822fa5263cfaa1b5110026bda69..452869e4a5700b47cb5c8d395dfdb0fe6b15a56e 100644 >--- a/LayoutTests/platform/chromium/TestExpectations >+++ b/LayoutTests/platform/chromium/TestExpectations >@@ -2813,8 +2813,6 @@ crbug.com/84032 [ Win ] fast/dom/object-plugin-hides-properties.html [ Pass Time > #new test added. Still fails on chrome > webkit.org/b/98315 css3/compositing/blend-mode-property.html [ Failure ] > webkit.org/b/98315 css3/compositing/should-have-compositing-layer.html [ Failure ] >-webkit.org/b/100205 compositing/tiling/backface-preserve-3d-tiled.html [ Failure ] >-webkit.org/b/100205 platform/chromium/virtual/softwarecompositing/tiling/backface-preserve-3d-tiled.html [ Failure ] > > # two regions reftests failing on Chromium > webkit.org/b/74219 fast/regions/positioned-objects-block-static-spanning-regions-rtl.html [ ImageOnlyFailure Pass ] >diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations >index e6146e1139bde81d2e2d29c6b8374f2a0a0dd3de..101631b1afc3664b27b4bb5e35ff1e4de33d9c19 100644 >--- a/LayoutTests/platform/efl/TestExpectations >+++ b/LayoutTests/platform/efl/TestExpectations >@@ -130,7 +130,6 @@ compositing/checkerboard.html > compositing/framesets/composited-frame-alignment.html > compositing/images/direct-pdf-image.html > compositing/reflections/backface-hidden-reflection.html >-compositing/tiling/constrained-layer-size.html > editing/selection/extend-selection-after-double-click.html > fast/forms/listbox-onchange.html > fast/forms/onselect-textfield.html >@@ -1489,14 +1488,6 @@ webkit.org/b/79766 compositing/rtl/rtl-iframe-fixed-overflow.html [ Failure ] > webkit.org/b/79766 compositing/rtl/rtl-iframe-fixed.html [ Failure ] > webkit.org/b/79766 compositing/rtl/rtl-iframe-relative.html [ Failure ] > webkit.org/b/79766 compositing/rtl/rtl-relative.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/backface-preserve-3d-tiled.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/crash-reparent-tiled-layer.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer-add-remove-child.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer-img.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer-resize.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer-with-layer-children-resize.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer-with-layer-children.html [ Failure ] >-webkit.org/b/79766 compositing/tiling/huge-layer.html [ Failure ] > webkit.org/b/79766 compositing/video/video-poster.html [ Failure ] > webkit.org/b/79766 compositing/backing/no-backing-for-clip-overlap.html [ Failure ] > webkit.org/b/79766 compositing/backing/no-backing-for-clip.html [ Failure ] >diff --git a/LayoutTests/platform/mac/compositing/tiling/backface-preserve-3d-tiled-expected.txt b/LayoutTests/platform/mac/compositing/tiling/backface-preserve-3d-tiled-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..298fc2064bb6314af82e0cfaa724d0f744f49bb3 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/backface-preserve-3d-tiled-expected.txt >@@ -0,0 +1,52 @@ >+(GraphicsLayer >+ (bounds 800.00 600.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 800.00 600.00) >+ (children 2 >+ (GraphicsLayer >+ (position 18.00 10.00) >+ (bounds 204.00 204.00) >+ (children 1 >+ (GraphicsLayer >+ (position 2.00 2.00) >+ (bounds 200.00 200.00) >+ (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00]) >+ (children 1 >+ (GraphicsLayer >+ (bounds 202.00 202.00) >+ (preserves3D 1) >+ (drawsContent 1) >+ (backfaceVisibility hidden) >+ (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00]) >+ ) >+ ) >+ ) >+ ) >+ ) >+ (GraphicsLayer >+ (position 18.00 224.00) >+ (bounds 204.00 204.00) >+ (children 1 >+ (GraphicsLayer >+ (position 2.00 2.00) >+ (bounds 200.00 200.00) >+ (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00]) >+ (children 1 >+ (GraphicsLayer >+ (bounds 202.00 2502.00) >+ (usingTiledLayer 1) >+ (preserves3D 1) >+ (drawsContent 1) >+ (backfaceVisibility hidden) >+ (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00]) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt b/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..67e8015f9acb8aedd5b6de8d0c2ffe4e60dc0b08 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/crash-reparent-tiled-layer-expected.txt >@@ -0,0 +1,27 @@ >+From https://bugs.webkit.org/show_bug.cgi?id=44629. The parent is a tiled layer. When the child is a non-tiled layer and it is switched to a tiled layer, a crash occurs. This test should not crash. >+ >+(GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 1 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 4800.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..606f7d66cf87a9cb83733b58239641eed9137f16 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-add-remove-child-expected.txt >@@ -0,0 +1,65 @@ >+The yellow box should be large enough to scroll off the bottom. At the start there should be no child. After 100ms a red box is added and after 100ms more it should be removed. This tests that we can support very large compositing layers with dynamically added and removed child compositing layers. >+ >+First (no children): >+(GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 86.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Second (child added): >+(GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 86.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 1 >+ (GraphicsLayer >+ (position 51.00 401.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Third (child removed): >+(GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 86.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..8cfc3f9aa85140d34e9d89b000a0853324c9dcf5 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-expected.txt >@@ -0,0 +1,31 @@ >+The yellow box should be large enough to scroll off the bottom. There should be a red box on the first page and a blue box near the bottom of the yellow box. This tests that we can support very large compositing layers. >+ >+(GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 2 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ (GraphicsLayer >+ (position 51.00 4701.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-img-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-img-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..73d9a1a935b2347c447742da9d0a1cb8da7b35f8 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-img-expected.txt >@@ -0,0 +1,18 @@ >+ >+(GraphicsLayer >+ (bounds 800.00 20053.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 800.00 20053.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 8.00) >+ (bounds 500.00 20000.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-resize-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-resize-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..91eaea76bb78e6d8076ba8204b7668be422727c0 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-resize-expected.txt >@@ -0,0 +1,77 @@ >+The yellow box should be 500 x 500 on startup. Then it should stretch to be 500 x 5000, then shrink back down to 500 x 500. This tests that we can resize to a huge layer and back again and still maintain integrity of the layer tree. >+ >+First (small layer): >+(GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 502.00) >+ (drawsContent 1) >+ (children 1 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Second (huge layer): >+(GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 1 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Third (small layer): >+(GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 502.00) >+ (drawsContent 1) >+ (children 1 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..87daf186abdab7bcef842dcb06618f5e9e46cee1 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-expected.txt >@@ -0,0 +1,32 @@ >+The yellow box should be large enough to scroll off the bottom. There should be a red box on the first page and a blue box near the bottom of the yellow box. This tests that we can support very large compositing layers with child compositing layers. >+ >+This is some text >+(GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5129.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 86.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 2 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ (GraphicsLayer >+ (position 51.00 4701.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt b/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..5af103fe3dad9184d37f80c47eca00a9bb8013f7 >--- /dev/null >+++ b/LayoutTests/platform/mac/compositing/tiling/huge-layer-with-layer-children-resize-expected.txt >@@ -0,0 +1,92 @@ >+The yellow box should be 500 x 500 on startup. Then it should stretch to be 500 x 5000, then shrink back down to 500 x 500. This tests that we can resize to a huge layer and back again and still maintain integrity of the layer tree. >+ >+First (small layer): >+(GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 502.00) >+ (drawsContent 1) >+ (children 2 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ (GraphicsLayer >+ (position 276.00 201.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Second (huge layer): >+(GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 5111.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 5002.00) >+ (usingTiledLayer 1) >+ (drawsContent 1) >+ (children 2 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ (GraphicsLayer >+ (position 276.00 4701.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >+ >+Third (small layer): >+(GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (bounds 785.00 611.00) >+ (children 1 >+ (GraphicsLayer >+ (position 8.00 68.00) >+ (bounds 502.00 502.00) >+ (drawsContent 1) >+ (children 2 >+ (GraphicsLayer >+ (position 51.00 101.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ (GraphicsLayer >+ (position 276.00 201.00) >+ (bounds 200.00 200.00) >+ (drawsContent 1) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/platform/qt-5.0-wk2/TestExpectations b/LayoutTests/platform/qt-5.0-wk2/TestExpectations >index d4aa17820906940de557fa46f4f6616da7d856e8..06ac604aaaebb8c17316a7fe79d4883c63ec52b8 100644 >--- a/LayoutTests/platform/qt-5.0-wk2/TestExpectations >+++ b/LayoutTests/platform/qt-5.0-wk2/TestExpectations >@@ -334,7 +334,6 @@ compositing/geometry/limit-layer-bounds-transformed.html > compositing/layer-creation/overflow-scroll-overlap.html > compositing/layer-creation/scroll-partial-update.html > compositing/layer-creation/spanOverlapsCanvas.html >-compositing/tiling/crash-reparent-tiled-layer.html > > # The following tests doesnt match both expected image and text. > compositing/geometry/ancestor-overflow-change.html >@@ -361,10 +360,6 @@ compositing/overflow/overflow-visible-with-touch.html > compositing/overflow/scrolling-content-clip-to-viewport.html > compositing/overflow/textarea-scroll-touch.html > >-# New compositing/tiling/backface-preserve-3d-tiled.html introduced in r132394 fails >-# https://bugs.webkit.org/show_bug.cgi?id=100348 >-compositing/tiling/backface-preserve-3d-tiled.html >- > # [Qt] [WK2] Some fullscreen layout tests are timing out on the bot > # https://bugs.webkit.org/show_bug.cgi?id=92543 > fullscreen/video-controls-timeline.html
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 48454
:
170515
|
170711
|
170767