Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / fast / events / drag-and-drop-autoscroll-inner-frame.html

diff --git a/src/third_party/WebKit/LayoutTests/fast/events/drag-and-drop-autoscroll-inner-frame.html b/src/third_party/WebKit/LayoutTests/fast/events/drag-and-drop-autoscroll-inner-frame.html
index 938f8a5..9547a19 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/fast/events/drag-and-drop-autoscroll-inner-frame.html
+++ b/src/third_party/WebKit/LayoutTests/fast/events/drag-and-drop-autoscroll-inner-frame.html
@@ -26,7 +26,11 @@ function setUpTest()
     }
 
     window.jsTestIsAsync = true;
-    setTimeout(testIt, 0);
+    iframe = document.getElementById('scrollable');
+    if (iframe.contentDocument.readyState != "complete")
+        iframe.onload = testIt;
+    else
+        testIt();
 }
 
 function testIt()
@@ -107,7 +111,7 @@ Try to drag and drop the text above in the input element at the bottom of this i
 "></iframe><br>
 </div>
 <div id="console"></div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 <script>
 description('Check autoscroll within an inner frame by drag-and-drop');
 setUpTest();