Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: LayoutTests/compositing/iframes/connect-compositing-iframe.html

Issue 181653006: Remove testRunner.display() from most compositing/ tests (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert change to plugin test Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 -webkit-transform: translateZ(0); 14 -webkit-transform: translateZ(0);
14 } 15 }
(...skipping 12 matching lines...) Expand all
27 if (window.testRunner) { 28 if (window.testRunner) {
28 testRunner.dumpAsText(); 29 testRunner.dumpAsText();
29 testRunner.waitUntilDone(); 30 testRunner.waitUntilDone();
30 } 31 }
31 32
32 // Called from subframe. 33 // Called from subframe.
33 function testDone() 34 function testDone()
34 { 35 {
35 document.getElementById('parent-iframe').contentDocument.body.offsetWidth; // work around bug 41999. 36 document.getElementById('parent-iframe').contentDocument.body.offsetWidth; // work around bug 41999.
36 37
37 if (window.testRunner)
38 testRunner.display();
39
40 if (window.testRunner) { 38 if (window.testRunner) {
41 document.getElementById('layers').innerText = window.internals.layerTree AsText(document); 39 runAfterDisplay(function() {
42 testRunner.notifyDone(); 40 document.getElementById('layers').innerText = window.internals.layerTr eeAsText(document);
41 testRunner.notifyDone();
42 });
43 } 43 }
44 } 44 }
45 </script> 45 </script>
46 </head> 46 </head>
47 <body> 47 <body>
48 48
49 <!-- Test with already-composited iframe, and iframe contents becoming compo sited. --> 49 <!-- Test with already-composited iframe, and iframe contents becoming compo sited. -->
50 <iframe id="parent-iframe" src="resources/enter-compositing-subframe.html">< /iframe> 50 <iframe id="parent-iframe" src="resources/enter-compositing-subframe.html">< /iframe>
51 51
52 <div class="overlay"> 52 <div class="overlay">
53 </div> 53 </div>
54 54
55 <pre id="layers">Layer tree appears here in DRT.</pre> 55 <pre id="layers">Layer tree appears here in DRT.</pre>
56 </body> 56 </body>
57 </html> 57 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698