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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« 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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/compositing/iframes/overlapped-nested-iframes.html

diff --git a/LayoutTests/compositing/iframes/overlapped-nested-iframes.html b/LayoutTests/compositing/iframes/overlapped-nested-iframes.html

index 0d84b27cec771481ce4e5b69ed993af1b570cc68..d8690f5ac23716000a721ad25c3b4150808b7de4 100644

--- a/LayoutTests/compositing/iframes/overlapped-nested-iframes.html

+++ b/LayoutTests/compositing/iframes/overlapped-nested-iframes.html

@@ -33,13 +33,19 @@

window.setTimeout(function() {

window.scrollTo(0, 100);

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

- if (window.testRunner)

- testRunner.display();

+ if (window.internals) {

+ // FIXME: forcing the child iframes to do a compositing update here might not be appropriate.

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

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

+ window.internals.forceCompositingUpdate(frameDocument1);

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

+ window.internals.forceCompositingUpdate(frameDocument2);

+ }

window.setTimeout(function() {

- if (window.testRunner) {

+ if (window.internals)

document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);

+ if (window.testRunner)

testRunner.notifyDone();

- }

}, 0);

}

@@ -50,10 +56,10 @@

<body>

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

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

and their contents become composited. -->

- <iframe style="margin-top: 150px;" src="resources/intermediate-frame.html"></iframe>

- <iframe src="resources/intermediate-frame.html"></iframe>

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

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

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

</body>