Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

1 files changed, 10 insertions, 8 deletions

diff --git a/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js b/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js
index c83daa4..af5275d 100644
--- a/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js
+++ b/LayoutTests/fast/events/touch/script-tests/send-oncancel-event.js
@@ -20,13 +20,15 @@ function touchcancelHandler() {
 if (window.layoutTestController)
     window.layoutTestController.waitUntilDone();
 
-if (window.eventSender) {
-    document.addEventListener("touchcancel", touchcancelHandler, false);
-    eventSender.addTouchPoint(touchX, touchY);
-    eventSender.touchStart();
-    eventSender.cancelTouchPoint(0);
-    eventSender.touchCancel();
-} else
-    debug("This test requires DumpRenderTree.");
+window.onload = function() {
+    if (window.eventSender) {
+        document.addEventListener("touchcancel", touchcancelHandler, false);
+        eventSender.addTouchPoint(touchX, touchY);
+        eventSender.touchStart();
+        eventSender.cancelTouchPoint(0);
+        eventSender.touchCancel();
+    } else
+        debug("This test requires DumpRenderTree.");
+}
 
 var successfullyParsed = true;