LayoutTests/compositing/iframes/overlapped-nested-iframes.html - Issue 26110004: Defer the real work in updateCompositingLayers until it's really needed.

Side by Side Diff: LayoutTests/compositing/iframes/overlapped-nested-iframes.html

Issue 26110004: Defer the real work in updateCompositingLayers until it's really needed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: try to fix chunk mismatch error Created 7 years, 2 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

« no previous file with comments | « LayoutTests/compositing/gestures/gesture-tapHighlight-on-promoted-overflow-div-scrolled.html ('k') | LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling-after-sibling-display-change.html » ('j') | Source/core/rendering/RenderLayerCompositor.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2	2

3 <html>	3 <html>

4 <head>	4 <head>

5 <style type="text/css" media="screen">	5 <style type="text/css" media="screen">

6 body {	6 body {

7 height: 1500px;	7 height: 1500px;

8 margin: 0;	8 margin: 0;

9 }	9 }

10 #banner {	10 #banner {

(...skipping 15 matching lines...) Expand all Loading...
26 testRunner.dumpAsText();	26 testRunner.dumpAsText();

27 testRunner.waitUntilDone();	27 testRunner.waitUntilDone();

28 }	28 }

29	29

30 function doTest()	30 function doTest()

31 {	31 {

32 // For some reason this delay is required for AppKit to not short-circui t the display.	32 // For some reason this delay is required for AppKit to not short-circui t the display.

33 window.setTimeout(function() {	33 window.setTimeout(function() {

34 window.scrollTo(0, 100);	34 window.scrollTo(0, 100);

35 // Force a paint, and give layers a chance to update.	35 // Force a paint, and give layers a chance to update.

36 if (window.testRunner)	36 if (window.internals) {

37 testRunner.display();	37 // FIXME: forcing the child iframes to do a compositing update here might not be appropriate.

	38 // Is it more correct to actually force a layout in the actual code somewhere?

	39 var frameDocument1 = document.getElementById('frame1').contentWindow .document;

	40 window.internals.forceCompositingUpdate(frameDocument1);

	41 var frameDocument2 = document.getElementById('frame2').contentWindow .document;

	42 window.internals.forceCompositingUpdate(frameDocument2);

	43 }

38 window.setTimeout(function() {	44 window.setTimeout(function() {

39 if (window.testRunner) {	45 if (window.internals)

40 document.getElementById('layers').innerHTML = window.internals.l ayerTreeAsText(document);	46 document.getElementById('layers').innerHTML = window.internals.l ayerTreeAsText(document);

	47 if (window.testRunner)

41 testRunner.notifyDone();	48 testRunner.notifyDone();

42 }

43 }, 0);	49 }, 0);

44 }, 0);	50 }, 0);

45 }	51 }

46	52

47 window.addEventListener('load', doTest, false);	53 window.addEventListener('load', doTest, false);

48 </script>	54 </script>

49 </head>	55 </head>

50 <body>	56 <body>

51 <div id="banner"></div>	57 <div id="banner"></div>

52	58

53 <!-- Tests that when scrolled so that one iframe is overlapped, both iframes	59 <!-- Tests that when scrolled so that one iframe is overlapped, both iframes

54 and their contents become composited. -->	60 and their contents become composited. -->

55 <iframe style="margin-top: 150px;" src="resources/intermediate-frame.html">< /iframe>	61 <iframe id="frame1" style="margin-top: 150px;" src="resources/intermediate-f rame.html"></iframe>

56 <iframe src="resources/intermediate-frame.html"></iframe>	62 <iframe id="frame2" src="resources/intermediate-frame.html"></iframe>

57	63

58 <pre id="layers">Layer tree appears here in DRT.</pre>	64 <pre id="layers">Layer tree appears here in DRT.</pre>

59 </body>	65 </body>

60 </html>	66 </html>

OLD	NEW