diff options
| author | enne@chromium.org <enne@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2014-02-28 01:14:10 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2014-02-28 01:14:10 +0000 |
| commit | 8866d950f1896703ffb9c4830b9eec5c82080fc3 (patch) | |
| tree | 6cf6d42239175af68921b13eb5a07d429b185b4c /third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html | |
| parent | 1b5ecb181f37f39940371f6cba9b49b1a45ad164 (diff) | |
| download | chromium_src-8866d950f1896703ffb9c4830b9eec5c82080fc3.zip chromium_src-8866d950f1896703ffb9c4830b9eec5c82080fc3.tar.gz chromium_src-8866d950f1896703ffb9c4830b9eec5c82080fc3.tar.bz2 | |
Remove testRunner.display() from most compositing/ tests
BUG=345027
Review URL: https://codereview.chromium.org/181653006
git-svn-id: svn://svn.chromium.org/blink/trunk@168066 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html')
| -rw-r--r-- | third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html b/third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html index 8a33c14..e92103c 100644 --- a/third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html +++ b/third_party/WebKit/LayoutTests/compositing/iframes/scrolling-iframe.html @@ -2,6 +2,7 @@ <html> <head> + <script src="../../resources/run-after-display.js"></script> <style type="text/css" media="screen"> iframe { border: 10px solid black; @@ -30,17 +31,13 @@ function doTest() { - // For some reason this delay is required for AppKit to not short-circuit the display. - window.setTimeout(function() { - if (window.testRunner) - testRunner.display(); - + runAfterDisplay(function() { document.getElementById('parent-iframe').contentWindow.scrollTo(80, 80); if (window.testRunner) { document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document); testRunner.notifyDone(); } - }, 0); + }); } window.addEventListener('load', doTest, false); |