| 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 } | 13 } |
| 13 | 14 |
| 14 .collapsed { | 15 .collapsed { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 26 | 27 |
| 27 </style> | 28 </style> |
| 28 <script type="text/javascript" charset="utf-8"> | 29 <script type="text/javascript" charset="utf-8"> |
| 29 if (window.testRunner) { | 30 if (window.testRunner) { |
| 30 testRunner.dumpAsText(); | 31 testRunner.dumpAsText(); |
| 31 testRunner.waitUntilDone(); | 32 testRunner.waitUntilDone(); |
| 32 } | 33 } |
| 33 | 34 |
| 34 function doTest() | 35 function doTest() |
| 35 { | 36 { |
| 36 // For some reason this delay is required for AppKit to not short-circui
t the display. | 37 var hadLayers = false; |
| 37 window.setTimeout(function() { | 38 if (window.testRunner) { |
| 38 if (window.testRunner) | 39 var layers = window.internals.layerTreeAsText(document); |
| 39 testRunner.display(); | 40 hadLayers = layers != ""; |
| 41 } |
| 40 | 42 |
| 41 var hadLayers = false; | 43 runAfterDisplay(function() { |
| 42 if (window.testRunner) { | |
| 43 var layers = window.internals.layerTreeAsText(document); | |
| 44 hadLayers = layers != ""; | |
| 45 } | |
| 46 | |
| 47 document.getElementById('iframe').className = 'collapsed'; | 44 document.getElementById('iframe').className = 'collapsed'; |
| 48 | 45 |
| 49 if (window.testRunner) { | 46 if (window.testRunner) { |
| 50 | |
| 51 testRunner.display(); | |
| 52 var haveLayers = window.internals.layerTreeAsText(document) != "
"; | 47 var haveLayers = window.internals.layerTreeAsText(document) != "
"; |
| 53 var result; | 48 var result; |
| 54 if (hadLayers && !haveLayers) | 49 if (hadLayers && !haveLayers) |
| 55 result = "PASS: had layers, and now do not"; | 50 result = "PASS: had layers, and now do not"; |
| 56 else | 51 else |
| 57 result = "FAIL: layers should have gone. hadLayers = " + hadLa
yers + ", haveLayers = " + haveLayers; | 52 result = "FAIL: layers should have gone. hadLayers = " + hadLa
yers + ", haveLayers = " + haveLayers; |
| 58 document.getElementById('result').innerHTML = result; | 53 document.getElementById('result').innerHTML = result; |
| 59 testRunner.notifyDone(); | 54 testRunner.notifyDone(); |
| 60 } | 55 } |
| 61 }, 0); | 56 }); |
| 62 } | 57 } |
| 63 | 58 |
| 64 window.addEventListener('load', doTest, false); | 59 window.addEventListener('load', doTest, false); |
| 65 </script> | 60 </script> |
| 66 </head> | 61 </head> |
| 67 <body> | 62 <body> |
| 68 | 63 |
| 69 <!-- The parent document may into compositing mode by the iframe. --> | 64 <!-- The parent document may into compositing mode by the iframe. --> |
| 70 <iframe id="iframe" src="resources/composited-subframe.html"></iframe> | 65 <iframe id="iframe" src="resources/composited-subframe.html"></iframe> |
| 71 | 66 |
| 72 <div class="overlay"> | 67 <div class="overlay"> |
| 73 </div> | 68 </div> |
| 74 | 69 |
| 75 <div id="result">Test only works in DRT</div> | 70 <div id="result">Test only works in DRT</div> |
| 76 </body> | 71 </body> |
| 77 </html> | 72 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 181653006:
Remove testRunner.display() from most compositing/ tests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk