| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 | 2 |
| 3 <html> | 3 <html> |
| 4 <head> | 4 <head> |
| 5 <script src="../../resources/run-after-display.js"></script> |
| 5 <style type="text/css" media="screen"> | 6 <style type="text/css" media="screen"> |
| 6 iframe { | 7 iframe { |
| 7 border: 10px solid black; | 8 border: 10px solid black; |
| 8 padding: 5px; | 9 padding: 5px; |
| 9 margin: 20px; | 10 margin: 20px; |
| 10 height: 150px; | 11 height: 150px; |
| 11 width: 300px; | 12 width: 300px; |
| 12 -webkit-box-shadow: 0 0 20px black; | 13 -webkit-box-shadow: 0 0 20px black; |
| 13 } | 14 } |
| 14 | 15 |
| 15 .overlay { | 16 .overlay { |
| 16 position: absolute; | 17 position: absolute; |
| 17 width: 50px; | 18 width: 50px; |
| 18 height: 50px; | 19 height: 50px; |
| 19 top: 5px; | 20 top: 5px; |
| 20 left: 5px; | 21 left: 5px; |
| 21 background-color: rgba(0, 0, 0, 0.2); | 22 background-color: rgba(0, 0, 0, 0.2); |
| 22 } | 23 } |
| 23 | 24 |
| 24 </style> | 25 </style> |
| 25 <script type="text/javascript" charset="utf-8"> | 26 <script type="text/javascript" charset="utf-8"> |
| 26 if (window.testRunner) { | 27 if (window.testRunner) { |
| 27 testRunner.dumpAsText(); | 28 testRunner.dumpAsText(); |
| 28 testRunner.waitUntilDone(); | 29 testRunner.waitUntilDone(); |
| 29 } | 30 } |
| 30 | 31 |
| 31 function doTest() | 32 function doTest() |
| 32 { | 33 { |
| 33 // For some reason this delay is required for AppKit to not short-circui
t the display. | 34 var hadLayersBefore = false; |
| 34 window.setTimeout(function() { | 35 var hadLayersAfter = false; |
| 35 var hadLayersBefore = false; | 36 |
| 36 var hadLayersAfter = false; | 37 // Need to paint for overlap testing. |
| 38 runAfterDisplay(function() { |
| 37 if (window.testRunner) { | 39 if (window.testRunner) { |
| 38 testRunner.display(); // Need to paint for overlap testing. | |
| 39 hadLayersBefore = window.internals.layerTreeAsText(document) !=
""; | 40 hadLayersBefore = window.internals.layerTreeAsText(document) !=
""; |
| 40 } | 41 } |
| 41 | 42 |
| 42 document.getElementById('parent-iframe').src = "about:blank"; | 43 document.getElementById('parent-iframe').src = "about:blank"; |
| 43 | 44 |
| 44 window.setTimeout(function() { | 45 runAfterDisplay(function() { |
| 45 if (window.testRunner) { | 46 if (window.testRunner) { |
| 46 hadLayersAfter = window.internals.layerTreeAsText(document)
!= ""; | 47 hadLayersAfter = window.internals.layerTreeAsText(document)
!= ""; |
| 47 | 48 |
| 48 var results = document.getElementById('results'); | 49 var results = document.getElementById('results'); |
| 49 if (hadLayersBefore && !hadLayersAfter) | 50 if (hadLayersBefore && !hadLayersAfter) |
| 50 results.innerText = "PASS: layers disappeared when ifram
e source changed." | 51 results.innerText = "PASS: layers disappeared when ifram
e source changed." |
| 51 else if (!hadLayersBefore) | 52 else if (!hadLayersBefore) |
| 52 results.innerText = "FAIL: should have initially had lay
ers, but did not." | 53 results.innerText = "FAIL: should have initially had lay
ers, but did not." |
| 53 else if (hadLayersAfter) | 54 else if (hadLayersAfter) |
| 54 results.innerText = "FAIL: layers did not disappear when
iframe source changed." | 55 results.innerText = "FAIL: layers did not disappear when
iframe source changed." |
| 55 | 56 |
| 56 testRunner.notifyDone(); | 57 testRunner.notifyDone(); |
| 57 } | 58 } |
| 58 }, 0); | 59 }); |
| 59 }, 0); | 60 }); |
| 60 } | 61 } |
| 61 | 62 |
| 62 window.addEventListener('load', doTest, false); | 63 window.addEventListener('load', doTest, false); |
| 63 </script> | 64 </script> |
| 64 </head> | 65 </head> |
| 65 <body> | 66 <body> |
| 66 | 67 |
| 67 <iframe id="parent-iframe" src="resources/composited-subframe.html"></iframe
> | 68 <iframe id="parent-iframe" src="resources/composited-subframe.html"></iframe
> |
| 68 | 69 |
| 69 <div class="overlay"> | 70 <div class="overlay"> |
| 70 </div> | 71 </div> |
| 71 | 72 |
| 72 <p>The iframe content was removed. There should be no layers here.</p> | 73 <p>The iframe content was removed. There should be no layers here.</p> |
| 73 <p id="results">This test needs to be run in DRT.</p> | 74 <p id="results">This test needs to be run in DRT.</p> |
| 74 </body> | 75 </body> |
| 75 </html> | 76 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 181653006:
Remove testRunner.display() from most compositing/ tests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk