Change fast/e* files to use pre and post js files in LayoutTests/resources.
https://bugs.webkit.org/show_bug.cgi?id=120975.
Rubber stamped by Filip Pizlo.
* fast/encoding/char-decoding-mac.html:
* fast/encoding/char-decoding.html:
* fast/encoding/char-encoding-mac.html:
* fast/encoding/char-encoding.html:
* fast/encoding/idn-security.html:
* fast/encoding/invalid-xml.html:
* fast/encoding/resources/invalid-xml.js:
(runNextTest):
* fast/events/autoscroll-in-overflow-hidden-html.html:
* fast/events/autoscroll-should-not-stop-on-keypress.html:
* fast/events/blur-focus-window-should-blur-focus-element.html:
* fast/events/bogus-dropEffect-effectAllowed.html:
* fast/events/caller-access-from-event-listener.html:
* fast/events/check-defocus-event-order-when-triggered-by-mouse-click.html:
* fast/events/check-defocus-event-order-when-triggered-by-tab.html:
* fast/events/click-focus-control.html:
* fast/events/click-range-slider.html:
* fast/events/clientXY-in-zoom-and-scroll.html:
* fast/events/constructors/before-load-event-constructor.html:
* fast/events/constructors/close-event-constructor.html:
* fast/events/constructors/composition-event-constructor.html:
* fast/events/constructors/custom-event-constructor.html:
* fast/events/constructors/device-proximity-event-constructor.html:
* fast/events/constructors/error-event-constructor.html:
* fast/events/constructors/event-constructors.html:
* fast/events/constructors/focus-event-constructor.html:
* fast/events/constructors/hash-change-event-constructor.html:
* fast/events/constructors/keyboard-event-constructor.html:
* fast/events/constructors/media-key-event-constructor.html:
* fast/events/constructors/media-stream-event-constructor.html:
* fast/events/constructors/message-event-constructor.html:
* fast/events/constructors/mouse-event-constructor.html:
* fast/events/constructors/overflow-event-constructor.html:
* fast/events/constructors/page-transition-event-constructor.html:
* fast/events/constructors/pop-state-event-constructor.html:
* fast/events/constructors/progress-event-constructor.html:
* fast/events/constructors/speech-recognition-error-constructor.html:
* fast/events/constructors/speech-recognition-event-constructor.html:
* fast/events/constructors/storage-event-constructor.html:
* fast/events/constructors/track-event-constructor.html:
* fast/events/constructors/transition-event-constructor.html:
* fast/events/constructors/ui-event-constructor.html:
* fast/events/constructors/webgl-context-event-constructor.html:
* fast/events/constructors/webkit-animation-event-constructor.html:
* fast/events/constructors/webkit-transition-event-constructor.html:
* fast/events/constructors/wheel-event-constructor.html:
* fast/events/content-changed-during-drop.html:
* fast/events/context-nodrag.html:
* fast/events/continuous-platform-wheelevent-in-scrolling-div.html:
* fast/events/create-document-crash-on-attach-event.html:
* fast/events/dispatch-event-being-dispatched.html:
* fast/events/dispatch-synthetic-mouseevent.html:
* fast/events/dispatch-to-function-with-handle-event.html:
* fast/events/drag-and-drop-autoscroll.html:
* fast/events/drag-and-drop-dataTransfer-types-nocrash.html:
* fast/events/drag-and-drop-fire-drag-dragover.html:
* fast/events/drag-and-drop-set-drag-data-arguments.html:
* fast/events/drag-and-drop.html:
* fast/events/dropzone-001.html:
* fast/events/dropzone-002.html:
* fast/events/dropzone-003.html:
* fast/events/dropzone-004.html:
* fast/events/dropzone-005.html:
* fast/events/event-attribute.html:
* fast/events/event-creation.html:
* fast/events/event-function-toString.html:
* fast/events/event-input-contentEditable.html:
* fast/events/event-listener-list-mutation.html:
* fast/events/event-listener-map-rehash-crash.html:
* fast/events/event-listener-moving-documents.html:
* fast/events/event-listener-sharing.html:
* fast/events/file-input-hidden-in-ondrop.html:
* fast/events/fire-mousedown-while-pressing-mouse-button.html:
* fast/events/fire-popstate-event.html:
* fast/events/fire-scroll-event-element.html:
* fast/events/fire-scroll-event.html:
* fast/events/flags-unset-on-init-event.html:
* fast/events/form-iframe-target-before-load-crash.html:
* fast/events/form-iframe-target-before-load-crash2.html:
* fast/events/form-onchange.html:
* fast/events/iframe-onmousemove.html:
* fast/events/imagemap-norender-crash.html:
* fast/events/init-events.html:
* fast/events/inputText-never-fired-on-keydown-cancel.html:
* fast/events/invalid-001.html:
* fast/events/invalid-002.html:
* fast/events/invalid-003.html:
* fast/events/invalid-004.html:
* fast/events/invalid-005.html:
* fast/events/keyboardevent-location-constants.html:
* fast/events/keydown-leftright-keys.html:
* fast/events/keydown-numpad-keys.html:
* fast/events/message-port-multi.html:
* fast/events/mosuedrag-on-canvas-should-not-start-selection.html:
* fast/events/mouse-click-events.html:
* fast/events/mouse-cursor-change.html:
* fast/events/mouse-cursor-image-set.html:
* fast/events/mouse-cursor-multiframecur.html:
* fast/events/mouse-cursor-no-mousemove.html:
* fast/events/mouse-cursor.html:
* fast/events/mouse-double-triple-click-should-not-select-next-node-for-user-select-none.html:
* fast/events/mouse-focus-imagemap.html:
* fast/events/mouse-relative-position.html:
* fast/events/mouseout-dead-node.html:
* fast/events/mouseover-button.html:
* fast/events/mutation-during-append-child.html:
* fast/events/mutation-during-insert-before.html:
* fast/events/mutation-during-replace-child-2.html:
* fast/events/mutation-during-replace-child.html:
* fast/events/no-scroll-on-input-text-selection.html:
* fast/events/onblur-remove.html:
* fast/events/onchange-range-slider.html:
* fast/events/onchange-setvalue.html:
* fast/events/onchange-text-form-field.html:
* fast/events/onerror-img-after-gc.html:
* fast/events/onunload-back-to-page-cache.html:
* fast/events/page-scaled-mouse-click-iframe.html:
* fast/events/page-scaled-mouse-click.html:
* fast/events/page-visibility-iframe-delete-test.html:
* fast/events/page-visibility-iframe-move-test.html:
* fast/events/page-visibility-iframe-propagation-test.html:
* fast/events/page-visibility-null-view.html:
* fast/events/page-visibility-transition-test.html:
* fast/events/pagehide-timeout.html:
* fast/events/pagehide-xhr-open.html:
* fast/events/platform-wheelevent-in-scrolling-div.html:
* fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html:
* fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html:
* fast/events/platform-wheelevent-paging-x-in-scrolling-div.html:
* fast/events/platform-wheelevent-paging-x-in-scrolling-page.html:
* fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html:
* fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html:
* fast/events/platform-wheelevent-paging-y-in-non-scrolling-div.html:
* fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html:
* fast/events/platform-wheelevent-paging-y-in-scrolling-div.html:
* fast/events/platform-wheelevent-paging-y-in-scrolling-page.html:
* fast/events/popup-allowed-from-gesture-initiated-event.html:
* fast/events/popup-blocked-from-fake-button-click.html:
* fast/events/popup-blocked-from-fake-focus.html:
* fast/events/popup-blocked-from-fake-user-gesture.html:
* fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html:
* fast/events/popup-blocking-timers1.html:
* fast/events/popup-blocking-timers2.html:
* fast/events/popup-blocking-timers3.html:
* fast/events/popup-blocking-timers4.html:
* fast/events/popup-blocking-timers5.html:
* fast/events/popup-blocking-timers6.html:
* fast/events/related-target-focusevent.html:
* fast/events/resources/record-events.js:
* fast/events/scale-and-scroll-body.html:
* fast/events/scale-and-scroll-iframe-body.html:
* fast/events/scale-and-scroll-iframe-window.html:
* fast/events/scale-and-scroll-window.html:
* fast/events/script-tests/TEMPLATE.html:
* fast/events/scroll-after-click-on-tab-index.html:
* fast/events/scroll-event-during-modal-dialog.html:
* fast/events/scroll-event-phase.html:
* fast/events/scroll-in-scaled-page-with-overflow-hidden.html:
* fast/events/select-element.html:
* fast/events/suspend-timers.html:
* fast/events/tab-focus-link-in-canvas.html:
* fast/events/tab-imagemap.html:
* fast/events/tab-is-focusable-assert.html:
* fast/events/tab-test-not-visible-imagemap.html:
* fast/events/touch/basic-multi-touch-events-limited.html:
* fast/events/touch/basic-multi-touch-events.html:
* fast/events/touch/basic-single-touch-events.html:
* fast/events/touch/create-touch-event.html:
* fast/events/touch/document-create-touch-list-crash.html:
* fast/events/touch/document-create-touch-list.html:
* fast/events/touch/document-create-touch.html:
* fast/events/touch/emulate-touch-events.html:
* fast/events/touch/emulated-touch-iframe.html:
* fast/events/touch/frame-hover-update.html:
* fast/events/touch/gesture/context-menu-on-long-press.html:
* fast/events/touch/gesture/context-menu-on-long-tap.html:
* fast/events/touch/gesture/context-menu-on-two-finger-tap.html:
* fast/events/touch/gesture/gesture-click.html:
* fast/events/touch/gesture/gesture-dblclick.html:
* fast/events/touch/gesture/gesture-scroll.html:
* fast/events/touch/gesture/gesture-scrollbar.html:
* fast/events/touch/gesture/gesture-tap-active-state-iframe.html:
* fast/events/touch/gesture/gesture-tap-active-state.html:
* fast/events/touch/gesture/gesture-tap-hover-clear.html:
* fast/events/touch/gesture/gesture-tap-on-hover-element.html:
* fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html:
* fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html:
* fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html:
* fast/events/touch/gesture/pad-gesture-cancel.html:
* fast/events/touch/gesture/pad-gesture-fling.html:
* fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html:
* fast/events/touch/gesture/touch-gesture-noscroll-body-xhidden.html:
* fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html:
* fast/events/touch/gesture/touch-gesture-noscroll-body.html:
* fast/events/touch/gesture/touch-gesture-noscroll-div.html:
* fast/events/touch/gesture/touch-gesture-noscroll-iframe.html:
* fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-div-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html:
* fast/events/touch/gesture/touch-gesture-scroll-div-twice-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-div.html:
* fast/events/touch/gesture/touch-gesture-scroll-iframe-editable.html:
* fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-iframe-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-iframe.html:
* fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-page-propagated.html:
* fast/events/touch/gesture/touch-gesture-scroll-page.html:
* fast/events/touch/gesture/touch-gesture-scroll-shy-target.html:
* fast/events/touch/gesture/touch-gesture-scroll-sideways.html:
* fast/events/touch/multi-touch-grouped-targets.html:
* fast/events/touch/multi-touch-inside-iframes.html:
* fast/events/touch/multi-touch-inside-nested-iframes.html:
* fast/events/touch/page-scaled-touch-gesture-click.html:
* fast/events/touch/script-tests/TEMPLATE.html:
* fast/events/touch/send-oncancel-event.html:
* fast/events/touch/tap-highlight-color.html:
* fast/events/touch/touch-active-state.html:
* fast/events/touch/touch-before-pressing-spin-button.html:
* fast/events/touch/touch-coords-in-zoom-and-scroll.html:
* fast/events/touch/touch-handler-count.html:
* fast/events/touch/touch-input-element-change-documents.html:
* fast/events/touch/touch-inside-iframe-scrolled.html:
* fast/events/touch/touch-inside-iframe.html:
* fast/events/touch/touch-scaled-scrolled.html:
* fast/events/touch/touch-slider-no-js-touch-listener.html:
* fast/events/touch/touch-slider.html:
* fast/events/touch/touch-stale-node-crash.html:
* fast/events/touch/touch-target-limited.html:
* fast/events/touch/touch-target.html:
* fast/events/wheelevent-basic.html:
* fast/events/wheelevent-constructor.html:
* fast/events/wheelevent-direction-inverted-from-device.html:
* fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html:
* fast/events/wheelevent-in-scrolling-div.html:
* fast/events/wheelevent-in-text-node.html:
* fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html:
* fast/events/wheelevent-mousewheel-interaction.html:
* fast/events/zoom-dblclick.html:
* fast/exclusions/css-exclusions-disabled.html:
* fast/exclusions/css-exclusions-enabled.html:
* fast/exclusions/parsing/parsing-wrap-flow.html:
* fast/exclusions/parsing/parsing-wrap-through.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/encoding/char-decoding-mac.html b/LayoutTests/fast/encoding/char-decoding-mac.html
index db8a6d8..3e28398 100644
--- a/LayoutTests/fast/encoding/char-decoding-mac.html
+++ b/LayoutTests/fast/encoding/char-decoding-mac.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/char-decoding-utils.js"></script>
</head>
<body>
@@ -21,6 +21,6 @@
testDecode('x-mac-turkish', '%81', 'U+00C5');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/encoding/char-decoding.html b/LayoutTests/fast/encoding/char-decoding.html
index e2d833e7..c428063 100644
--- a/LayoutTests/fast/encoding/char-decoding.html
+++ b/LayoutTests/fast/encoding/char-decoding.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/char-decoding-utils.js"></script>
</head>
<body>
@@ -106,6 +106,6 @@
testDecode('unicodeFFFE', '%D8%69%DE%D6', 'U+D869/U+DED6');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/encoding/char-encoding-mac.html b/LayoutTests/fast/encoding/char-encoding-mac.html
index e482c1e..3198865 100644
--- a/LayoutTests/fast/encoding/char-encoding-mac.html
+++ b/LayoutTests/fast/encoding/char-encoding-mac.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/char-encoding-utils.js"></script>
</head>
<body>
diff --git a/LayoutTests/fast/encoding/char-encoding.html b/LayoutTests/fast/encoding/char-encoding.html
index ad98d98..d4b70f1 100644
--- a/LayoutTests/fast/encoding/char-encoding.html
+++ b/LayoutTests/fast/encoding/char-encoding.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/char-encoding-utils.js"></script>
</head>
<body>
diff --git a/LayoutTests/fast/encoding/idn-security.html b/LayoutTests/fast/encoding/idn-security.html
index b02f7df..05973c8 100644
--- a/LayoutTests/fast/encoding/idn-security.html
+++ b/LayoutTests/fast/encoding/idn-security.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
diff --git a/LayoutTests/fast/encoding/invalid-xml.html b/LayoutTests/fast/encoding/invalid-xml.html
index a149e4f..a789b53 100644
--- a/LayoutTests/fast/encoding/invalid-xml.html
+++ b/LayoutTests/fast/encoding/invalid-xml.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/invalid-xml.js"></script>
diff --git a/LayoutTests/fast/encoding/resources/invalid-xml.js b/LayoutTests/fast/encoding/resources/invalid-xml.js
index 0d1ca7c..d90f25a 100644
--- a/LayoutTests/fast/encoding/resources/invalid-xml.js
+++ b/LayoutTests/fast/encoding/resources/invalid-xml.js
@@ -22,7 +22,7 @@
{
if (currentTest >= encodingTests.length) {
var script = document.createElement("script");
- script.src = "../js/resources/js-test-post.js";
+ script.src = "../../resources/js-test-post.js";
if (window.testRunner)
script.setAttribute("onload", "testRunner.notifyDone()");
document.body.appendChild(script);
diff --git a/LayoutTests/fast/events/autoscroll-in-overflow-hidden-html.html b/LayoutTests/fast/events/autoscroll-in-overflow-hidden-html.html
index cc30393..be99790 100644
--- a/LayoutTests/fast/events/autoscroll-in-overflow-hidden-html.html
+++ b/LayoutTests/fast/events/autoscroll-in-overflow-hidden-html.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
function log(msg)
{
diff --git a/LayoutTests/fast/events/autoscroll-should-not-stop-on-keypress.html b/LayoutTests/fast/events/autoscroll-should-not-stop-on-keypress.html
index 565a968..13bcd85 100644
--- a/LayoutTests/fast/events/autoscroll-should-not-stop-on-keypress.html
+++ b/LayoutTests/fast/events/autoscroll-should-not-stop-on-keypress.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
window.jsTestIsAsync = true;
@@ -93,6 +93,6 @@
<body onload="test()">
<iframe id="frame" style="height: 400px;" frameborder="0"></iframe>
<div id="console"></div>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/blur-focus-window-should-blur-focus-element.html b/LayoutTests/fast/events/blur-focus-window-should-blur-focus-element.html
index b57ed8d..7015fd4 100644
--- a/LayoutTests/fast/events/blur-focus-window-should-blur-focus-element.html
+++ b/LayoutTests/fast/events/blur-focus-window-should-blur-focus-element.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/blur-focus-window-should-blur-focus-element.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html b/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html
index 6432e81..5789f62 100644
--- a/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html
+++ b/LayoutTests/fast/events/bogus-dropEffect-effectAllowed.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/caller-access-from-event-listener.html b/LayoutTests/fast/events/caller-access-from-event-listener.html
index c5cad99..867d36e 100644
--- a/LayoutTests/fast/events/caller-access-from-event-listener.html
+++ b/LayoutTests/fast/events/caller-access-from-event-listener.html
@@ -2,7 +2,7 @@
from inside an event listener.</p>
<hr>
<pre>PASS: WebKit didn't crash.</pre>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function crash() {
eval('crash.caller');
diff --git a/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-mouse-click.html b/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-mouse-click.html
index 4a688cb..95e61fe 100644
--- a/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-mouse-click.html
+++ b/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-mouse-click.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/record-events.js"></script>
<script>
if (window.testRunner)
diff --git a/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-tab.html b/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-tab.html
index f3b8d2c..f01cc9b 100644
--- a/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-tab.html
+++ b/LayoutTests/fast/events/check-defocus-event-order-when-triggered-by-tab.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="resources/record-events.js"></script>
<script>
if (window.testRunner)
diff --git a/LayoutTests/fast/events/click-focus-control.html b/LayoutTests/fast/events/click-focus-control.html
index e77b3c3..0b712a9 100644
--- a/LayoutTests/fast/events/click-focus-control.html
+++ b/LayoutTests/fast/events/click-focus-control.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript">
diff --git a/LayoutTests/fast/events/click-range-slider.html b/LayoutTests/fast/events/click-range-slider.html
index f95c212..288225e 100644
--- a/LayoutTests/fast/events/click-range-slider.html
+++ b/LayoutTests/fast/events/click-range-slider.html
@@ -8,7 +8,7 @@
<!-- See bug 84674 -->
<input id="slider" type="range" min="0" max="100" value="50"></input>
<pre id="console"></pre>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
var clickCount = 0;
var slider;
diff --git a/LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html b/LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html
index 3bc3791..29d20ad 100644
--- a/LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html
+++ b/LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html
@@ -1,4 +1,4 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#pusher {
width: 1000px;
@@ -124,4 +124,4 @@
testRunner.notifyDone();
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/events/constructors/before-load-event-constructor.html b/LayoutTests/fast/events/constructors/before-load-event-constructor.html
index 6302494..8c9e4da 100644
--- a/LayoutTests/fast/events/constructors/before-load-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/before-load-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -46,6 +46,6 @@
shouldBe("new BeforeLoadEvent('eventType', { bubbles: true, cancelable: true, url: 'doremi' }).cancelable", "true");
shouldBe("new BeforeLoadEvent('eventType', { bubbles: true, cancelable: true, url: 'doremi' }).url", "'doremi'");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/close-event-constructor.html b/LayoutTests/fast/events/constructors/close-event-constructor.html
index b181ceb..7e64c91 100644
--- a/LayoutTests/fast/events/constructors/close-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/close-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -83,6 +83,6 @@
shouldBe("new CloseEvent('eventType', { bubbles: true, cancelable: true, wasClean: true, code : 12345, reason: 'koakuma' }).code", "12345");
shouldBeEqualToString("new CloseEvent('eventType', { bubbles: true, cancelable: true, wasClean: true, code : 12345, reason: 'koakuma' }).reason", "koakuma");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/composition-event-constructor.html b/LayoutTests/fast/events/constructors/composition-event-constructor.html
index e2f3b8b..596b9c7 100644
--- a/LayoutTests/fast/events/constructors/composition-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/composition-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -72,6 +72,6 @@
shouldBe("new CompositionEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, data: 'koakuma' }).detail", "111");
shouldBeEqualToString("new CompositionEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, data: 'koakuma' }).data", "koakuma");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/custom-event-constructor.html b/LayoutTests/fast/events/constructors/custom-event-constructor.html
index be5547d..a860a92 100644
--- a/LayoutTests/fast/events/constructors/custom-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/custom-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -37,6 +37,6 @@
// Detail throws an exeception.
shouldThrow("new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } })");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html b/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html
index 7fe0d25..5196456 100644
--- a/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/device-proximity-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -113,6 +113,6 @@
shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).min", "0");
shouldBe("new DeviceProximityEvent('eventType', { bubbles: true, cancelable: true, value: 1000, min: 0, max: 10000 }).max", "10000");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/error-event-constructor.html b/LayoutTests/fast/events/constructors/error-event-constructor.html
index a5313b2..85a93ab 100644
--- a/LayoutTests/fast/events/constructors/error-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/error-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -113,6 +113,6 @@
shouldBe("new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).lineno", "12345");
shouldBe("new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).colno", "23456");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/event-constructors.html b/LayoutTests/fast/events/constructors/event-constructors.html
index a674274..7666818 100644
--- a/LayoutTests/fast/events/constructors/event-constructors.html
+++ b/LayoutTests/fast/events/constructors/event-constructors.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -83,6 +83,6 @@
// One getter throws an exeception.
shouldThrow("new Event('eventType', { bubbles: true, get cancelable() { throw 'Custom Error'; } })")
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/events/constructors/focus-event-constructor.html b/LayoutTests/fast/events/constructors/focus-event-constructor.html
index c304480..de3365d 100644
--- a/LayoutTests/fast/events/constructors/focus-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/focus-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -79,6 +79,6 @@
shouldBe("new FocusEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, relatedTarget: testDiv }).detail", "111");
shouldBe("new FocusEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, relatedTarget: testDiv }).relatedTarget", "testDiv");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/hash-change-event-constructor.html b/LayoutTests/fast/events/constructors/hash-change-event-constructor.html
index 4c9ad25..16491f3 100644
--- a/LayoutTests/fast/events/constructors/hash-change-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/hash-change-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -48,6 +48,6 @@
shouldBeEqualToString("new HashChangeEvent('eventType', { bubbles: true, cancelable: true, oldURL: 'doremi', newURL: 'andre' }).oldURL", "doremi");
shouldBeEqualToString("new HashChangeEvent('eventType', { bubbles: true, cancelable: true, oldURL: 'doremi', newURL: 'andre' }).newURL", "andre");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/keyboard-event-constructor.html b/LayoutTests/fast/events/constructors/keyboard-event-constructor.html
index 675bc25..64ef8d9 100644
--- a/LayoutTests/fast/events/constructors/keyboard-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/keyboard-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -123,6 +123,6 @@
shouldBe("new KeyboardEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, keyIdentifier: 'chocolate', location: 222, ctrlKey: true, altKey: true, shiftKey: true, metaKey: true }).shiftKey", "true");
shouldBe("new KeyboardEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, keyIdentifier: 'chocolate', location: 222, ctrlKey: true, altKey: true, shiftKey: true, metaKey: true }).metaKey", "true");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/media-key-event-constructor.html b/LayoutTests/fast/events/constructors/media-key-event-constructor.html
index db33a8a..46e0493 100644
--- a/LayoutTests/fast/events/constructors/media-key-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/media-key-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -129,7 +129,7 @@
test()
</script>
- <script src="../../js/resources/js-test-post.js"></script>
+ <script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/media-stream-event-constructor.html b/LayoutTests/fast/events/constructors/media-stream-event-constructor.html
index b7cbc3c..d0dbf17 100644
--- a/LayoutTests/fast/events/constructors/media-stream-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/media-stream-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -50,6 +50,6 @@
shouldBe("new MediaStreamEvent('eventType', { bubbles: true, cancelable: true, stream: mediaStream }).cancelable", "true");
shouldBe("new MediaStreamEvent('eventType', { bubbles: true, cancelable: true, stream: mediaStream }).stream", "mediaStream");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/message-event-constructor.html b/LayoutTests/fast/events/constructors/message-event-constructor.html
index 20155cd..3a94d80 100644
--- a/LayoutTests/fast/events/constructors/message-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/message-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -126,6 +126,6 @@
shouldBe("new MessageEvent('eventType', { bubbles: true, cancelable: true, data: test_object, origin: 'wonderful', lastEventId: 'excellent', source: window, ports: [channel.port1, channel.port2, channel2.port1] }).ports[1]", "channel.port2");
shouldBe("new MessageEvent('eventType', { bubbles: true, cancelable: true, data: test_object, origin: 'wonderful', lastEventId: 'excellent', source: window, ports: [channel.port1, channel.port2, channel2.port1] }).ports[2]", "channel2.port1");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/mouse-event-constructor.html b/LayoutTests/fast/events/constructors/mouse-event-constructor.html
index afef410..34b3842 100644
--- a/LayoutTests/fast/events/constructors/mouse-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/mouse-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -167,6 +167,6 @@
shouldBe("new MouseEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, screenX: 222, screenY: 333, clientX: 444, clientY: 555, ctrlKey: true, shiftKey: true, altKey: true, metaKey: true, button: 666, relatedTarget: testDiv }).button", "666");
shouldBe("new MouseEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, screenX: 222, screenY: 333, clientX: 444, clientY: 555, ctrlKey: true, shiftKey: true, altKey: true, metaKey: true, button: 666, relatedTarget: testDiv }).relatedTarget", "testDiv");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/overflow-event-constructor.html b/LayoutTests/fast/events/constructors/overflow-event-constructor.html
index 87572cb..000e80b 100644
--- a/LayoutTests/fast/events/constructors/overflow-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/overflow-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -61,6 +61,6 @@
shouldBe("new OverflowEvent('eventType', { bubbles: true, cancelable: true, horizontalOverflow: true, verticalOverflow: true, orient: 12345 }).verticalOverflow", "true");
shouldBe("new OverflowEvent('eventType', { bubbles: true, cancelable: true, horizontalOverflow: true, verticalOverflow: true, orient: 12345 }).orient", "12345");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/page-transition-event-constructor.html b/LayoutTests/fast/events/constructors/page-transition-event-constructor.html
index 511642a..fdc69c5 100644
--- a/LayoutTests/fast/events/constructors/page-transition-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/page-transition-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -30,6 +30,6 @@
shouldBe("new PageTransitionEvent('eventType', { bubbles: true, cancelable: true, persisted: true }).cancelable", "true");
shouldBe("new PageTransitionEvent('eventType', { bubbles: true, cancelable: true, persisted: true }).persisted", "true");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/pop-state-event-constructor.html b/LayoutTests/fast/events/constructors/pop-state-event-constructor.html
index d824f09..10374ac 100644
--- a/LayoutTests/fast/events/constructors/pop-state-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/pop-state-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -46,6 +46,6 @@
shouldBe("new PopStateEvent('eventType', { bubbles: true, cancelable: true, state: object3 }).cancelable", "true");
shouldBe("new PopStateEvent('eventType', { bubbles: true, cancelable: true, state: object3 }).state", "object3");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/progress-event-constructor.html b/LayoutTests/fast/events/constructors/progress-event-constructor.html
index f2752e2a..5e7624f 100644
--- a/LayoutTests/fast/events/constructors/progress-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/progress-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -71,6 +71,6 @@
shouldBe("new ProgressEvent('eventType', { bubbles: true, cancelable: true, lengthComputable: true, loaded: 12345, total: 12345 }).loaded", "12345");
shouldBe("new ProgressEvent('eventType', { bubbles: true, cancelable: true, lengthComputable: true, loaded: 12345, total: 12345 }).total", "12345");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/speech-recognition-error-constructor.html b/LayoutTests/fast/events/constructors/speech-recognition-error-constructor.html
index 345d40d..becf9cb 100644
--- a/LayoutTests/fast/events/constructors/speech-recognition-error-constructor.html
+++ b/LayoutTests/fast/events/constructors/speech-recognition-error-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/constructors/speech-recognition-event-constructor.html b/LayoutTests/fast/events/constructors/speech-recognition-event-constructor.html
index ae11c1d..c01acf4 100644
--- a/LayoutTests/fast/events/constructors/speech-recognition-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/speech-recognition-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/constructors/storage-event-constructor.html b/LayoutTests/fast/events/constructors/storage-event-constructor.html
index 0439f56..f6b803f 100644
--- a/LayoutTests/fast/events/constructors/storage-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/storage-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/constructors/track-event-constructor.html b/LayoutTests/fast/events/constructors/track-event-constructor.html
index b69d01e..bc9e337 100644
--- a/LayoutTests/fast/events/constructors/track-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/track-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -60,7 +60,7 @@
trackElement.src='data:text/vtt,WEBVTT FILE \r\r1\r00:00:00.000 --> 00:00:30.500\ronly one caption';
</script>
- <script src="../../js/resources/js-test-post.js"></script>
+ <script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/transition-event-constructor.html b/LayoutTests/fast/events/constructors/transition-event-constructor.html
index 8aafcdd..18175d8 100644
--- a/LayoutTests/fast/events/constructors/transition-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/transition-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -76,6 +76,6 @@
shouldBe("new TransitionEvent('eventType', { bubbles: true, cancelable: true, propertyName: 'doremi', elapsedTime: 123.45, pseudoElement: '::after' }).elapsedTime", "123.45");
shouldBe("new TransitionEvent('eventType', { bubbles: true, cancelable: true, propertyName: 'doremi', elapsedTime: 123.45, pseudoElement: '::after' }).pseudoElement", "'::after'");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/ui-event-constructor.html b/LayoutTests/fast/events/constructors/ui-event-constructor.html
index 68bca7c..001af52 100644
--- a/LayoutTests/fast/events/constructors/ui-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/ui-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -82,6 +82,6 @@
shouldBe("new UIEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 123 }).view", "window");
shouldBe("new UIEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 123 }).detail", "123");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/webgl-context-event-constructor.html b/LayoutTests/fast/events/constructors/webgl-context-event-constructor.html
index 985c063..8b96776 100644
--- a/LayoutTests/fast/events/constructors/webgl-context-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/webgl-context-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -46,6 +46,6 @@
shouldBe("new WebGLContextEvent('eventType', { bubbles: true, cancelable: true, statusMessage: 'abcde' }).cancelable", "true");
shouldBe("new WebGLContextEvent('eventType', { bubbles: true, cancelable: true, statusMessage: 'abcde' }).statusMessage", "'abcde'");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/webkit-animation-event-constructor.html b/LayoutTests/fast/events/constructors/webkit-animation-event-constructor.html
index 7ba8549..883f00c 100644
--- a/LayoutTests/fast/events/constructors/webkit-animation-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/webkit-animation-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -69,6 +69,6 @@
shouldBe("new WebKitAnimationEvent('eventType', { bubbles: true, cancelable: true, animationName: 'doremi', elapsedTime: 123.45 }).animationName", "'doremi'");
shouldBe("new WebKitAnimationEvent('eventType', { bubbles: true, cancelable: true, animationName: 'doremi', elapsedTime: 123.45 }).elapsedTime", "123.45");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/webkit-transition-event-constructor.html b/LayoutTests/fast/events/constructors/webkit-transition-event-constructor.html
index b2b7eeb..713be75 100644
--- a/LayoutTests/fast/events/constructors/webkit-transition-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/webkit-transition-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -76,6 +76,6 @@
shouldBe("new WebKitTransitionEvent('eventType', { bubbles: true, cancelable: true, propertyName: 'doremi', elapsedTime: 123.45, pseudoElement: '::after' }).elapsedTime", "123.45");
shouldBe("new WebKitTransitionEvent('eventType', { bubbles: true, cancelable: true, propertyName: 'doremi', elapsedTime: 123.45, pseudoElement: '::after' }).pseudoElement", "'::after'");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/constructors/wheel-event-constructor.html b/LayoutTests/fast/events/constructors/wheel-event-constructor.html
index 8bc50d9..738e653 100644
--- a/LayoutTests/fast/events/constructors/wheel-event-constructor.html
+++ b/LayoutTests/fast/events/constructors/wheel-event-constructor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -206,6 +206,6 @@
shouldBe("new WheelEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, screenX: 222, screenY: 333, clientX: 444, clientY: 555, ctrlKey: true, shiftKey: true, altKey: true, metaKey: true, button: 666, relatedTarget: testDiv, wheelDeltaX: 777, wheelDeltaY: 888, deltaMode: WheelEvent.DOM_DELTA_PAGE }).wheelDeltaY", "888");
shouldBe("new WheelEvent('eventType', { bubbles: true, cancelable: true, view: window, detail: 111, screenX: 222, screenY: 333, clientX: 444, clientY: 555, ctrlKey: true, shiftKey: true, altKey: true, metaKey: true, button: 666, relatedTarget: testDiv, wheelDeltaX: 777, wheelDeltaY: 888, deltaMode: WheelEvent.DOM_DELTA_PAGE }).deltaMode", "WheelEvent.DOM_DELTA_PAGE");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/content-changed-during-drop.html b/LayoutTests/fast/events/content-changed-during-drop.html
index 6c55b9d..c3c8cb7 100644
--- a/LayoutTests/fast/events/content-changed-during-drop.html
+++ b/LayoutTests/fast/events/content-changed-during-drop.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
function resetField()
@@ -46,6 +46,6 @@
description("This tests that we don't lose data dropped onto an input field that changes its content during a drop event");
runTest();
</script>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/events/context-nodrag.html b/LayoutTests/fast/events/context-nodrag.html
index 0adf591..84e5539 100644
--- a/LayoutTests/fast/events/context-nodrag.html
+++ b/LayoutTests/fast/events/context-nodrag.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="box">This is a test box. ABC 123</div>
@@ -25,6 +25,6 @@
shouldBeTrue("window.getSelection().isCollapsed");
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
index eb0b802..58f2891 100644
--- a/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
+++ b/LayoutTests/fast/events/continuous-platform-wheelevent-in-scrolling-div.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var expectedScrollTop = 200;
var expectedScrollLeft = 100;
diff --git a/LayoutTests/fast/events/create-document-crash-on-attach-event.html b/LayoutTests/fast/events/create-document-crash-on-attach-event.html
index 72250c9..395ad0a 100644
--- a/LayoutTests/fast/events/create-document-crash-on-attach-event.html
+++ b/LayoutTests/fast/events/create-document-crash-on-attach-event.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/create-document-crash-on-attach-event.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/dispatch-event-being-dispatched.html b/LayoutTests/fast/events/dispatch-event-being-dispatched.html
index 61b06dc..4dd3988 100644
--- a/LayoutTests/fast/events/dispatch-event-being-dispatched.html
+++ b/LayoutTests/fast/events/dispatch-event-being-dispatched.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p class="description">
@@ -77,6 +77,6 @@
window.addEventListener('load', redispatchLoad, true);
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/dispatch-synthetic-mouseevent.html b/LayoutTests/fast/events/dispatch-synthetic-mouseevent.html
index d7a7536..80ef67b 100644
--- a/LayoutTests/fast/events/dispatch-synthetic-mouseevent.html
+++ b/LayoutTests/fast/events/dispatch-synthetic-mouseevent.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -39,6 +39,6 @@
test();
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/dispatch-to-function-with-handle-event.html b/LayoutTests/fast/events/dispatch-to-function-with-handle-event.html
index 67b804d..49fe548 100644
--- a/LayoutTests/fast/events/dispatch-to-function-with-handle-event.html
+++ b/LayoutTests/fast/events/dispatch-to-function-with-handle-event.html
@@ -14,7 +14,7 @@
<p id="console"></p>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" charset="utf-8">
// This function should be called.
var listener = function(event) {
diff --git a/LayoutTests/fast/events/drag-and-drop-autoscroll.html b/LayoutTests/fast/events/drag-and-drop-autoscroll.html
index c1fe7e3..70cae1d 100644
--- a/LayoutTests/fast/events/drag-and-drop-autoscroll.html
+++ b/LayoutTests/fast/events/drag-and-drop-autoscroll.html
@@ -117,11 +117,11 @@
</div>
</div>
<div id="console"></div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Check autoscroll by drag-and-drop');
setUpTest();
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
index 7a3e056..dc6e2a5 100644
--- a/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
+++ b/LayoutTests/fast/events/drag-and-drop-dataTransfer-types-nocrash.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/drag-and-drop-fire-drag-dragover.html b/LayoutTests/fast/events/drag-and-drop-fire-drag-dragover.html
index 3f4a3df..7eb39f4 100644
--- a/LayoutTests/fast/events/drag-and-drop-fire-drag-dragover.html
+++ b/LayoutTests/fast/events/drag-and-drop-fire-drag-dragover.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/drag-and-drop-set-drag-data-arguments.html b/LayoutTests/fast/events/drag-and-drop-set-drag-data-arguments.html
index acb4124..0c86185 100644
--- a/LayoutTests/fast/events/drag-and-drop-set-drag-data-arguments.html
+++ b/LayoutTests/fast/events/drag-and-drop-set-drag-data-arguments.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<div draggable="true" id="dragger">Drag me</div>
<script>
@@ -27,4 +27,4 @@
}
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/events/drag-and-drop.html b/LayoutTests/fast/events/drag-and-drop.html
index 8e131e3..75c5a67 100644
--- a/LayoutTests/fast/events/drag-and-drop.html
+++ b/LayoutTests/fast/events/drag-and-drop.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/dropzone-001.html b/LayoutTests/fast/events/dropzone-001.html
index 1aa3272..ad58c04 100644
--- a/LayoutTests/fast/events/dropzone-001.html
+++ b/LayoutTests/fast/events/dropzone-001.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/dropzone-002.html b/LayoutTests/fast/events/dropzone-002.html
index f9dc137..37344a7 100644
--- a/LayoutTests/fast/events/dropzone-002.html
+++ b/LayoutTests/fast/events/dropzone-002.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/dropzone-003.html b/LayoutTests/fast/events/dropzone-003.html
index 64a531a..e65a535 100644
--- a/LayoutTests/fast/events/dropzone-003.html
+++ b/LayoutTests/fast/events/dropzone-003.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/dropzone-004.html b/LayoutTests/fast/events/dropzone-004.html
index 2a1a906..a04f1d0 100644
--- a/LayoutTests/fast/events/dropzone-004.html
+++ b/LayoutTests/fast/events/dropzone-004.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/dropzone-005.html b/LayoutTests/fast/events/dropzone-005.html
index e69e097..aabced3 100644
--- a/LayoutTests/fast/events/dropzone-005.html
+++ b/LayoutTests/fast/events/dropzone-005.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
#dropTarget {width: 256px; height: 256px; border: 1px dashed}
diff --git a/LayoutTests/fast/events/event-attribute.html b/LayoutTests/fast/events/event-attribute.html
index b0dedf9..efab3d0 100644
--- a/LayoutTests/fast/events/event-attribute.html
+++ b/LayoutTests/fast/events/event-attribute.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -32,6 +32,6 @@
}
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/event-creation.html b/LayoutTests/fast/events/event-creation.html
index 31ba7e2..16d36e6 100644
--- a/LayoutTests/fast/events/event-creation.html
+++ b/LayoutTests/fast/events/event-creation.html
@@ -1,5 +1,5 @@
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -270,5 +270,5 @@
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/events/event-function-toString.html b/LayoutTests/fast/events/event-function-toString.html
index 8210c70..83523b9 100644
--- a/LayoutTests/fast/events/event-function-toString.html
+++ b/LayoutTests/fast/events/event-function-toString.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/event-function-toString.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/event-input-contentEditable.html b/LayoutTests/fast/events/event-input-contentEditable.html
index df535f6..a05566f 100644
--- a/LayoutTests/fast/events/event-input-contentEditable.html
+++ b/LayoutTests/fast/events/event-input-contentEditable.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/event-input-contentEditable.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/event-listener-list-mutation.html b/LayoutTests/fast/events/event-listener-list-mutation.html
index 6026a49..343be35 100644
--- a/LayoutTests/fast/events/event-listener-list-mutation.html
+++ b/LayoutTests/fast/events/event-listener-list-mutation.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/event-listener-list-mutation.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/event-listener-map-rehash-crash.html b/LayoutTests/fast/events/event-listener-map-rehash-crash.html
index c9018d7..e807895 100644
--- a/LayoutTests/fast/events/event-listener-map-rehash-crash.html
+++ b/LayoutTests/fast/events/event-listener-map-rehash-crash.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function stub() {}
@@ -18,6 +18,6 @@
description("Ensures that rehashing of events map doesn't leave us with a dangling event list reference.");
testPassed("Did not crash.");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/event-listener-moving-documents.html b/LayoutTests/fast/events/event-listener-moving-documents.html
index a47a164..6721dc6 100644
--- a/LayoutTests/fast/events/event-listener-moving-documents.html
+++ b/LayoutTests/fast/events/event-listener-moving-documents.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Moving an event listener between documents should keep it active');
@@ -17,5 +17,5 @@
div.removeChild(div.firstChild);
shouldBe('removedCalls', '1');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/events/event-listener-sharing.html b/LayoutTests/fast/events/event-listener-sharing.html
index 29910b7..97a7563 100644
--- a/LayoutTests/fast/events/event-listener-sharing.html
+++ b/LayoutTests/fast/events/event-listener-sharing.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/event-listener-sharing.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/file-input-hidden-in-ondrop.html b/LayoutTests/fast/events/file-input-hidden-in-ondrop.html
index 3e745c8..1acdad7 100644
--- a/LayoutTests/fast/events/file-input-hidden-in-ondrop.html
+++ b/LayoutTests/fast/events/file-input-hidden-in-ondrop.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
diff --git a/LayoutTests/fast/events/fire-mousedown-while-pressing-mouse-button.html b/LayoutTests/fast/events/fire-mousedown-while-pressing-mouse-button.html
index a9fa798..351c5aa 100644
--- a/LayoutTests/fast/events/fire-mousedown-while-pressing-mouse-button.html
+++ b/LayoutTests/fast/events/fire-mousedown-while-pressing-mouse-button.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#square {
display: table-cell;
diff --git a/LayoutTests/fast/events/fire-popstate-event.html b/LayoutTests/fast/events/fire-popstate-event.html
index ca200cd..483654d 100644
--- a/LayoutTests/fast/events/fire-popstate-event.html
+++ b/LayoutTests/fast/events/fire-popstate-event.html
@@ -1,6 +1,6 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body style="min-width: 5000px; min-height: 5000px">
<script>
description('Checks that the popstate event fires when dispatched via createEvent');
@@ -26,6 +26,6 @@
setTimeout(finishJSTest, 500);
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/fire-scroll-event-element.html b/LayoutTests/fast/events/fire-scroll-event-element.html
index 0d92608..84c9497 100644
--- a/LayoutTests/fast/events/fire-scroll-event-element.html
+++ b/LayoutTests/fast/events/fire-scroll-event-element.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<div id="container" style="overflow: auto; width: 500px; height: 500px">
<div style="height: 5000px; width: 5000px;"></div>
@@ -41,6 +41,6 @@
}
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/events/fire-scroll-event.html b/LayoutTests/fast/events/fire-scroll-event.html
index 4c1ee31..c382507 100644
--- a/LayoutTests/fast/events/fire-scroll-event.html
+++ b/LayoutTests/fast/events/fire-scroll-event.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body style="min-width: 5000px; min-height: 5000px">
<script>
description('Checks that the scroll event fires on the document asychronously and only once.');
@@ -35,6 +35,6 @@
}
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/flags-unset-on-init-event.html b/LayoutTests/fast/events/flags-unset-on-init-event.html
index d2f944d..5a20f38 100644
--- a/LayoutTests/fast/events/flags-unset-on-init-event.html
+++ b/LayoutTests/fast/events/flags-unset-on-init-event.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<input id=target type=text value="">
@@ -36,6 +36,6 @@
target.parentNode.removeChild(target);
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/form-iframe-target-before-load-crash.html b/LayoutTests/fast/events/form-iframe-target-before-load-crash.html
index a8c508e..657d87d 100644
--- a/LayoutTests/fast/events/form-iframe-target-before-load-crash.html
+++ b/LayoutTests/fast/events/form-iframe-target-before-load-crash.html
@@ -1,5 +1,5 @@
<html>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<body onload="runTest()">
<div id="console"></div>
<form id="form1" style="display:none" method="post" target="test" action="http://anything.com"></form>
diff --git a/LayoutTests/fast/events/form-iframe-target-before-load-crash2.html b/LayoutTests/fast/events/form-iframe-target-before-load-crash2.html
index c4f4269..dae0316 100644
--- a/LayoutTests/fast/events/form-iframe-target-before-load-crash2.html
+++ b/LayoutTests/fast/events/form-iframe-target-before-load-crash2.html
@@ -1,5 +1,5 @@
<html>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<body onload="runTest()">
<div id="console"></div>
<form id="form1" style="display:none" target="test" action="about:blank"></form>
diff --git a/LayoutTests/fast/events/form-onchange.html b/LayoutTests/fast/events/form-onchange.html
index 65078cd..8504930 100644
--- a/LayoutTests/fast/events/form-onchange.html
+++ b/LayoutTests/fast/events/form-onchange.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -21,6 +21,6 @@
document.getElementById('e').blur();
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/iframe-onmousemove.html b/LayoutTests/fast/events/iframe-onmousemove.html
index ef3901a..b0d1a29 100644
--- a/LayoutTests/fast/events/iframe-onmousemove.html
+++ b/LayoutTests/fast/events/iframe-onmousemove.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/events/imagemap-norender-crash.html b/LayoutTests/fast/events/imagemap-norender-crash.html
index d319723..98e5caf 100644
--- a/LayoutTests/fast/events/imagemap-norender-crash.html
+++ b/LayoutTests/fast/events/imagemap-norender-crash.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body id="body">
<h1 id="header" tabindex=0>start element</h1>
@@ -23,6 +23,6 @@
shouldBe("document.activeElement.id", "'area1'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/init-events.html b/LayoutTests/fast/events/init-events.html
index 753398b..ac1b0d9 100644
--- a/LayoutTests/fast/events/init-events.html
+++ b/LayoutTests/fast/events/init-events.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/init-events.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html
index aff8464..45beaf5 100644
--- a/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html
+++ b/LayoutTests/fast/events/inputText-never-fired-on-keydown-cancel.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/inputText-never-fired-on-keydown-cancel.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/invalid-001.html b/LayoutTests/fast/events/invalid-001.html
index ab0d09f..6aebcfd 100644
--- a/LayoutTests/fast/events/invalid-001.html
+++ b/LayoutTests/fast/events/invalid-001.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -18,6 +18,6 @@
for (i = 0; i < v.length; i++)
shouldBe("v[i].checkValidity()", "false");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/invalid-002.html b/LayoutTests/fast/events/invalid-002.html
index ccb7d38..f2ba25a 100644
--- a/LayoutTests/fast/events/invalid-002.html
+++ b/LayoutTests/fast/events/invalid-002.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -17,6 +17,6 @@
if (document.getElementById("sad_form").checkValidity())
testFailed('checkValidity should have returned false');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/invalid-003.html b/LayoutTests/fast/events/invalid-003.html
index 6a6a45c..ebc2d23 100644
--- a/LayoutTests/fast/events/invalid-003.html
+++ b/LayoutTests/fast/events/invalid-003.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -19,6 +19,6 @@
if (document.getElementById("sad_form").checkValidity())
testFailed('checkValidity should have returned false');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/invalid-004.html b/LayoutTests/fast/events/invalid-004.html
index 2159681..20017b3 100644
--- a/LayoutTests/fast/events/invalid-004.html
+++ b/LayoutTests/fast/events/invalid-004.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -19,6 +19,6 @@
if (document.getElementById("sad_form").checkValidity())
testFailed('checkValidity should have returned false');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/invalid-005.html b/LayoutTests/fast/events/invalid-005.html
index 920eda4..2740400 100644
--- a/LayoutTests/fast/events/invalid-005.html
+++ b/LayoutTests/fast/events/invalid-005.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -17,6 +17,6 @@
if (document.getElementById("sad_form").checkValidity())
testFailed('checkValidity should have returned false');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/keyboardevent-location-constants.html b/LayoutTests/fast/events/keyboardevent-location-constants.html
index a88f5f3..e3bff51 100644
--- a/LayoutTests/fast/events/keyboardevent-location-constants.html
+++ b/LayoutTests/fast/events/keyboardevent-location-constants.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-KeyboardEvent" />
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -16,7 +16,7 @@
shouldBeUndefined('KeyboardEvent.DOM_KEY_LOCATION_MOBILE');
shouldBeUndefined('KeyboardEvent.DOM_KEY_LOCATION_JOYSTICK');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/keydown-leftright-keys.html b/LayoutTests/fast/events/keydown-leftright-keys.html
index 7bc8b7f..41a1116 100644
--- a/LayoutTests/fast/events/keydown-leftright-keys.html
+++ b/LayoutTests/fast/events/keydown-leftright-keys.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -53,6 +53,6 @@
debug("This test requires DumpRenderTree.");
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/keydown-numpad-keys.html b/LayoutTests/fast/events/keydown-numpad-keys.html
index a29ee65..21aadd6 100644
--- a/LayoutTests/fast/events/keydown-numpad-keys.html
+++ b/LayoutTests/fast/events/keydown-numpad-keys.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/keydown-numpad-keys.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/message-port-multi.html b/LayoutTests/fast/events/message-port-multi.html
index 106f872..2938c34 100644
--- a/LayoutTests/fast/events/message-port-multi.html
+++ b/LayoutTests/fast/events/message-port-multi.html
@@ -1,5 +1,5 @@
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/message-port-multi.js"></script>
diff --git a/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html
index 2e6714d..c185f7f 100644
--- a/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html
+++ b/LayoutTests/fast/events/mosuedrag-on-canvas-should-not-start-selection.html
@@ -4,7 +4,7 @@
<div id="editor" contenteditable>
<canvas width="100" height="100" style="border: 1px solid black" onmousedown="mouseDown=true;" onmouseup="mouseUp=true;"></canvas>
</div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description("This tests initiating a mouse drag on a canvas element doesn't start selection."
diff --git a/LayoutTests/fast/events/mouse-click-events.html b/LayoutTests/fast/events/mouse-click-events.html
index 7c1e967..19fb962 100644
--- a/LayoutTests/fast/events/mouse-click-events.html
+++ b/LayoutTests/fast/events/mouse-click-events.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/mouse-click-events.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-cursor-change.html b/LayoutTests/fast/events/mouse-cursor-change.html
index 194772a..86f6dbd 100644
--- a/LayoutTests/fast/events/mouse-cursor-change.html
+++ b/LayoutTests/fast/events/mouse-cursor-change.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style type="text/css">
</style>
</head>
@@ -75,6 +75,6 @@
}
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-cursor-image-set.html b/LayoutTests/fast/events/mouse-cursor-image-set.html
index 822146c..6c10fae 100644
--- a/LayoutTests/fast/events/mouse-cursor-image-set.html
+++ b/LayoutTests/fast/events/mouse-cursor-image-set.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="../js/resources/image-preload-helper.js"></script>
<style type="text/css">
</style>
@@ -83,6 +83,6 @@
preloadImagesFromStyle(testContainer, 6, runTests, /doesntexist/);
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-cursor-multiframecur.html b/LayoutTests/fast/events/mouse-cursor-multiframecur.html
index f15242e..5434a43 100644
--- a/LayoutTests/fast/events/mouse-cursor-multiframecur.html
+++ b/LayoutTests/fast/events/mouse-cursor-multiframecur.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="../js/resources/image-preload-helper.js"></script>
<style type="text/css">
</style>
@@ -62,6 +62,6 @@
preloadImagesFromStyle(testContainer, 1, runTests);
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-cursor-no-mousemove.html b/LayoutTests/fast/events/mouse-cursor-no-mousemove.html
index acb6fad..40f12cd 100644
--- a/LayoutTests/fast/events/mouse-cursor-no-mousemove.html
+++ b/LayoutTests/fast/events/mouse-cursor-no-mousemove.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style type="text/css">
</style>
</head>
@@ -52,6 +52,6 @@
}
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-cursor.html b/LayoutTests/fast/events/mouse-cursor.html
index fd99d5d..213e954 100644
--- a/LayoutTests/fast/events/mouse-cursor.html
+++ b/LayoutTests/fast/events/mouse-cursor.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="../js/resources/image-preload-helper.js"></script>
<style type="text/css">
</style>
@@ -88,6 +88,6 @@
preloadImagesFromStyle(testContainer, 9, runTests, /(#greenbox|_FAIL)/);
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-double-triple-click-should-not-select-next-node-for-user-select-none.html b/LayoutTests/fast/events/mouse-double-triple-click-should-not-select-next-node-for-user-select-none.html
index 02601cf..bc826d0 100644
--- a/LayoutTests/fast/events/mouse-double-triple-click-should-not-select-next-node-for-user-select-none.html
+++ b/LayoutTests/fast/events/mouse-double-triple-click-should-not-select-next-node-for-user-select-none.html
@@ -11,7 +11,7 @@
visibility: hidden;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p> Mouse double/triple click on an element with "webkit-user-select none" should not select the next node</p>
@@ -58,6 +58,6 @@
}
successfullyParsed = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-focus-imagemap.html b/LayoutTests/fast/events/mouse-focus-imagemap.html
index d09bf30..bc757b0 100644
--- a/LayoutTests/fast/events/mouse-focus-imagemap.html
+++ b/LayoutTests/fast/events/mouse-focus-imagemap.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body id="body">
<img id="image" usemap="#map" src="data:image/gif;base64,R0lGODlhAQABAIAAAOTm7AAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" width="1000" height="1000" alt="" style="border:1px solid black;">
@@ -34,6 +34,6 @@
shouldBe("document.activeElement.id == 'focusable-area' || document.activeElement.id == 'body'", "true");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouse-relative-position.html b/LayoutTests/fast/events/mouse-relative-position.html
index caaa21e..283f348 100644
--- a/LayoutTests/fast/events/mouse-relative-position.html
+++ b/LayoutTests/fast/events/mouse-relative-position.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
html, body {
margin: 0;
diff --git a/LayoutTests/fast/events/mouseout-dead-node.html b/LayoutTests/fast/events/mouseout-dead-node.html
index f8882cf..25099c4 100644
--- a/LayoutTests/fast/events/mouseout-dead-node.html
+++ b/LayoutTests/fast/events/mouseout-dead-node.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -45,6 +45,6 @@
document.body.removeChild(testContainer);
}
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mouseover-button.html b/LayoutTests/fast/events/mouseover-button.html
index a74936b..43aa3e5 100644
--- a/LayoutTests/fast/events/mouseover-button.html
+++ b/LayoutTests/fast/events/mouseover-button.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
diff --git a/LayoutTests/fast/events/mutation-during-append-child.html b/LayoutTests/fast/events/mutation-during-append-child.html
index ca71a4d2..3e7aa94 100644
--- a/LayoutTests/fast/events/mutation-during-append-child.html
+++ b/LayoutTests/fast/events/mutation-during-append-child.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div>
@@ -18,6 +18,6 @@
document.addEventListener("DOMNodeRemoved", listener, false);
shouldThrow("newparent.appendChild(child);", "'Error: HierarchyRequestError: DOM Exception 3'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mutation-during-insert-before.html b/LayoutTests/fast/events/mutation-during-insert-before.html
index 04781cbb..0ddc319 100644
--- a/LayoutTests/fast/events/mutation-during-insert-before.html
+++ b/LayoutTests/fast/events/mutation-during-insert-before.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div>
@@ -18,6 +18,6 @@
document.addEventListener("DOMNodeRemoved", listener, false);
shouldThrow("newparent.insertBefore(child, beforeChild);", "'Error: HierarchyRequestError: DOM Exception 3'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mutation-during-replace-child-2.html b/LayoutTests/fast/events/mutation-during-replace-child-2.html
index b44b271..f4aeae0 100644
--- a/LayoutTests/fast/events/mutation-during-replace-child-2.html
+++ b/LayoutTests/fast/events/mutation-during-replace-child-2.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div>
@@ -30,7 +30,7 @@
document.addEventListener("DOMNodeRemoved", handler, false);
shouldThrow("target.replaceChild(newChild, oldChild);", "'Error: HierarchyRequestError: DOM Exception 3'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/mutation-during-replace-child.html b/LayoutTests/fast/events/mutation-during-replace-child.html
index 4a5b32b..2d2c963 100644
--- a/LayoutTests/fast/events/mutation-during-replace-child.html
+++ b/LayoutTests/fast/events/mutation-during-replace-child.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div>
@@ -26,7 +26,7 @@
document.addEventListener("DOMNodeRemoved", handler, false);
shouldThrow("target.replaceChild(newChild, oldChild);", "'Error: HierarchyRequestError: DOM Exception 3'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/no-scroll-on-input-text-selection.html b/LayoutTests/fast/events/no-scroll-on-input-text-selection.html
index 41ec5a6..8667e22 100644
--- a/LayoutTests/fast/events/no-scroll-on-input-text-selection.html
+++ b/LayoutTests/fast/events/no-scroll-on-input-text-selection.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
jsTestIsAsync = true;
@@ -56,5 +56,5 @@
<input id="ta" value="select some of this text"></input>
<p>If the bug does not occur, you'll be left down here at the bottom.</p>
</body>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/events/onblur-remove.html b/LayoutTests/fast/events/onblur-remove.html
index 2a78559..137ff5d 100644
--- a/LayoutTests/fast/events/onblur-remove.html
+++ b/LayoutTests/fast/events/onblur-remove.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/events/onchange-range-slider.html b/LayoutTests/fast/events/onchange-range-slider.html
index a2f94ee..472048c 100644
--- a/LayoutTests/fast/events/onchange-range-slider.html
+++ b/LayoutTests/fast/events/onchange-range-slider.html
@@ -8,7 +8,7 @@
<!-- See bug 84674 -->
<input id="slider" type="range" min="0" max="3" value="0"></input>
<pre id="console"></pre>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
var receivedChangeEvent = false;
var slider;
diff --git a/LayoutTests/fast/events/onchange-setvalue.html b/LayoutTests/fast/events/onchange-setvalue.html
index 2335390..47eb870 100644
--- a/LayoutTests/fast/events/onchange-setvalue.html
+++ b/LayoutTests/fast/events/onchange-setvalue.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<div id="test">
<input type="text">
diff --git a/LayoutTests/fast/events/onchange-text-form-field.html b/LayoutTests/fast/events/onchange-text-form-field.html
index 2fceb48..d3fef0c 100644
--- a/LayoutTests/fast/events/onchange-text-form-field.html
+++ b/LayoutTests/fast/events/onchange-text-form-field.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<div id="test">
<input type="text">
diff --git a/LayoutTests/fast/events/onerror-img-after-gc.html b/LayoutTests/fast/events/onerror-img-after-gc.html
index b216c3f..e62c0b4 100644
--- a/LayoutTests/fast/events/onerror-img-after-gc.html
+++ b/LayoutTests/fast/events/onerror-img-after-gc.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/events/onunload-back-to-page-cache.html b/LayoutTests/fast/events/onunload-back-to-page-cache.html
index 729f831..fa646cb 100644
--- a/LayoutTests/fast/events/onunload-back-to-page-cache.html
+++ b/LayoutTests/fast/events/onunload-back-to-page-cache.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/onunload-back-to-page-cache.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/page-scaled-mouse-click-iframe.html b/LayoutTests/fast/events/page-scaled-mouse-click-iframe.html
index 0d28be9..b51bff1 100644
--- a/LayoutTests/fast/events/page-scaled-mouse-click-iframe.html
+++ b/LayoutTests/fast/events/page-scaled-mouse-click-iframe.html
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html style="background-color: red; ">
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body style="margin: 0px;">
<script src="script-tests/page-scaled-mouse-click-iframe.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/page-scaled-mouse-click.html b/LayoutTests/fast/events/page-scaled-mouse-click.html
index 229c9b1..aa24ab3 100644
--- a/LayoutTests/fast/events/page-scaled-mouse-click.html
+++ b/LayoutTests/fast/events/page-scaled-mouse-click.html
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body style="margin:0px">
<script src="script-tests/page-scaled-mouse-click.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/page-visibility-iframe-delete-test.html b/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
index e202a32..a6d33e4 100644
--- a/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
+++ b/LayoutTests/fast/events/page-visibility-iframe-delete-test.html
@@ -1,7 +1,7 @@
<html>
<body onload="startTest()">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
@@ -96,7 +96,7 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
<iframe id="topFrame1" onload="startTest()" ></iframe>
<iframe id="topFrame2" onload="startTest()" ></iframe>
diff --git a/LayoutTests/fast/events/page-visibility-iframe-move-test.html b/LayoutTests/fast/events/page-visibility-iframe-move-test.html
index 27bab2c..b58e744 100644
--- a/LayoutTests/fast/events/page-visibility-iframe-move-test.html
+++ b/LayoutTests/fast/events/page-visibility-iframe-move-test.html
@@ -1,7 +1,7 @@
<html>
<body onload="startTest()">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
@@ -69,7 +69,7 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/page-visibility-iframe-propagation-test.html b/LayoutTests/fast/events/page-visibility-iframe-propagation-test.html
index 58070ce..50c336e 100644
--- a/LayoutTests/fast/events/page-visibility-iframe-propagation-test.html
+++ b/LayoutTests/fast/events/page-visibility-iframe-propagation-test.html
@@ -1,7 +1,7 @@
<html>
<body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
@@ -113,7 +113,7 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
<iframe id="childFrame" onload="startTest()"></iframe>
</body>
diff --git a/LayoutTests/fast/events/page-visibility-null-view.html b/LayoutTests/fast/events/page-visibility-null-view.html
index b405479..821b22d 100644
--- a/LayoutTests/fast/events/page-visibility-null-view.html
+++ b/LayoutTests/fast/events/page-visibility-null-view.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
@@ -14,7 +14,7 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</head>
</html>
diff --git a/LayoutTests/fast/events/page-visibility-transition-test.html b/LayoutTests/fast/events/page-visibility-transition-test.html
index 7c54d8c..1602bb2 100644
--- a/LayoutTests/fast/events/page-visibility-transition-test.html
+++ b/LayoutTests/fast/events/page-visibility-transition-test.html
@@ -1,7 +1,7 @@
<html>
<body onload='startTest()'>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
@@ -116,7 +116,7 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/pagehide-timeout.html b/LayoutTests/fast/events/pagehide-timeout.html
index 0dead74..d9f24d7 100644
--- a/LayoutTests/fast/events/pagehide-timeout.html
+++ b/LayoutTests/fast/events/pagehide-timeout.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<script type="text/javascript">
@@ -37,6 +37,6 @@
}
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/pagehide-xhr-open.html b/LayoutTests/fast/events/pagehide-xhr-open.html
index e6e542a..2be8101 100644
--- a/LayoutTests/fast/events/pagehide-xhr-open.html
+++ b/LayoutTests/fast/events/pagehide-xhr-open.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<iframe src="resources/subframe-xmlhttprequest.html" id="a-frame"></iframe> <iframe src="resources/suspend-subframe-2.html" id="b-frame"></iframe>
@@ -29,6 +29,6 @@
var successfullyParsed = true;
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/platform-wheelevent-in-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-in-scrolling-div.html
index 5211f06..68f73db 100644
--- a/LayoutTests/fast/events/platform-wheelevent-in-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-in-scrolling-div.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var expectedScrollTop = 5;
var expectedScrollLeft = 3;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html
index cdd767c..66ac6c0 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-div.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 0;
var givenScrollLeft = 2;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html
index 8687901..ff92169 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-non-scrolling-page.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 0;
var givenScrollLeft = 2;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-div.html
index 77b1bea..34b6204 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-div.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 0;
var givenScrollLeft = 2;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-page.html
index b64eca7..8d45aba 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-page.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-x-in-scrolling-page.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 0;
var givenScrollLeft = 2; // When paging, this is ignored. Every event is one page.
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html
index 9031153..8d3d6ad 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 1;
var givenScrollLeft = 2;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
index e56243a..68a2906 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 2; // Only one page per event, so this should be interpreted as 1
var givenScrollLeft = 2;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-div.html
index f73eb6a..1adf10e 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-div.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 2;
var givenScrollLeft = 0;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html
index 8836679..1bc6515 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-non-scrolling-page.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 2;
var givenScrollLeft = 0;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-div.html b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-div.html
index c0a2338..27c2fd8 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-div.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-div.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 2;
var givenScrollLeft = 0;
diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
index c1c85cf..4deaed5 100644
--- a/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
+++ b/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
@@ -1,7 +1,7 @@
<html>
<head>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var givenScrollTop = 2; // Only page is scrolled per event, regardless of this number.
var givenScrollLeft = 0;
diff --git a/LayoutTests/fast/events/popup-allowed-from-gesture-initiated-event.html b/LayoutTests/fast/events/popup-allowed-from-gesture-initiated-event.html
index e6c83de..31ad2e8 100644
--- a/LayoutTests/fast/events/popup-allowed-from-gesture-initiated-event.html
+++ b/LayoutTests/fast/events/popup-allowed-from-gesture-initiated-event.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<button id="button1" onclick="testButton1()">Click Here</button>
diff --git a/LayoutTests/fast/events/popup-blocked-from-fake-button-click.html b/LayoutTests/fast/events/popup-blocked-from-fake-button-click.html
index 73ac883..f6536f5 100644
--- a/LayoutTests/fast/events/popup-blocked-from-fake-button-click.html
+++ b/LayoutTests/fast/events/popup-blocked-from-fake-button-click.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<button id="test" onclick="popup()" style="display:none"></button>
diff --git a/LayoutTests/fast/events/popup-blocked-from-fake-focus.html b/LayoutTests/fast/events/popup-blocked-from-fake-focus.html
index 5092192..d52a21b 100644
--- a/LayoutTests/fast/events/popup-blocked-from-fake-focus.html
+++ b/LayoutTests/fast/events/popup-blocked-from-fake-focus.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<textarea id="test" width="100" onfocus="popup()" onblur="popup()"></textarea>
diff --git a/LayoutTests/fast/events/popup-blocked-from-fake-user-gesture.html b/LayoutTests/fast/events/popup-blocked-from-fake-user-gesture.html
index 6903b95..0aab909 100644
--- a/LayoutTests/fast/events/popup-blocked-from-fake-user-gesture.html
+++ b/LayoutTests/fast/events/popup-blocked-from-fake-user-gesture.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<button id="test" onclick="clickHandler()">Click Here</button>
diff --git a/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
index 544b253..e7e9ebf 100644
--- a/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
+++ b/LayoutTests/fast/events/popup-blocked-from-untrusted-click-event-on-anchor.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<a id=test href="javascript:popup()">test</a>
diff --git a/LayoutTests/fast/events/popup-blocking-timers1.html b/LayoutTests/fast/events/popup-blocking-timers1.html
index 808995b..5d2acbc 100644
--- a/LayoutTests/fast/events/popup-blocking-timers1.html
+++ b/LayoutTests/fast/events/popup-blocking-timers1.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
diff --git a/LayoutTests/fast/events/popup-blocking-timers2.html b/LayoutTests/fast/events/popup-blocking-timers2.html
index e78812c..d2bb66d 100644
--- a/LayoutTests/fast/events/popup-blocking-timers2.html
+++ b/LayoutTests/fast/events/popup-blocking-timers2.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
diff --git a/LayoutTests/fast/events/popup-blocking-timers3.html b/LayoutTests/fast/events/popup-blocking-timers3.html
index fafd74c..5f3f1f1 100644
--- a/LayoutTests/fast/events/popup-blocking-timers3.html
+++ b/LayoutTests/fast/events/popup-blocking-timers3.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
var intervalId;
diff --git a/LayoutTests/fast/events/popup-blocking-timers4.html b/LayoutTests/fast/events/popup-blocking-timers4.html
index e2f32ee..9a8a055 100644
--- a/LayoutTests/fast/events/popup-blocking-timers4.html
+++ b/LayoutTests/fast/events/popup-blocking-timers4.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
diff --git a/LayoutTests/fast/events/popup-blocking-timers5.html b/LayoutTests/fast/events/popup-blocking-timers5.html
index 49f1dc8..015e77a 100644
--- a/LayoutTests/fast/events/popup-blocking-timers5.html
+++ b/LayoutTests/fast/events/popup-blocking-timers5.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
diff --git a/LayoutTests/fast/events/popup-blocking-timers6.html b/LayoutTests/fast/events/popup-blocking-timers6.html
index dc2ee7a..64b0f6f 100644
--- a/LayoutTests/fast/events/popup-blocking-timers6.html
+++ b/LayoutTests/fast/events/popup-blocking-timers6.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var newWindow;
diff --git a/LayoutTests/fast/events/related-target-focusevent.html b/LayoutTests/fast/events/related-target-focusevent.html
index fe1fb2d..9dfd1f2 100644
--- a/LayoutTests/fast/events/related-target-focusevent.html
+++ b/LayoutTests/fast/events/related-target-focusevent.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -30,6 +30,6 @@
eventSender.keyDown('\t');
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/resources/record-events.js b/LayoutTests/fast/events/resources/record-events.js
index 92174e3..996aa19 100644
--- a/LayoutTests/fast/events/resources/record-events.js
+++ b/LayoutTests/fast/events/resources/record-events.js
@@ -1,4 +1,4 @@
-// NOTE: You must include fast/js/resources/js-test-pre.js before this file in a test case since
+// NOTE: You must include resources/js-test-pre.js before this file in a test case since
// this file makes use of functions in js-test-pre.js.
var replayEventQueue = []; // Global queue of recorded events.
diff --git a/LayoutTests/fast/events/scale-and-scroll-body.html b/LayoutTests/fast/events/scale-and-scroll-body.html
index a4b4f49..e47ceac 100644
--- a/LayoutTests/fast/events/scale-and-scroll-body.html
+++ b/LayoutTests/fast/events/scale-and-scroll-body.html
@@ -42,7 +42,7 @@
scrollViaJavascript();
}
</script>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body style="width:2000px; height:2000px; margin:0px;" onload="test();">
<div style="left:0; top:0; width:100px; height:100px; position:absolute; background:yellow;"></div>
diff --git a/LayoutTests/fast/events/scale-and-scroll-iframe-body.html b/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
index dcc703c..c06114b 100644
--- a/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
+++ b/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
@@ -34,7 +34,7 @@
scroll();
}
</script>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="test();" style="height: 2000px">
<iframe id="frame" style="width:400px; height: 400px; position: absolute; top: 100px;"></iframe>
diff --git a/LayoutTests/fast/events/scale-and-scroll-iframe-window.html b/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
index 801de8d..9460c6a 100644
--- a/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
+++ b/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
@@ -33,7 +33,7 @@
scroll();
}
</script>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="test();" style="height: 2000px">
<div id="console"></div>
diff --git a/LayoutTests/fast/events/scale-and-scroll-window.html b/LayoutTests/fast/events/scale-and-scroll-window.html
index 2c67664..afb5236 100644
--- a/LayoutTests/fast/events/scale-and-scroll-window.html
+++ b/LayoutTests/fast/events/scale-and-scroll-window.html
@@ -34,7 +34,7 @@
scroll();
}
</script>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body style="width:2000px; height:2000px; margin:0px;" onload="test();">
<div style="left:0; top:0; width:100px; height:100px; position:absolute; background:yellow;"></div>
diff --git a/LayoutTests/fast/events/script-tests/TEMPLATE.html b/LayoutTests/fast/events/script-tests/TEMPLATE.html
index 056ea5d..d0cb77d 100644
--- a/LayoutTests/fast/events/script-tests/TEMPLATE.html
+++ b/LayoutTests/fast/events/script-tests/TEMPLATE.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="YOUR_JS_FILE_HERE"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/scroll-after-click-on-tab-index.html b/LayoutTests/fast/events/scroll-after-click-on-tab-index.html
index 48736aa..7a09f3c 100644
--- a/LayoutTests/fast/events/scroll-after-click-on-tab-index.html
+++ b/LayoutTests/fast/events/scroll-after-click-on-tab-index.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function getCenterFor(element)
{
@@ -39,7 +39,7 @@
<body onload="runTest();">
<input type="radio" id="myradio">Click the text below and then try to scroll.<br>
<div id="console"></div>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
<br><br><br><br><br><br><br><br><br><br>
<span tabindex=1 id="sp">My span</span>
<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
diff --git a/LayoutTests/fast/events/scroll-event-during-modal-dialog.html b/LayoutTests/fast/events/scroll-event-during-modal-dialog.html
index 386a45b..e9ff819 100644
--- a/LayoutTests/fast/events/scroll-event-during-modal-dialog.html
+++ b/LayoutTests/fast/events/scroll-event-during-modal-dialog.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body style="min-height: 2000px">
<script type="text/javascript">
@@ -27,6 +27,6 @@
}
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/scroll-event-phase.html b/LayoutTests/fast/events/scroll-event-phase.html
index b03ae6c..a2f6ee8 100644
--- a/LayoutTests/fast/events/scroll-event-phase.html
+++ b/LayoutTests/fast/events/scroll-event-phase.html
@@ -1,5 +1,5 @@
<html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body style="min-height: 2000px">
<script type="text/javascript">
@@ -35,6 +35,6 @@
window.scrollTo(200, 200);
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html b/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
index 3013cbf..79ad9f0 100644
--- a/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
+++ b/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
@@ -2,7 +2,7 @@
<style>
html, body { margin:0; overflow: hidden; }
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<div>This tests that a usually overflow: hidden viewport should be scrollable when scaled. Otherwise, you can't get to content
diff --git a/LayoutTests/fast/events/select-element.html b/LayoutTests/fast/events/select-element.html
index 3ab4f18..c305828 100644
--- a/LayoutTests/fast/events/select-element.html
+++ b/LayoutTests/fast/events/select-element.html
@@ -1,6 +1,6 @@
<html>
<head>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p>This test verifies that the Home/End/PageUp/PageDown keys work correctly for <select> elements.
@@ -298,6 +298,6 @@
testPageUpWithGroup();
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/suspend-timers.html b/LayoutTests/fast/events/suspend-timers.html
index 5cd12b0..308e0b4 100644
--- a/LayoutTests/fast/events/suspend-timers.html
+++ b/LayoutTests/fast/events/suspend-timers.html
@@ -12,7 +12,7 @@
}
</style>
<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -47,7 +47,7 @@
var successfullyParsed = true;
var jsTestIsAsync = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/tab-focus-link-in-canvas.html b/LayoutTests/fast/events/tab-focus-link-in-canvas.html
index adc9ef4..f361172 100644
--- a/LayoutTests/fast/events/tab-focus-link-in-canvas.html
+++ b/LayoutTests/fast/events/tab-focus-link-in-canvas.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -26,6 +26,6 @@
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/tab-imagemap.html b/LayoutTests/fast/events/tab-imagemap.html
index 4b5df60..40536b7 100644
--- a/LayoutTests/fast/events/tab-imagemap.html
+++ b/LayoutTests/fast/events/tab-imagemap.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body id="body">
<map name="mymap">
@@ -46,6 +46,6 @@
shouldBe("document.activeElement.id == 'area1' || document.activeElement.id == 'body'", "true");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/tab-is-focusable-assert.html b/LayoutTests/fast/events/tab-is-focusable-assert.html
index cca9b88..cb68111 100644
--- a/LayoutTests/fast/events/tab-is-focusable-assert.html
+++ b/LayoutTests/fast/events/tab-is-focusable-assert.html
@@ -1,10 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/tab-is-focusable-assert.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/tab-test-not-visible-imagemap.html b/LayoutTests/fast/events/tab-test-not-visible-imagemap.html
index 88fd5d5..773af46 100644
--- a/LayoutTests/fast/events/tab-test-not-visible-imagemap.html
+++ b/LayoutTests/fast/events/tab-test-not-visible-imagemap.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body id="body">
<form>
@@ -59,6 +59,6 @@
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/basic-multi-touch-events-limited.html b/LayoutTests/fast/events/touch/basic-multi-touch-events-limited.html
index c23bcc4..8511fce 100644
--- a/LayoutTests/fast/events/touch/basic-multi-touch-events-limited.html
+++ b/LayoutTests/fast/events/touch/basic-multi-touch-events-limited.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/basic-multi-touch-events.html b/LayoutTests/fast/events/touch/basic-multi-touch-events.html
index 3357ce9..35c9d2a 100644
--- a/LayoutTests/fast/events/touch/basic-multi-touch-events.html
+++ b/LayoutTests/fast/events/touch/basic-multi-touch-events.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/basic-single-touch-events.html b/LayoutTests/fast/events/touch/basic-single-touch-events.html
index 1c9354e..4ef5491 100644
--- a/LayoutTests/fast/events/touch/basic-single-touch-events.html
+++ b/LayoutTests/fast/events/touch/basic-single-touch-events.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/create-touch-event.html b/LayoutTests/fast/events/touch/create-touch-event.html
index bca5f72..67e28b9 100644
--- a/LayoutTests/fast/events/touch/create-touch-event.html
+++ b/LayoutTests/fast/events/touch/create-touch-event.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
<div id="console"></div>
<script src="resources/create-touch-event.js"></script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/document-create-touch-list-crash.html b/LayoutTests/fast/events/touch/document-create-touch-list-crash.html
index 73d134d..114568a 100644
--- a/LayoutTests/fast/events/touch/document-create-touch-list-crash.html
+++ b/LayoutTests/fast/events/touch/document-create-touch-list-crash.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/document-create-touch-list.html b/LayoutTests/fast/events/touch/document-create-touch-list.html
index ba1097b..5be70fd 100644
--- a/LayoutTests/fast/events/touch/document-create-touch-list.html
+++ b/LayoutTests/fast/events/touch/document-create-touch-list.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/document-create-touch.html b/LayoutTests/fast/events/touch/document-create-touch.html
index ee3936d..dbbad5b 100644
--- a/LayoutTests/fast/events/touch/document-create-touch.html
+++ b/LayoutTests/fast/events/touch/document-create-touch.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/emulate-touch-events.html b/LayoutTests/fast/events/touch/emulate-touch-events.html
index 90255f2..b4760b0 100644
--- a/LayoutTests/fast/events/touch/emulate-touch-events.html
+++ b/LayoutTests/fast/events/touch/emulate-touch-events.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<div id="touchtarget" style="width: 100px; height: 100px; background-color: blue"></div>
<p id="description"></p>
<div id="console"></div>
@@ -105,6 +105,6 @@
} else
debug("This test requires DumpRenderTree. Tap on the blue rect to log.");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/emulated-touch-iframe.html b/LayoutTests/fast/events/touch/emulated-touch-iframe.html
index a256caf..aeddfc9 100644
--- a/LayoutTests/fast/events/touch/emulated-touch-iframe.html
+++ b/LayoutTests/fast/events/touch/emulated-touch-iframe.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<body>
<iframe style="position:absolute; top:100px; left:100px;" src="./resources/emulated-touch-iframe2.html"></iframe>
<p>Test touchend events are emulated in iframes correctly.</p>
diff --git a/LayoutTests/fast/events/touch/frame-hover-update.html b/LayoutTests/fast/events/touch/frame-hover-update.html
index e5b3fc8..a8a01cb 100644
--- a/LayoutTests/fast/events/touch/frame-hover-update.html
+++ b/LayoutTests/fast/events/touch/frame-hover-update.html
@@ -25,7 +25,7 @@
border: none;
}
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<div id='sandbox'>
@@ -96,6 +96,6 @@
}
runTest();
</script>
- <script src="../../js/resources/js-test-post.js"></script>
+ <script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/gesture/context-menu-on-long-press.html b/LayoutTests/fast/events/touch/gesture/context-menu-on-long-press.html
index 5779ac8..a626b21 100644
--- a/LayoutTests/fast/events/touch/gesture/context-menu-on-long-press.html
+++ b/LayoutTests/fast/events/touch/gesture/context-menu-on-long-press.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="test()">
<p>This test checks that the context menu is shown on long press gesture.</p>
diff --git a/LayoutTests/fast/events/touch/gesture/context-menu-on-long-tap.html b/LayoutTests/fast/events/touch/gesture/context-menu-on-long-tap.html
index 48b62bd..c657347 100644
--- a/LayoutTests/fast/events/touch/gesture/context-menu-on-long-tap.html
+++ b/LayoutTests/fast/events/touch/gesture/context-menu-on-long-tap.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="test()">
<p>This test checks that the context menu is shown on long tap gesture.</p>
diff --git a/LayoutTests/fast/events/touch/gesture/context-menu-on-two-finger-tap.html b/LayoutTests/fast/events/touch/gesture/context-menu-on-two-finger-tap.html
index a3d0674..0da42d1 100644
--- a/LayoutTests/fast/events/touch/gesture/context-menu-on-two-finger-tap.html
+++ b/LayoutTests/fast/events/touch/gesture/context-menu-on-two-finger-tap.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="test()">
<p>This test checks that the context menu is shown on a two finger tap gesture.</p>
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-click.html b/LayoutTests/fast/events/touch/gesture/gesture-click.html
index 3a8a909..4e8b0ba 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-click.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-click.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="runTest();">
<div id="gesture">
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-dblclick.html b/LayoutTests/fast/events/touch/gesture/gesture-dblclick.html
index d58a855..f89d706 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-dblclick.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-dblclick.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="runTest();">
<div id="gesture">
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-scroll.html b/LayoutTests/fast/events/touch/gesture/gesture-scroll.html
index 5e40a51..052f790 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-scroll.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-scroll.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
#gesturetarget {
width: 100px;
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html b/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html
index 1d175c5..fa5b081 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
::-webkit-scrollbar {
background-color: #ccc;
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state-iframe.html b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state-iframe.html
index fbefb42..050f11b 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state-iframe.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state-iframe.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
#frame {
position: absolute;
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
index 2865e9d..e62fb0e 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
#box {
background-color: blue;
@@ -101,6 +101,6 @@
runTests();
</script>
-<script src="../../../js/resources/js-test-post.js"></script>
+<script src="../../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-tap-hover-clear.html b/LayoutTests/fast/events/touch/gesture/gesture-tap-hover-clear.html
index 613b3a3..d9bf3cb 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-tap-hover-clear.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-tap-hover-clear.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
::-webkit-scrollbar {
@@ -85,6 +85,6 @@
runTests();
</script>
-<script src="../../../js/resources/js-test-post.js"></script>
+<script src="../../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/gesture/gesture-tap-on-hover-element.html b/LayoutTests/fast/events/touch/gesture/gesture-tap-on-hover-element.html
index 014c9a6..91d1324 100644
--- a/LayoutTests/fast/events/touch/gesture/gesture-tap-on-hover-element.html
+++ b/LayoutTests/fast/events/touch/gesture/gesture-tap-on-hover-element.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<style type="text/css">
::-webkit-scrollbar {
@@ -83,6 +83,6 @@
runTests();
</script>
-<script src="../../../js/resources/js-test-post.js"></script>
+<script src="../../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html
index a86281d..27164d5 100644
--- a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html
+++ b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body>
<iframe src="resources/drag-inside-iframe2.html"></iframe>
diff --git a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html
index e8f6a7a..2f7fd36 100644
--- a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html
+++ b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body>
<iframe src="resources/drag-inside-nested-iframes2.html"></iframe>
diff --git a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html
index d10f651..aa8fd4c 100644
--- a/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html
+++ b/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="test()">
<p>This test checks that a long press gesture on a draggable element starts a drag/drop session.</p>
diff --git a/LayoutTests/fast/events/touch/gesture/pad-gesture-cancel.html b/LayoutTests/fast/events/touch/gesture/pad-gesture-cancel.html
index 4772d58..05c25ad 100644
--- a/LayoutTests/fast/events/touch/gesture/pad-gesture-cancel.html
+++ b/LayoutTests/fast/events/touch/gesture/pad-gesture-cancel.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body>
<span id="e"></span>
diff --git a/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.html b/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.html
index 4f142b5..b88f4dc 100644
--- a/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.html
+++ b/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body>
<span id="e"></span>
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html
index a8bbdee..76c2fda 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-xhidden.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-xhidden.html
index 74bc84f..dd14a81 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-xhidden.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-xhidden.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html
index fadc86a..2c126af 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body.html
index 85b5e48..b517a39 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-body.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-div.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-div.html
index 5883cbb..6f1c048 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-div.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-div.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-iframe.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-iframe.html
index dd30abf..e22d3ee 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-iframe.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-noscroll-iframe.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html
index d0c5d50..5d5220e 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated.html
index 9976985..7efe5db 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html
index 6dd80c6..527e898 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-twice-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-twice-propagated.html
index 1b6e61e..17d462e 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-twice-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-twice-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div.html
index 2aa0ae2..2e6b1f4 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-editable.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-editable.html
index 5d2b22e..319121a 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-editable.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-editable.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
index a99c265..44fcd62 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-propagated.html
index d3c0af4..d9dc384 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe.html
index e7ec921..b8c01ad 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html
index 46d836c..eb01902 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
::-webkit-scrollbar {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-propagated.html
index daa4567..d839a7b 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-propagated.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-propagated.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
::-webkit-scrollbar {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page.html
index f935432..8c00170 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
::-webkit-scrollbar {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-shy-target.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-shy-target.html
index 6154223..bfda48e 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-shy-target.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-shy-target.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
::-webkit-scrollbar {
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-sideways.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-sideways.html
index 770f327..ab3e41e 100644
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-sideways.html
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-sideways.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../../js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
<script src="resources/gesture-helpers.js"></script>
<style type="text/css">
#touchtarget {
diff --git a/LayoutTests/fast/events/touch/multi-touch-grouped-targets.html b/LayoutTests/fast/events/touch/multi-touch-grouped-targets.html
index 21801c7..7c8aea7 100644
--- a/LayoutTests/fast/events/touch/multi-touch-grouped-targets.html
+++ b/LayoutTests/fast/events/touch/multi-touch-grouped-targets.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html b/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html
index 1518d89..8c0aaf8 100644
--- a/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html
+++ b/LayoutTests/fast/events/touch/multi-touch-inside-iframes.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style>
iframe {
width: 100px;
diff --git a/LayoutTests/fast/events/touch/multi-touch-inside-nested-iframes.html b/LayoutTests/fast/events/touch/multi-touch-inside-nested-iframes.html
index a3ce4d3..055fbbb 100644
--- a/LayoutTests/fast/events/touch/multi-touch-inside-nested-iframes.html
+++ b/LayoutTests/fast/events/touch/multi-touch-inside-nested-iframes.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style>
#iframe1 {
width: 200px;
diff --git a/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html b/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
index c366736..b0d0570 100644
--- a/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
+++ b/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style type="text/css">
#touchtarget {
width: 100px;
diff --git a/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html b/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html
index 1d50fe9..966df33 100644
--- a/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html
+++ b/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/send-oncancel-event.html b/LayoutTests/fast/events/touch/send-oncancel-event.html
index 7f9bf69..b0c52e3 100644
--- a/LayoutTests/fast/events/touch/send-oncancel-event.html
+++ b/LayoutTests/fast/events/touch/send-oncancel-event.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/tap-highlight-color.html b/LayoutTests/fast/events/touch/tap-highlight-color.html
index 4a40be9..08b22b5 100644
--- a/LayoutTests/fast/events/touch/tap-highlight-color.html
+++ b/LayoutTests/fast/events/touch/tap-highlight-color.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
To test the new CSS property -webkit-tap-highlight-color which is only supported when building
WebKit with ENABLE(TOUCH_EVENTS), we create a new div element and add -webkit-tap-highlight-color
diff --git a/LayoutTests/fast/events/touch/touch-active-state.html b/LayoutTests/fast/events/touch/touch-active-state.html
index 07c5e25..b936bee 100644
--- a/LayoutTests/fast/events/touch/touch-active-state.html
+++ b/LayoutTests/fast/events/touch/touch-active-state.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style type="text/css">
#box {
background-color:blue;
diff --git a/LayoutTests/fast/events/touch/touch-before-pressing-spin-button.html b/LayoutTests/fast/events/touch/touch-before-pressing-spin-button.html
index 7dac4f9..c7e4810 100644
--- a/LayoutTests/fast/events/touch/touch-before-pressing-spin-button.html
+++ b/LayoutTests/fast/events/touch/touch-before-pressing-spin-button.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style type="text/css">
#box {
background-color:blue;
@@ -28,6 +28,6 @@
debug('Needs eventSender.');
}
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
index e883cb0..9f76511 100644
--- a/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
+++ b/LayoutTests/fast/events/touch/touch-coords-in-zoom-and-scroll.html
@@ -1,4 +1,4 @@
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<style>
#pusher {
width: 1000px;
diff --git a/LayoutTests/fast/events/touch/touch-handler-count.html b/LayoutTests/fast/events/touch/touch-handler-count.html
index 86c1455..4b27778 100644
--- a/LayoutTests/fast/events/touch/touch-handler-count.html
+++ b/LayoutTests/fast/events/touch/touch-handler-count.html
@@ -1,4 +1,4 @@
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<div id='touchtarget' style='width: 50; height: 50'></div>
<script>
description("This test checks that we correctly update the touch event handler count as event handlers are added and removed");
diff --git a/LayoutTests/fast/events/touch/touch-input-element-change-documents.html b/LayoutTests/fast/events/touch/touch-input-element-change-documents.html
index ed7f799..5a102186 100644
--- a/LayoutTests/fast/events/touch/touch-input-element-change-documents.html
+++ b/LayoutTests/fast/events/touch/touch-input-element-change-documents.html
@@ -1,4 +1,4 @@
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<div id='container'></div>
<script>
description("This test checks that we correctly update the touch event handler count when an Input element with default touch handlers changes documents.");
diff --git a/LayoutTests/fast/events/touch/touch-inside-iframe-scrolled.html b/LayoutTests/fast/events/touch/touch-inside-iframe-scrolled.html
index dd5e5ad..b24c4e2 100644
--- a/LayoutTests/fast/events/touch/touch-inside-iframe-scrolled.html
+++ b/LayoutTests/fast/events/touch/touch-inside-iframe-scrolled.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<body>
<iframe style="position:absolute; top:100px; left:100px;" src="./resources/touch-inside-iframe-scrolled2.html"></iframe>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/touch/touch-inside-iframe.html b/LayoutTests/fast/events/touch/touch-inside-iframe.html
index c9e6e2a..1000ddf 100644
--- a/LayoutTests/fast/events/touch/touch-inside-iframe.html
+++ b/LayoutTests/fast/events/touch/touch-inside-iframe.html
@@ -1,5 +1,5 @@
<html>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<body>
<iframe style="position:absolute; top:100px; left:100px;" src="./resources/touch-inside-iframe2.html"></iframe>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/touch/touch-scaled-scrolled.html b/LayoutTests/fast/events/touch/touch-scaled-scrolled.html
index 2276764..b666b10 100644
--- a/LayoutTests/fast/events/touch/touch-scaled-scrolled.html
+++ b/LayoutTests/fast/events/touch/touch-scaled-scrolled.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../../../resources/js-test-pre.js"></script>
</head>
<body onload="runTest();" style="width:2000px;height:2000px;">
<div>This test is successful if event.clientX/Y are consistent with the generated input.</div>
diff --git a/LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener.html b/LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener.html
index d55b866..418e6e1 100644
--- a/LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener.html
+++ b/LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/touch-slider.html b/LayoutTests/fast/events/touch/touch-slider.html
index 8c7d516..3dccb35 100644
--- a/LayoutTests/fast/events/touch/touch-slider.html
+++ b/LayoutTests/fast/events/touch/touch-slider.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/touch-stale-node-crash.html b/LayoutTests/fast/events/touch/touch-stale-node-crash.html
index 0d7f36b..6c4e9693 100644
--- a/LayoutTests/fast/events/touch/touch-stale-node-crash.html
+++ b/LayoutTests/fast/events/touch/touch-stale-node-crash.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
diff --git a/LayoutTests/fast/events/touch/touch-target-limited.html b/LayoutTests/fast/events/touch/touch-target-limited.html
index b4bdc44..b794a52 100644
--- a/LayoutTests/fast/events/touch/touch-target-limited.html
+++ b/LayoutTests/fast/events/touch/touch-target-limited.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/touch/touch-target.html b/LayoutTests/fast/events/touch/touch-target.html
index fc2b3d6..56467bd 100644
--- a/LayoutTests/fast/events/touch/touch-target.html
+++ b/LayoutTests/fast/events/touch/touch-target.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<!--
Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
diff --git a/LayoutTests/fast/events/wheelevent-basic.html b/LayoutTests/fast/events/wheelevent-basic.html
index b5e818c..03d368a 100644
--- a/LayoutTests/fast/events/wheelevent-basic.html
+++ b/LayoutTests/fast/events/wheelevent-basic.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
var deltaX = 0;
var deltaY = 0;
@@ -70,6 +70,6 @@
runTest();
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/wheelevent-constructor.html b/LayoutTests/fast/events/wheelevent-constructor.html
index 2eb7b18..830403c 100644
--- a/LayoutTests/fast/events/wheelevent-constructor.html
+++ b/LayoutTests/fast/events/wheelevent-constructor.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -24,6 +24,6 @@
shouldBe("testEvent.deltaMode", "WheelEvent.DOM_DELTA_PAGE");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/wheelevent-direction-inverted-from-device.html b/LayoutTests/fast/events/wheelevent-direction-inverted-from-device.html
index 6dbc826..06eafcd 100644
--- a/LayoutTests/fast/events/wheelevent-direction-inverted-from-device.html
+++ b/LayoutTests/fast/events/wheelevent-direction-inverted-from-device.html
@@ -6,7 +6,7 @@
<div style="width:100px; height:80px; background-color:green; color:white" id="target">Scroll over me</div>
<div id="console"></div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description("This test checks for the existence of the webkitDirectionInvertedFromDevice property in the WheelEvent.");
@@ -27,7 +27,7 @@
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html b/LayoutTests/fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html
index 0543a20..170deb5 100644
--- a/LayoutTests/fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html
+++ b/LayoutTests/fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html
@@ -1,6 +1,6 @@
<html dir=rtl>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
function log(str)
diff --git a/LayoutTests/fast/events/wheelevent-in-scrolling-div.html b/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
index 9b3095a..276654b 100644
--- a/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
+++ b/LayoutTests/fast/events/wheelevent-in-scrolling-div.html
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
var expectedScrollTop = 200;
var expectedScrollLeft = 100;
diff --git a/LayoutTests/fast/events/wheelevent-in-text-node.html b/LayoutTests/fast/events/wheelevent-in-text-node.html
index 5ecd385..7553efb 100644
--- a/LayoutTests/fast/events/wheelevent-in-text-node.html
+++ b/LayoutTests/fast/events/wheelevent-in-text-node.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
window.jsTestIsAsync = true;
@@ -30,7 +30,7 @@
test();
};
</script>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</head>
<body>
<div>This is a div containing text. Wheel events originating on the text
diff --git a/LayoutTests/fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html b/LayoutTests/fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html
index 9653101..5712233 100644
--- a/LayoutTests/fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html
+++ b/LayoutTests/fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html
@@ -1,6 +1,6 @@
<html dir=rtl style="-webkit-writing-mode:vertical-lr">
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
function log(str)
diff --git a/LayoutTests/fast/events/wheelevent-mousewheel-interaction.html b/LayoutTests/fast/events/wheelevent-mousewheel-interaction.html
index 687caef..e7d282d 100644
--- a/LayoutTests/fast/events/wheelevent-mousewheel-interaction.html
+++ b/LayoutTests/fast/events/wheelevent-mousewheel-interaction.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function runTest() {
var div = document.getElementById('target');
@@ -50,6 +50,6 @@
runTest();
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/events/zoom-dblclick.html b/LayoutTests/fast/events/zoom-dblclick.html
index 4c3dab5..e072003 100644
--- a/LayoutTests/fast/events/zoom-dblclick.html
+++ b/LayoutTests/fast/events/zoom-dblclick.html
@@ -1,5 +1,5 @@
<!-- based on clientXY-in-zoom-and-scroll.html -->
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function clickHandler(e)
{
@@ -71,5 +71,5 @@
testRunner.notifyDone();
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/exclusions/css-exclusions-disabled.html b/LayoutTests/fast/exclusions/css-exclusions-disabled.html
index 3149ed5..907a026 100644
--- a/LayoutTests/fast/exclusions/css-exclusions-disabled.html
+++ b/LayoutTests/fast/exclusions/css-exclusions-disabled.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Test that parsing of css exclusions related properties can be disabled.');
@@ -35,6 +35,6 @@
testStyle("-webkit-wrap-through", "none", "wrap");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/exclusions/css-exclusions-enabled.html b/LayoutTests/fast/exclusions/css-exclusions-enabled.html
index 5c51283..a7072a8 100644
--- a/LayoutTests/fast/exclusions/css-exclusions-enabled.html
+++ b/LayoutTests/fast/exclusions/css-exclusions-enabled.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Test that parsing of css exclusions related properties is enabled by default.');
@@ -30,6 +30,6 @@
testStyle("-webkit-wrap-through", "none", "none");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/exclusions/parsing/parsing-wrap-flow.html b/LayoutTests/fast/exclusions/parsing/parsing-wrap-flow.html
index 2ab3a8f..b8978e6 100644
--- a/LayoutTests/fast/exclusions/parsing/parsing-wrap-flow.html
+++ b/LayoutTests/fast/exclusions/parsing/parsing-wrap-flow.html
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/parsing-test-utils.js"></script>
<script src="script-tests/parsing-wrap-flow.js"></script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/exclusions/parsing/parsing-wrap-through.html b/LayoutTests/fast/exclusions/parsing/parsing-wrap-through.html
index 388326c..3cbacef 100644
--- a/LayoutTests/fast/exclusions/parsing/parsing-wrap-through.html
+++ b/LayoutTests/fast/exclusions/parsing/parsing-wrap-through.html
@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="script-tests/parsing-test-utils.js"></script>
<script src="script-tests/parsing-wrap-through.js"></script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
