Change fast/c* files to use pre and post js files in LayoutTests/resources.
https://bugs.webkit.org/show_bug.cgi?id=120970.
Rubber stamped by Filip Pizlo.
* fast/canvas/2d.composite.globalAlpha.fillPath.html:
* fast/canvas/canvas-2d-imageData-create-nonfinite.html:
* fast/canvas/canvas-ImageData-behaviour.html:
* fast/canvas/canvas-alphaImageData-behavior.html:
* fast/canvas/canvas-arc-360-winding.html:
* fast/canvas/canvas-arc-connecting-line.html:
* fast/canvas/canvas-arc-zero-lineto.html:
* fast/canvas/canvas-bezier-same-endpoint.html:
* fast/canvas/canvas-blend-image.html:
* fast/canvas/canvas-blend-solid.html:
* fast/canvas/canvas-blending-clipping.html:
* fast/canvas/canvas-blending-color-over-color.html:
* fast/canvas/canvas-blending-color-over-gradient.html:
* fast/canvas/canvas-blending-color-over-image.html:
* fast/canvas/canvas-blending-color-over-pattern.html:
* fast/canvas/canvas-blending-fill-style.html:
* fast/canvas/canvas-blending-global-alpha.html:
* fast/canvas/canvas-blending-gradient-over-color.html:
* fast/canvas/canvas-blending-gradient-over-gradient.html:
* fast/canvas/canvas-blending-gradient-over-image.html:
* fast/canvas/canvas-blending-gradient-over-pattern.html:
* fast/canvas/canvas-blending-image-over-color.html:
* fast/canvas/canvas-blending-image-over-gradient.html:
* fast/canvas/canvas-blending-image-over-image.html:
* fast/canvas/canvas-blending-image-over-pattern.html:
* fast/canvas/canvas-blending-pattern-over-color.html:
* fast/canvas/canvas-blending-pattern-over-gradient.html:
* fast/canvas/canvas-blending-pattern-over-image.html:
* fast/canvas/canvas-blending-pattern-over-pattern.html:
* fast/canvas/canvas-blending-shadow.html:
* fast/canvas/canvas-blending-text.html:
* fast/canvas/canvas-blending-transforms.html:
* fast/canvas/canvas-clearRect.html:
* fast/canvas/canvas-clip-rule.html:
* fast/canvas/canvas-closePath-single-point.html:
* fast/canvas/canvas-color-clamping.html:
* fast/canvas/canvas-color-serialization.html:
* fast/canvas/canvas-copyPixels.html:
* fast/canvas/canvas-createImageData.html:
* fast/canvas/canvas-createPattern-fillRect-shadow.html:
* fast/canvas/canvas-currentColor.html:
* fast/canvas/canvas-currentPath-crash.html:
* fast/canvas/canvas-currentPath.html:
* fast/canvas/canvas-draw-canvas-on-canvas-shadow.html:
* fast/canvas/canvas-drawImage-incomplete.html:
* fast/canvas/canvas-drawImage-shadow.html:
* fast/canvas/canvas-fill-rule.html:
* fast/canvas/canvas-fill-zeroSizeGradient.html:
* fast/canvas/canvas-fillPath-alpha-shadow.html:
* fast/canvas/canvas-fillPath-gradient-shadow.html:
* fast/canvas/canvas-fillPath-pattern-shadow.html:
* fast/canvas/canvas-fillPath-shadow.html:
* fast/canvas/canvas-fillRect-gradient-shadow.html:
* fast/canvas/canvas-fillRect-shadow.html:
* fast/canvas/canvas-fillRect-zeroSizeGradient.html:
* fast/canvas/canvas-fillRect.html:
* fast/canvas/canvas-fillText-invalid-maxWidth.html:
* fast/canvas/canvas-fillText-zeroSizeGradient.html:
* fast/canvas/canvas-font-ex-units-crash.html:
* fast/canvas/canvas-getContext-invalid.html:
* fast/canvas/canvas-getImageData-invalid.html:
* fast/canvas/canvas-getImageData-negative-source.html:
* fast/canvas/canvas-getImageData-rounding.html:
* fast/canvas/canvas-gradient-addStop-error.html:
* fast/canvas/canvas-gradient-without-path.html:
* fast/canvas/canvas-image-shadow.html:
* fast/canvas/canvas-imageSmoothingEnabled-repaint.html:
* fast/canvas/canvas-imageSmoothingEnabled.html:
* fast/canvas/canvas-invalid-fillstyle.html:
* fast/canvas/canvas-invalid-strokestyle.html:
* fast/canvas/canvas-invalid-values.html:
* fast/canvas/canvas-isPointInPath-winding.html:
* fast/canvas/canvas-isPointInStroke.html:
* fast/canvas/canvas-large-dimensions.html:
* fast/canvas/canvas-large-fills.html:
* fast/canvas/canvas-lineDash-invalid.html:
* fast/canvas/canvas-lineDash.html:
* fast/canvas/canvas-lineWidth-intact-after-strokeRect.html:
* fast/canvas/canvas-lineWidth.html:
* fast/canvas/canvas-longlived-context.html:
* fast/canvas/canvas-modify-emptyPath.html:
* fast/canvas/canvas-negative-size.html:
* fast/canvas/canvas-overloads-drawImage.html:
* fast/canvas/canvas-overloads-drawImageFromRect.html:
* fast/canvas/canvas-overloads-fillText.html:
* fast/canvas/canvas-overloads-setFillColor.html:
* fast/canvas/canvas-overloads-setShadow.html:
* fast/canvas/canvas-overloads-setStrokeColor.html:
* fast/canvas/canvas-overloads-strokeText.html:
* fast/canvas/canvas-path-constructors.html:
* fast/canvas/canvas-path-object.html:
* fast/canvas/canvas-pattern-behaviour.html:
* fast/canvas/canvas-pattern-modify.html:
* fast/canvas/canvas-pattern-transform.html:
* fast/canvas/canvas-putImageData.html:
* fast/canvas/canvas-quadratic-same-endpoint.html:
* fast/canvas/canvas-radial-gradient-spreadMethod.html:
* fast/canvas/canvas-save-restore-with-path.html:
* fast/canvas/canvas-scale-drawImage-shadow.html:
* fast/canvas/canvas-scale-fillPath-shadow.html:
* fast/canvas/canvas-scale-fillRect-shadow.html:
* fast/canvas/canvas-scale-shadowBlur.html:
* fast/canvas/canvas-scale-strokePath-shadow.html:
* fast/canvas/canvas-set-properties-with-non-invertible-ctm.html:
* fast/canvas/canvas-setTransform.html:
* fast/canvas/canvas-shadow.html:
* fast/canvas/canvas-state-intact-after-putImageData.html:
* fast/canvas/canvas-stroke-empty-fill.html:
* fast/canvas/canvas-stroke-zeroSizeGradient.html:
* fast/canvas/canvas-strokePath-alpha-shadow.html:
* fast/canvas/canvas-strokePath-cap-join.html:
* fast/canvas/canvas-strokePath-gradient-shadow.html:
* fast/canvas/canvas-strokePath-shadow.html:
* fast/canvas/canvas-strokeRect-alpha-shadow.html:
* fast/canvas/canvas-strokeRect-gradient-shadow.html:
* fast/canvas/canvas-strokeRect-zeroSizeGradient.html:
* fast/canvas/canvas-strokeRect.html:
* fast/canvas/canvas-strokeText-invalid-maxWidth.html:
* fast/canvas/canvas-strokeText-strokes-shadow.html:
* fast/canvas/canvas-strokeText-zeroSizeGradient.html:
* fast/canvas/canvas-style-intact-after-text.html:
* fast/canvas/canvas-to-canvas.html:
* fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html:
* fast/canvas/canvas-transforms-fillRect-shadow.html:
* fast/canvas/canvas-transparency-and-composite.html:
* fast/canvas/canvas-webkitLineDash-invalid.html:
* fast/canvas/canvas-webkitLineDash.html:
* fast/canvas/canvas-with-illegal-args.html:
* fast/canvas/drawImage-with-negative-source-destination.html:
* fast/canvas/fallback-content.html:
* fast/canvas/fillText-shadow.html:
* fast/canvas/gradient-addColorStop-with-invalid-color.html:
* fast/canvas/gradient-with-clip.html:
* fast/canvas/imagedata-contains-uint8clampedarray.html:
* fast/canvas/linearGradient-infinite-values.html:
* fast/canvas/pattern-with-transform.html:
* fast/canvas/pointInPath.html:
* fast/canvas/radialGradient-infinite-values.html:
* fast/canvas/rgba-parsing.html:
* fast/canvas/script-tests/TEMPLATE.html:
* fast/canvas/set-colors.html:
* fast/canvas/text-globalAlpha.html:
* fast/canvas/translate-text.html:
* fast/canvas/webgl/WebGLContextEvent.html:
* fast/canvas/webgl/array-bounds-clamping.html:
* fast/canvas/webgl/array-buffer-crash.html:
* fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html:
* fast/canvas/webgl/array-buffer-view-crash.html:
* fast/canvas/webgl/array-constructor.html:
* fast/canvas/webgl/array-get-and-set-method-removal.html:
* fast/canvas/webgl/array-get-out-of-bounds.html:
* fast/canvas/webgl/array-message-passing.html:
* fast/canvas/webgl/array-override-set.html:
* fast/canvas/webgl/array-set-invalid-arguments.html:
* fast/canvas/webgl/array-set-out-of-bounds.html:
* fast/canvas/webgl/array-set-with-offset.html:
* fast/canvas/webgl/array-setters.html:
* fast/canvas/webgl/array-unit-tests.html:
* fast/canvas/webgl/arraybuffer-transfer-of-control.html:
* fast/canvas/webgl/attrib-location-length-limits.html:
* fast/canvas/webgl/bad-arguments-test.html:
* fast/canvas/webgl/buffer-bind-test.html:
* fast/canvas/webgl/buffer-data-array-buffer.html:
* fast/canvas/webgl/canvas-2d-webgl-texture.html:
* fast/canvas/webgl/canvas-resize-crash.html:
* fast/canvas/webgl/canvas-supports-context.html:
* fast/canvas/webgl/canvas-test.html:
* fast/canvas/webgl/canvas-zero-size.html:
* fast/canvas/webgl/compressed-tex-image.html:
* fast/canvas/webgl/constants.html:
* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html:
* fast/canvas/webgl/context-creation-and-destruction.html:
* fast/canvas/webgl/context-lost-restored.html:
* fast/canvas/webgl/context-lost.html:
* fast/canvas/webgl/context-release-upon-reload.html:
* fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html:
* fast/canvas/webgl/data-view-crash.html:
* fast/canvas/webgl/data-view-test.html:
* fast/canvas/webgl/draw-arrays-out-of-bounds.html:
* fast/canvas/webgl/draw-elements-out-of-bounds.html:
* fast/canvas/webgl/drawingbuffer-test.html:
* fast/canvas/webgl/error-reporting.html:
* fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html:
* fast/canvas/webgl/framebuffer-object-attachment.html:
* fast/canvas/webgl/framebuffer-test.html:
* fast/canvas/webgl/functions-returning-strings.html:
* fast/canvas/webgl/get-active-test.html:
* fast/canvas/webgl/gl-bind-attrib-location-test.html:
* fast/canvas/webgl/gl-enable-enum-test.html:
* fast/canvas/webgl/gl-enum-tests.html:
* fast/canvas/webgl/gl-get-calls.html:
* fast/canvas/webgl/gl-getshadersource.html:
* fast/canvas/webgl/gl-getstring.html:
* fast/canvas/webgl/gl-object-get-calls.html:
* fast/canvas/webgl/gl-pixelstorei.html:
* fast/canvas/webgl/gl-teximage.html:
* fast/canvas/webgl/gl-uniform-arrays.html:
* fast/canvas/webgl/gl-uniformmatrix4fv.html:
* fast/canvas/webgl/gl-vertex-attrib-zero-issues.html:
* fast/canvas/webgl/gl-vertex-attrib.html:
* fast/canvas/webgl/gl-vertexattribpointer.html:
* fast/canvas/webgl/glsl-conformance.html:
* fast/canvas/webgl/incorrect-context-object-behaviour.html:
* fast/canvas/webgl/index-validation-copies-indices.html:
* fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html:
* fast/canvas/webgl/index-validation-verifies-too-many-indices.html:
* fast/canvas/webgl/index-validation-with-resized-buffer.html:
* fast/canvas/webgl/index-validation.html:
* fast/canvas/webgl/instanceof-test.html:
* fast/canvas/webgl/invalid-UTF-16.html:
* fast/canvas/webgl/invalid-passed-params.html:
* fast/canvas/webgl/is-object.html:
* fast/canvas/webgl/null-object-behaviour.html:
* fast/canvas/webgl/null-uniform-location.html:
* fast/canvas/webgl/object-deletion-behaviour.html:
* fast/canvas/webgl/oes-element-index-uint.html:
* fast/canvas/webgl/oes-texture-half-float-not-supported.html:
* fast/canvas/webgl/oes-texture-half-float.html:
* fast/canvas/webgl/oes-vertex-array-object.html:
* fast/canvas/webgl/point-size.html:
* fast/canvas/webgl/premultiplyalpha-test.html:
* fast/canvas/webgl/program-test.html:
* fast/canvas/webgl/read-pixels-pack-alignment.html:
* fast/canvas/webgl/read-pixels-test.html:
* fast/canvas/webgl/renderbuffer-initialization.html:
* fast/canvas/webgl/renderer-and-vendor-strings.html:
* fast/canvas/webgl/resources/webgl-test.js:
(finishTest):
* fast/canvas/webgl/shader-deleted-by-accessor.html:
* fast/canvas/webgl/shader-precision-format.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html:
* fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html:
* fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html:
* fast/canvas/webgl/tex-image-webgl.html:
* fast/canvas/webgl/tex-image-with-format-and-type.html:
* fast/canvas/webgl/tex-image-with-greyscale-image.html:
* fast/canvas/webgl/tex-input-validation.html:
* fast/canvas/webgl/tex-sub-image-2d-bad-args.html:
* fast/canvas/webgl/tex-sub-image-2d.html:
* fast/canvas/webgl/tex-sub-image-cube-maps.html:
* fast/canvas/webgl/texImageTest.html:
* fast/canvas/webgl/texture-active-bind.html:
* fast/canvas/webgl/texture-bindings-uneffected-on-resize.html:
* fast/canvas/webgl/texture-color-profile.html:
* fast/canvas/webgl/texture-complete.html:
* fast/canvas/webgl/texture-npot.html:
* fast/canvas/webgl/texture-transparent-pixels-initialized.html:
* fast/canvas/webgl/triangle.html:
* fast/canvas/webgl/type-conversion-test.html:
* fast/canvas/webgl/typed-arrays-in-workers.html:
* fast/canvas/webgl/uniform-array-length-overflow.html:
* fast/canvas/webgl/uniform-location-length-limits.html:
* fast/canvas/webgl/uniform-location.html:
* fast/canvas/webgl/uninitialized-test.html:
* fast/canvas/webgl/viewport-unchanged-upon-resize.html:
* fast/canvas/webgl/webgl-array-invalid-ranges.html:
* fast/canvas/webgl/webgl-depth-texture.html:
* fast/canvas/webgl/webgl-exceptions.html:
* fast/canvas/webgl/webgl-specific.html:
* fast/canvas/webgl/webgl-texture-binding-preserved.html:
* fast/canvas/webgl/webgl-unprefixed-context-id.html:
* fast/canvas/webgl/webgl-viewport-parameters-preserved.html:
* fast/canvas/winding-enumeration.html:
* fast/cookies/local-file-can-set-cookies.html:
* fast/css-generated-content/insert-stylesheet-and-pseudo-crash.html:
* fast/css-generated-content/pseudo-animation.html:
* fast/css-generated-content/pseudo-element-events.html:
* fast/css-generated-content/pseudo-transition-event.html:
* fast/css-generated-content/pseudo-transition.html:
* fast/css-grid-layout/display-grid-set-get.html:
* fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
* fast/css-grid-layout/grid-auto-flow-get-set.html:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-disabled-by-default.html:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css-grid-layout/grid-item-end-after-get-set.html:
* fast/css-grid-layout/grid-item-start-before-get-set.html:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-intrinsic-dimensions/height-property-value.html:
* fast/css-intrinsic-dimensions/multicol.html:
* fast/css-intrinsic-dimensions/width-property-value.html:
* fast/css/CSSPrimitiveValue-exceptions.html:
* fast/css/MarqueeLayoutTest.html:
* fast/css/aspect-ratio-inheritance.html:
* fast/css/aspect-ratio-parsing-tests.html:
* fast/css/attribute-selector-recursive-update-on-setAttribute.html:
* fast/css/auto-min-size.html:
* fast/css/background-clip-text.html:
* fast/css/background-currentcolor.html:
* fast/css/border-image-null-image-crash.html:
* fast/css/border-image-style-length.html:
* fast/css/border-radius-property-value.html:
* fast/css/border-shorthand-initialize-longhands.html:
* fast/css/border-start-end.html:
* fast/css/border-width-large.html:
* fast/css/box-sizing-backwards-compat-prefix.html:
* fast/css/button-height.html:
* fast/css/cloneNode-after-deleteRule-crash.html:
* fast/css/computed-width-without-renderer.html:
* fast/css/content-language-case-insensitivity.html:
* fast/css/content-language-comma-separated-list.html:
* fast/css/content-language-dynamically-added.html:
* fast/css/content-language-dynamically-changed.html:
* fast/css/content-language-dynamically-removed.html:
* fast/css/content-language-empty.html:
* fast/css/content-language-late.html:
* fast/css/content-language-mapped-to-webkit-locale.html:
* fast/css/content-language-multiple.html:
* fast/css/content-language-no-content.html:
* fast/css/content-language-only-whitespace.html:
* fast/css/content-language-with-whitespace.html:
* fast/css/counters/2displays.html:
* fast/css/counters/after-continuation.html:
* fast/css/counters/content-021.html:
* fast/css/counters/counter-cssText.html:
* fast/css/counters/counter-increment-000.html:
* fast/css/counters/counter-increment-001.html:
* fast/css/counters/counter-increment-inherit.htm:
* fast/css/counters/counter-increment-tests.htm:
* fast/css/counters/counterValueForElementById.html:
* fast/css/counters/deep-before.html:
* fast/css/counters/getCounterValue.html:
* fast/css/css-keyframe-style-parentRule.html:
* fast/css/css-selector-text.html:
* fast/css/css-set-selector-text.html:
* fast/css/css3-ch-unit.html:
* fast/css/css3-nth-space.html:
* fast/css/css3-nth-tokens-script.html:
* fast/css/css3-nth-tokens-style.html:
* fast/css/cssText-shorthand.html:
* fast/css/cssom-remove-shorthand-property.html:
* fast/css/cursor-parsing-image-set.html:
* fast/css/cursor-parsing.html:
* fast/css/default-bidi-css-rules.html:
* fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html:
* fast/css/device-aspect-ratio.html:
* fast/css/draggable-region-parser.html:
* fast/css/dynamic-pseudo-class.html:
* fast/css/dynamic-style-attribute-query.html:
* fast/css/ex-unit-with-no-x-height.html:
* fast/css/first-letter-nested.html:
* fast/css/first-letter-removed-added.html:
* fast/css/font-face-cache-bug.html:
* fast/css/font-face-data-uri.html:
* fast/css/font-face-descending-unicode-range.html:
* fast/css/font-face-download-error.html:
* fast/css/font-face-font-family-descriptor.html:
* fast/css/font-face-insert-link.html:
* fast/css/font-face-multiple-ranges-for-unicode-range.html:
* fast/css/font-family-initial.html:
* fast/css/font-family-trailing-bracket-gunk.html:
* fast/css/font-shorthand-from-longhands.html:
* fast/css/font-shorthand-mix-inherit.html:
* fast/css/fontloader-download-error.html:
* fast/css/fontloader-events.html:
* fast/css/fontloader-loadingdone.html:
* fast/css/fontloader-multiple-faces-download-error.html:
* fast/css/fontloader-multiple-faces.html:
* fast/css/fontloader-multiple-families.html:
* fast/css/getComputedStyle/computed-style-border-image.html:
* fast/css/getComputedStyle/computed-style-cross-fade.html:
* fast/css/getComputedStyle/computed-style-font-family-monospace.html:
* fast/css/getComputedStyle/computed-style-font.html:
* fast/css/getComputedStyle/computed-style-page-break-inside.html:
* fast/css/getComputedStyle/computed-style-properties.html:
* fast/css/getComputedStyle/computed-style-select-overflow.html:
* fast/css/getComputedStyle/computed-style-with-zoom.html:
* fast/css/getComputedStyle/counterIncrement-without-counter.html:
* fast/css/getComputedStyle/font-family-fallback-reset.html:
* fast/css/getComputedStyle/getComputedStyle-background-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-border-color-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-border-image-slice.html:
* fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-border-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-border-style-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-border-width.html:
* fast/css/getComputedStyle/getComputedStyle-column-rule.html:
* fast/css/getComputedStyle/getComputedStyle-height.html:
* fast/css/getComputedStyle/getComputedStyle-length-unit.html:
* fast/css/getComputedStyle/getComputedStyle-list-style-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-margin-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-outline-offset.html:
* fast/css/getComputedStyle/getComputedStyle-outline-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-padding-margin-subpixel-length.html:
* fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html:
* fast/css/getComputedStyle/getComputedStyle-text-decoration.html:
* fast/css/getComputedStyle/getComputedStyle-webkit-columns-shorthand.html:
* fast/css/getComputedStyle/script-tests/TEMPLATE.html:
* fast/css/getFloatValueForUnit.html:
* fast/css/getPropertyValue-border.html:
* fast/css/getPropertyValue-column-rule.html:
* fast/css/getPropertyValue-columns.html:
* fast/css/getPropertyValue-webkit-margin-collapse.html:
* fast/css/getPropertyValue-webkit-marquee.html:
* fast/css/getPropertyValue-webkit-text-stroke.html:
* fast/css/hover-active-drag.html:
* fast/css/hover-display-block-inline.html:
* fast/css/hover-display-block-none.html:
* fast/css/hover-display-block.html:
* fast/css/hover-update.html:
* fast/css/html-attr-case-sensitivity.html:
* fast/css/id-or-class-before-stylesheet-strict.html:
* fast/css/id-or-class-before-stylesheet.html:
* fast/css/image-orientation/image-orientation.html:
* fast/css/image-rendering-parsing.html:
* fast/css/image-resolution/image-resolution.html:
* fast/css/image-set-parsing-invalid.html:
* fast/css/image-set-parsing.html:
* fast/css/image-set-setting.html:
* fast/css/image-value-type.html:
* fast/css/inherit-initial-shorthand-values.html:
* fast/css/inherited-properties-explicit.html:
* fast/css/insertRule-font-face.html:
* fast/css/insertRule-media.html:
* fast/css/invalid-appearance-progress-bar-meter.html:
* fast/css/invalid-predefined-color.html:
* fast/css/invalid-rule-value.html:
* fast/css/lang-mapped-to-webkit-locale-dynamic.xhtml:
* fast/css/lang-mapped-to-webkit-locale.xhtml:
* fast/css/large-numbers.html:
* fast/css/last-child-innerhtml.html:
* fast/css/legacy-opacity-styles.html:
* fast/css/limited-vendor-prefix-behavior.html-disabled:
* fast/css/link-alternate-stylesheet-1.html:
* fast/css/link-alternate-stylesheet-2.html:
* fast/css/link-alternate-stylesheet-3.html:
* fast/css/link-alternate-stylesheet-4.html:
* fast/css/link-alternate-stylesheet-5.html:
* fast/css/link-disabled-attr.html:
* fast/css/margin-start-end.html:
* fast/css/max-device-aspect-ratio.html:
* fast/css/max-height-and-max-width.html:
* fast/css/min-device-aspect-ratio.html:
* fast/css/nested-at-rules.html:
* fast/css/outline-currentcolor.html:
* fast/css/overflow-property.html:
* fast/css/padding-no-renderer.html:
* fast/css/padding-start-end.html:
* fast/css/parsing-color-correction.html:
* fast/css/parsing-object-fit.html:
* fast/css/parsing-text-rendering.html:
* fast/css/parsing-webkit-font-smoothing.html:
* fast/css/position-absolute-float.html:
* fast/css/pseudo-any.html:
* fast/css/pseudo-default-001.html:
* fast/css/pseudo-default-002.html:
* fast/css/pseudo-default-003.html:
* fast/css/pseudo-default-004.html:
* fast/css/pseudo-in-range-invalid-value.html:
* fast/css/pseudo-in-range.html:
* fast/css/pseudo-invalid-001.html:
* fast/css/pseudo-invalid-002.html:
* fast/css/pseudo-invalid-novalidate-001.html:
* fast/css/pseudo-not.html:
* fast/css/pseudo-out-of-range.html:
* fast/css/pseudo-required-optional-005.html:
* fast/css/pseudo-required-optional-unapplied.html:
* fast/css/pseudo-target-indirect-sibling-001.html:
* fast/css/pseudo-target-indirect-sibling-002.html:
* fast/css/pseudo-valid-001.html:
* fast/css/pseudo-valid-002.html:
* fast/css/pseudo-valid-004.html:
* fast/css/pseudo-valid-007.html:
* fast/css/pseudo-valid-dynamic.html:
* fast/css/pseudo-valid-unapplied.html:
* fast/css/remove-attribute-style.html:
* fast/css/rgba-custom-text.html:
* fast/css/rule-selector-overflow.html:
* fast/css/script-tests/TEMPLATE.html:
* fast/css/selector-text-escape.html:
* fast/css/shorthand-mismatched-list-crash.html:
* fast/css/shorthand-priority.html:
* fast/css/shorthands-four-values.html:
* fast/css/sibling-selectors.html:
* fast/css/square-button-appearance.html:
* fast/css/sticky/parsing-position-sticky.html:
* fast/css/string-quote-binary.html:
* fast/css/style-enumerate-properties.html:
* fast/css/style-scoped/basic-attribute.html:
* fast/css/style-scoped/registering-shadowroot.html:
* fast/css/style-scoped/registering.html:
* fast/css/style-scoped/style-scoped-apply-author-styles.html:
* fast/css/style-scoped/style-scoped-change-scoped-in-shadow.html:
* fast/css/style-scoped/style-scoped-in-shadow.html:
* fast/css/style-scoped/style-scoped-nested.html:
* fast/css/style-scoped/style-scoped-with-dom-operation.html:
* fast/css/style-scoped/style-scoped-with-important-rule.html:
* fast/css/style-sharing-inline-stylesheet.html:
* fast/css/table-border-spacing.html:
* fast/css/test-setting-canvas-color.html:
* fast/css/text-overflow-ellipsis-and-floating-input-hittest.html:
* fast/css/text-overflow-ellipsis-behind-floats-expected.html:
* fast/css/transform-origin-parsing.html:
* fast/css/unicode-bidi-computed-value.html:
* fast/css/url-with-multi-byte-unicode-escape.html:
* fast/css/vertical-align-length-copy-bug.html:
* fast/css/xml-lang-ignored-in-html.html:
* fast/css/xml-stylesheet-alternate-no-title.xhtml:
* fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last-inherited.html:
* fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-color.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-line.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-ordering.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-style.html:
* fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html:
* fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html:
* fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html:
* fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify-inherited.html:
* fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/canvas/2d.composite.globalAlpha.fillPath.html b/LayoutTests/fast/canvas/2d.composite.globalAlpha.fillPath.html
index 1eafc6a..dde5aac 100644
--- a/LayoutTests/fast/canvas/2d.composite.globalAlpha.fillPath.html
+++ b/LayoutTests/fast/canvas/2d.composite.globalAlpha.fillPath.html
@@ -4,7 +4,7 @@
-->
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<canvas id="canvas" width="100" height="100"></canvas>
@@ -30,7 +30,7 @@
assertPixelApprox(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
</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/canvas/canvas-2d-imageData-create-nonfinite.html b/LayoutTests/fast/canvas/canvas-2d-imageData-create-nonfinite.html
index f2c8f9a..eab8384 100644
--- a/LayoutTests/fast/canvas/canvas-2d-imageData-create-nonfinite.html
+++ b/LayoutTests/fast/canvas/canvas-2d-imageData-create-nonfinite.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>
<canvas id="canvas" width=600 height=300>
<script src="resources/canvas-2d-imageData-create-nonfinite.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/canvas/canvas-ImageData-behaviour.html b/LayoutTests/fast/canvas/canvas-ImageData-behaviour.html
index 92de050..8f116b2 100644
--- a/LayoutTests/fast/canvas/canvas-ImageData-behaviour.html
+++ b/LayoutTests/fast/canvas/canvas-ImageData-behaviour.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas"></canvas>
<script src="canvas-ImageData-behaviour.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/canvas/canvas-alphaImageData-behavior.html b/LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html
index ae29848..5e750e9 100644
--- a/LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html
+++ b/LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas" width="200" height="200"></canvas>
<script src="canvas-alphaImageData-behavior.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/canvas/canvas-arc-360-winding.html b/LayoutTests/fast/canvas/canvas-arc-360-winding.html
index 6d48c8c..29ad2d1 100644
--- a/LayoutTests/fast/canvas/canvas-arc-360-winding.html
+++ b/LayoutTests/fast/canvas/canvas-arc-360-winding.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/canvas-arc-360-winding.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/canvas/canvas-arc-connecting-line.html b/LayoutTests/fast/canvas/canvas-arc-connecting-line.html
index 106d944..f7c2a49 100644
--- a/LayoutTests/fast/canvas/canvas-arc-connecting-line.html
+++ b/LayoutTests/fast/canvas/canvas-arc-connecting-line.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/canvas-arc-connecting-line.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/canvas/canvas-arc-zero-lineto.html b/LayoutTests/fast/canvas/canvas-arc-zero-lineto.html
index 897d0f8..13351460 100644
--- a/LayoutTests/fast/canvas/canvas-arc-zero-lineto.html
+++ b/LayoutTests/fast/canvas/canvas-arc-zero-lineto.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>
<canvas id="canvas" width="100" height="100"></canvas>
@@ -49,6 +49,6 @@
ctx.stroke();
shouldBeBlackPixel(50, 80);
</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/canvas/canvas-bezier-same-endpoint.html b/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html
index ca546ad..aee42f5 100644
--- a/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html
+++ b/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.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>
<canvas id="canvas" width="100" height="100"></canvas>
@@ -51,6 +51,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/canvas/canvas-blend-image.html b/LayoutTests/fast/canvas/canvas-blend-image.html
index 79f5757..d4b5f31 100644
--- a/LayoutTests/fast/canvas/canvas-blend-image.html
+++ b/LayoutTests/fast/canvas/canvas-blend-image.html
@@ -1,9 +1,9 @@
<!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/canvas-blend-image.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-blend-solid.html b/LayoutTests/fast/canvas/canvas-blend-solid.html
index 7c4abf6..eb1a403 100644
--- a/LayoutTests/fast/canvas/canvas-blend-solid.html
+++ b/LayoutTests/fast/canvas/canvas-blend-solid.html
@@ -1,9 +1,9 @@
<!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/canvas-blend-solid.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-blending-clipping.html b/LayoutTests/fast/canvas/canvas-blending-clipping.html
index 201497d..f7507fb 100644
--- a/LayoutTests/fast/canvas/canvas-blending-clipping.html
+++ b/LayoutTests/fast/canvas/canvas-blending-clipping.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -63,6 +63,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-color-over-color.html b/LayoutTests/fast/canvas/canvas-blending-color-over-color.html
index a5f8d8e..290ab63 100644
--- a/LayoutTests/fast/canvas/canvas-blending-color-over-color.html
+++ b/LayoutTests/fast/canvas/canvas-blending-color-over-color.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -48,6 +48,6 @@
debug('Running test in hardware accelerated mode\n');
runTest(100, 100);
</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/canvas/canvas-blending-color-over-gradient.html b/LayoutTests/fast/canvas/canvas-blending-color-over-gradient.html
index b40f303..d89d992 100644
--- a/LayoutTests/fast/canvas/canvas-blending-color-over-gradient.html
+++ b/LayoutTests/fast/canvas/canvas-blending-color-over-gradient.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -49,6 +49,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-color-over-image.html b/LayoutTests/fast/canvas/canvas-blending-color-over-image.html
index 6847837..81afee9 100644
--- a/LayoutTests/fast/canvas/canvas-blending-color-over-image.html
+++ b/LayoutTests/fast/canvas/canvas-blending-color-over-image.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-color-over-pattern.html b/LayoutTests/fast/canvas/canvas-blending-color-over-pattern.html
index 32cbecf..59594b2 100644
--- a/LayoutTests/fast/canvas/canvas-blending-color-over-pattern.html
+++ b/LayoutTests/fast/canvas/canvas-blending-color-over-pattern.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-fill-style.html b/LayoutTests/fast/canvas/canvas-blending-fill-style.html
index 364e3e7..6e5ef6a 100644
--- a/LayoutTests/fast/canvas/canvas-blending-fill-style.html
+++ b/LayoutTests/fast/canvas/canvas-blending-fill-style.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -49,6 +49,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-global-alpha.html b/LayoutTests/fast/canvas/canvas-blending-global-alpha.html
index 168a1da..83e345f 100644
--- a/LayoutTests/fast/canvas/canvas-blending-global-alpha.html
+++ b/LayoutTests/fast/canvas/canvas-blending-global-alpha.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -50,6 +50,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-gradient-over-color.html b/LayoutTests/fast/canvas/canvas-blending-gradient-over-color.html
index bbd7880..12fdd67 100644
--- a/LayoutTests/fast/canvas/canvas-blending-gradient-over-color.html
+++ b/LayoutTests/fast/canvas/canvas-blending-gradient-over-color.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -49,6 +49,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-gradient-over-gradient.html b/LayoutTests/fast/canvas/canvas-blending-gradient-over-gradient.html
index e4e504c..e228d3b 100644
--- a/LayoutTests/fast/canvas/canvas-blending-gradient-over-gradient.html
+++ b/LayoutTests/fast/canvas/canvas-blending-gradient-over-gradient.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -49,6 +49,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-gradient-over-image.html b/LayoutTests/fast/canvas/canvas-blending-gradient-over-image.html
index 33c4e0c..ee6a4e5 100644
--- a/LayoutTests/fast/canvas/canvas-blending-gradient-over-image.html
+++ b/LayoutTests/fast/canvas/canvas-blending-gradient-over-image.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-gradient-over-pattern.html b/LayoutTests/fast/canvas/canvas-blending-gradient-over-pattern.html
index 00ee228..693b6b8 100644
--- a/LayoutTests/fast/canvas/canvas-blending-gradient-over-pattern.html
+++ b/LayoutTests/fast/canvas/canvas-blending-gradient-over-pattern.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-image-over-color.html b/LayoutTests/fast/canvas/canvas-blending-image-over-color.html
index 1804a4c..57e1e3c 100644
--- a/LayoutTests/fast/canvas/canvas-blending-image-over-color.html
+++ b/LayoutTests/fast/canvas/canvas-blending-image-over-color.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-image-over-gradient.html b/LayoutTests/fast/canvas/canvas-blending-image-over-gradient.html
index d8ffa3b..af5bdfe 100644
--- a/LayoutTests/fast/canvas/canvas-blending-image-over-gradient.html
+++ b/LayoutTests/fast/canvas/canvas-blending-image-over-gradient.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-image-over-image.html b/LayoutTests/fast/canvas/canvas-blending-image-over-image.html
index 6e10a439..f92c6fc 100644
--- a/LayoutTests/fast/canvas/canvas-blending-image-over-image.html
+++ b/LayoutTests/fast/canvas/canvas-blending-image-over-image.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-image-over-pattern.html b/LayoutTests/fast/canvas/canvas-blending-image-over-pattern.html
index fab0aad..202a8c8 100644
--- a/LayoutTests/fast/canvas/canvas-blending-image-over-pattern.html
+++ b/LayoutTests/fast/canvas/canvas-blending-image-over-pattern.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-pattern-over-color.html b/LayoutTests/fast/canvas/canvas-blending-pattern-over-color.html
index 5005b26..e639881 100644
--- a/LayoutTests/fast/canvas/canvas-blending-pattern-over-color.html
+++ b/LayoutTests/fast/canvas/canvas-blending-pattern-over-color.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-pattern-over-gradient.html b/LayoutTests/fast/canvas/canvas-blending-pattern-over-gradient.html
index 9cc4ecf..fd8fc1e 100644
--- a/LayoutTests/fast/canvas/canvas-blending-pattern-over-gradient.html
+++ b/LayoutTests/fast/canvas/canvas-blending-pattern-over-gradient.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-pattern-over-image.html b/LayoutTests/fast/canvas/canvas-blending-pattern-over-image.html
index d9fcdb4..bbae4fd 100644
--- a/LayoutTests/fast/canvas/canvas-blending-pattern-over-image.html
+++ b/LayoutTests/fast/canvas/canvas-blending-pattern-over-image.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-pattern-over-pattern.html b/LayoutTests/fast/canvas/canvas-blending-pattern-over-pattern.html
index bf62bcd..0c89277 100644
--- a/LayoutTests/fast/canvas/canvas-blending-pattern-over-pattern.html
+++ b/LayoutTests/fast/canvas/canvas-blending-pattern-over-pattern.html
@@ -7,7 +7,7 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -32,7 +32,7 @@
if (i >= blendModes.length) {
if (hardwareAcceleratedTestsDone) {
var scriptElement = document.createElement("script");
- scriptElement.src = "../js/resources/js-test-post-async.js";
+ scriptElement.src = "../../resources/js-test-post-async.js";
document.body.appendChild(scriptElement);
return;
}
diff --git a/LayoutTests/fast/canvas/canvas-blending-shadow.html b/LayoutTests/fast/canvas/canvas-blending-shadow.html
index 0975399..57f583a 100644
--- a/LayoutTests/fast/canvas/canvas-blending-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-blending-shadow.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -56,6 +56,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-text.html b/LayoutTests/fast/canvas/canvas-blending-text.html
index 3529dd8..4c6a275 100644
--- a/LayoutTests/fast/canvas/canvas-blending-text.html
+++ b/LayoutTests/fast/canvas/canvas-blending-text.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -51,6 +51,6 @@
runTest(100, 100);
</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/canvas/canvas-blending-transforms.html b/LayoutTests/fast/canvas/canvas-blending-transforms.html
index 7d402b6..e25c9579 100644
--- a/LayoutTests/fast/canvas/canvas-blending-transforms.html
+++ b/LayoutTests/fast/canvas/canvas-blending-transforms.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 type="text/javascript" src="canvas-blending-helpers.js"></script>
<script type="text/javascript">
@@ -56,6 +56,6 @@
runTest(100, 100);
</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/canvas/canvas-clearRect.html b/LayoutTests/fast/canvas/canvas-clearRect.html
index 3e8a255..71b1bb2 100644
--- a/LayoutTests/fast/canvas/canvas-clearRect.html
+++ b/LayoutTests/fast/canvas/canvas-clearRect.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/canvas-clearRect.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/canvas/canvas-clip-rule.html b/LayoutTests/fast/canvas/canvas-clip-rule.html
index af1b8f3..058df42e 100644
--- a/LayoutTests/fast/canvas/canvas-clip-rule.html
+++ b/LayoutTests/fast/canvas/canvas-clip-rule.html
@@ -1,9 +1,9 @@
<!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/canvas-clip-rule.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-closePath-single-point.html b/LayoutTests/fast/canvas/canvas-closePath-single-point.html
index eb9ee61..23897a5 100644
--- a/LayoutTests/fast/canvas/canvas-closePath-single-point.html
+++ b/LayoutTests/fast/canvas/canvas-closePath-single-point.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/canvas-closePath-single-point.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/canvas/canvas-color-clamping.html b/LayoutTests/fast/canvas/canvas-color-clamping.html
index 7ed56fe..b844c35 100644
--- a/LayoutTests/fast/canvas/canvas-color-clamping.html
+++ b/LayoutTests/fast/canvas/canvas-color-clamping.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/canvas-color-clamping.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/canvas/canvas-color-serialization.html b/LayoutTests/fast/canvas/canvas-color-serialization.html
index de1da5e..f600193 100644
--- a/LayoutTests/fast/canvas/canvas-color-serialization.html
+++ b/LayoutTests/fast/canvas/canvas-color-serialization.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/canvas-color-serialization.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/canvas/canvas-copyPixels.html b/LayoutTests/fast/canvas/canvas-copyPixels.html
index 6719172..783d187 100644
--- a/LayoutTests/fast/canvas/canvas-copyPixels.html
+++ b/LayoutTests/fast/canvas/canvas-copyPixels.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/canvas-copyPixels.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/canvas/canvas-createImageData.html b/LayoutTests/fast/canvas/canvas-createImageData.html
index 614dc74..82ed04e 100644
--- a/LayoutTests/fast/canvas/canvas-createImageData.html
+++ b/LayoutTests/fast/canvas/canvas-createImageData.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/canvas-createImageData.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/canvas/canvas-createPattern-fillRect-shadow.html b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.html
index 09bfea0..562c952 100644
--- a/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow.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/canvas-createPattern-fillRect-shadow.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/canvas/canvas-currentColor.html b/LayoutTests/fast/canvas/canvas-currentColor.html
index cae2e98..41cee98 100644
--- a/LayoutTests/fast/canvas/canvas-currentColor.html
+++ b/LayoutTests/fast/canvas/canvas-currentColor.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/canvas-currentColor.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/canvas/canvas-currentPath-crash.html b/LayoutTests/fast/canvas/canvas-currentPath-crash.html
index 632c4ad..d75a23b 100644
--- a/LayoutTests/fast/canvas/canvas-currentPath-crash.html
+++ b/LayoutTests/fast/canvas/canvas-currentPath-crash.html
@@ -1,9 +1,9 @@
<!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/canvas-currentPath-crash.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-currentPath.html b/LayoutTests/fast/canvas/canvas-currentPath.html
index 0a95178..6a1b775 100644
--- a/LayoutTests/fast/canvas/canvas-currentPath.html
+++ b/LayoutTests/fast/canvas/canvas-currentPath.html
@@ -1,9 +1,9 @@
<!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/canvas-currentPath.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow.html b/LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow.html
index 1a15161..c207c4e 100644
--- a/LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-shadow.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/canvas-draw-canvas-on-canvas-shadow.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/canvas/canvas-drawImage-incomplete.html b/LayoutTests/fast/canvas/canvas-drawImage-incomplete.html
index 796a2a1..84f1386 100644
--- a/LayoutTests/fast/canvas/canvas-drawImage-incomplete.html
+++ b/LayoutTests/fast/canvas/canvas-drawImage-incomplete.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/canvas-drawImage-incomplete.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/canvas/canvas-drawImage-shadow.html b/LayoutTests/fast/canvas/canvas-drawImage-shadow.html
index 816c4b9..2d3fdfa 100644
--- a/LayoutTests/fast/canvas/canvas-drawImage-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-drawImage-shadow.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/canvas-drawImage-shadow.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/canvas/canvas-fill-rule.html b/LayoutTests/fast/canvas/canvas-fill-rule.html
index f7ae9db..9ea46a0 100644
--- a/LayoutTests/fast/canvas/canvas-fill-rule.html
+++ b/LayoutTests/fast/canvas/canvas-fill-rule.html
@@ -1,9 +1,9 @@
<!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/canvas-fill-rule.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-fill-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-fill-zeroSizeGradient.html
index 6102933..0844c3c 100644
--- a/LayoutTests/fast/canvas/canvas-fill-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-fill-zeroSizeGradient.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/canvas-fill-zeroSizeGradient.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/canvas/canvas-fillPath-alpha-shadow.html b/LayoutTests/fast/canvas/canvas-fillPath-alpha-shadow.html
index c395de4..cf87ae8 100644
--- a/LayoutTests/fast/canvas/canvas-fillPath-alpha-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillPath-alpha-shadow.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/canvas-fillPath-alpha-shadow.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/canvas/canvas-fillPath-gradient-shadow.html b/LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.html
index 38f582d..29693bb 100644
--- a/LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.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/canvas-fillPath-gradient-shadow.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/canvas/canvas-fillPath-pattern-shadow.html b/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html
index 5ea78ad..81c0f6a 100644
--- a/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillPath-pattern-shadow.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/canvas-fillPath-pattern-shadow.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/canvas/canvas-fillPath-shadow.html b/LayoutTests/fast/canvas/canvas-fillPath-shadow.html
index b63e900..a444277 100644
--- a/LayoutTests/fast/canvas/canvas-fillPath-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillPath-shadow.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/canvas-fillPath-shadow.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/canvas/canvas-fillRect-gradient-shadow.html b/LayoutTests/fast/canvas/canvas-fillRect-gradient-shadow.html
index 4e9ee7b..f4f3814 100644
--- a/LayoutTests/fast/canvas/canvas-fillRect-gradient-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillRect-gradient-shadow.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/canvas-fillRect-gradient-shadow.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/canvas/canvas-fillRect-shadow.html b/LayoutTests/fast/canvas/canvas-fillRect-shadow.html
index cd1c198..5965632 100644
--- a/LayoutTests/fast/canvas/canvas-fillRect-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-fillRect-shadow.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/canvas-fillRect-shadow.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/canvas/canvas-fillRect-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-fillRect-zeroSizeGradient.html
index 4c484cd..e6d121c 100644
--- a/LayoutTests/fast/canvas/canvas-fillRect-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-fillRect-zeroSizeGradient.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/canvas-fillRect-zeroSizeGradient.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/canvas/canvas-fillRect.html b/LayoutTests/fast/canvas/canvas-fillRect.html
index fbf34b2..efe9f26 100644
--- a/LayoutTests/fast/canvas/canvas-fillRect.html
+++ b/LayoutTests/fast/canvas/canvas-fillRect.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/canvas-fillRect.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/canvas/canvas-fillText-invalid-maxWidth.html b/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html
index a6bbb79..045ffe8 100644
--- a/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html
+++ b/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html
@@ -1,11 +1,11 @@
<!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/canvas-fillText-invalid-maxWidth.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/canvas/canvas-fillText-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-fillText-zeroSizeGradient.html
index b367af7..a07bea2 100644
--- a/LayoutTests/fast/canvas/canvas-fillText-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-fillText-zeroSizeGradient.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/canvas-fillText-zeroSizeGradient.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/canvas/canvas-font-ex-units-crash.html b/LayoutTests/fast/canvas/canvas-font-ex-units-crash.html
index d39c7cc9..8f4af80 100644
--- a/LayoutTests/fast/canvas/canvas-font-ex-units-crash.html
+++ b/LayoutTests/fast/canvas/canvas-font-ex-units-crash.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/canvas-font-ex-units-crash.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/canvas/canvas-getContext-invalid.html b/LayoutTests/fast/canvas/canvas-getContext-invalid.html
index 7ff5d7a..ea9686b 100644
--- a/LayoutTests/fast/canvas/canvas-getContext-invalid.html
+++ b/LayoutTests/fast/canvas/canvas-getContext-invalid.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/canvas-getContext-invalid.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/canvas/canvas-getImageData-invalid.html b/LayoutTests/fast/canvas/canvas-getImageData-invalid.html
index 69b9d72..6662e35 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData-invalid.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData-invalid.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/canvas-getImageData-invalid.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/canvas/canvas-getImageData-negative-source.html b/LayoutTests/fast/canvas/canvas-getImageData-negative-source.html
index 23fb128..e3b93e4 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData-negative-source.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData-negative-source.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/canvas-getImageData-negative-source.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/canvas/canvas-getImageData-rounding.html b/LayoutTests/fast/canvas/canvas-getImageData-rounding.html
index 77667f1..9e3c4fc 100644
--- a/LayoutTests/fast/canvas/canvas-getImageData-rounding.html
+++ b/LayoutTests/fast/canvas/canvas-getImageData-rounding.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>
@@ -38,6 +38,6 @@
dimensionsShouldBe(-1.1, 0, 20, 10, 21, 10);
dimensionsShouldBe(-1.9, 0, 20, 10, 21, 10);
</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/canvas/canvas-gradient-addStop-error.html b/LayoutTests/fast/canvas/canvas-gradient-addStop-error.html
index 0ca9537..8180d09 100644
--- a/LayoutTests/fast/canvas/canvas-gradient-addStop-error.html
+++ b/LayoutTests/fast/canvas/canvas-gradient-addStop-error.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/canvas-gradient-addStop-error.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/canvas/canvas-gradient-without-path.html b/LayoutTests/fast/canvas/canvas-gradient-without-path.html
index 05ac7b6..b102e0f 100644
--- a/LayoutTests/fast/canvas/canvas-gradient-without-path.html
+++ b/LayoutTests/fast/canvas/canvas-gradient-without-path.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/canvas-gradient-without-path.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/canvas/canvas-image-shadow.html b/LayoutTests/fast/canvas/canvas-image-shadow.html
index 8e6f0cd5..90814ba 100644
--- a/LayoutTests/fast/canvas/canvas-image-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-image-shadow.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="myCanvas" width="400" height="400"></canvas>
<script src="script-tests/canvas-image-shadow.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/canvas/canvas-imageSmoothingEnabled-repaint.html b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-repaint.html
index ffc4b20..dd688fe 100644
--- a/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-repaint.html
+++ b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-repaint.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html>
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<canvas id="destination" width="300" height="300"></canvas>
<canvas id="source" width="300" height="300"></canvas>
<script src="script-tests/canvas-imageSmoothingEnabled-repaint.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/canvas/canvas-imageSmoothingEnabled.html b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled.html
index 7eb30eb..1132019 100644
--- a/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled.html
+++ b/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled.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>
<script src="script-tests/canvas-imageSmoothingEnabled.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/canvas/canvas-invalid-fillstyle.html b/LayoutTests/fast/canvas/canvas-invalid-fillstyle.html
index e6b692b..439034d 100644
--- a/LayoutTests/fast/canvas/canvas-invalid-fillstyle.html
+++ b/LayoutTests/fast/canvas/canvas-invalid-fillstyle.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas" width="200" height="200"></canvas>
<script src="canvas-invalid-fillstyle.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/canvas/canvas-invalid-strokestyle.html b/LayoutTests/fast/canvas/canvas-invalid-strokestyle.html
index 09b620b..dd520ea 100644
--- a/LayoutTests/fast/canvas/canvas-invalid-strokestyle.html
+++ b/LayoutTests/fast/canvas/canvas-invalid-strokestyle.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas" width="200" height="200"></canvas>
<script src="canvas-invalid-strokestyle.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/canvas/canvas-invalid-values.html b/LayoutTests/fast/canvas/canvas-invalid-values.html
index bdc78ef..4fc52c1 100644
--- a/LayoutTests/fast/canvas/canvas-invalid-values.html
+++ b/LayoutTests/fast/canvas/canvas-invalid-values.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/canvas-invalid-values.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/canvas/canvas-isPointInPath-winding.html b/LayoutTests/fast/canvas/canvas-isPointInPath-winding.html
index 0ae4d9a..33ebb4c 100644
--- a/LayoutTests/fast/canvas/canvas-isPointInPath-winding.html
+++ b/LayoutTests/fast/canvas/canvas-isPointInPath-winding.html
@@ -1,9 +1,9 @@
<!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/canvas-isPointInPath-winding.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-isPointInStroke.html b/LayoutTests/fast/canvas/canvas-isPointInStroke.html
index 5f83dd7..139ab15 100644
--- a/LayoutTests/fast/canvas/canvas-isPointInStroke.html
+++ b/LayoutTests/fast/canvas/canvas-isPointInStroke.html
@@ -1,9 +1,9 @@
<!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/canvas-isPointInStroke.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/canvas-large-dimensions.html b/LayoutTests/fast/canvas/canvas-large-dimensions.html
index 19be71a..6d1bb2b 100644
--- a/LayoutTests/fast/canvas/canvas-large-dimensions.html
+++ b/LayoutTests/fast/canvas/canvas-large-dimensions.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<title>Canvas test: test large width/height values</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<p>Tests that using reasonably large values for canvas.height and canvas.height don't cause a crash"</p>
<pre id="console"></pre>
diff --git a/LayoutTests/fast/canvas/canvas-large-fills.html b/LayoutTests/fast/canvas/canvas-large-fills.html
index 2167d82..58f3515 100644
--- a/LayoutTests/fast/canvas/canvas-large-fills.html
+++ b/LayoutTests/fast/canvas/canvas-large-fills.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<pre id="console"></pre>
<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
diff --git a/LayoutTests/fast/canvas/canvas-lineDash-invalid.html b/LayoutTests/fast/canvas/canvas-lineDash-invalid.html
index 491ca2f..05cda83 100644
--- a/LayoutTests/fast/canvas/canvas-lineDash-invalid.html
+++ b/LayoutTests/fast/canvas/canvas-lineDash-invalid.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/canvas-lineDash-invalid.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/canvas/canvas-lineDash.html b/LayoutTests/fast/canvas/canvas-lineDash.html
index 6aac2a9..d89b66b 100644
--- a/LayoutTests/fast/canvas/canvas-lineDash.html
+++ b/LayoutTests/fast/canvas/canvas-lineDash.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/canvas-lineDash.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/canvas/canvas-lineWidth-intact-after-strokeRect.html b/LayoutTests/fast/canvas/canvas-lineWidth-intact-after-strokeRect.html
index af5f67b..f9b4325 100644
--- a/LayoutTests/fast/canvas/canvas-lineWidth-intact-after-strokeRect.html
+++ b/LayoutTests/fast/canvas/canvas-lineWidth-intact-after-strokeRect.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/canvas-lineWidth-intact-after-strokeRect.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/canvas/canvas-lineWidth.html b/LayoutTests/fast/canvas/canvas-lineWidth.html
index e0c20c8..f5e7ea3 100644
--- a/LayoutTests/fast/canvas/canvas-lineWidth.html
+++ b/LayoutTests/fast/canvas/canvas-lineWidth.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas" width=600 height=300 style="border:5px solid black">
<script src="canvas-lineWidth.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/canvas/canvas-longlived-context.html b/LayoutTests/fast/canvas/canvas-longlived-context.html
index 1c79d0d..0643fd2 100644
--- a/LayoutTests/fast/canvas/canvas-longlived-context.html
+++ b/LayoutTests/fast/canvas/canvas-longlived-context.html
@@ -1,4 +1,4 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="canvas-longlived-context.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/canvas-modify-emptyPath.html b/LayoutTests/fast/canvas/canvas-modify-emptyPath.html
index 71b4873..425ff17 100644
--- a/LayoutTests/fast/canvas/canvas-modify-emptyPath.html
+++ b/LayoutTests/fast/canvas/canvas-modify-emptyPath.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/canvas-modify-emptyPath.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/canvas/canvas-negative-size.html b/LayoutTests/fast/canvas/canvas-negative-size.html
index 55e82d2..fc258d9 100644
--- a/LayoutTests/fast/canvas/canvas-negative-size.html
+++ b/LayoutTests/fast/canvas/canvas-negative-size.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/canvas-negative-size.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/canvas/canvas-overloads-drawImage.html b/LayoutTests/fast/canvas/canvas-overloads-drawImage.html
index 57b2c14..a63cc1d 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-drawImage.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-drawImage.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/canvas-overloads-drawImage.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/canvas/canvas-overloads-drawImageFromRect.html b/LayoutTests/fast/canvas/canvas-overloads-drawImageFromRect.html
index 116ffaf..751635c 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-drawImageFromRect.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-drawImageFromRect.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/canvas-overloads-drawImageFromRect.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/canvas/canvas-overloads-fillText.html b/LayoutTests/fast/canvas/canvas-overloads-fillText.html
index fd8d52d..7bd093d 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-fillText.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-fillText.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/canvas-overloads-fillText.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/canvas/canvas-overloads-setFillColor.html b/LayoutTests/fast/canvas/canvas-overloads-setFillColor.html
index b61ef55..ab001c7 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-setFillColor.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-setFillColor.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/canvas-overloads-setFillColor.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/canvas/canvas-overloads-setShadow.html b/LayoutTests/fast/canvas/canvas-overloads-setShadow.html
index 7dc0df8..1251f7e 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-setShadow.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-setShadow.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/canvas-overloads-setShadow.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/canvas/canvas-overloads-setStrokeColor.html b/LayoutTests/fast/canvas/canvas-overloads-setStrokeColor.html
index e424523..6b13cd4 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-setStrokeColor.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-setStrokeColor.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/canvas-overloads-setStrokeColor.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/canvas/canvas-overloads-strokeText.html b/LayoutTests/fast/canvas/canvas-overloads-strokeText.html
index 28732f8..7c2e4e6 100644
--- a/LayoutTests/fast/canvas/canvas-overloads-strokeText.html
+++ b/LayoutTests/fast/canvas/canvas-overloads-strokeText.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/canvas-overloads-strokeText.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/canvas/canvas-path-constructors.html b/LayoutTests/fast/canvas/canvas-path-constructors.html
index 41b8aef..4056bd0 100644
--- a/LayoutTests/fast/canvas/canvas-path-constructors.html
+++ b/LayoutTests/fast/canvas/canvas-path-constructors.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/canvas-path-constructors.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/canvas/canvas-path-object.html b/LayoutTests/fast/canvas/canvas-path-object.html
index 87616d9..47fe4c5 100644
--- a/LayoutTests/fast/canvas/canvas-path-object.html
+++ b/LayoutTests/fast/canvas/canvas-path-object.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas" width="200" height="200"></canvas>
<script src="script-tests/canvas-path-object.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/canvas/canvas-pattern-behaviour.html b/LayoutTests/fast/canvas/canvas-pattern-behaviour.html
index 3d139d42..3fc83b2 100644
--- a/LayoutTests/fast/canvas/canvas-pattern-behaviour.html
+++ b/LayoutTests/fast/canvas/canvas-pattern-behaviour.html
@@ -1,3 +1,3 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="canvas-pattern-behaviour.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/canvas-pattern-modify.html b/LayoutTests/fast/canvas/canvas-pattern-modify.html
index 064db53..cb2b57d 100644
--- a/LayoutTests/fast/canvas/canvas-pattern-modify.html
+++ b/LayoutTests/fast/canvas/canvas-pattern-modify.html
@@ -1,3 +1,3 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="canvas-pattern-modify.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/canvas-pattern-transform.html b/LayoutTests/fast/canvas/canvas-pattern-transform.html
index 73af7c2..fb8d0f9 100644
--- a/LayoutTests/fast/canvas/canvas-pattern-transform.html
+++ b/LayoutTests/fast/canvas/canvas-pattern-transform.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="canvas-pattern-transform.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/canvas/canvas-putImageData.html b/LayoutTests/fast/canvas/canvas-putImageData.html
index 4558234..7f890bf 100644
--- a/LayoutTests/fast/canvas/canvas-putImageData.html
+++ b/LayoutTests/fast/canvas/canvas-putImageData.html
@@ -1,4 +1,4 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<canvas id="canvas" width="100" height="100"></canvas><br/>
<script src="canvas-putImageData.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/canvas-quadratic-same-endpoint.html b/LayoutTests/fast/canvas/canvas-quadratic-same-endpoint.html
index bf355f2..d481ecf 100644
--- a/LayoutTests/fast/canvas/canvas-quadratic-same-endpoint.html
+++ b/LayoutTests/fast/canvas/canvas-quadratic-same-endpoint.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>
<canvas id="canvas" width="100" height="100"></canvas>
@@ -40,6 +40,6 @@
shouldBeYellow(70,70);
</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/canvas/canvas-radial-gradient-spreadMethod.html b/LayoutTests/fast/canvas/canvas-radial-gradient-spreadMethod.html
index e04e445..a093d2a 100644
--- a/LayoutTests/fast/canvas/canvas-radial-gradient-spreadMethod.html
+++ b/LayoutTests/fast/canvas/canvas-radial-gradient-spreadMethod.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="canvas-radial-gradient-spreadMethod.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/canvas/canvas-save-restore-with-path.html b/LayoutTests/fast/canvas/canvas-save-restore-with-path.html
index 0713841..2235ad1 100644
--- a/LayoutTests/fast/canvas/canvas-save-restore-with-path.html
+++ b/LayoutTests/fast/canvas/canvas-save-restore-with-path.html
@@ -1,3 +1,3 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script src="canvas-save-restore-with-path.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.html b/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.html
index 0d6d4e1..c95a638 100644
--- a/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow.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/canvas-scale-drawImage-shadow.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/canvas/canvas-scale-fillPath-shadow.html b/LayoutTests/fast/canvas/canvas-scale-fillPath-shadow.html
index 9b4ee73..f21c551 100644
--- a/LayoutTests/fast/canvas/canvas-scale-fillPath-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-scale-fillPath-shadow.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/canvas-scale-fillPath-shadow.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/canvas/canvas-scale-fillRect-shadow.html b/LayoutTests/fast/canvas/canvas-scale-fillRect-shadow.html
index 7686a1d..af70fec 100644
--- a/LayoutTests/fast/canvas/canvas-scale-fillRect-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-scale-fillRect-shadow.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/canvas-scale-fillRect-shadow.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/canvas/canvas-scale-shadowBlur.html b/LayoutTests/fast/canvas/canvas-scale-shadowBlur.html
index d3938b9..20726de 100644
--- a/LayoutTests/fast/canvas/canvas-scale-shadowBlur.html
+++ b/LayoutTests/fast/canvas/canvas-scale-shadowBlur.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/canvas-scale-shadowBlur.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/canvas/canvas-scale-strokePath-shadow.html b/LayoutTests/fast/canvas/canvas-scale-strokePath-shadow.html
index 7583f0b..ea480d1 100644
--- a/LayoutTests/fast/canvas/canvas-scale-strokePath-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-scale-strokePath-shadow.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/canvas-scale-strokePath-shadow.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/canvas/canvas-set-properties-with-non-invertible-ctm.html b/LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.html
index 6f70720..fc1d1da 100644
--- a/LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.html
+++ b/LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.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/canvas-set-properties-with-non-invertible-ctm.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/canvas/canvas-setTransform.html b/LayoutTests/fast/canvas/canvas-setTransform.html
index 55a22ad..f4df756 100644
--- a/LayoutTests/fast/canvas/canvas-setTransform.html
+++ b/LayoutTests/fast/canvas/canvas-setTransform.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/canvas-setTransform.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/canvas/canvas-shadow.html b/LayoutTests/fast/canvas/canvas-shadow.html
index cbc91f4..f18cf3a 100644
--- a/LayoutTests/fast/canvas/canvas-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-shadow.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/canvas-shadow.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/canvas/canvas-state-intact-after-putImageData.html b/LayoutTests/fast/canvas/canvas-state-intact-after-putImageData.html
index af5864d..06b5a73 100644
--- a/LayoutTests/fast/canvas/canvas-state-intact-after-putImageData.html
+++ b/LayoutTests/fast/canvas/canvas-state-intact-after-putImageData.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/canvas-state-intact-after-putImageData.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/canvas/canvas-stroke-empty-fill.html b/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html
index 27d85ea..cdb84d0 100644
--- a/LayoutTests/fast/canvas/canvas-stroke-empty-fill.html
+++ b/LayoutTests/fast/canvas/canvas-stroke-empty-fill.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="canvas-stroke-empty-fill.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/canvas/canvas-stroke-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-stroke-zeroSizeGradient.html
index 8c36cd8..f6d74a7 100644
--- a/LayoutTests/fast/canvas/canvas-stroke-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-stroke-zeroSizeGradient.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/canvas-stroke-zeroSizeGradient.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/canvas/canvas-strokePath-alpha-shadow.html b/LayoutTests/fast/canvas/canvas-strokePath-alpha-shadow.html
index 33c9733..febb846 100644
--- a/LayoutTests/fast/canvas/canvas-strokePath-alpha-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokePath-alpha-shadow.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/canvas-strokePath-alpha-shadow.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/canvas/canvas-strokePath-cap-join.html b/LayoutTests/fast/canvas/canvas-strokePath-cap-join.html
index 1e6bba5..ececbcf 100644
--- a/LayoutTests/fast/canvas/canvas-strokePath-cap-join.html
+++ b/LayoutTests/fast/canvas/canvas-strokePath-cap-join.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/canvas-strokePath-cap-join.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/canvas/canvas-strokePath-gradient-shadow.html b/LayoutTests/fast/canvas/canvas-strokePath-gradient-shadow.html
index 2f1bba5..6ce3226 100644
--- a/LayoutTests/fast/canvas/canvas-strokePath-gradient-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokePath-gradient-shadow.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/canvas-strokePath-gradient-shadow.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/canvas/canvas-strokePath-shadow.html b/LayoutTests/fast/canvas/canvas-strokePath-shadow.html
index 8437bf4..92c222b 100644
--- a/LayoutTests/fast/canvas/canvas-strokePath-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokePath-shadow.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/canvas-strokePath-shadow.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/canvas/canvas-strokeRect-alpha-shadow.html b/LayoutTests/fast/canvas/canvas-strokeRect-alpha-shadow.html
index 91149ac..6f7632f 100644
--- a/LayoutTests/fast/canvas/canvas-strokeRect-alpha-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokeRect-alpha-shadow.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/canvas-strokeRect-alpha-shadow.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/canvas/canvas-strokeRect-gradient-shadow.html b/LayoutTests/fast/canvas/canvas-strokeRect-gradient-shadow.html
index d93a41f..b7ecead 100644
--- a/LayoutTests/fast/canvas/canvas-strokeRect-gradient-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokeRect-gradient-shadow.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/canvas-strokeRect-gradient-shadow.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/canvas/canvas-strokeRect-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-strokeRect-zeroSizeGradient.html
index a379b51..de00640 100644
--- a/LayoutTests/fast/canvas/canvas-strokeRect-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-strokeRect-zeroSizeGradient.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/canvas-strokeRect-zeroSizeGradient.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/canvas/canvas-strokeRect.html b/LayoutTests/fast/canvas/canvas-strokeRect.html
index c4e77a2..64d2a5c 100644
--- a/LayoutTests/fast/canvas/canvas-strokeRect.html
+++ b/LayoutTests/fast/canvas/canvas-strokeRect.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/canvas-strokeRect.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/canvas/canvas-strokeText-invalid-maxWidth.html b/LayoutTests/fast/canvas/canvas-strokeText-invalid-maxWidth.html
index 8b0efd1..26e884d 100644
--- a/LayoutTests/fast/canvas/canvas-strokeText-invalid-maxWidth.html
+++ b/LayoutTests/fast/canvas/canvas-strokeText-invalid-maxWidth.html
@@ -1,11 +1,11 @@
<!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/canvas-strokeText-invalid-maxWidth.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/canvas/canvas-strokeText-strokes-shadow.html b/LayoutTests/fast/canvas/canvas-strokeText-strokes-shadow.html
index 523c43a..295c380 100644
--- a/LayoutTests/fast/canvas/canvas-strokeText-strokes-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-strokeText-strokes-shadow.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/canvas-strokeText-strokes-shadow.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/canvas/canvas-strokeText-zeroSizeGradient.html b/LayoutTests/fast/canvas/canvas-strokeText-zeroSizeGradient.html
index 1fc079d..fe5121f 100644
--- a/LayoutTests/fast/canvas/canvas-strokeText-zeroSizeGradient.html
+++ b/LayoutTests/fast/canvas/canvas-strokeText-zeroSizeGradient.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/canvas-strokeText-zeroSizeGradient.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/canvas/canvas-style-intact-after-text.html b/LayoutTests/fast/canvas/canvas-style-intact-after-text.html
index eaf0504..2d3c375 100644
--- a/LayoutTests/fast/canvas/canvas-style-intact-after-text.html
+++ b/LayoutTests/fast/canvas/canvas-style-intact-after-text.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/canvas-style-intact-after-text.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/canvas/canvas-to-canvas.html b/LayoutTests/fast/canvas/canvas-to-canvas.html
index 3d0510e..2775729 100644
--- a/LayoutTests/fast/canvas/canvas-to-canvas.html
+++ b/LayoutTests/fast/canvas/canvas-to-canvas.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>
<script src="script-tests/canvas-to-canvas.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/canvas/canvas-toDataURL-case-insensitive-mimetype.html b/LayoutTests/fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html
index e3ab17d..28a367c 100644
--- a/LayoutTests/fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html
+++ b/LayoutTests/fast/canvas/canvas-toDataURL-case-insensitive-mimetype.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/canvas-toDataURL-case-insensitive-mimetype.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/canvas/canvas-transforms-fillRect-shadow.html b/LayoutTests/fast/canvas/canvas-transforms-fillRect-shadow.html
index abb4b5c..17b9c77 100644
--- a/LayoutTests/fast/canvas/canvas-transforms-fillRect-shadow.html
+++ b/LayoutTests/fast/canvas/canvas-transforms-fillRect-shadow.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/canvas-transforms-fillRect-shadow.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/canvas/canvas-transparency-and-composite.html b/LayoutTests/fast/canvas/canvas-transparency-and-composite.html
index 37256a9..6b59a37 100644
--- a/LayoutTests/fast/canvas/canvas-transparency-and-composite.html
+++ b/LayoutTests/fast/canvas/canvas-transparency-and-composite.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/canvas-transparency-and-composite.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/canvas/canvas-webkitLineDash-invalid.html b/LayoutTests/fast/canvas/canvas-webkitLineDash-invalid.html
index 97858de..8937bc8 100644
--- a/LayoutTests/fast/canvas/canvas-webkitLineDash-invalid.html
+++ b/LayoutTests/fast/canvas/canvas-webkitLineDash-invalid.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/canvas-webkitLineDash-invalid.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/canvas/canvas-webkitLineDash.html b/LayoutTests/fast/canvas/canvas-webkitLineDash.html
index 1a0bdf9..dd0aaf8 100644
--- a/LayoutTests/fast/canvas/canvas-webkitLineDash.html
+++ b/LayoutTests/fast/canvas/canvas-webkitLineDash.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/canvas-webkitLineDash.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/canvas/canvas-with-illegal-args.html b/LayoutTests/fast/canvas/canvas-with-illegal-args.html
index 324e792..752a083 100644
--- a/LayoutTests/fast/canvas/canvas-with-illegal-args.html
+++ b/LayoutTests/fast/canvas/canvas-with-illegal-args.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/canvas-with-illegal-args.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/canvas/drawImage-with-negative-source-destination.html b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.html
index 649d0dd..b4233b7 100644
--- a/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.html
+++ b/LayoutTests/fast/canvas/drawImage-with-negative-source-destination.html
@@ -4,11 +4,11 @@
-->
<html>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<canvas id="canvas" width="100" height="100"></canvas>
<script src="drawImage-with-negative-source-destination.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/canvas/fallback-content.html b/LayoutTests/fast/canvas/fallback-content.html
index 0f33521..45df20f 100644
--- a/LayoutTests/fast/canvas/fallback-content.html
+++ b/LayoutTests/fast/canvas/fallback-content.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>
<a id="link1" href="#">Link</a>
@@ -89,6 +89,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/canvas/fillText-shadow.html b/LayoutTests/fast/canvas/fillText-shadow.html
index 857ce50..9d40562 100644
--- a/LayoutTests/fast/canvas/fillText-shadow.html
+++ b/LayoutTests/fast/canvas/fillText-shadow.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>
<canvas width="600" height="300" style="border: solid 1px gray"></canvas>
@@ -51,6 +51,6 @@
testWithBlur(5, 299);
</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/canvas/gradient-addColorStop-with-invalid-color.html b/LayoutTests/fast/canvas/gradient-addColorStop-with-invalid-color.html
index 631d2a4..eeb8cea 100644
--- a/LayoutTests/fast/canvas/gradient-addColorStop-with-invalid-color.html
+++ b/LayoutTests/fast/canvas/gradient-addColorStop-with-invalid-color.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/gradient-addColorStop-with-invalid-color.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/canvas/gradient-with-clip.html b/LayoutTests/fast/canvas/gradient-with-clip.html
index f59d7a8..691b99f 100644
--- a/LayoutTests/fast/canvas/gradient-with-clip.html
+++ b/LayoutTests/fast/canvas/gradient-with-clip.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/gradient-with-clip.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/canvas/imagedata-contains-uint8clampedarray.html b/LayoutTests/fast/canvas/imagedata-contains-uint8clampedarray.html
index 4700ae0..0080862 100644
--- a/LayoutTests/fast/canvas/imagedata-contains-uint8clampedarray.html
+++ b/LayoutTests/fast/canvas/imagedata-contains-uint8clampedarray.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>
@@ -15,6 +15,6 @@
var imageData = context.getImageData(0, 0, 1, 1);
shouldBe('imageData.data.constructor', 'Uint8ClampedArray');
</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/canvas/linearGradient-infinite-values.html b/LayoutTests/fast/canvas/linearGradient-infinite-values.html
index 641ae7b..f8a0f7d 100644
--- a/LayoutTests/fast/canvas/linearGradient-infinite-values.html
+++ b/LayoutTests/fast/canvas/linearGradient-infinite-values.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/linearGradient-infinite-values.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/canvas/pattern-with-transform.html b/LayoutTests/fast/canvas/pattern-with-transform.html
index 8f518a6..931b5d0 100644
--- a/LayoutTests/fast/canvas/pattern-with-transform.html
+++ b/LayoutTests/fast/canvas/pattern-with-transform.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/pattern-with-transform.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/canvas/pointInPath.html b/LayoutTests/fast/canvas/pointInPath.html
index ca8bca8..a6e7208 100644
--- a/LayoutTests/fast/canvas/pointInPath.html
+++ b/LayoutTests/fast/canvas/pointInPath.html
@@ -1,11 +1,11 @@
<!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>
<canvas id="canvas"></canvas>
<script src="pointInPath.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/canvas/radialGradient-infinite-values.html b/LayoutTests/fast/canvas/radialGradient-infinite-values.html
index d953905..f08a16f 100644
--- a/LayoutTests/fast/canvas/radialGradient-infinite-values.html
+++ b/LayoutTests/fast/canvas/radialGradient-infinite-values.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/radialGradient-infinite-values.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/canvas/rgba-parsing.html b/LayoutTests/fast/canvas/rgba-parsing.html
index 9fa1c9f..90cd792 100644
--- a/LayoutTests/fast/canvas/rgba-parsing.html
+++ b/LayoutTests/fast/canvas/rgba-parsing.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/rgba-parsing.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/canvas/script-tests/TEMPLATE.html b/LayoutTests/fast/canvas/script-tests/TEMPLATE.html
index 056ea5d..d0cb77d 100644
--- a/LayoutTests/fast/canvas/script-tests/TEMPLATE.html
+++ b/LayoutTests/fast/canvas/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/canvas/set-colors.html b/LayoutTests/fast/canvas/set-colors.html
index 00b03e9..0f131f6 100644
--- a/LayoutTests/fast/canvas/set-colors.html
+++ b/LayoutTests/fast/canvas/set-colors.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/set-colors.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/canvas/text-globalAlpha.html b/LayoutTests/fast/canvas/text-globalAlpha.html
index 02d246c..d21a536 100644
--- a/LayoutTests/fast/canvas/text-globalAlpha.html
+++ b/LayoutTests/fast/canvas/text-globalAlpha.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>
<script src="script-tests/text-globalAlpha.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/canvas/translate-text.html b/LayoutTests/fast/canvas/translate-text.html
index bfa7e54..6b13eec 100644
--- a/LayoutTests/fast/canvas/translate-text.html
+++ b/LayoutTests/fast/canvas/translate-text.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/translate-text.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/canvas/webgl/WebGLContextEvent.html b/LayoutTests/fast/canvas/webgl/WebGLContextEvent.html
index 240bb60..e5f97ae 100644
--- a/LayoutTests/fast/canvas/webgl/WebGLContextEvent.html
+++ b/LayoutTests/fast/canvas/webgl/WebGLContextEvent.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script>
@@ -72,7 +72,7 @@
if (window.nonKhronosFrameworkNotifyDone)
window.nonKhronosFrameworkNotifyDone();
};
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
diff --git a/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html b/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html
index 963d79e..8bae2d0 100644
--- a/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html
+++ b/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL array bounds clamping conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
</head>
<body>
@@ -100,7 +100,7 @@
init();
</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/canvas/webgl/array-buffer-crash.html b/LayoutTests/fast/canvas/webgl/array-buffer-crash.html
index 7bdfb85..4ca67c4 100644
--- a/LayoutTests/fast/canvas/webgl/array-buffer-crash.html
+++ b/LayoutTests/fast/canvas/webgl/array-buffer-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 src="resources/webgl-test.js"></script>
</head>
<body>
@@ -17,7 +17,7 @@
testPassed("new ArrayBuffer().byteLength did not crash");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html b/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html
index 84fb8c8..c0805a7 100644
--- a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html
+++ b/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.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/webgl-test.js"></script>
</head>
<body>
@@ -23,7 +23,7 @@
testPassed("reassigning typed array constructor did not crash");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html b/LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html
index c0690a2..3e91681 100644
--- a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html
+++ b/LayoutTests/fast/canvas/webgl/array-buffer-view-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 src="resources/webgl-test.js"></script>
</head>
<body>
@@ -17,7 +17,7 @@
testPassed("new Uint32Array().length did not crash");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/array-constructor.html b/LayoutTests/fast/canvas/webgl/array-constructor.html
index f379e64..ac2450a 100644
--- a/LayoutTests/fast/canvas/webgl/array-constructor.html
+++ b/LayoutTests/fast/canvas/webgl/array-constructor.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/webgl-test.js"></script>
</head>
<body>
@@ -30,7 +30,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/canvas/webgl/array-get-and-set-method-removal.html b/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.html
index 7a37ee2..1528a34 100644
--- a/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.html
+++ b/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.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/webgl-test.js"></script>
</head>
<body>
@@ -47,6 +47,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/canvas/webgl/array-get-out-of-bounds.html b/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.html
index 0cc3a27..75e507f 100644
--- a/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.html
+++ b/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.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/webgl-test.js"></script>
</head>
<body>
@@ -34,6 +34,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/canvas/webgl/array-message-passing.html b/LayoutTests/fast/canvas/webgl/array-message-passing.html
index c2d80c1..6f931c2 100644
--- a/LayoutTests/fast/canvas/webgl/array-message-passing.html
+++ b/LayoutTests/fast/canvas/webgl/array-message-passing.html
@@ -1,13 +1,13 @@
<!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="webgl-test.js"></script>
</head>
<body>
<div id="description"></div>
<div id="console"></div>
<script src="script-tests/array-message-passing.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/canvas/webgl/array-override-set.html b/LayoutTests/fast/canvas/webgl/array-override-set.html
index 799bfdc..e356212 100644
--- a/LayoutTests/fast/canvas/webgl/array-override-set.html
+++ b/LayoutTests/fast/canvas/webgl/array-override-set.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/webgl-test.js"></script>
</head>
<body>
@@ -42,6 +42,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/canvas/webgl/array-set-invalid-arguments.html b/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.html
index 1ee4e20..4a22384 100644
--- a/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.html
+++ b/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.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/webgl-test.js"></script>
</head>
<body>
@@ -35,7 +35,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/canvas/webgl/array-set-out-of-bounds.html b/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.html
index 2bc6f3a..0c5dbb5 100644
--- a/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.html
+++ b/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.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/webgl-test.js"></script>
</head>
<body>
@@ -34,6 +34,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/canvas/webgl/array-set-with-offset.html b/LayoutTests/fast/canvas/webgl/array-set-with-offset.html
index ae92d96..cdd1998 100644
--- a/LayoutTests/fast/canvas/webgl/array-set-with-offset.html
+++ b/LayoutTests/fast/canvas/webgl/array-set-with-offset.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/webgl-test.js"></script>
</head>
<body>
@@ -40,6 +40,6 @@
testSetters("Float32Array", -2.5, 3.5);
</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/canvas/webgl/array-setters.html b/LayoutTests/fast/canvas/webgl/array-setters.html
index 301a184..e66f203 100644
--- a/LayoutTests/fast/canvas/webgl/array-setters.html
+++ b/LayoutTests/fast/canvas/webgl/array-setters.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/webgl-test.js"></script>
</head>
<body>
@@ -66,6 +66,6 @@
testSetters("Float32Array", -2.5, 3.5);
</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/canvas/webgl/array-unit-tests.html b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
index 997aeda..f9036b7 100644
--- a/LayoutTests/fast/canvas/webgl/array-unit-tests.html
+++ b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="../../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/webgl-test.js"></script>
<script src="resources/typed-array-test-cases.js"></script>
</head>
@@ -1029,7 +1029,7 @@
var 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/canvas/webgl/arraybuffer-transfer-of-control.html b/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html
index 465f561..59d22ab 100644
--- a/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html
+++ b/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html
@@ -2,14 +2,14 @@
<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="webgl-test.js"></script>
</head>
<body>
<div id="description"></div>
<div id="console"></div>
<script src="script-tests/arraybuffer-transfer-of-control.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/canvas/webgl/attrib-location-length-limits.html b/LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html
index f8e1a7c..6066b65 100644
--- a/LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html
+++ b/LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL attrib location length tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -94,6 +94,6 @@
wtu.glErrorShouldBe(gl, gl.INVALID_VALUE);
</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/canvas/webgl/bad-arguments-test.html b/LayoutTests/fast/canvas/webgl/bad-arguments-test.html
index 27e95d4..7a56fef 100644
--- a/LayoutTests/fast/canvas/webgl/bad-arguments-test.html
+++ b/LayoutTests/fast/canvas/webgl/bad-arguments-test.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -86,6 +86,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/canvas/webgl/buffer-bind-test.html b/LayoutTests/fast/canvas/webgl/buffer-bind-test.html
index 3e62967..63fdcf82 100644
--- a/LayoutTests/fast/canvas/webgl/buffer-bind-test.html
+++ b/LayoutTests/fast/canvas/webgl/buffer-bind-test.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL BindBuffer conformance test.</title>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
</head>
<body>
@@ -53,7 +53,7 @@
debug("");
</script>
</body>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html b/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html
index 344e7fc..7caebcf 100644
--- a/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html
+++ b/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.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/webgl-test.js"></script>
</head>
<body>
@@ -55,6 +55,6 @@
glErrorShouldBe(gl, gl.NO_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/canvas/webgl/canvas-2d-webgl-texture.html b/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html
index 962232c..8d1b478 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -69,7 +69,7 @@
setTimeout(draw, 0);
}
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<body>
<div id="description"></div>
<div id="console"></div>
diff --git a/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html b/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html
index 7430d19..c92dc80 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html
@@ -6,7 +6,7 @@
height: 100%;
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test-utils.js"> </script>
<script>
description('Tests that canvas does not crash on resize.');
@@ -37,7 +37,7 @@
</script>
<canvas id="example"></canvas>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/canvas/webgl/canvas-supports-context.html b/LayoutTests/fast/canvas/webgl/canvas-supports-context.html
index faeb958..45dbd05 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-supports-context.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-supports-context.html
@@ -1,7 +1,7 @@
<html>
<head>
<title>WebGL Canvas probablySupportsContext Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="description"></div>
@@ -165,6 +165,6 @@
run_tests();
</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/canvas/webgl/canvas-test.html b/LayoutTests/fast/canvas/webgl/canvas-test.html
index 0ef144c..0d904d5 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-test.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-test.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL Canvas Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -175,7 +175,7 @@
debug("");
var epilogue = document.createElement("script");
epilogue.onload = finish;
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
}, 1000/30);
diff --git a/LayoutTests/fast/canvas/webgl/canvas-zero-size.html b/LayoutTests/fast/canvas/webgl/canvas-zero-size.html
index 098ba82..4b5a088 100644
--- a/LayoutTests/fast/canvas/webgl/canvas-zero-size.html
+++ b/LayoutTests/fast/canvas/webgl/canvas-zero-size.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Zero Size Canvas Test</title>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -29,7 +29,7 @@
glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup.");
</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/canvas/webgl/compressed-tex-image.html b/LayoutTests/fast/canvas/webgl/compressed-tex-image.html
index ab1950d..720825a 100644
--- a/LayoutTests/fast/canvas/webgl/compressed-tex-image.html
+++ b/LayoutTests/fast/canvas/webgl/compressed-tex-image.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL CompressedTexImage and CompressedTexSubImage Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -45,7 +45,7 @@
shouldGenerateGLError(gl, gl.INVALID_ENUM, "gl.compressedTexImage2D(gl.TEXTURE_2D, 0, COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, 8, 8, 0, new Uint8Array(8))");
}
</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/canvas/webgl/constants.html b/LayoutTests/fast/canvas/webgl/constants.html
index 8b6bc94..3c77141 100644
--- a/LayoutTests/fast/canvas/webgl/constants.html
+++ b/LayoutTests/fast/canvas/webgl/constants.html
@@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL Constants Test</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -508,7 +508,7 @@
debug("");
</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/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
index e70c19c..c3b11cb 100644
--- a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
+++ b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 pos;
diff --git a/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html b/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html
index 0d1fcbe..38a50d6 100644
--- a/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html
+++ b/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/context-lost-restored.html b/LayoutTests/fast/canvas/webgl/context-lost-restored.html
index 236cea6..89b347b 100644
--- a/LayoutTests/fast/canvas/webgl/context-lost-restored.html
+++ b/LayoutTests/fast/canvas/webgl/context-lost-restored.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script>
diff --git a/LayoutTests/fast/canvas/webgl/context-lost.html b/LayoutTests/fast/canvas/webgl/context-lost.html
index 6353147..6d2ee58 100644
--- a/LayoutTests/fast/canvas/webgl/context-lost.html
+++ b/LayoutTests/fast/canvas/webgl/context-lost.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script>
diff --git a/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html b/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html
index 63ae0f7..164edc8 100644
--- a/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html
+++ b/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>WebGL Context Release Test</title>
<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/webgl-test.js"></script>
</head>
<body>
diff --git a/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html b/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html
index 994de78..40b9cb5 100644
--- a/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html
+++ b/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.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/webgl-test.js"></script>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 g_Position;
@@ -166,7 +166,7 @@
runTestIteration(false);
var epilogue = document.createElement("script");
epilogue.onload = finish;
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
diff --git a/LayoutTests/fast/canvas/webgl/data-view-crash.html b/LayoutTests/fast/canvas/webgl/data-view-crash.html
index 6fce7bc..f14c1dd 100644
--- a/LayoutTests/fast/canvas/webgl/data-view-crash.html
+++ b/LayoutTests/fast/canvas/webgl/data-view-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>
</head>
<body>
<div id="description"></div>
@@ -16,6 +16,6 @@
var value = view ? view.getFloat32(0, true) : 0;
</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/canvas/webgl/data-view-test.html b/LayoutTests/fast/canvas/webgl/data-view-test.html
index 56940df..406d4f6 100644
--- a/LayoutTests/fast/canvas/webgl/data-view-test.html
+++ b/LayoutTests/fast/canvas/webgl/data-view-test.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>
<div id="description"></div>
@@ -350,6 +350,6 @@
runIndexingTests();
</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/canvas/webgl/draw-arrays-out-of-bounds.html b/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.html
index 955e56f..16f5b1a 100644
--- a/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.html
+++ b/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.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/webgl-test.js"></script>
</head>
<body>
@@ -103,6 +103,6 @@
debug("")
</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/canvas/webgl/draw-elements-out-of-bounds.html b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html
index 194d615..a11c7c0 100644
--- a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html
+++ b/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.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/webgl-test.js"></script>
</head>
<body>
@@ -134,6 +134,6 @@
debug("")
</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/canvas/webgl/drawingbuffer-test.html b/LayoutTests/fast/canvas/webgl/drawingbuffer-test.html
index 749f810..c14595b 100644
--- a/LayoutTests/fast/canvas/webgl/drawingbuffer-test.html
+++ b/LayoutTests/fast/canvas/webgl/drawingbuffer-test.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL Canvas Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -215,6 +215,6 @@
debug("")
</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/canvas/webgl/error-reporting.html b/LayoutTests/fast/canvas/webgl/error-reporting.html
index 6b02a41..c3250ba 100644
--- a/LayoutTests/fast/canvas/webgl/error-reporting.html
+++ b/LayoutTests/fast/canvas/webgl/error-reporting.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/webgl-test.js"></script>
</head>
<body>
@@ -64,6 +64,6 @@
glErrorShouldBe(context, context.NO_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/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html b/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html
index 86c2ab8..4dbfe16 100644
--- a/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html
+++ b/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html
@@ -5,7 +5,7 @@
<meta charset="utf-8">
<title>Verifies that GL framebuffer bindings do not change when canvas is resized</title>
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html b/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html
index ca7eba7..9a90152 100644
--- a/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html
+++ b/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.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 src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -529,6 +529,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/canvas/webgl/framebuffer-test.html b/LayoutTests/fast/canvas/webgl/framebuffer-test.html
index ae7eb58..9f57a6c 100644
--- a/LayoutTests/fast/canvas/webgl/framebuffer-test.html
+++ b/LayoutTests/fast/canvas/webgl/framebuffer-test.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL Framebuffer Test</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -163,7 +163,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/functions-returning-strings.html b/LayoutTests/fast/canvas/webgl/functions-returning-strings.html
index 739d87b..497a784 100644
--- a/LayoutTests/fast/canvas/webgl/functions-returning-strings.html
+++ b/LayoutTests/fast/canvas/webgl/functions-returning-strings.html
@@ -5,7 +5,7 @@
<title>WebGL Conformance Tests</title>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -90,7 +90,7 @@
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/canvas/webgl/get-active-test.html b/LayoutTests/fast/canvas/webgl/get-active-test.html
index 4d631cd..e904df4 100644
--- a/LayoutTests/fast/canvas/webgl/get-active-test.html
+++ b/LayoutTests/fast/canvas/webgl/get-active-test.html
@@ -1,7 +1,7 @@
<html>
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -105,6 +105,6 @@
glErrorShouldBe(context, context.INVALID_VALUE);
</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/canvas/webgl/gl-bind-attrib-location-test.html b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
index 3b99c57..6cf9959 100644
--- a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
+++ b/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL BindAttribLocation Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -193,7 +193,7 @@
debug("");
</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/canvas/webgl/gl-enable-enum-test.html b/LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html
index 56ecd0b..7b5b383 100644
--- a/LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html
+++ b/LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL gl.ENABLE enums Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -124,7 +124,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-enum-tests.html b/LayoutTests/fast/canvas/webgl/gl-enum-tests.html
index 25d5dc0..b484f2c 100644
--- a/LayoutTests/fast/canvas/webgl/gl-enum-tests.html
+++ b/LayoutTests/fast/canvas/webgl/gl-enum-tests.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL gl enums Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -78,7 +78,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
index a1bbf58..b7c765b 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL gl calls Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -113,7 +113,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-getshadersource.html b/LayoutTests/fast/canvas/webgl/gl-getshadersource.html
index fa90cde..3b102c1 100644
--- a/LayoutTests/fast/canvas/webgl/gl-getshadersource.html
+++ b/LayoutTests/fast/canvas/webgl/gl-getshadersource.html
@@ -4,7 +4,7 @@
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
<title>WebGL getShaderSource conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -27,7 +27,7 @@
</script>
</body>
</body>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-getstring.html b/LayoutTests/fast/canvas/webgl/gl-getstring.html
index 8621cbc..8164cc0 100644
--- a/LayoutTests/fast/canvas/webgl/gl-getstring.html
+++ b/LayoutTests/fast/canvas/webgl/gl-getstring.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL gl.getParameter Strings Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -46,7 +46,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
index a0f2af8..1279567 100644
--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-object-get-calls.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 src="resources/webgl-test.js"></script>
</head>
<body>
@@ -247,6 +247,6 @@
glErrorShouldBe(gl, gl.NO_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/canvas/webgl/gl-pixelstorei.html b/LayoutTests/fast/canvas/webgl/gl-pixelstorei.html
index bad2e37..98b51ab 100644
--- a/LayoutTests/fast/canvas/webgl/gl-pixelstorei.html
+++ b/LayoutTests/fast/canvas/webgl/gl-pixelstorei.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL pixelStorei Test</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
</head>
@@ -113,7 +113,7 @@
init();
</script>
</body>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage.html b/LayoutTests/fast/canvas/webgl/gl-teximage.html
index 9418270..45ec324 100644
--- a/LayoutTests/fast/canvas/webgl/gl-teximage.html
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL texImage2D conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html b/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html
index c5a3ac7..f89cee7 100644
--- a/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html
+++ b/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL uniform array Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -295,7 +295,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html b/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html
index 5d87773..f671d1b 100644
--- a/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html
+++ b/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL uniformMatrix Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -70,7 +70,7 @@
debug("");
</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/canvas/webgl/gl-vertex-attrib-zero-issues.html b/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html
index 4a5b7e7..f5524bf 100644
--- a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html
+++ b/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>WebGL Enable Vertex Attrib Zero Test</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -79,7 +79,7 @@
wtu.checkCanvas(gl, [0, 0, 0, 0], "canvas should be 0, 0, 0, 0");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html b/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html
index ab53459..10728f9 100644
--- a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html
+++ b/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL vertexAttrib Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -42,7 +42,7 @@
debug("");
</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/canvas/webgl/gl-vertexattribpointer.html b/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html
index 8ce5254..692a6d8 100644
--- a/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html
+++ b/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL vertexAttribPointer Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -127,7 +127,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/glsl-conformance.html b/LayoutTests/fast/canvas/webgl/glsl-conformance.html
index 062e50f..625c875 100644
--- a/LayoutTests/fast/canvas/webgl/glsl-conformance.html
+++ b/LayoutTests/fast/canvas/webgl/glsl-conformance.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL GLSL Conformance Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -518,7 +518,7 @@
debug("");
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html b/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html
index e529b69..8c8cb63 100644
--- a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html
+++ b/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.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/webgl-test.js"></script>
</head>
<body>
@@ -52,6 +52,6 @@
shouldGenerateGLError(contextA, contextA.INVALID_OPERATION, "contextA.getUniformLocation(programB, 'u_modelViewProjMatrix')");
</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/canvas/webgl/index-validation-copies-indices.html b/LayoutTests/fast/canvas/webgl/index-validation-copies-indices.html
index 6e15e20..57cc5ba 100644
--- a/LayoutTests/fast/canvas/webgl/index-validation-copies-indices.html
+++ b/LayoutTests/fast/canvas/webgl/index-validation-copies-indices.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/webgl-test.js"></script>
</head>
<body>
@@ -41,6 +41,6 @@
debug("")
</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/canvas/webgl/index-validation-crash-with-buffer-sub-data.html b/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html
index 11405a5..f8d8bd8 100644
--- a/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html
+++ b/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.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/webgl-test.js"></script>
</head>
<body>
@@ -20,6 +20,6 @@
testPassed("bufferSubData, when buffer object was initialized with null, 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/canvas/webgl/index-validation-verifies-too-many-indices.html b/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.html
index 32e9dfe..339022d 100644
--- a/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.html
+++ b/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.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/webgl-test.js"></script>
</head>
<body>
@@ -36,6 +36,6 @@
debug("")
</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/canvas/webgl/index-validation-with-resized-buffer.html b/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.html
index 087914f..ca1e9aa 100644
--- a/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.html
+++ b/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.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/webgl-test.js"></script>
</head>
<body>
@@ -92,6 +92,6 @@
debug("")
</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/canvas/webgl/index-validation.html b/LayoutTests/fast/canvas/webgl/index-validation.html
index 5c96bab..fb35aa3 100644
--- a/LayoutTests/fast/canvas/webgl/index-validation.html
+++ b/LayoutTests/fast/canvas/webgl/index-validation.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
</head>
<body>
@@ -110,6 +110,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/canvas/webgl/instanceof-test.html b/LayoutTests/fast/canvas/webgl/instanceof-test.html
index d293235..e9c76d2 100644
--- a/LayoutTests/fast/canvas/webgl/instanceof-test.html
+++ b/LayoutTests/fast/canvas/webgl/instanceof-test.html
@@ -5,7 +5,7 @@
<meta charset="utf-8">
<title>WebGL instanceof test.</title>
<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/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -81,7 +81,7 @@
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/canvas/webgl/invalid-UTF-16.html b/LayoutTests/fast/canvas/webgl/invalid-UTF-16.html
index 4700bb8..14cc86a 100644
--- a/LayoutTests/fast/canvas/webgl/invalid-UTF-16.html
+++ b/LayoutTests/fast/canvas/webgl/invalid-UTF-16.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/webgl-test.js"></script>
</head>
<body>
@@ -33,6 +33,6 @@
gl.bindAttribLocation(program, 0, string);
testPassed("bindAttribLocation with invalid UTF-16 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/canvas/webgl/invalid-passed-params.html b/LayoutTests/fast/canvas/webgl/invalid-passed-params.html
index a050674..5259163 100644
--- a/LayoutTests/fast/canvas/webgl/invalid-passed-params.html
+++ b/LayoutTests/fast/canvas/webgl/invalid-passed-params.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/webgl-test.js"></script>
<script src="resources/desktop-gl-constants.js"></script>
</head>
@@ -160,6 +160,6 @@
debug("")
</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/canvas/webgl/is-object.html b/LayoutTests/fast/canvas/webgl/is-object.html
index 957c486..3a36e5b 100644
--- a/LayoutTests/fast/canvas/webgl/is-object.html
+++ b/LayoutTests/fast/canvas/webgl/is-object.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -64,6 +64,6 @@
shouldBeFalse("gl.isShader(shader)");
debug("");
</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/canvas/webgl/null-object-behaviour.html b/LayoutTests/fast/canvas/webgl/null-object-behaviour.html
index 0283855..253980b 100644
--- a/LayoutTests/fast/canvas/webgl/null-object-behaviour.html
+++ b/LayoutTests/fast/canvas/webgl/null-object-behaviour.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -75,6 +75,6 @@
shouldGenerateGLError(context, context.INVALID_OPERATION, "context.getTexParameter(context.TEXTURE_2D, context.TEXTURE_MIN_FILTER)");
</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/canvas/webgl/null-uniform-location.html b/LayoutTests/fast/canvas/webgl/null-uniform-location.html
index 3cece6a..ae2d61e 100644
--- a/LayoutTests/fast/canvas/webgl/null-uniform-location.html
+++ b/LayoutTests/fast/canvas/webgl/null-uniform-location.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/webgl-test.js"></script>
</head>
<body>
@@ -61,6 +61,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/canvas/webgl/object-deletion-behaviour.html b/LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html
index 2f2e749..6a4d1fe 100644
--- a/LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html
+++ b/LayoutTests/fast/canvas/webgl/object-deletion-behaviour.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 src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -417,6 +417,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/canvas/webgl/oes-element-index-uint.html b/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html
index 336a95a..9b99366 100644
--- a/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html
+++ b/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>WebGL OES_element_index_uint Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/oes-texture-half-float-not-supported.html b/LayoutTests/fast/canvas/webgl/oes-texture-half-float-not-supported.html
index a08e947..88b41b7 100644
--- a/LayoutTests/fast/canvas/webgl/oes-texture-half-float-not-supported.html
+++ b/LayoutTests/fast/canvas/webgl/oes-texture-half-float-not-supported.html
@@ -5,7 +5,7 @@
<title>WebGL OES_texture_half_float not yet implemented Conformance Tests</title>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -164,7 +164,7 @@
debug("");
</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/canvas/webgl/oes-texture-half-float.html b/LayoutTests/fast/canvas/webgl/oes-texture-half-float.html
index 96d4d10..bd1c8e0 100644
--- a/LayoutTests/fast/canvas/webgl/oes-texture-half-float.html
+++ b/LayoutTests/fast/canvas/webgl/oes-texture-half-float.html
@@ -5,7 +5,7 @@
<title>WebGL OES_texture_half_float Conformance Tests</title>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -243,7 +243,7 @@
debug("");
var 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/canvas/webgl/oes-vertex-array-object.html b/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html
index 3a13d6a..00a98e5 100644
--- a/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html
+++ b/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>WebGL OES_vertex_array_object Conformance Tests</title>
<script src="resources/desktop-gl-constants.js" type="text/javascript"></script>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/point-size.html b/LayoutTests/fast/canvas/webgl/point-size.html
index a177f89..022d484 100644
--- a/LayoutTests/fast/canvas/webgl/point-size.html
+++ b/LayoutTests/fast/canvas/webgl/point-size.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/webgl-test.js"></script>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 pos;
@@ -119,7 +119,7 @@
testPassed("");
</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/canvas/webgl/premultiplyalpha-test.html b/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
index f8acc05..13edd16 100644
--- a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
+++ b/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Test the WebGL premultipledAlpha context creation flag.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/program-test.html b/LayoutTests/fast/canvas/webgl/program-test.html
index ea6263f..1399799 100644
--- a/LayoutTests/fast/canvas/webgl/program-test.html
+++ b/LayoutTests/fast/canvas/webgl/program-test.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL Program Compiling/Linking Conformance Test</title>
-<script src="../../js/resources/js-test-pre.js" type="text/javascript"></script>
+<script src="../../../resources/js-test-pre.js" type="text/javascript"></script>
<script src="resources/webgl-test.js" type="text/javascript"></script>
</head>
<body>
@@ -305,7 +305,7 @@
debug("");
go();
</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/canvas/webgl/read-pixels-pack-alignment.html b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
index abcdced..b339835 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.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/webgl-test.js"></script>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 pos;
@@ -233,6 +233,6 @@
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 4, 0, -1);
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 8, -1, -1);
</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/canvas/webgl/read-pixels-test.html b/LayoutTests/fast/canvas/webgl/read-pixels-test.html
index e6410e5..9353d8d 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-test.html
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-test.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL ReadPixels conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html b/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html
index 49bbe80..f0a2554 100644
--- a/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html
+++ b/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.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/webgl-test.js"></script>
<script>
function runTest(gl, width, height)
@@ -79,6 +79,6 @@
} else
testFailed('canvas.getContext() failed');
</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/canvas/webgl/renderer-and-vendor-strings.html b/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html
index 2a7f706..ef99b94 100644
--- a/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html
+++ b/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html
@@ -1,5 +1,5 @@
<head>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -24,5 +24,5 @@
shouldBe("gl.getParameter(gl.VENDOR)", '"WebKit"');
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
index fd8d7be..e5bf53a 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
@@ -34,7 +34,7 @@
window.nonKhronosFrameworkNotifyDone();
}
};
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
diff --git a/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html b/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html
index 1534818..cc9f182 100644
--- a/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html
+++ b/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -37,7 +37,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/canvas/webgl/shader-precision-format.html b/LayoutTests/fast/canvas/webgl/shader-precision-format.html
index 4ebf63a..de86feb 100644
--- a/LayoutTests/fast/canvas/webgl/shader-precision-format.html
+++ b/LayoutTests/fast/canvas/webgl/shader-precision-format.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>WebGL shader precision format test.</title>
<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/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html
index c18bd44d..b64834d 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-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 src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -178,6 +178,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/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html
index a2c2eb4..78123ef 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html
index bb1f7df..3c5d332 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html
index 9a556af..ec9d4f2 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html
index a99eec7..093a95e 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html
index e89496a..c42e69d 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html
index d9c231a..f2f12e6 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html
index 2ecb6a6..16f59c3 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html
index c364833..29c2954 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html
index 7016cc6..0ee37e8 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html
index 54b01c9..59f2d97 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html
index eafa8eb..f83e174 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
index d23aff6..2b1762e 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-image.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html
index eb62214..c2cf373 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-video.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html
index 7b22f4f1..d70b5a9 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-video.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html
index fbf8eb7..22a10b6 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-video.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html
index 9f9e107..75216e9 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script src="resources/tex-image-and-sub-image-2d-with-video.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html b/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html
index 5f6aabc..4cebae5 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.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/webgl-test.js"></script>
</head>
<body>
@@ -26,7 +26,7 @@
shouldBeUndefined("gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, tmpcanvas)");
</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/canvas/webgl/tex-image-webgl.html b/LayoutTests/fast/canvas/webgl/tex-image-webgl.html
index 766464b..66e4b97 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-webgl.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-webgl.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL texImage2D from WebGL conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -52,7 +52,7 @@
debug("");
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/canvas/webgl/tex-image-with-format-and-type.html b/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.html
index 36bc36d..025b488 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.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/pnglib.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
@@ -352,7 +352,7 @@
runOneTest(testCases[i]);
var epilogue = document.createElement("script");
epilogue.onload = finish;
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
diff --git a/LayoutTests/fast/canvas/webgl/tex-image-with-greyscale-image.html b/LayoutTests/fast/canvas/webgl/tex-image-with-greyscale-image.html
index dc631c4..6bf9448 100644
--- a/LayoutTests/fast/canvas/webgl/tex-image-with-greyscale-image.html
+++ b/LayoutTests/fast/canvas/webgl/tex-image-with-greyscale-image.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script>
diff --git a/LayoutTests/fast/canvas/webgl/tex-input-validation.html b/LayoutTests/fast/canvas/webgl/tex-input-validation.html
index 8d581d3..4d14d0d 100644
--- a/LayoutTests/fast/canvas/webgl/tex-input-validation.html
+++ b/LayoutTests/fast/canvas/webgl/tex-input-validation.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -349,6 +349,6 @@
testCopyFromInternalFBO(testCases[ii]);
</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/canvas/webgl/tex-sub-image-2d-bad-args.html b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html
index de88bbe..37e8a01 100644
--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html
+++ b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -64,6 +64,6 @@
gl.texSubImage2D(gl.TEXTURE_2D, 0, 0,0, gl.RGBA, gl.UNSIGNED_BYTE, c);
glErrorShouldBe(gl, gl.INVALID_OPERATION, "type not same as original RGBA 4_4_4_4");
</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/canvas/webgl/tex-sub-image-2d.html b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html
index 285f3cc..3cb8d6e 100644
--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html
+++ b/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script id="fshader" type="x-shader/x-fragment">
@@ -86,6 +86,6 @@
if (passed)
testPassed("");
</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/canvas/webgl/tex-sub-image-cube-maps.html b/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html
index fcd545c..82b4490 100644
--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html
+++ b/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html
@@ -30,7 +30,7 @@
<head>
<meta charset="utf-8">
<title>WebGL texture texSubImage2Ds cube map conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -328,7 +328,7 @@
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/canvas/webgl/texImageTest.html b/LayoutTests/fast/canvas/webgl/texImageTest.html
index bdf9171..76641a1 100644
--- a/LayoutTests/fast/canvas/webgl/texImageTest.html
+++ b/LayoutTests/fast/canvas/webgl/texImageTest.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/webgl-test.js"></script>
</head>
<body>
@@ -9,6 +9,6 @@
<script src="script-tests/texImageTest.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/canvas/webgl/texture-active-bind.html b/LayoutTests/fast/canvas/webgl/texture-active-bind.html
index b1c9bc1..16239c8 100644
--- a/LayoutTests/fast/canvas/webgl/texture-active-bind.html
+++ b/LayoutTests/fast/canvas/webgl/texture-active-bind.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL ActiveTexture BindTexture conformance test.</title>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
</head>
<body>
@@ -149,7 +149,7 @@
init();
</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/canvas/webgl/texture-bindings-uneffected-on-resize.html b/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html
index 3bc500b..2fddbca 100644
--- a/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html
+++ b/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html
@@ -1,7 +1,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 src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/texture-color-profile.html b/LayoutTests/fast/canvas/webgl/texture-color-profile.html
index ed9e70b..e3bad50 100644
--- a/LayoutTests/fast/canvas/webgl/texture-color-profile.html
+++ b/LayoutTests/fast/canvas/webgl/texture-color-profile.html
@@ -3,7 +3,7 @@
<head>
<title>Texture upload with color profile</title>
<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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/texture-complete.html b/LayoutTests/fast/canvas/webgl/texture-complete.html
index 7b15fd5..a0e5061 100644
--- a/LayoutTests/fast/canvas/webgl/texture-complete.html
+++ b/LayoutTests/fast/canvas/webgl/texture-complete.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL "Texture Complete" texture conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
</head>
<body>
@@ -122,7 +122,7 @@
init();
</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/canvas/webgl/texture-npot.html b/LayoutTests/fast/canvas/webgl/texture-npot.html
index 3129a03..098c5b3 100644
--- a/LayoutTests/fast/canvas/webgl/texture-npot.html
+++ b/LayoutTests/fast/canvas/webgl/texture-npot.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>WebGL Non-Power of 2 texture conformance test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -219,7 +219,7 @@
</script>
</body>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<script>
</script>
diff --git a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html b/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html
index 747f12f..943044d 100644
--- a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html
+++ b/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<script>
@@ -71,7 +71,7 @@
"shouldBe " + color);
var epilogue = document.createElement("script");
epilogue.onload = finish;
- epilogue.src = "../../js/resources/js-test-post.js";
+ epilogue.src = "../../../resources/js-test-post.js";
document.body.appendChild(epilogue);
}
diff --git a/LayoutTests/fast/canvas/webgl/triangle.html b/LayoutTests/fast/canvas/webgl/triangle.html
index 3ba15d9..4309875 100644
--- a/LayoutTests/fast/canvas/webgl/triangle.html
+++ b/LayoutTests/fast/canvas/webgl/triangle.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>Rendering Test</title>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
</head>
<body>
@@ -89,7 +89,7 @@
init();
</script>
</body>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/canvas/webgl/type-conversion-test.html b/LayoutTests/fast/canvas/webgl/type-conversion-test.html
index 2796bdc..cdf4d3a 100644
--- a/LayoutTests/fast/canvas/webgl/type-conversion-test.html
+++ b/LayoutTests/fast/canvas/webgl/type-conversion-test.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -138,7 +138,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/canvas/webgl/typed-arrays-in-workers.html b/LayoutTests/fast/canvas/webgl/typed-arrays-in-workers.html
index d00b7d2..cd540cb 100644
--- a/LayoutTests/fast/canvas/webgl/typed-arrays-in-workers.html
+++ b/LayoutTests/fast/canvas/webgl/typed-arrays-in-workers.html
@@ -30,7 +30,7 @@
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="../../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/webgl-test.js"></script>
<script src="resources/typed-array-test-cases.js"></script>
</head>
diff --git a/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html b/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html
index b1e89ce..a5add21 100644
--- a/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html
+++ b/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.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/webgl-test.js"></script>
</head>
<body>
@@ -32,6 +32,6 @@
} catch (e) { }
</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/canvas/webgl/uniform-location-length-limits.html b/LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html
index 012cb06..d180699 100644
--- a/LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html
+++ b/LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL uniform location length tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"> </script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -103,6 +103,6 @@
shouldBeNull('uniformLoc');
</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/canvas/webgl/uniform-location.html b/LayoutTests/fast/canvas/webgl/uniform-location.html
index 5394660..86af687 100644
--- a/LayoutTests/fast/canvas/webgl/uniform-location.html
+++ b/LayoutTests/fast/canvas/webgl/uniform-location.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/webgl-test.js"></script>
</head>
<body>
@@ -67,6 +67,6 @@
shouldBe("contextA.getUniform(programS, locationSx)", "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/canvas/webgl/uninitialized-test.html b/LayoutTests/fast/canvas/webgl/uninitialized-test.html
index 3c2d5b8..cb4f993 100644
--- a/LayoutTests/fast/canvas/webgl/uninitialized-test.html
+++ b/LayoutTests/fast/canvas/webgl/uninitialized-test.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>WebGL Uninitialized GL Resources Tests</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -237,7 +237,7 @@
debug("");
</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/canvas/webgl/viewport-unchanged-upon-resize.html b/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html
index 26314a7..9a0ef78 100644
--- a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html
+++ b/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.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/webgl-test.js"></script>
<script id="vshader" type="x-shader/x-vertex">
attribute vec3 g_Position;
@@ -88,6 +88,6 @@
if (passed)
testPassed("Viewport correctly did not change size during canvas resize");
</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/canvas/webgl/webgl-array-invalid-ranges.html b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html
index 37ac73a..33dc9cf 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.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/webgl-test.js"></script>
</head>
<body>
@@ -155,7 +155,7 @@
shouldBeTrue("isNaN(floats[0])");
</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/canvas/webgl/webgl-depth-texture.html b/LayoutTests/fast/canvas/webgl/webgl-depth-texture.html
index 8975bc3..b991e73 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-depth-texture.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-depth-texture.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 src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
<title>WebGL WEBGL_depth_texture Conformance Tests</title>
diff --git a/LayoutTests/fast/canvas/webgl/webgl-exceptions.html b/LayoutTests/fast/canvas/webgl/webgl-exceptions.html
index c1cbe13..5a35627 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-exceptions.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-exceptions.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>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -24,5 +24,5 @@
shouldThrow('gl.vertexAttrib1fv()');
</script>
</body>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific.html b/LayoutTests/fast/canvas/webgl/webgl-specific.html
index 6964bfd..0e56f43 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-specific.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-specific.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>WebGL GLES2 difference test.</title>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="resources/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"></script>
</head>
@@ -101,6 +101,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/canvas/webgl/webgl-texture-binding-preserved.html b/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html
index c75bfb1..8edcd8ee 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -64,7 +64,7 @@
setTimeout(draw, 100);
}
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<canvas id="webgl-canvas" width="32px" height="32px"></canvas>
</body>
</html>
diff --git a/LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id.html b/LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id.html
index 66ce7ac..161f960 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id.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>
<script src="resources/webgl-test.js"></script>
</head>
<body>
@@ -16,5 +16,5 @@
testPassed("context exists");
</script>
</body>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html b/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html
index dbf3a80..022129d 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.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/webgl-test.js"></script>
<script src="resources/webgl-test-utils.js"> </script>
</head>
@@ -54,7 +54,7 @@
setTimeout(draw, 0);
}
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
<canvas id="webgl-canvas" width="32px" height="32px"></canvas>
</body>
</html>
diff --git a/LayoutTests/fast/canvas/winding-enumeration.html b/LayoutTests/fast/canvas/winding-enumeration.html
index a160962..ecd9ead 100644
--- a/LayoutTests/fast/canvas/winding-enumeration.html
+++ b/LayoutTests/fast/canvas/winding-enumeration.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>
@@ -22,6 +22,6 @@
shouldThrow("context.isPointInPath(0, 0, 'randomstring')");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/cookies/local-file-can-set-cookies.html b/LayoutTests/fast/cookies/local-file-can-set-cookies.html
index 96a8a65..94e4bef 100644
--- a/LayoutTests/fast/cookies/local-file-can-set-cookies.html
+++ b/LayoutTests/fast/cookies/local-file-can-set-cookies.html
@@ -1,7 +1,7 @@
<html>
<head>
<title>Local File Can Set Cookies</title>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -12,7 +12,7 @@
document.cookie = 'ppkcookie1=testcookie';
shouldBeTrue("document.cookie.indexOf('ppkcookie1=testcookie') >= 0");
</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/css-generated-content/insert-stylesheet-and-pseudo-crash.html b/LayoutTests/fast/css-generated-content/insert-stylesheet-and-pseudo-crash.html
index f9e7aec..69bc9b2 100644
--- a/LayoutTests/fast/css-generated-content/insert-stylesheet-and-pseudo-crash.html
+++ b/LayoutTests/fast/css-generated-content/insert-stylesheet-and-pseudo-crash.html
@@ -1,4 +1,4 @@
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<body>
<script>
var style = document.createElement("style");
@@ -10,4 +10,4 @@
div.appendChild(span);
document.body.appendChild(div);
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css-generated-content/pseudo-animation.html b/LayoutTests/fast/css-generated-content/pseudo-animation.html
index 9cf3ef9..3a0c6c4 100644
--- a/LayoutTests/fast/css-generated-content/pseudo-animation.html
+++ b/LayoutTests/fast/css-generated-content/pseudo-animation.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
@-webkit-keyframes example {
diff --git a/LayoutTests/fast/css-generated-content/pseudo-element-events.html b/LayoutTests/fast/css-generated-content/pseudo-element-events.html
index e7be161..088cc6a 100644
--- a/LayoutTests/fast/css-generated-content/pseudo-element-events.html
+++ b/LayoutTests/fast/css-generated-content/pseudo-element-events.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
div:before {
diff --git a/LayoutTests/fast/css-generated-content/pseudo-transition-event.html b/LayoutTests/fast/css-generated-content/pseudo-transition-event.html
index e4f8a4f..0a00938 100644
--- a/LayoutTests/fast/css-generated-content/pseudo-transition-event.html
+++ b/LayoutTests/fast/css-generated-content/pseudo-transition-event.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#before:before,
diff --git a/LayoutTests/fast/css-generated-content/pseudo-transition.html b/LayoutTests/fast/css-generated-content/pseudo-transition.html
index 3acf786..2499e88 100644
--- a/LayoutTests/fast/css-generated-content/pseudo-transition.html
+++ b/LayoutTests/fast/css-generated-content/pseudo-transition.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#before:before,
diff --git a/LayoutTests/fast/css-grid-layout/display-grid-set-get.html b/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
index 694cc76..1f6e622 100644
--- a/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
+++ b/LayoutTests/fast/css-grid-layout/display-grid-set-get.html
@@ -6,12 +6,12 @@
testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</script>
<link href="resources/grid.css" rel="stylesheet">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid" id="gridElement"></div>
<div class="inline-grid" id="inlineGridElement"></div>
<script src="resources/display-grid-set-get.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/css-grid-layout/grid-auto-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
index 4be1a75..707693f 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
@@ -22,7 +22,7 @@
-webkit-grid-auto-columns: -webkit-max-content;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid gridAutoFixedFixed" id="gridAutoFixedFixed"></div>
@@ -119,6 +119,6 @@
shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
</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/css-grid-layout/grid-auto-flow-get-set.html b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
index f1f2a92..b772e23 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
@@ -18,7 +18,7 @@
-webkit-grid-auto-flow: columns;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid" id="gridInitial"></div>
@@ -74,6 +74,6 @@
element.style.webkitGridAutoFlow = "noone";
shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
</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/css-grid-layout/grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
index a93d47a..1ce4595 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
@@ -61,7 +61,7 @@
font: 10px Ahem;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid gridWithFixed" id="gridWithFixedElement"></div>
@@ -77,6 +77,6 @@
<div class="grid gridWithMinMaxAndFixed" id="gridWithMinMaxAndFixed"></div>
<div class="grid gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxContent"></div>
<script src="resources/grid-columns-rows-get-set-multiple.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/css-grid-layout/grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
index 8ab0007..b44e7ae 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
@@ -53,7 +53,7 @@
-webkit-grid-definition-rows: -webkit-max-content;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid gridWithNone" id="gridWithNoneElement"></div>
@@ -68,6 +68,6 @@
<div class="grid gridWithMinContent" id="gridWithMinContent"></div>
<div class="grid gridWithMaxContent" id="gridWithMaxContent"></div>
<script src="resources/grid-columns-rows-get-set.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/css-grid-layout/grid-disabled-by-default.html b/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html
index 1d54f8b..930eea2 100644
--- a/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html
+++ b/LayoutTests/fast/css-grid-layout/grid-disabled-by-default.html
@@ -3,12 +3,12 @@
<body>
<div id="grid" style="display: -webkit-grid"></div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description("Verifies that display: -webkit-grid does nothing by default.");
shouldBe("document.getElementById('grid').style.display", "''");
</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/css-grid-layout/grid-item-column-row-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
index bfc10a1..4075bb6 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
@@ -64,7 +64,7 @@
-webkit-grid-row: -1 / "last" 2 span ;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<!-- The first has no properties set on it. -->
@@ -198,6 +198,6 @@
testColumnRowInvalidJSParsing("3 'first' / 2 span 'last'", "5 'nav' / 'last' span 7");
testColumnRowInvalidJSParsing("3 / 1 span 2", "5 / 3 span 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/css-grid-layout/grid-item-end-after-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
index 04d6fc5..12cc1bc 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
@@ -32,7 +32,7 @@
}
</style>
<script src="resources/grid-item-column-row-parsing-utils.js"></script>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<!-- The first has no properties set on it. -->
@@ -86,6 +86,6 @@
shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
</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/css-grid-layout/grid-item-start-before-get-set.html b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
index 742c5ce..012299c 100644
--- a/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
@@ -32,7 +32,7 @@
}
</style>
<script src="resources/grid-item-column-row-parsing-utils.js"></script>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<!-- The first has no properties set on it. -->
@@ -91,6 +91,6 @@
shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
</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/css-grid-layout/named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
index b4b2361..2b5e4ea 100644
--- a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
@@ -32,7 +32,7 @@
-webkit-grid-definition-rows: "first" "nav2" 25% "nav2" 75% "last";
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div class="grid gridWithFixed" id="gridWithFixedElement"></div>
@@ -148,6 +148,6 @@
element.style.webkitGridDefinitionRows = "'bar";
testValue(element, "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/css-intrinsic-dimensions/height-property-value.html b/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html
index 76944e3..145cd21 100644
--- a/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html
+++ b/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html
@@ -2,7 +2,7 @@
<!--
Tests that the height keywords are not respected by the parser yet.
-->
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<div style="height: -webkit-min-content; min-height: -webkit-min-content; max-height: -webkit-min-content;"></div>
<div style="height: -webkit-max-content; min-height: -webkit-max-content; max-height: -webkit-max-content;"></div>
@@ -34,4 +34,4 @@
});
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css-intrinsic-dimensions/multicol.html b/LayoutTests/fast/css-intrinsic-dimensions/multicol.html
index 8a1cc9f..6d79cdc 100644
--- a/LayoutTests/fast/css-intrinsic-dimensions/multicol.html
+++ b/LayoutTests/fast/css-intrinsic-dimensions/multicol.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>'columns' property with 'auto' and something else</title>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
description("Test intrinsic width calculation for multicol. See http://dev.w3.org/csswg/css-sizing/#multicol-intrinsic");
if (window.testRunner)
@@ -177,6 +177,6 @@
shouldBe("elm19.offsetWidth", "100");
shouldBe("elm20.offsetWidth", "200");
</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/css-intrinsic-dimensions/width-property-value.html b/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html
index 0121ab5..618d392 100644
--- a/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html
+++ b/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html
@@ -1,5 +1,5 @@
<!doctype html>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<div style="width: -webkit-min-content"></div>
<div style="width: -webkit-max-content"></div>
@@ -25,4 +25,4 @@
});
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/CSSPrimitiveValue-exceptions.html b/LayoutTests/fast/css/CSSPrimitiveValue-exceptions.html
index 7e8ab8b..020109c 100644
--- a/LayoutTests/fast/css/CSSPrimitiveValue-exceptions.html
+++ b/LayoutTests/fast/css/CSSPrimitiveValue-exceptions.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="resources/CSSPrimitiveValue-exceptions.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/css/MarqueeLayoutTest.html b/LayoutTests/fast/css/MarqueeLayoutTest.html
index 5c04133..23aa2bd 100644
--- a/LayoutTests/fast/css/MarqueeLayoutTest.html
+++ b/LayoutTests/fast/css/MarqueeLayoutTest.html
@@ -70,7 +70,7 @@
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description("The height of a horizontal marquee is computed as normal for inline-blocks. The 'auto' height of a vertical marquee defaults to 200px.");
var horiz = document.querySelector('#horiz marquee');
@@ -83,4 +83,4 @@
testRunner.dumpAsText();
}
</script>
-<script src="../js/resources/js-test-post.js"></script>
\ No newline at end of file
+<script src="../../resources/js-test-post.js"></script>
\ No newline at end of file
diff --git a/LayoutTests/fast/css/aspect-ratio-inheritance.html b/LayoutTests/fast/css/aspect-ratio-inheritance.html
index 76e5042..3ce199c 100644
--- a/LayoutTests/fast/css/aspect-ratio-inheritance.html
+++ b/LayoutTests/fast/css/aspect-ratio-inheritance.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 style="-webkit-aspect-ratio: 1 / 2;">
<div id="aspectRatioTest"></div>
</div>
@@ -15,4 +15,4 @@
shouldBeEqualToString('testComputedValue("aspectRatioTest", "inherit", "-webkit-aspect-ratio")', '1/2');
shouldBeEqualToString('testComputedValue("aspectRatioTest", "none", "-webkit-aspect-ratio")', 'none');
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/aspect-ratio-parsing-tests.html b/LayoutTests/fast/css/aspect-ratio-parsing-tests.html
index 5100345..4783f2d 100644
--- a/LayoutTests/fast/css/aspect-ratio-parsing-tests.html
+++ b/LayoutTests/fast/css/aspect-ratio-parsing-tests.html
@@ -2,7 +2,7 @@
<html>
<head>
<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
- <script src="../../fast/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 @@
shouldBeEqualToString('testParsing("aspectRatioTest", "1 / -9", "-webkit-aspect-ratio")', 'none');
shouldBeEqualToString('testParsing("aspectRatioTest", "-1 / -4", "-webkit-aspect-ratio")', 'none');
</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/css/attribute-selector-recursive-update-on-setAttribute.html b/LayoutTests/fast/css/attribute-selector-recursive-update-on-setAttribute.html
index ffd5815..95ce795 100644
--- a/LayoutTests/fast/css/attribute-selector-recursive-update-on-setAttribute.html
+++ b/LayoutTests/fast/css/attribute-selector-recursive-update-on-setAttribute.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>
<style>
.entry[status="foo"] .toggle {
color: green;
@@ -30,6 +30,6 @@
document.body.removeChild(entry);
</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/css/auto-min-size.html b/LayoutTests/fast/css/auto-min-size.html
index 23f53ef..d889604 100644
--- a/LayoutTests/fast/css/auto-min-size.html
+++ b/LayoutTests/fast/css/auto-min-size.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<script src='../js/resources/js-test-pre.js'></script>
+<script src='../../resources/js-test-pre.js'></script>
<div id=foo></div>
<script>
div = document.getElementById('foo');
@@ -30,4 +30,4 @@
shouldBe('getComputedStyle(div)["min-height"]', '"0px"');
</script>
-<script src='../js/resources/js-test-post.js'></script>
+<script src='../../resources/js-test-post.js'></script>
diff --git a/LayoutTests/fast/css/background-clip-text.html b/LayoutTests/fast/css/background-clip-text.html
index c0b7f2b..018155b 100644
--- a/LayoutTests/fast/css/background-clip-text.html
+++ b/LayoutTests/fast/css/background-clip-text.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/background-clip-text.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/css/background-currentcolor.html b/LayoutTests/fast/css/background-currentcolor.html
index 4f83998..74a177e 100644
--- a/LayoutTests/fast/css/background-currentcolor.html
+++ b/LayoutTests/fast/css/background-currentcolor.html
@@ -9,7 +9,7 @@
<div id="test3" style="color:currentColor; background: currentColor"></div>
</div>
</div>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Test that background-color is non-inherit and currentColor is handled correctly.');
var test1 = document.getElementById("test1");
@@ -20,4 +20,4 @@
shouldBeEqualToString('getComputedStyle(test2).backgroundColor', 'rgb(0, 128, 0)');
shouldBeEqualToString('getComputedStyle(test3).backgroundColor', 'rgb(0, 128, 0)');
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/border-image-null-image-crash.html b/LayoutTests/fast/css/border-image-null-image-crash.html
index ce3ed58..66c6a22 100644
--- a/LayoutTests/fast/css/border-image-null-image-crash.html
+++ b/LayoutTests/fast/css/border-image-null-image-crash.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>
<script>
@@ -22,6 +22,6 @@
document.body.removeChild(testContainer);
</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/css/border-image-style-length.html b/LayoutTests/fast/css/border-image-style-length.html
index d7c743b3..4e43693 100644
--- a/LayoutTests/fast/css/border-image-style-length.html
+++ b/LayoutTests/fast/css/border-image-style-length.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>
<script>
@@ -24,6 +24,6 @@
document.body.removeChild(testContainer);
</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/css/border-radius-property-value.html b/LayoutTests/fast/css/border-radius-property-value.html
index c13685c..cc4e30c 100644
--- a/LayoutTests/fast/css/border-radius-property-value.html
+++ b/LayoutTests/fast/css/border-radius-property-value.html
@@ -6,7 +6,7 @@
}
</style>
<div id="element-container"></div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
@@ -23,5 +23,5 @@
shouldBe("style.getPropertyValue('border-bottom-right-radius')","'5px'");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/border-shorthand-initialize-longhands.html b/LayoutTests/fast/css/border-shorthand-initialize-longhands.html
index d25980d..0de86cc 100644
--- a/LayoutTests/fast/css/border-shorthand-initialize-longhands.html
+++ b/LayoutTests/fast/css/border-shorthand-initialize-longhands.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("This test ensures border shorthand property initializes longhand properties such as border-top-style and border-right-color.");
@@ -24,6 +24,6 @@
shouldBe("div.style.borderLeftWidth", "'initial'");
</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/css/border-start-end.html b/LayoutTests/fast/css/border-start-end.html
index 7dfc39b..b3f811b 100644
--- a/LayoutTests/fast/css/border-start-end.html
+++ b/LayoutTests/fast/css/border-start-end.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/border-start-end.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/css/border-width-large.html b/LayoutTests/fast/css/border-width-large.html
index 522bf31..1314a0a 100644
--- a/LayoutTests/fast/css/border-width-large.html
+++ b/LayoutTests/fast/css/border-width-large.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Test for WebKit bug 18294 : Strange Result for getComputedStyle on borderWidth set in em</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description">Test for WebKit bug <a href="https://bugs.webkit.org/show_bug.cgi?id=18294">18294</a> : Strange Result for getComputedStyle on borderWidth set in em</p>
@@ -28,6 +28,6 @@
var tests_container = document.getElementById("tests_container");
tests_container.parentNode.removeChild(tests_container);
</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/css/box-sizing-backwards-compat-prefix.html b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.html
index 3d7b58b..015fe67 100644
--- a/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.html
+++ b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.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>
@@ -25,6 +25,6 @@
shouldBeEqualToString("prefixLessStyle.WebkitBoxSizing", "border-box");
shouldBeEqualToString("prefixLessStyle.webkitBoxSizing", "border-box");
</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/css/button-height.html b/LayoutTests/fast/css/button-height.html
index 03618c5..a93824f 100644
--- a/LayoutTests/fast/css/button-height.html
+++ b/LayoutTests/fast/css/button-height.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>
#button3, #button5 { height: 40px; }
#button4 { height: 40px; background-color: yellow; }
diff --git a/LayoutTests/fast/css/cloneNode-after-deleteRule-crash.html b/LayoutTests/fast/css/cloneNode-after-deleteRule-crash.html
index 689310e..9f79973 100644
--- a/LayoutTests/fast/css/cloneNode-after-deleteRule-crash.html
+++ b/LayoutTests/fast/css/cloneNode-after-deleteRule-crash.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>
<script>
@@ -17,6 +17,6 @@
</script>
<object data="resources/cloneNode-after-deleteRule-subdocument.html" onload="runtest()"/>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/computed-width-without-renderer.html b/LayoutTests/fast/css/computed-width-without-renderer.html
index 32e4ac0..0711660 100644
--- a/LayoutTests/fast/css/computed-width-without-renderer.html
+++ b/LayoutTests/fast/css/computed-width-without-renderer.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/css/content-language-case-insensitivity.html b/LayoutTests/fast/css/content-language-case-insensitivity.html
index dd7aa3f..5542a52 100644
--- a/LayoutTests/fast/css/content-language-case-insensitivity.html
+++ b/LayoutTests/fast/css/content-language-case-insensitivity.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="cONtENT-LAnguAGE" content="ja-JP">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -20,6 +20,6 @@
}
shouldBeEqualToString("languageOfNode('x')", "ja-JP");
</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/css/content-language-comma-separated-list.html b/LayoutTests/fast/css/content-language-comma-separated-list.html
index 87ad7c2..feedcac 100644
--- a/LayoutTests/fast/css/content-language-comma-separated-list.html
+++ b/LayoutTests/fast/css/content-language-comma-separated-list.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-language" content="ja, zh_CN">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -28,6 +28,6 @@
shouldBeEqualToString("languageOfNode('x')", "auto");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-dynamically-added.html b/LayoutTests/fast/css/content-language-dynamically-added.html
index cdff74f..b095d43 100644
--- a/LayoutTests/fast/css/content-language-dynamically-added.html
+++ b/LayoutTests/fast/css/content-language-dynamically-added.html
@@ -2,7 +2,7 @@
<html>
<head id="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>
</head>
<body>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -33,6 +33,6 @@
shouldBeEqualToString("languageOfNode('x')", "ja");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-dynamically-changed.html b/LayoutTests/fast/css/content-language-dynamically-changed.html
index 63cd451..3d6dd4c 100644
--- a/LayoutTests/fast/css/content-language-dynamically-changed.html
+++ b/LayoutTests/fast/css/content-language-dynamically-changed.html
@@ -3,7 +3,7 @@
<head>
<meta id="target" http-equiv="content-language" content="zh">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -40,6 +40,6 @@
shouldBeEqualToString("languageOfNode('x')", "zh");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-dynamically-removed.html b/LayoutTests/fast/css/content-language-dynamically-removed.html
index e7f51ae..8067fbc 100644
--- a/LayoutTests/fast/css/content-language-dynamically-removed.html
+++ b/LayoutTests/fast/css/content-language-dynamically-removed.html
@@ -3,7 +3,7 @@
<head>
<meta id="target" http-equiv="content-language" content="zh">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -33,6 +33,6 @@
shouldBeEqualToString("languageOfNode('x')", "zh");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-empty.html b/LayoutTests/fast/css/content-language-empty.html
index c043a18f..d52593c 100644
--- a/LayoutTests/fast/css/content-language-empty.html
+++ b/LayoutTests/fast/css/content-language-empty.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-language" content="">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -23,6 +23,6 @@
shouldBeEqualToString("languageOfNode('x')", "auto");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-late.html b/LayoutTests/fast/css/content-language-late.html
index b5c7d3e..2b63876 100644
--- a/LayoutTests/fast/css/content-language-late.html
+++ b/LayoutTests/fast/css/content-language-late.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<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>
</head>
<body>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -24,7 +24,7 @@
shouldBeEqualToString("languageOfNode('x')", "ja-JP");
shouldBeEqualToString("languageOfNode('y')", "ar");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
<meta http-equiv="content-language" content="ja-JP">
</body>
</html>
diff --git a/LayoutTests/fast/css/content-language-mapped-to-webkit-locale.html b/LayoutTests/fast/css/content-language-mapped-to-webkit-locale.html
index 9ff0fd6..73be185 100644
--- a/LayoutTests/fast/css/content-language-mapped-to-webkit-locale.html
+++ b/LayoutTests/fast/css/content-language-mapped-to-webkit-locale.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-language" content="zh-CN">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -19,6 +19,6 @@
shouldBeEqualToString("languageOfNode('x')", "zh-CN");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-multiple.html b/LayoutTests/fast/css/content-language-multiple.html
index 0d73cf8..15cdd18 100644
--- a/LayoutTests/fast/css/content-language-multiple.html
+++ b/LayoutTests/fast/css/content-language-multiple.html
@@ -5,7 +5,7 @@
<meta http-equiv="content-language" content="ja_JP">
<meta http-equiv="content-language" content="zh_CN">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -26,6 +26,6 @@
shouldBeEqualToString("languageOfNode('x')", "zh_CN");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-no-content.html b/LayoutTests/fast/css/content-language-no-content.html
index 8839b22..6dd3d29 100644
--- a/LayoutTests/fast/css/content-language-no-content.html
+++ b/LayoutTests/fast/css/content-language-no-content.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-language">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -22,6 +22,6 @@
shouldBeEqualToString("languageOfNode('x')", "auto");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-only-whitespace.html b/LayoutTests/fast/css/content-language-only-whitespace.html
index 88e82ed..9753642 100644
--- a/LayoutTests/fast/css/content-language-only-whitespace.html
+++ b/LayoutTests/fast/css/content-language-only-whitespace.html
@@ -4,7 +4,7 @@
<meta http-equiv="content-language" content="
">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -23,6 +23,6 @@
shouldBeEqualToString("languageOfNode('x')", "auto");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/content-language-with-whitespace.html b/LayoutTests/fast/css/content-language-with-whitespace.html
index a8658e7..3334ccb 100644
--- a/LayoutTests/fast/css/content-language-with-whitespace.html
+++ b/LayoutTests/fast/css/content-language-with-whitespace.html
@@ -6,7 +6,7 @@
">
<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>
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=76701">bug 76701</a>:
@@ -28,6 +28,6 @@
shouldBeEqualToString("languageOfNode('x')", "ja_JP");
shouldBeEqualToString("languageOfNode('y')", "ar");
</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/css/counters/2displays.html b/LayoutTests/fast/css/counters/2displays.html
index cf9b844..cefcfd5 100644
--- a/LayoutTests/fast/css/counters/2displays.html
+++ b/LayoutTests/fast/css/counters/2displays.html
@@ -16,7 +16,7 @@
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript">
description("This test passes if both the first and the second counter are 1000.");
@@ -43,6 +43,6 @@
</head>
<body>
<div id="testView" class="counter1"></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/css/counters/after-continuation.html b/LayoutTests/fast/css/counters/after-continuation.html
index d110014..8b91345 100644
--- a/LayoutTests/fast/css/counters/after-continuation.html
+++ b/LayoutTests/fast/css/counters/after-continuation.html
@@ -2,7 +2,7 @@
<style>
.c0:after { counter-increment:section; content: counter(section); }
</style>
- <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/css/counters/content-021.html b/LayoutTests/fast/css/counters/content-021.html
index de2f122..c961e73 100644
--- a/LayoutTests/fast/css/counters/content-021.html
+++ b/LayoutTests/fast/css/counters/content-021.html
@@ -18,7 +18,7 @@
border: 2px solid black;
}
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript">
if (window.testRunner)
diff --git a/LayoutTests/fast/css/counters/counter-cssText.html b/LayoutTests/fast/css/counters/counter-cssText.html
index b2c1890..3345c04 100644
--- a/LayoutTests/fast/css/counters/counter-cssText.html
+++ b/LayoutTests/fast/css/counters/counter-cssText.html
@@ -23,7 +23,7 @@
content: counter(section, none);
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -35,6 +35,6 @@
shouldBeEqualToString("rules[5].style.cssText", "content: counters(section, ',', upper-roman);");
shouldBeEqualToString("rules[6].style.cssText", "content: counter(section, 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/css/counters/counter-increment-000.html b/LayoutTests/fast/css/counters/counter-increment-000.html
index 8929125..7dcd3fd8 100644
--- a/LayoutTests/fast/css/counters/counter-increment-000.html
+++ b/LayoutTests/fast/css/counters/counter-increment-000.html
@@ -9,7 +9,7 @@
.increment { counter-increment: c; }
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript">
if (window.testRunner)
diff --git a/LayoutTests/fast/css/counters/counter-increment-001.html b/LayoutTests/fast/css/counters/counter-increment-001.html
index 97f8101..8a85a75 100644
--- a/LayoutTests/fast/css/counters/counter-increment-001.html
+++ b/LayoutTests/fast/css/counters/counter-increment-001.html
@@ -9,7 +9,7 @@
.increment { counter-increment: c; }
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript">
if (window.testRunner)
diff --git a/LayoutTests/fast/css/counters/counter-increment-inherit.htm b/LayoutTests/fast/css/counters/counter-increment-inherit.htm
index 608ed2f..58928cc 100644
--- a/LayoutTests/fast/css/counters/counter-increment-inherit.htm
+++ b/LayoutTests/fast/css/counters/counter-increment-inherit.htm
@@ -4,7 +4,7 @@
<title>CSS Test: Counter-increment tests</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/">
<link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters">
- <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/css/counters/counter-increment-tests.htm b/LayoutTests/fast/css/counters/counter-increment-tests.htm
index c05c6d6..c618827 100644
--- a/LayoutTests/fast/css/counters/counter-increment-tests.htm
+++ b/LayoutTests/fast/css/counters/counter-increment-tests.htm
@@ -4,7 +4,7 @@
<title>CSS Test: Counter-increment tests</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/">
<link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters">
- <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/css/counters/counterValueForElementById.html b/LayoutTests/fast/css/counters/counterValueForElementById.html
index 7bd55c1..8723139 100644
--- a/LayoutTests/fast/css/counters/counterValueForElementById.html
+++ b/LayoutTests/fast/css/counters/counterValueForElementById.html
@@ -11,7 +11,7 @@
.show-three-greeks:before { content: counters(c, ".", lower-greek) counters(c, ".", lower-greek); }
.show-three-greeks:after { content: counters(c, ".", lower-greek); }
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<div>This is the test for window.internals.counterValueForElementById</div>
diff --git a/LayoutTests/fast/css/counters/deep-before.html b/LayoutTests/fast/css/counters/deep-before.html
index f776a41..0b152b2 100644
--- a/LayoutTests/fast/css/counters/deep-before.html
+++ b/LayoutTests/fast/css/counters/deep-before.html
@@ -16,7 +16,7 @@
border: 2px solid black;
}
</style>
- <script src="../../js/resources/js-test-pre.js"></script>
+ <script src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript">
if (window.testRunner)
diff --git a/LayoutTests/fast/css/counters/getCounterValue.html b/LayoutTests/fast/css/counters/getCounterValue.html
index e526a76..2a9e97a 100644
--- a/LayoutTests/fast/css/counters/getCounterValue.html
+++ b/LayoutTests/fast/css/counters/getCounterValue.html
@@ -23,7 +23,7 @@
content: counter(section, none);
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -58,6 +58,6 @@
shouldBeEqualToString("counters[4].listStyle", "none");
shouldBeEqualToString("counters[4].separator", "");
</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/css/css-keyframe-style-parentRule.html b/LayoutTests/fast/css/css-keyframe-style-parentRule.html
index 89e7416..cb02cdf 100644
--- a/LayoutTests/fast/css/css-keyframe-style-parentRule.html
+++ b/LayoutTests/fast/css/css-keyframe-style-parentRule.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>
<style>
@-webkit-keyframes anim {
from {
@@ -22,6 +22,6 @@
shouldBe("rules[0][0].style.parentRule", "rules[0][0]");
</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/css/css-selector-text.html b/LayoutTests/fast/css/css-selector-text.html
index c637c20..875d04a 100644
--- a/LayoutTests/fast/css/css-selector-text.html
+++ b/LayoutTests/fast/css/css-selector-text.html
@@ -1,6 +1,6 @@
<html>
<head id="head">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -160,6 +160,6 @@
debug('');
</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/css/css-set-selector-text.html b/LayoutTests/fast/css/css-set-selector-text.html
index 7b3a51d..c53a1f3 100644
--- a/LayoutTests/fast/css/css-set-selector-text.html
+++ b/LayoutTests/fast/css/css-set-selector-text.html
@@ -1,6 +1,6 @@
<html>
<head id="head">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -177,6 +177,6 @@
debug('');
</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/css/css3-ch-unit.html b/LayoutTests/fast/css/css3-ch-unit.html
index 050425c..5ea85f8 100644
--- a/LayoutTests/fast/css/css3-ch-unit.html
+++ b/LayoutTests/fast/css/css3-ch-unit.html
@@ -44,7 +44,7 @@
font-size:1ch;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script type="text/javascript">
</script>
</head>
@@ -168,7 +168,7 @@
<script type="text/javascript">
shouldEvaluateTo('document.getElementById("box_mono_one").clientWidth', 'document.getElementById("box_mono").clientWidth');
</script>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
<script>
// Text with '<span class="fail">' must not appear in DumpRenderTree's output, only when opening this file in a web browser.
if (window.testRunner) {
diff --git a/LayoutTests/fast/css/css3-nth-space.html b/LayoutTests/fast/css/css3-nth-space.html
index d8356a5..fc09095 100644
--- a/LayoutTests/fast/css/css3-nth-space.html
+++ b/LayoutTests/fast/css/css3-nth-space.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>
div.class { background-color: red; }
div.class:nth-of-type(3n
@@ -32,6 +32,6 @@
el = document.getElementById("fourth");
shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(0, 128, 0)'");
</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/css/css3-nth-tokens-script.html b/LayoutTests/fast/css/css3-nth-tokens-script.html
index fdbac2f..8c7dd12 100644
--- a/LayoutTests/fast/css/css3-nth-tokens-script.html
+++ b/LayoutTests/fast/css/css3-nth-tokens-script.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>
span.c1:nth-of-type(2n -1){ color: red; }
span.c1:nth-of-type(2n){ color: green; }
@@ -63,6 +63,6 @@
shouldThrow('document.querySelector("span.c3:nth-of-type(foon + bar)")', '"Error: SyntaxError: DOM Exception 12"');
</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/css/css3-nth-tokens-style.html b/LayoutTests/fast/css/css3-nth-tokens-style.html
index 3faf772..5601304 100644
--- a/LayoutTests/fast/css/css3-nth-tokens-style.html
+++ b/LayoutTests/fast/css/css3-nth-tokens-style.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>
span.c1:nth-of-type(2n + 1){ color: red; }
span.c1:nth-of-type(2n - 2){ color: green; }
@@ -69,6 +69,6 @@
el = document.getElementById("span42");
shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('color')", "'rgb(0, 0, 0)'");
</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/css/cssText-shorthand.html b/LayoutTests/fast/css/cssText-shorthand.html
index 13334b9..bdb471f 100644
--- a/LayoutTests/fast/css/cssText-shorthand.html
+++ b/LayoutTests/fast/css/cssText-shorthand.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("This test ensures WebKit uses shorthand notations for cssText");
@@ -52,6 +52,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/css/cssom-remove-shorthand-property.html b/LayoutTests/fast/css/cssom-remove-shorthand-property.html
index 2f8f935..759a427 100644
--- a/LayoutTests/fast/css/cssom-remove-shorthand-property.html
+++ b/LayoutTests/fast/css/cssom-remove-shorthand-property.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>
<script>
@@ -51,6 +51,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/css/cursor-parsing-image-set.html b/LayoutTests/fast/css/cursor-parsing-image-set.html
index f2da84f..2cda46f 100644
--- a/LayoutTests/fast/css/cursor-parsing-image-set.html
+++ b/LayoutTests/fast/css/cursor-parsing-image-set.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>
@@ -43,6 +43,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/css/cursor-parsing.html b/LayoutTests/fast/css/cursor-parsing.html
index 892f391..b3c36d6 100644
--- a/LayoutTests/fast/css/cursor-parsing.html
+++ b/LayoutTests/fast/css/cursor-parsing.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>
@@ -67,6 +67,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/css/default-bidi-css-rules.html b/LayoutTests/fast/css/default-bidi-css-rules.html
index 556f79e..8cb6d38 100644
--- a/LayoutTests/fast/css/default-bidi-css-rules.html
+++ b/LayoutTests/fast/css/default-bidi-css-rules.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>
<p>This test checks <a href="http://dev.w3.org/html5/spec/Overview.html#bidirectional-text">the default rules for direction and unicode-bidi CSS properties</a>.</p>
<div id="container"></div>
<div id="console"></div>
@@ -69,6 +69,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/css/deprecated-flex-box-zero-width-intrinsic-max-width.html b/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html
index a2a3065..1ce8019 100644
--- a/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html
+++ b/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html
@@ -1,6 +1,6 @@
<head>
<title>Test case for bug https://bugs.webkit.org/show_bug.cgi?id=85991</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<style>
#outer {
@@ -27,4 +27,4 @@
var node = document.getElementById('inner');
node.parentNode.removeChild(node);
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/device-aspect-ratio.html b/LayoutTests/fast/css/device-aspect-ratio.html
index c20bd25..ed49322 100644
--- a/LayoutTests/fast/css/device-aspect-ratio.html
+++ b/LayoutTests/fast/css/device-aspect-ratio.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head id="myhead">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner) {
window.testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/css/draggable-region-parser.html b/LayoutTests/fast/css/draggable-region-parser.html
index 617567a..cccafdf 100644
--- a/LayoutTests/fast/css/draggable-region-parser.html
+++ b/LayoutTests/fast/css/draggable-region-parser.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 id="description"></p>
@@ -63,6 +63,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/css/dynamic-pseudo-class.html b/LayoutTests/fast/css/dynamic-pseudo-class.html
index aef2af6..5304fec 100644
--- a/LayoutTests/fast/css/dynamic-pseudo-class.html
+++ b/LayoutTests/fast/css/dynamic-pseudo-class.html
@@ -1,6 +1,6 @@
<html>
<head id="head">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style type="text/css">
li:only-child { color: red; }
</style>
diff --git a/LayoutTests/fast/css/dynamic-style-attribute-query.html b/LayoutTests/fast/css/dynamic-style-attribute-query.html
index e63f1f9..6794178 100644
--- a/LayoutTests/fast/css/dynamic-style-attribute-query.html
+++ b/LayoutTests/fast/css/dynamic-style-attribute-query.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>
<div id="testDiv">
@@ -10,5 +10,5 @@
shouldNotBe("document.querySelector('#testDiv[style]')", "null");
</script>
</body>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/ex-unit-with-no-x-height.html b/LayoutTests/fast/css/ex-unit-with-no-x-height.html
index 7aab8eb..0d56029 100644
--- a/LayoutTests/fast/css/ex-unit-with-no-x-height.html
+++ b/LayoutTests/fast/css/ex-unit-with-no-x-height.html
@@ -25,7 +25,7 @@
<div class='back ex two'></div>
<div class='cover em two'></div>
</div>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description("This test ensures that the CSS 'ex' unit is treated as half the size of the CSS 'em' unit when a font has no x-height information.")
@@ -35,4 +35,4 @@
shouldBe("measureExBox();", "'50px'")
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/first-letter-nested.html b/LayoutTests/fast/css/first-letter-nested.html
index 6a543f1..92e5518 100644
--- a/LayoutTests/fast/css/first-letter-nested.html
+++ b/LayoutTests/fast/css/first-letter-nested.html
@@ -6,7 +6,7 @@
.test:first-letter { color: green; }
.boxed { border: solid 1px; }
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="description"></div>
@@ -35,6 +35,6 @@
shouldBe("document.getElementById('test_span_1').offsetWidth", "document.getElementById('ref_span').offsetWidth");
shouldBe("document.getElementById('test_span_2').offsetWidth", "document.getElementById('ref_span').offsetWidth");
</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/css/first-letter-removed-added.html b/LayoutTests/fast/css/first-letter-removed-added.html
index ad7c638..987ebfc 100644
--- a/LayoutTests/fast/css/first-letter-removed-added.html
+++ b/LayoutTests/fast/css/first-letter-removed-added.html
@@ -8,7 +8,7 @@
.boxed { border: solid 1px; }
.bef:before { content:"Before "; }
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="description"></div>
@@ -80,6 +80,6 @@
shouldBeTrue("document.getElementById('test7').offsetWidth == document.getElementById('ref7').offsetWidth");
shouldBeTrue("document.getElementById('test8').offsetWidth == document.getElementById('ref8').offsetWidth");
</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/css/font-face-cache-bug.html b/LayoutTests/fast/css/font-face-cache-bug.html
index 507ddce..a81fd6a 100644
--- a/LayoutTests/fast/css/font-face-cache-bug.html
+++ b/LayoutTests/fast/css/font-face-cache-bug.html
@@ -1,5 +1,5 @@
<html>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
description('Test for <a href="http://webkit.org/b/73520">WebKit bug 73520</a>');
window.jsTestIsAsync = true;
@@ -33,6 +33,6 @@
<span>aaa</span>
</a>
</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/css/font-face-data-uri.html b/LayoutTests/fast/css/font-face-data-uri.html
index 4cb064a..b832331 100644
--- a/LayoutTests/fast/css/font-face-data-uri.html
+++ b/LayoutTests/fast/css/font-face-data-uri.html
@@ -15,7 +15,7 @@
src:url("data:font/ttf;base64,AAEAAAALAIAAAwAwT1MvMnhQSo0AAAE4AAAAYGNtYXAP1hZGAAAFbAAABnJnYXNwABcACQAAMLAAAAAQZ2x5ZkmzdNoAAAvgAAAaZGhlYWTWok4cAAAAvAAAADZoaGVhBwoEFgAAAPQAAAAkaG10eLkgAH0AAAGYAAAD1GxvY2EgdSciAAAmRAAAAextYXhwAPgACQAAARgAAAAgbmFtZX4UjLgAACgwAAAGaHBvc3SN0B2KAAAumAAAAhgAAQAAAAEAQhIXUWdfDzz1AAkD6AAAAACzb19ZAAAAAMAtq0kAAP84A+gDIAAAAAMAAgAAAAAAAAABAAADIP84AAAD6AAAAAAD6AABAAAAAAAAAAAAAAAAAAAA9QABAAAA9QAIAAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAID6AGQAAUAAAK8AooAAACPArwCigAAAcUAMgEDAAACAAQJAAAAAAAAgAAArxAAIEgAAAAAAAAAAFczQwAAQAAg8AIDIP84AAADIADIIAABEUAAAAADIAMgAAAAIAAAA+gAfQAAAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAAAAADAAAAAwAABEwAAQAAAAAAHAADAAEAAAImAAYCCgAAAAABAAABAAAAAAAAAAAAAAAAAAAAAQACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAwAEAAUABgAHAAgACQAAAAoACwAMAA0ADgAPABAAEQASABMAFAAVABYAFwAYABkAGgAbABwAHQAeAB8AIAAhACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwADEAMgAzADQANQA2ADcAOAA5ADoAOwA8AD0APgA/AEAAQQBCAEMARABFAEYARwBIAEkASgBLAEwATQBOAE8AUABRAFIAUwBUAFUAVgBXAFgAWQBaAFsAXABdAF4AXwBgAAAAYQBiAGMAZABlAGYAZwBoAGkAagBrAGwAbQBuAG8AcABxAHIAcwB0AHUAdgB3AHgAeQB6AHsAfAB9AH4AfwCAANsAgQCCAIMAhADdAIUAhgCHAIgA4wCJAIoA6gCLAIwA6ACNAOsA7ACOAI8A5ADmAOUA1ADpAJAAkQDTAJIAkwCUAJUAlgDnANEA7QDSAJcAmADeAAMAmgCbAJwAzgDPANUA1gDYANkAnQCeAJ8A7gCgANAA4gChAOAA4QAAAAAA3ACiANcA2gDfAKMApAClAKYApwCoAKkAqgCrAKwArQAAAK4ArwCwALEAsgCzALQAtQC2ALcAuAC5ALoAuwC8AAQCJgAAAE4AQAAFAA4AJgB+AP8BMQFTAXgBkgLHAskC3QOUA6kDvAPAIBAgFCAaIB4gIiAmIDAgOiBEISIhJiICIgYiDyISIhoiHiIrIkgiYCJlIvIlyvAC//8AAAAgACgAoAExAVIBeAGSAsYCyQLYA5QDqQO8A8AgECATIBggHCAgICYgMCA5IEQhIiEmIgIiBiIPIhEiGSIeIisiSCJgImQi8iXK8AD////j/+IAAP+B/3z/WP8/AAD97AAA/T79KvzT/RTf/+DCAADgvOC74Ljgr+Cn4J7fwd+t3uLezN7WAAAAAN7K3r7epd6K3ofd+9skEO8AAQAAAAAASgAAAAAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwA7gAAAAAAAAAAAAAAAAAAAAAAAACZAJUAggCDAKEAjgC9AIQAigCIAJAAlwCWAMQAhwC1AIEAjQDHAMgAiQCPAIUAogC5AMYAkQCYAMoAyQDLAJQAmgClAKMAmwBhAGIAiwBjAKcAZACkAKYAqwCoAKkAqgC+AGUArgCsAK0AnABmAMUAjACxAK8AsABnAMAAwgCGAGkAaABqAGwAawBtAJIAbgBwAG8AcQByAHQAcwB1AHYAvwB3AHkAeAB6AHwAewCfAJMAfgB9AH8AgADBAMMAoACzALwAtgC3ALgAuwC0ALoAnQCeANcA5gDEAKIA5wAEAiYAAABOAEAABQAOACYAfgD/ATEBUwF4AZICxwLJAt0DlAOpA7wDwCAQIBQgGiAeICIgJiAwIDogRCEiISYiAiIGIg8iEiIaIh4iKyJIImAiZSLyJcrwAv//AAAAIAAoAKABMQFSAXgBkgLGAskC2AOUA6kDvAPAIBAgEyAYIBwgICAmIDAgOSBEISIhJiICIgYiDyIRIhkiHiIrIkgiYCJkIvIlyvAA////4//iAAD/gf98/1j/PwAA/ewAAP0+/Sr80/0U3//gwgAA4Lzgu+C44K/gp+Ce38Hfrd7i3sze1gAAAADeyt6+3qXeit6H3fvbJBDvAAEAAAAAAEoAAAAAAAAAAAEAAAABAAAAAAAAAAAAAAAAAAD+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsAO4AAAAAAAAAAAAAAAAAAAAAAAAAmQCVAIIAgwChAI4AvQCEAIoAiACQAJcAlgDEAIcAtQCBAI0AxwDIAIkAjwCFAKIAuQDGAJEAmADKAMkAywCUAJoApQCjAJsAYQBiAIsAYwCnAGQApACmAKsAqACpAKoAvgBlAK4ArACtAJwAZgDFAIwAsQCvALAAZwDAAMIAhgBpAGgAagBsAGsAbQCSAG4AcABvAHEAcgB0AHMAdQB2AL8AdwB5AHgAegB8AHsAnwCTAH4AfQB/AIAAwQDDAKAAswC8ALYAtwC4ALsAtAC6AJ0AngDXAOYAxACiAOcAAAACAH0AAANrAyAAAwAHAAAzESERJSERIX0C7v2PAfT+DAMg/OB9AiYAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AAAAAMAADEhFSED6PwYyAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAAAAAPoAyAAAwAAESERIQPo/BgDIPzgAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAABAAD/OAPoAyAAAwAAESERIQPo/BgDIPwYAAAAAQAA/zgD6AMgAAMAABEhESED6PwYAyD8GAAAAAEAAP84A+gDIAADAAARIREhA+j8GAMg/BgAAAAAABQAFAAUABQAIgAwAD4ATABaAGgAdgCEAJIAoACuALwAygDYAOYA9AECARABHgEsAToBSAFWAWQBcgGAAY4BnAGqAbgBxgHUAeIB8AH+AgwCGgIoAjYCRAJSAmACbgJ8AooCmAKmArQCwgLQAt4C7AL6AwgDFgMkAzIDQANOA1wDagN4A4YDlAOiA7ADvgPMA9oD6AP2BAQEEgQgBC4EPARKBFgEZARyBIAEjgScBKoEuATGBNQE4gTwBP4FDAUaBSgFNgVEBVIFYAVuBXwFigWYBaYFtAXCBdAF3gXsBfoGCAYWBiQGMgZABk4GXAZqBngGhgaUBqIGsAa+BswG2gboBvYHBAcSByAHLgc8B0oHWAdmB3QHggeQB54HrAe6B8gH1gfkB/IIAAgOCBwIKgg4CDgIRghUCGIIcAh+CIwImgioCLYIxAjSCOAI7gj8CQoJGAkmCTQJQglQCV4JbAl6CYgJlgmkCbIJwAnOCdwJ6gn4CgYKFAoiCjAKPgpMCloKaAp2CoQKkgqgCq4KvArKCtgK5gr0CwILEAseCywLOgtIC1YLZAtyC4ALjgucC6oLuAvGC9QL4gvwC/4MDAwaDCgMNgxEDFIMYAxuDHwMigyYDKYMtAzCDNAM3gzsDPoNCA0WDSQNMgAAABsBSgAAAAAAAAAAAZ4AAAAAAAAAAAABAAgBngAAAAAAAAACAA4BpgAAAAAAAAADACABtAAAAAAAAAAEAAgB1AAAAAAAAAAFABYB3AAAAAAAAAAGAAgB8gABAAAAAAAAAM8B+gABAAAAAAABAAQCyQABAAAAAAACAAcCzQABAAAAAAADABAC1AABAAAAAAAEAAQC5AABAAAAAAAFAAsC6AABAAAAAAAGAAQC8wABAAAAAAAQAAQC9wABAAAAAAARAAcC+wABAAAAAAASAAQDAgADAAEECQAAAZ4DBgADAAEECQABAAgEpAADAAEECQACAA4ErAADAAEECQADACAEugADAAEECQAEAAgE2gADAAEECQAFABYE4gADAAEECQAGAAgE+AADAAEECQAQAAgFAAADAAEECQARAA4FCAADAAEECQASAAgFFgBNAG8AcwB0ACAAYwBoAGEAcgBhAGMAdABlAHIAcwAgAGEAcgBlACAAdABoAGUAIABlAG0AIABzAHEAdQBhAHIAZQAsACAAZQB4AGMAZQBwAHQAIAAmAEUAQQBjAHUAdABlACAAYQBuAGQAIAAiAHAAIgAsACAAdwBoAGkAYwBoACAAcwBoAG8AdwAgAGEAcwBjAGUAbgB0AC8AZABlAHMAYwBlAG4AdAAgAGYAcgBvAG0AIAB0AGgAZQAgAGIAYQBzAGUAbABpAG4AZQAuACAAVQBzAGUAZgB1AGwAIABmAG8AcgAgAHQAZQBzAHQAaQBuAGcAIABjAG8AbQBwAG8AcwBpAHQAaQBvAG4AIABzAHkAcwB0AGUAbQBzAC4AIABQAHIAbwBkAHUAYwBlAGQAIABiAHkAIABUAG8AZABkACAARgBhAGgAcgBuAGUAcgAgAGYAbwByACAAdABoAGUAIABDAFMAUwAgAFMAYQBtAHUAcgBhAGkAJwBzACAAYgByAG8AdwBzAGUAcgAgAHQAZQBzAHQAaQBuAGcALgBBAGgAZQBtAFIAZQBnAHUAbABhAHIAVgBlAHIAcwBpAG8AbgAgADEALgAxACAAQQBoAGUAbQBBAGgAZQBtAFYAZQByAHMAaQBvAG4AIAAxAC4AMQBBAGgAZQBtTW9zdCBjaGFyYWN0ZXJzIGFyZSB0aGUgZW0gc3F1YXJlLCBleGNlcHQgJkVBY3V0ZSBhbmQgInAiLCB3aGljaCBzaG93IGFzY2VudC9kZXNjZW50IGZyb20gdGhlIGJhc2VsaW5lLiBVc2VmdWwgZm9yIHRlc3RpbmcgY29tcG9zaXRpb24gc3lzdGVtcy4gUHJvZHVjZWQgYnkgVG9kZCBGYWhybmVyIGZvciB0aGUgQ1NTIFNhbXVyYWkncyBicm93c2VyIHRlc3RpbmcuQWhlbVJlZ3VsYXJWZXJzaW9uIDEuMSBBaGVtQWhlbVZlcnNpb24gMS4xQWhlbUFoZW1SZWd1bGFyQWhlbQBNAG8AcwB0ACAAYwBoAGEAcgBhAGMAdABlAHIAcwAgAGEAcgBlACAAdABoAGUAIABlAG0AIABzAHEAdQBhAHIAZQAsACAAZQB4AGMAZQBwAHQAIAAmAEUAQQBjAHUAdABlACAAYQBuAGQAIAAiAHAAIgAsACAAdwBoAGkAYwBoACAAcwBoAG8AdwAgAGEAcwBjAGUAbgB0AC8AZABlAHMAYwBlAG4AdAAgAGYAcgBvAG0AIAB0AGgAZQAgAGIAYQBzAGUAbABpAG4AZQAuACAAVQBzAGUAZgB1AGwAIABmAG8AcgAgAHQAZQBzAHQAaQBuAGcAIABjAG8AbQBwAG8AcwBpAHQAaQBvAG4AIABzAHkAcwB0AGUAbQBzAC4AIABQAHIAbwBkAHUAYwBlAGQAIABiAHkAIABUAG8AZABkACAARgBhAGgAcgBuAGUAcgAgAGYAbwByACAAdABoAGUAIABDAFMAUwAgAFMAYQBtAHUAcgBhAGkAJwBzACAAYgByAG8AdwBzAGUAcgAgAHQAZQBzAHQAaQBuAGcALgBBAGgAZQBtAFIAZQBnAHUAbABhAHIAVgBlAHIAcwBpAG8AbgAgADEALgAxACAAQQBoAGUAbQBBAGgAZQBtAFYAZQByAHMAaQBvAG4AIAAxAC4AMQBBAGgAZQBtAEEAaABlAG0AUgBlAGcAdQBsAGEAcgBBAGgAZQBtAAIAAAAAAAD/ewAUAAAAAQAAAAAAAAAAAAAAAAAAAAAA9QAAAQIAAgADAAQABQAGAAcACAAJAAsADAANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMAAxADIAMwA0ADUANgA3ADgAOQA6ADsAPAA9AD4APwBAAEEAQgBDAEQARQBGAEcASABJAEoASwBMAE0ATgBPAFAAUQBSAFMAVABVAFYAVwBYAFkAWgBbAFwAXQBeAF8AYABhAGIAYwBkAGUAZgBnAGgAaQBqAGsAbABtAG4AbwBwAHEAcgBzAHQAdQB2AHcAeAB5AHoAewB8AH0AfgB/AIAAgQCDAIQAhQCGAIgAiQCKAIsAjQCOAJAAkQCTAJYAlwCdAJ4AoAChAKIAowCkAKkAqgCsAK0ArgCvALYAtwC4ALoAvQDDAMcAyADJAMoAywDMAM0AzgDPANAA0QDTANQA1QDWANcA2ADZANoA2wDcAN0A3gDfAOAA4QDoAOkA6gDrAOwA7QDuAO8A8ADxAPIA8wD0APUA9gAAAAAAsACxALsApgCoAJ8AmwCyALMAxAC0ALUAxQCCAMIAhwCrAMYAvgC/ALwAjACYAJoAmQClAJIAnACPAJQAlQCnALkA0gDAAMEBAwACAQQETlVMTAJIVANERUwAAAADAAgAAgAQAAH//wAD/EOT");
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="warmUpAndTest()">
<div id="description"></div>
@@ -56,6 +56,6 @@
if (window.testRunner)
window.testRunner.waitUntilDone();
</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/css/font-face-descending-unicode-range.html b/LayoutTests/fast/css/font-face-descending-unicode-range.html
index 2fd8d952..2f04c15 100644
--- a/LayoutTests/fast/css/font-face-descending-unicode-range.html
+++ b/LayoutTests/fast/css/font-face-descending-unicode-range.html
@@ -9,7 +9,7 @@
unicode-range: U+062-60;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="description"></div>
@@ -23,7 +23,7 @@
shouldBe("document.getElementById('i_s').offsetWidth", "document.getElementById('x_s').offsetWidth");
</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/css/font-face-download-error.html b/LayoutTests/fast/css/font-face-download-error.html
index 713f804..b161b58 100644
--- a/LayoutTests/fast/css/font-face-download-error.html
+++ b/LayoutTests/fast/css/font-face-download-error.html
@@ -53,7 +53,7 @@
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="runTest()">
<div id="description"></div>
@@ -130,7 +130,7 @@
window.setTimeout(test, 200);
}
</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/css/font-face-font-family-descriptor.html b/LayoutTests/fast/css/font-face-font-family-descriptor.html
index 74fb574..75fc811 100644
--- a/LayoutTests/fast/css/font-face-font-family-descriptor.html
+++ b/LayoutTests/fast/css/font-face-font-family-descriptor.html
@@ -13,7 +13,7 @@
src: local(Courier);
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="test()">
<div id="description"></div>
@@ -36,7 +36,7 @@
shouldBeTrue("document.getElementById('testText').offsetWidth != document.getElementById('mustNotMatch').offsetWidth");
}
</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/css/font-face-insert-link.html b/LayoutTests/fast/css/font-face-insert-link.html
index ef770b3..4111146 100644
--- a/LayoutTests/fast/css/font-face-insert-link.html
+++ b/LayoutTests/fast/css/font-face-insert-link.html
@@ -1,5 +1,5 @@
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
.test {
font-family: 'myahem';
@@ -36,4 +36,4 @@
},
1);
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/font-face-multiple-ranges-for-unicode-range.html b/LayoutTests/fast/css/font-face-multiple-ranges-for-unicode-range.html
index cbdf9ea..ca0c305 100644
--- a/LayoutTests/fast/css/font-face-multiple-ranges-for-unicode-range.html
+++ b/LayoutTests/fast/css/font-face-multiple-ranges-for-unicode-range.html
@@ -85,7 +85,7 @@
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="description"></div>
@@ -140,7 +140,7 @@
testsElement.appendChild(document.createElement("br"));
}
</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/css/font-family-initial.html b/LayoutTests/fast/css/font-family-initial.html
index f91d982..6a49b14 100644
--- a/LayoutTests/fast/css/font-family-initial.html
+++ b/LayoutTests/fast/css/font-family-initial.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>
if (window.testRunner) {
window.testRunner.dumpAsText();
@@ -29,6 +29,6 @@
shouldBe("initialFontFamily", "unstyled");
shouldBe("initialFont", "unstyled");
</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/css/font-family-trailing-bracket-gunk.html b/LayoutTests/fast/css/font-family-trailing-bracket-gunk.html
index 89f0c30..9b0c7df 100644
--- a/LayoutTests/fast/css/font-family-trailing-bracket-gunk.html
+++ b/LayoutTests/fast/css/font-family-trailing-bracket-gunk.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>
<span id="testspan" style="font-family: 'Arial [ding dong]', 'Helvetica [Xft]', Courier">foo</span>
@@ -19,6 +19,6 @@
document.body.removeChild(spanElement);
</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/css/font-shorthand-from-longhands.html b/LayoutTests/fast/css/font-shorthand-from-longhands.html
index 28c6f51..fd0b40b 100644
--- a/LayoutTests/fast/css/font-shorthand-from-longhands.html
+++ b/LayoutTests/fast/css/font-shorthand-from-longhands.html
@@ -10,7 +10,7 @@
font-family: "foobar";
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -94,6 +94,6 @@
document.body.removeChild(testContainer);
</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/css/font-shorthand-mix-inherit.html b/LayoutTests/fast/css/font-shorthand-mix-inherit.html
index fa95c38..b1bcef4 100644
--- a/LayoutTests/fast/css/font-shorthand-mix-inherit.html
+++ b/LayoutTests/fast/css/font-shorthand-mix-inherit.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Test for WebKit bug 20181 : font shorthand with inherit keyword incorrectly parsed and rendered</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description">Test for WebKit bug <a href="https://bugs.webkit.org/show_bug.cgi?id=20181">20181</a> : font shorthand with inherit keyword incorrectly parsed and rendered</p>
@@ -51,6 +51,6 @@
var tests_container = document.getElementById("tests_container");
tests_container.parentNode.removeChild(tests_container);
</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/css/fontloader-download-error.html b/LayoutTests/fast/css/fontloader-download-error.html
index 07baf81..7d02227 100644
--- a/LayoutTests/fast/css/fontloader-download-error.html
+++ b/LayoutTests/fast/css/fontloader-download-error.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>
/* Test 1: Invalid font data */
@font-face {
@@ -75,6 +75,6 @@
<div style="font-family: myfont3">font3</div>
<div style="font-family: myfont4">font4</div>
<div style="font-family: myfont5">font5</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/css/fontloader-events.html b/LayoutTests/fast/css/fontloader-events.html
index ec29500..61b8ffb 100644
--- a/LayoutTests/fast/css/fontloader-events.html
+++ b/LayoutTests/fast/css/fontloader-events.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>
@font-face {
font-family: 'ahem';
@@ -44,6 +44,6 @@
</head>
<body>
<div style="font-family: ahem">Hello, world!</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/css/fontloader-loadingdone.html b/LayoutTests/fast/css/fontloader-loadingdone.html
index 23b0657..bbcb182 100644
--- a/LayoutTests/fast/css/fontloader-loadingdone.html
+++ b/LayoutTests/fast/css/fontloader-loadingdone.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>
body {
font-family: serif;
@@ -49,6 +49,6 @@
<span>aaa</span>
</a>
</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/css/fontloader-multiple-faces-download-error.html b/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html
index 71e6b8ef..2326d3a 100644
--- a/LayoutTests/fast/css/fontloader-multiple-faces-download-error.html
+++ b/LayoutTests/fast/css/fontloader-multiple-faces-download-error.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>
@font-face {
font-family: TestFont;
@@ -65,6 +65,6 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/fontloader-multiple-faces.html b/LayoutTests/fast/css/fontloader-multiple-faces.html
index 01fd0ba..8993f31 100644
--- a/LayoutTests/fast/css/fontloader-multiple-faces.html
+++ b/LayoutTests/fast/css/fontloader-multiple-faces.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>
@font-face {
font-family: TestFont;
@@ -65,6 +65,6 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/fontloader-multiple-families.html b/LayoutTests/fast/css/fontloader-multiple-families.html
index 4e51abd..a4e8570 100644
--- a/LayoutTests/fast/css/fontloader-multiple-families.html
+++ b/LayoutTests/fast/css/fontloader-multiple-families.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>
@font-face {
font-family: TestFont1;
@@ -64,6 +64,6 @@
</script>
</head>
<body>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-border-image.html b/LayoutTests/fast/css/getComputedStyle/computed-style-border-image.html
index a4419d4..5f9a3cc 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-border-image.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-border-image.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>
<p>Test computed style for the border-image property and sub-properties</p>
@@ -82,6 +82,6 @@
shouldBe("checkComputedStyleValue()", "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/css/getComputedStyle/computed-style-cross-fade.html b/LayoutTests/fast/css/getComputedStyle/computed-style-cross-fade.html
index 0b0d2a4..44169e2 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-cross-fade.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-cross-fade.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 type="text/javascript">
@@ -52,6 +52,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/css/getComputedStyle/computed-style-font-family-monospace.html b/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-monospace.html
index 3acd9d6..16794fd 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-monospace.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-monospace.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/computed-style-font-family-monospace.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/css/getComputedStyle/computed-style-font.html b/LayoutTests/fast/css/getComputedStyle/computed-style-font.html
index 4d7345a..d00d805 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-font.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-font.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/computed-style-font.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/css/getComputedStyle/computed-style-page-break-inside.html b/LayoutTests/fast/css/getComputedStyle/computed-style-page-break-inside.html
index 1a1113e..05ac2ec 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-page-break-inside.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-page-break-inside.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/computed-style-page-break-inside.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/css/getComputedStyle/computed-style-properties.html b/LayoutTests/fast/css/getComputedStyle/computed-style-properties.html
index 62d30bd..85ce061 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-properties.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-properties.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>
#test {
width: 400px;
@@ -75,5 +75,5 @@
shouldBe("computedStyleFor('subcounter2', 'before', 'counter-increment')", "'subsection 1'");
shouldBe("computedStyleFor('subcounter2', 'before', 'content')", '"counter(section) \'.\' counter(subsection) \'. \'"');
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow.html b/LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow.html
index 024c9ba..ff5de41 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-select-overflow.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<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>
<p>Test computed style for the overflow property of select element</p>
@@ -52,6 +52,6 @@
var 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/css/getComputedStyle/computed-style-with-zoom.html b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.html
index d860d37..d954b83 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.html
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-with-zoom.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>
<script src="script-tests/computed-style-with-zoom.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/css/getComputedStyle/counterIncrement-without-counter.html b/LayoutTests/fast/css/getComputedStyle/counterIncrement-without-counter.html
index e23c850..80c0e3c 100644
--- a/LayoutTests/fast/css/getComputedStyle/counterIncrement-without-counter.html
+++ b/LayoutTests/fast/css/getComputedStyle/counterIncrement-without-counter.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>
<div id="console"></div>
diff --git a/LayoutTests/fast/css/getComputedStyle/font-family-fallback-reset.html b/LayoutTests/fast/css/getComputedStyle/font-family-fallback-reset.html
index 94370aa..c3766b2 100644
--- a/LayoutTests/fast/css/getComputedStyle/font-family-fallback-reset.html
+++ b/LayoutTests/fast/css/getComputedStyle/font-family-fallback-reset.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/font-family-fallback-reset.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/css/getComputedStyle/getComputedStyle-background-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-background-shorthand.html
index 6bb9a90..ee5bea3 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-background-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-background-shorthand.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>
<script>
@@ -217,6 +217,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-color-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-color-shorthand.html
index 3472f7e..23c8155 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-color-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-color-shorthand.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>
<script>
@@ -67,6 +67,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-image-slice.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-image-slice.html
index c85f4df..28159eb 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-image-slice.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-image-slice.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>
<script>
@@ -30,6 +30,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html
index 9cbfa1d..6253671 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.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>
<script>
@@ -132,6 +132,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-shorthand.html
index ee51640..a3c4dba 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-shorthand.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>
<script>
@@ -78,6 +78,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-style-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-style-shorthand.html
index f753740..58f7257 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-style-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-style-shorthand.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>
<script>
@@ -39,6 +39,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-border-width.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-width.html
index 026f371..b513a1a 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-width.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-width.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>
<script>
@@ -67,6 +67,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-column-rule.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-column-rule.html
index 38b728f..9b85d17 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-column-rule.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-column-rule.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>
<script>
@@ -74,6 +74,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-height.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-height.html
index a644ced..56cdc43 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-height.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-height.html
@@ -12,7 +12,7 @@
height: 200px;
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<table border="0" cellspacing="0" cellpadding="0" id="table">
@@ -33,6 +33,6 @@
document.body.removeChild(table);
</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/css/getComputedStyle/getComputedStyle-length-unit.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-length-unit.html
index 10dfe5c..a5a5557 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-length-unit.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-length-unit.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>
.visible { position: absolute; }
.hidden { position: relative; display: none; }
diff --git a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-list-style-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-list-style-shorthand.html
index 3adda21..d6955cf6 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-list-style-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-list-style-shorthand.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>
<script>
@@ -70,6 +70,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-margin-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-margin-shorthand.html
index a60769b..e782d5f 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-margin-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-margin-shorthand.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>
<script>
@@ -51,6 +51,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-outline-offset.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-offset.html
index 487a39d..6f84b71 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-offset.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-offset.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>
<script>
@@ -25,6 +25,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-outline-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-shorthand.html
index 7779555..f3eeff9 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-outline-shorthand.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>
<script>
@@ -54,6 +54,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-padding-margin-subpixel-length.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-margin-subpixel-length.html
index e3c21b4..2b365df 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-margin-subpixel-length.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-margin-subpixel-length.html
@@ -14,7 +14,7 @@
padding-left: 8.5px;
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<div id="testElement"></div>
@@ -38,6 +38,6 @@
var 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/css/getComputedStyle/getComputedStyle-padding-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html
index ff4452f..0abbabe 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-padding-shorthand.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>
<script>
@@ -51,6 +51,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/getComputedStyle-text-decoration.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration.html
index 4034cec..e5efe05 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-text-decoration.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/getComputedStyle-text-decoration.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/css/getComputedStyle/getComputedStyle-webkit-columns-shorthand.html b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-webkit-columns-shorthand.html
index c2e5535..2b1a334 100644
--- a/LayoutTests/fast/css/getComputedStyle/getComputedStyle-webkit-columns-shorthand.html
+++ b/LayoutTests/fast/css/getComputedStyle/getComputedStyle-webkit-columns-shorthand.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>
<script>
@@ -69,6 +69,6 @@
document.body.removeChild(testContainer);
</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/css/getComputedStyle/script-tests/TEMPLATE.html b/LayoutTests/fast/css/getComputedStyle/script-tests/TEMPLATE.html
index 43f30e8..4beed93 100644
--- a/LayoutTests/fast/css/getComputedStyle/script-tests/TEMPLATE.html
+++ b/LayoutTests/fast/css/getComputedStyle/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/css/getFloatValueForUnit.html b/LayoutTests/fast/css/getFloatValueForUnit.html
index bf0d361..86879a9 100644
--- a/LayoutTests/fast/css/getFloatValueForUnit.html
+++ b/LayoutTests/fast/css/getFloatValueForUnit.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="test-div" style="font-size: 10pt; -webkit-transform: rotate(100grad); -webkit-animation-delay: 0.2s;"></div>
@@ -58,5 +58,5 @@
shouldThrow("getFloatValue('-webkit-animation-delay', CSSPrimitiveValue.CSS_HZ)", "invalidAccessError");
shouldThrow("getFloatValue('-webkit-animation-delay', CSSPrimitiveValue.CSS_RGBCOLOR)", "invalidAccessError");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/getPropertyValue-border.html b/LayoutTests/fast/css/getPropertyValue-border.html
index 358cfdb..4d215a3 100644
--- a/LayoutTests/fast/css/getPropertyValue-border.html
+++ b/LayoutTests/fast/css/getPropertyValue-border.html
@@ -11,7 +11,7 @@
vertical-align: middle;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -61,6 +61,6 @@
var div9 = document.getElementById("border9");
shouldBe('div9.style.getPropertyValue("border")', "null");
</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/css/getPropertyValue-column-rule.html b/LayoutTests/fast/css/getPropertyValue-column-rule.html
index 338040c..cffbd21 100644
--- a/LayoutTests/fast/css/getPropertyValue-column-rule.html
+++ b/LayoutTests/fast/css/getPropertyValue-column-rule.html
@@ -8,7 +8,7 @@
display: inline-block;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -69,6 +69,6 @@
var div12 = document.getElementById("-webkit-column-rule12");
shouldBe('div12.style.getPropertyValue("-webkit-column-rule")', "null");
</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/css/getPropertyValue-columns.html b/LayoutTests/fast/css/getPropertyValue-columns.html
index 5e905f8..7345c85 100644
--- a/LayoutTests/fast/css/getPropertyValue-columns.html
+++ b/LayoutTests/fast/css/getPropertyValue-columns.html
@@ -8,7 +8,7 @@
height: 100px;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -44,6 +44,6 @@
debug("NOTE: If only few longhand properties are specified, getPropertyValue for shorthand property returns null.")
shouldBe('webkitColumnsValue("columns9")', "null");
</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/css/getPropertyValue-webkit-margin-collapse.html b/LayoutTests/fast/css/getPropertyValue-webkit-margin-collapse.html
index 17f2ed8..d7c266d 100644
--- a/LayoutTests/fast/css/getPropertyValue-webkit-margin-collapse.html
+++ b/LayoutTests/fast/css/getPropertyValue-webkit-margin-collapse.html
@@ -9,7 +9,7 @@
height: 10em;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -37,6 +37,6 @@
debug("NOTE: If only few longhand properties are specified, getPropertyValue for shorthand property returns null.")
shouldBe('webkitMarginCollapseValue("margin-collapse5")', "null");
</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/css/getPropertyValue-webkit-marquee.html b/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html
index 0b178bb..0a04008 100644
--- a/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html
+++ b/LayoutTests/fast/css/getPropertyValue-webkit-marquee.html
@@ -10,7 +10,7 @@
overflow-x: -webkit-marquee;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -57,6 +57,6 @@
shouldBe('webkitMarqueeValue("marquee13")', "null");
shouldBe('webkitMarqueeValue("marquee14")', "null");
</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/css/getPropertyValue-webkit-text-stroke.html b/LayoutTests/fast/css/getPropertyValue-webkit-text-stroke.html
index b7bfd0c..96bc302 100644
--- a/LayoutTests/fast/css/getPropertyValue-webkit-text-stroke.html
+++ b/LayoutTests/fast/css/getPropertyValue-webkit-text-stroke.html
@@ -8,7 +8,7 @@
height: 10em;
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -40,6 +40,6 @@
debug("NOTE: If only few longhand properties are specified, getPropertyValue for shorthand property returns null.")
shouldBe('webkitTextStrokeValue("text-stroke7")', "null");
</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/css/hover-active-drag.html b/LayoutTests/fast/css/hover-active-drag.html
index e07827f..42f7af6 100644
--- a/LayoutTests/fast/css/hover-active-drag.html
+++ b/LayoutTests/fast/css/hover-active-drag.html
@@ -18,7 +18,7 @@
<pre id="console"></pre>
</body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
function shouldHaveBackground(element, bg) {
background = getComputedStyle(element, null).getPropertyValue("background-color")
diff --git a/LayoutTests/fast/css/hover-display-block-inline.html b/LayoutTests/fast/css/hover-display-block-inline.html
index a252ef0..e163b29 100644
--- a/LayoutTests/fast/css/hover-display-block-inline.html
+++ b/LayoutTests/fast/css/hover-display-block-inline.html
@@ -27,7 +27,7 @@
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<script type="text/javascript">
diff --git a/LayoutTests/fast/css/hover-display-block-none.html b/LayoutTests/fast/css/hover-display-block-none.html
index d109288..0cea5c2 100644
--- a/LayoutTests/fast/css/hover-display-block-none.html
+++ b/LayoutTests/fast/css/hover-display-block-none.html
@@ -28,7 +28,7 @@
}
</style>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<script type="text/javascript">
diff --git a/LayoutTests/fast/css/hover-display-block.html b/LayoutTests/fast/css/hover-display-block.html
index 2038860..23a3bad 100644
--- a/LayoutTests/fast/css/hover-display-block.html
+++ b/LayoutTests/fast/css/hover-display-block.html
@@ -21,7 +21,7 @@
</div>
</body>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner) {
description("Hover should work for :display block elements")
@@ -35,4 +35,4 @@
}
successfullyParsed = true;
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/hover-update.html b/LayoutTests/fast/css/hover-update.html
index 90a6a42..24c8745 100644
--- a/LayoutTests/fast/css/hover-update.html
+++ b/LayoutTests/fast/css/hover-update.html
@@ -11,7 +11,7 @@
div#b:hover { background: green; }
span#c:hover { color: red; }
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body onload="runtest()">
<p><b>BUG ID:</b> <a href="http://bugs.webkit.org/show_bug.cgi?id=6821">Bugzilla bug 6821</a> Fix for 5983 will not always update hover correctly.</p>
diff --git a/LayoutTests/fast/css/html-attr-case-sensitivity.html b/LayoutTests/fast/css/html-attr-case-sensitivity.html
index b4a3836..7b19bb2 100644
--- a/LayoutTests/fast/css/html-attr-case-sensitivity.html
+++ b/LayoutTests/fast/css/html-attr-case-sensitivity.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="resources/html-attr-case-sensitivity.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/css/id-or-class-before-stylesheet-strict.html b/LayoutTests/fast/css/id-or-class-before-stylesheet-strict.html
index 5f838ca..ff40901 100644
--- a/LayoutTests/fast/css/id-or-class-before-stylesheet-strict.html
+++ b/LayoutTests/fast/css/id-or-class-before-stylesheet-strict.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang=en>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#testid { background-color: red; }
#testID2 { background-color: red; }
@@ -33,5 +33,5 @@
shouldBe('window.getComputedStyle(document.getElementById("testID2")).backgroundColor','"rgb(255, 0, 0)"');
shouldBe('window.getComputedStyle(document.getElementsByClassName("testClass2")[0]).backgroundColor','"rgb(255, 0, 0)"');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/id-or-class-before-stylesheet.html b/LayoutTests/fast/css/id-or-class-before-stylesheet.html
index 7c640c1..a2b604c 100644
--- a/LayoutTests/fast/css/id-or-class-before-stylesheet.html
+++ b/LayoutTests/fast/css/id-or-class-before-stylesheet.html
@@ -1,6 +1,6 @@
<html lang=en>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#testid { background-color: red; }
#testID2 { background-color: red; }
@@ -32,5 +32,5 @@
shouldBe('window.getComputedStyle(document.getElementById("testID2")).backgroundColor','"rgb(0, 128, 0)"');
shouldBe('window.getComputedStyle(document.getElementsByClassName("testClass2")[0]).backgroundColor','"rgb(0, 128, 0)"');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/image-orientation/image-orientation.html b/LayoutTests/fast/css/image-orientation/image-orientation.html
index c627122..bdf79d5 100644
--- a/LayoutTests/fast/css/image-orientation/image-orientation.html
+++ b/LayoutTests/fast/css/image-orientation/image-orientation.html
@@ -2,7 +2,7 @@
<html>
<head>
<style src="../../js/resources/js-test-style.css"></style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -26,6 +26,6 @@
}
document.body.removeChild(p);
</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/css/image-rendering-parsing.html b/LayoutTests/fast/css/image-rendering-parsing.html
index 5cc5815..40742c2 100644
--- a/LayoutTests/fast/css/image-rendering-parsing.html
+++ b/LayoutTests/fast/css/image-rendering-parsing.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="script-tests/image-rendering-parsing.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/css/image-resolution/image-resolution.html b/LayoutTests/fast/css/image-resolution/image-resolution.html
index 34827e0..5a484d1 100644
--- a/LayoutTests/fast/css/image-resolution/image-resolution.html
+++ b/LayoutTests/fast/css/image-resolution/image-resolution.html
@@ -2,7 +2,7 @@
<html>
<head>
<style src="../../js/resources/js-test-style.css"></style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script>
@@ -13,7 +13,7 @@
function testCompleted()
{
var scriptElement = document.createElement("script")
- scriptElement.src = '../../js/resources/js-test-post-async.js'
+ scriptElement.src = '../../../resources/js-test-post-async.js'
document.body.appendChild(scriptElement);
}
diff --git a/LayoutTests/fast/css/image-set-parsing-invalid.html b/LayoutTests/fast/css/image-set-parsing-invalid.html
index 869df66..73dd615 100644
--- a/LayoutTests/fast/css/image-set-parsing-invalid.html
+++ b/LayoutTests/fast/css/image-set-parsing-invalid.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="script-tests/image-set-parsing-invalid.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/css/image-set-parsing.html b/LayoutTests/fast/css/image-set-parsing.html
index daa2f1e..175a893 100644
--- a/LayoutTests/fast/css/image-set-parsing.html
+++ b/LayoutTests/fast/css/image-set-parsing.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="script-tests/image-set-parsing.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/css/image-set-setting.html b/LayoutTests/fast/css/image-set-setting.html
index 3189ff9..cc00f9e 100644
--- a/LayoutTests/fast/css/image-set-setting.html
+++ b/LayoutTests/fast/css/image-set-setting.html
@@ -1,12 +1,12 @@
<!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>
<div id="console"></div>
<script src="script-tests/image-set-setting.js"></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/css/image-value-type.html b/LayoutTests/fast/css/image-value-type.html
index 5d2ec7e7..8cd2b91 100644
--- a/LayoutTests/fast/css/image-value-type.html
+++ b/LayoutTests/fast/css/image-value-type.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>
<style>
div#test {
background-image: url(stars.gif);
@@ -20,6 +20,6 @@
shouldBe("imageValue.cssValueType", "CSSValue.CSS_PRIMITIVE_VALUE");
</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/css/inherit-initial-shorthand-values.html b/LayoutTests/fast/css/inherit-initial-shorthand-values.html
index c04b811..cbaf7eb 100644
--- a/LayoutTests/fast/css/inherit-initial-shorthand-values.html
+++ b/LayoutTests/fast/css/inherit-initial-shorthand-values.html
@@ -1,4 +1,4 @@
-<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/css/inherited-properties-explicit.html b/LayoutTests/fast/css/inherited-properties-explicit.html
index bf9671b..69ed87c 100644
--- a/LayoutTests/fast/css/inherited-properties-explicit.html
+++ b/LayoutTests/fast/css/inherited-properties-explicit.html
@@ -1,4 +1,4 @@
-<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/css/insertRule-font-face.html b/LayoutTests/fast/css/insertRule-font-face.html
index 66448fd..dcaaa32 100644
--- a/LayoutTests/fast/css/insertRule-font-face.html
+++ b/LayoutTests/fast/css/insertRule-font-face.html
@@ -2,10 +2,10 @@
<html>
<head>
<style type="text/css"></style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/insertRule-font-face.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/css/insertRule-media.html b/LayoutTests/fast/css/insertRule-media.html
index 3a817ac..cb5898d6 100644
--- a/LayoutTests/fast/css/insertRule-media.html
+++ b/LayoutTests/fast/css/insertRule-media.html
@@ -3,10 +3,10 @@
<head>
<link rel="help" href="http://dev.w3.org/csswg/cssom/#serialize-a-list-of-media-queries" />
<style type="text/css"></style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/insertRule-media.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/css/invalid-appearance-progress-bar-meter.html b/LayoutTests/fast/css/invalid-appearance-progress-bar-meter.html
index 91ad8f5..24a907d 100644
--- a/LayoutTests/fast/css/invalid-appearance-progress-bar-meter.html
+++ b/LayoutTests/fast/css/invalid-appearance-progress-bar-meter.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/invalid-appearance-progress-bar-meter.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/css/invalid-predefined-color.html b/LayoutTests/fast/css/invalid-predefined-color.html
index 4e14ed9b..d8bb63f39 100644
--- a/LayoutTests/fast/css/invalid-predefined-color.html
+++ b/LayoutTests/fast/css/invalid-predefined-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>
</head>
<body style="color: black">
@@ -17,7 +17,7 @@
<div id="invalid5" style="color: #FF000000">This style is "color: #FF000000"</div>
<script src="script-tests/invalid-predefined-color.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/css/invalid-rule-value.html b/LayoutTests/fast/css/invalid-rule-value.html
index dbaa7ae..5b09952 100644
--- a/LayoutTests/fast/css/invalid-rule-value.html
+++ b/LayoutTests/fast/css/invalid-rule-value.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>
<div id="test-invalid-rule" style="weight: *; color: rgb(0, 128, 0)"></div>
@@ -10,6 +10,6 @@
shouldBe("document.getElementById('test-invalid-rule').style.getPropertyValue('color')", "'rgb(0, 128, 0)'");
</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/css/lang-mapped-to-webkit-locale-dynamic.xhtml b/LayoutTests/fast/css/lang-mapped-to-webkit-locale-dynamic.xhtml
index a2453b7..cb71e77 100644
--- a/LayoutTests/fast/css/lang-mapped-to-webkit-locale-dynamic.xhtml
+++ b/LayoutTests/fast/css/lang-mapped-to-webkit-locale-dynamic.xhtml
@@ -4,7 +4,7 @@
<head>
<title>mapping dynamic lang to -webkit-locale</title>
<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>
<p>This is tests mapping of lang/xml:lang to -webkit-locale with dynamic attribute changes. <a href="http://webkit.org/b/76364">bug 76364</a>.</p>
@@ -50,6 +50,6 @@
shouldBeEqualToString("localeOfNode('x2')", "ja");
</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/css/lang-mapped-to-webkit-locale.xhtml b/LayoutTests/fast/css/lang-mapped-to-webkit-locale.xhtml
index 34ee75a..31b3d07 100644
--- a/LayoutTests/fast/css/lang-mapped-to-webkit-locale.xhtml
+++ b/LayoutTests/fast/css/lang-mapped-to-webkit-locale.xhtml
@@ -4,7 +4,7 @@
<head>
<title>mapping lang to -webkit-locale</title>
<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>
<p>This is a test for <a href="http://webkit.org/b/67586">bug 67586</a>. HTML attributes lang and xml:lang are mapped to '-webkit-locale' to use their value in font fallback.</p>
@@ -54,7 +54,7 @@
var 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/css/large-numbers.html b/LayoutTests/fast/css/large-numbers.html
index fdc8925..a5e09dd 100644
--- a/LayoutTests/fast/css/large-numbers.html
+++ b/LayoutTests/fast/css/large-numbers.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>
.test { position: absolute; width: 50px; left: 25px; }
</style>
diff --git a/LayoutTests/fast/css/last-child-innerhtml.html b/LayoutTests/fast/css/last-child-innerhtml.html
index 22cde97..eca8073 100644
--- a/LayoutTests/fast/css/last-child-innerhtml.html
+++ b/LayoutTests/fast/css/last-child-innerhtml.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>
div p:first-child {
color: blue;
@@ -45,5 +45,5 @@
document.getElementById("threeChildren").innerHTML = "";
document.getElementById("oneChild").innerHTML = "";
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/legacy-opacity-styles.html b/LayoutTests/fast/css/legacy-opacity-styles.html
index 02cb09a..6a016be 100644
--- a/LayoutTests/fast/css/legacy-opacity-styles.html
+++ b/LayoutTests/fast/css/legacy-opacity-styles.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>
<div id="test-opacity" style="opacity: 0.2;"></div>
@@ -17,6 +17,6 @@
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('opacity')", "'0.8'");
shouldBe("document.getElementById('test-webkit-opacity').style.getPropertyValue('-webkit-opacity')", "'0.8'");
</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/css/limited-vendor-prefix-behavior.html-disabled b/LayoutTests/fast/css/limited-vendor-prefix-behavior.html-disabled
index 8f50699..b3906a9 100644
--- a/LayoutTests/fast/css/limited-vendor-prefix-behavior.html-disabled
+++ b/LayoutTests/fast/css/limited-vendor-prefix-behavior.html-disabled
@@ -2,7 +2,7 @@
<html>
<head>
<style type="text/css"></style>
-<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 @@
shouldBe("document.getElementById('test-limited-apple').style.appleLineClamp", "'10%'");
shouldBe("document.getElementById('test-limited-apple').style.appleUserDrag", "undefined");
</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/css/link-alternate-stylesheet-1.html b/LayoutTests/fast/css/link-alternate-stylesheet-1.html
index 8ca20c9..2abfe14 100644
--- a/LayoutTests/fast/css/link-alternate-stylesheet-1.html
+++ b/LayoutTests/fast/css/link-alternate-stylesheet-1.html
@@ -4,7 +4,7 @@
<link rel="stylesheet" href="resources/basic.css" type="text/css">
<link rel="stylesheet" href="resources/small.css" type="text/css">
<link rel="stylesheet" href="resources/normal.css" type="text/css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<h1 id="firstH1" >Alternate stylesheets</h1>
diff --git a/LayoutTests/fast/css/link-alternate-stylesheet-2.html b/LayoutTests/fast/css/link-alternate-stylesheet-2.html
index ab7d4ad..8208665 100644
--- a/LayoutTests/fast/css/link-alternate-stylesheet-2.html
+++ b/LayoutTests/fast/css/link-alternate-stylesheet-2.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="resources/small.css" type="text/css" />
<link rel="stylesheet" href="resources/normal.css" type="text/css" />
<link rel="alternate stylesheet" href="resources/high.css" type="text/css" />
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
diff --git a/LayoutTests/fast/css/link-alternate-stylesheet-3.html b/LayoutTests/fast/css/link-alternate-stylesheet-3.html
index c14d9af..ba4e9f2 100644
--- a/LayoutTests/fast/css/link-alternate-stylesheet-3.html
+++ b/LayoutTests/fast/css/link-alternate-stylesheet-3.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" href="resources/small.css" type="text/css">
<link rel="stylesheet" href="resources/normal.css" type="text/css">
<link rel="alternate stylesheet" href="resources/high.css" title="Different layout" type="text/css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<h1 id="firstH1">Alternate stylesheets</h1>
diff --git a/LayoutTests/fast/css/link-alternate-stylesheet-4.html b/LayoutTests/fast/css/link-alternate-stylesheet-4.html
index d9445a8..6425725 100644
--- a/LayoutTests/fast/css/link-alternate-stylesheet-4.html
+++ b/LayoutTests/fast/css/link-alternate-stylesheet-4.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" href="resources/small.css" type="text/css">
<link rel="stylesheet" href="resources/normal.css" type="text/css">
<link rel="stylesheet" href="resources/high.css" title="Layout" type="text/css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<h1 id="firstH1">Alternate stylesheets</h1>
diff --git a/LayoutTests/fast/css/link-alternate-stylesheet-5.html b/LayoutTests/fast/css/link-alternate-stylesheet-5.html
index 25e204b..7da69db 100644
--- a/LayoutTests/fast/css/link-alternate-stylesheet-5.html
+++ b/LayoutTests/fast/css/link-alternate-stylesheet-5.html
@@ -5,7 +5,7 @@
<link rel="stylesheet" href="resources/small.css" type="text/css">
<link rel="stylesheet" href="resources/normal.css" title="Different layout" type="text/css">
<link rel="alternate stylesheet" href="resources/high.css" type="text/css">
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<h1 id="firstH1">Alternate stylesheets</h1>
diff --git a/LayoutTests/fast/css/link-disabled-attr.html b/LayoutTests/fast/css/link-disabled-attr.html
index 20b7064..a2ca773 100644
--- a/LayoutTests/fast/css/link-disabled-attr.html
+++ b/LayoutTests/fast/css/link-disabled-attr.html
@@ -4,7 +4,7 @@
<link id="sheet" rel="stylesheet" href="data:tex/css,#test-element{text-decoration:line-through}">
<link id="notsheet" rel="author" href="mailto:nosuch@webkit.org">
<link id="alt" rel="alternate stylesheet" title="altset" href="resources/green.css">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
@@ -98,5 +98,5 @@
onSheetLoaded(altSheetLoaded, link, 500);
</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/css/margin-start-end.html b/LayoutTests/fast/css/margin-start-end.html
index b028541..87f1f18 100644
--- a/LayoutTests/fast/css/margin-start-end.html
+++ b/LayoutTests/fast/css/margin-start-end.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/margin-start-end.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/css/max-device-aspect-ratio.html b/LayoutTests/fast/css/max-device-aspect-ratio.html
index 6096b38..52a5ac5 100644
--- a/LayoutTests/fast/css/max-device-aspect-ratio.html
+++ b/LayoutTests/fast/css/max-device-aspect-ratio.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head id="myhead">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner) {
window.testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/css/max-height-and-max-width.html b/LayoutTests/fast/css/max-height-and-max-width.html
index 35d8d63..cf5c3e8 100644
--- a/LayoutTests/fast/css/max-height-and-max-width.html
+++ b/LayoutTests/fast/css/max-height-and-max-width.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head id="myhead">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
window.testRunner.dumpAsText();
diff --git a/LayoutTests/fast/css/min-device-aspect-ratio.html b/LayoutTests/fast/css/min-device-aspect-ratio.html
index f7ea7e7..b6b8e87 100644
--- a/LayoutTests/fast/css/min-device-aspect-ratio.html
+++ b/LayoutTests/fast/css/min-device-aspect-ratio.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head id="myhead">
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner) {
window.testRunner.waitUntilDone();
diff --git a/LayoutTests/fast/css/nested-at-rules.html b/LayoutTests/fast/css/nested-at-rules.html
index 7d28719..4d47cfc 100644
--- a/LayoutTests/fast/css/nested-at-rules.html
+++ b/LayoutTests/fast/css/nested-at-rules.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>
.test {
content: "UNTOUCHED";
@@ -60,4 +60,4 @@
shouldBeEqualToString("getComputedStyle(document.getElementById('t0')).content", "APPLIED");
shouldBeEqualToString("getComputedStyle(document.getElementById('t1')).content", "UNTOUCHED");
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/outline-currentcolor.html b/LayoutTests/fast/css/outline-currentcolor.html
index 2f39dc0..69febbe 100644
--- a/LayoutTests/fast/css/outline-currentcolor.html
+++ b/LayoutTests/fast/css/outline-currentcolor.html
@@ -9,7 +9,7 @@
<div id="test3" style="color:currentColor; outline: solid 1em currentColor"></div>
</div>
</div>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
description('Test that outline-color is non-inherit and currentColor is handled correctly.');
var test1 = document.getElementById("test1");
@@ -20,4 +20,4 @@
shouldBeEqualToString('getComputedStyle(test2).outlineColor', 'rgb(0, 128, 0)');
shouldBeEqualToString('getComputedStyle(test3).outlineColor', 'rgb(0, 128, 0)');
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/css/overflow-property.html b/LayoutTests/fast/css/overflow-property.html
index 13da955..e267947 100644
--- a/LayoutTests/fast/css/overflow-property.html
+++ b/LayoutTests/fast/css/overflow-property.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">This tests the parsing and retrieval of the overflow, overflow-x and overflow-y properties.</p>
@@ -73,6 +73,6 @@
var tests_container = document.getElementById("tests_container");
tests_container.parentNode.removeChild(tests_container);
</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/css/padding-no-renderer.html b/LayoutTests/fast/css/padding-no-renderer.html
index 01bea39..fb30d8c 100644
--- a/LayoutTests/fast/css/padding-no-renderer.html
+++ b/LayoutTests/fast/css/padding-no-renderer.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>
#test1 { padding: 10px; display: none; }
</style>
@@ -57,6 +57,6 @@
var tests_container = document.getElementById("tests_container");
tests_container.parentNode.removeChild(tests_container);
</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/css/padding-start-end.html b/LayoutTests/fast/css/padding-start-end.html
index 9eed783..d8c0b25 100644
--- a/LayoutTests/fast/css/padding-start-end.html
+++ b/LayoutTests/fast/css/padding-start-end.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/padding-start-end.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/css/parsing-color-correction.html b/LayoutTests/fast/css/parsing-color-correction.html
index 5a29c7e..8d855a3 100644
--- a/LayoutTests/fast/css/parsing-color-correction.html
+++ b/LayoutTests/fast/css/parsing-color-correction.html
@@ -2,10 +2,10 @@
<html>
<head>
<style type="text/css"></style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/parsing-color-correction.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/css/parsing-object-fit.html b/LayoutTests/fast/css/parsing-object-fit.html
index 4c590ad..323fc97 100644
--- a/LayoutTests/fast/css/parsing-object-fit.html
+++ b/LayoutTests/fast/css/parsing-object-fit.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>
@@ -43,6 +43,6 @@
shouldBeNull('test("object-fit: 23px;")');
shouldBeNull('test("object-fit: 20%;")');
</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/css/parsing-text-rendering.html b/LayoutTests/fast/css/parsing-text-rendering.html
index 86cc486..851bcad 100644
--- a/LayoutTests/fast/css/parsing-text-rendering.html
+++ b/LayoutTests/fast/css/parsing-text-rendering.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="resources/parsing-text-rendering.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/css/parsing-webkit-font-smoothing.html b/LayoutTests/fast/css/parsing-webkit-font-smoothing.html
index 1f7e7f4..b2d8df4 100644
--- a/LayoutTests/fast/css/parsing-webkit-font-smoothing.html
+++ b/LayoutTests/fast/css/parsing-webkit-font-smoothing.html
@@ -2,10 +2,10 @@
<html>
<head>
<style type="text/css"></style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/parsing-webkit-font-smoothing.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/css/position-absolute-float.html b/LayoutTests/fast/css/position-absolute-float.html
index f5b64e9..16ed221 100644
--- a/LayoutTests/fast/css/position-absolute-float.html
+++ b/LayoutTests/fast/css/position-absolute-float.html
@@ -6,7 +6,7 @@
#absolute { position: absolute; float: right; }
#fixed { position: fixed; float: right; }
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -23,5 +23,5 @@
shouldBe('getComputedStyle(document.getElementById("absolute")).float', '"none"');
shouldBe('getComputedStyle(document.getElementById("fixed")).float', '"none"');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/pseudo-any.html b/LayoutTests/fast/css/pseudo-any.html
index 6819d1d..541654a 100644
--- a/LayoutTests/fast/css/pseudo-any.html
+++ b/LayoutTests/fast/css/pseudo-any.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
:-webkit-any(h1),
:-webkit-any( #div1, b ),
diff --git a/LayoutTests/fast/css/pseudo-default-001.html b/LayoutTests/fast/css/pseudo-default-001.html
index 948213f..ea40ac0 100644
--- a/LayoutTests/fast/css/pseudo-default-001.html
+++ b/LayoutTests/fast/css/pseudo-default-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>
<style>
input:default { background: lime; }
button:default { background: lime; }
@@ -22,6 +22,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-default-002.html b/LayoutTests/fast/css/pseudo-default-002.html
index 54d764b..50b8cd4a 100644
--- a/LayoutTests/fast/css/pseudo-default-002.html
+++ b/LayoutTests/fast/css/pseudo-default-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>
<style>
input { background: red; }
button { background: red; }
@@ -24,6 +24,6 @@
for (i = 1; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(255, 0, 0)'");
</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/css/pseudo-default-003.html b/LayoutTests/fast/css/pseudo-default-003.html
index 3e29065..832d31f 100644
--- a/LayoutTests/fast/css/pseudo-default-003.html
+++ b/LayoutTests/fast/css/pseudo-default-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>
<style>
input { background: red; }
button { background: red; }
@@ -24,6 +24,6 @@
for (i = 1; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(255, 0, 0)'");
</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/css/pseudo-default-004.html b/LayoutTests/fast/css/pseudo-default-004.html
index 9029a26..ef8a8e2 100644
--- a/LayoutTests/fast/css/pseudo-default-004.html
+++ b/LayoutTests/fast/css/pseudo-default-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>
<style>
input { background: lime; }
button { background: lime; }
@@ -23,6 +23,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-in-range-invalid-value.html b/LayoutTests/fast/css/pseudo-in-range-invalid-value.html
index f9e5865..1b903b0 100644
--- a/LayoutTests/fast/css/pseudo-in-range-invalid-value.html
+++ b/LayoutTests/fast/css/pseudo-in-range-invalid-value.html
@@ -1,10 +1,10 @@
<!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>
<script src="script-tests/pseudo-in-range-invalid-value.js"></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/css/pseudo-in-range.html b/LayoutTests/fast/css/pseudo-in-range.html
index 8a6d846..4935af3 100644
--- a/LayoutTests/fast/css/pseudo-in-range.html
+++ b/LayoutTests/fast/css/pseudo-in-range.html
@@ -1,10 +1,10 @@
<!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>
<script src="script-tests/pseudo-in-range.js"></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/css/pseudo-invalid-001.html b/LayoutTests/fast/css/pseudo-invalid-001.html
index 9e9af54..9a77f9f 100644
--- a/LayoutTests/fast/css/pseudo-invalid-001.html
+++ b/LayoutTests/fast/css/pseudo-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>
<style>
:invalid { background: lime; }
:valid { background: red; }
@@ -23,6 +23,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-invalid-002.html b/LayoutTests/fast/css/pseudo-invalid-002.html
index acac113..9f482e6 100644
--- a/LayoutTests/fast/css/pseudo-invalid-002.html
+++ b/LayoutTests/fast/css/pseudo-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>
<style>
:invalid { background: lime; }
:valid { background: red; }
@@ -21,6 +21,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-invalid-novalidate-001.html b/LayoutTests/fast/css/pseudo-invalid-novalidate-001.html
index 72c951f..638457f 100644
--- a/LayoutTests/fast/css/pseudo-invalid-novalidate-001.html
+++ b/LayoutTests/fast/css/pseudo-invalid-novalidate-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>
<style>
:invalid { background: lime; }
:valid { background: red; }
@@ -23,6 +23,6 @@
shouldBe("document.defaultView.getComputedStyle(v[0], null).getPropertyValue('background-color')", "'rgb(0, 0, 255)'");
shouldBe("document.defaultView.getComputedStyle(v[1], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-not.html b/LayoutTests/fast/css/pseudo-not.html
index 25b755f..485447f 100644
--- a/LayoutTests/fast/css/pseudo-not.html
+++ b/LayoutTests/fast/css/pseudo-not.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>
#test1 :not(.evenclass1) { background-color: green; }
@@ -99,6 +99,6 @@
el = document.getElementById("span43");
shouldBe("document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color')", "'rgb(0, 128, 0)'");
</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/css/pseudo-out-of-range.html b/LayoutTests/fast/css/pseudo-out-of-range.html
index 043fd7e..af0bb85 100644
--- a/LayoutTests/fast/css/pseudo-out-of-range.html
+++ b/LayoutTests/fast/css/pseudo-out-of-range.html
@@ -1,10 +1,10 @@
<!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>
<script src="script-tests/pseudo-out-of-range.js"></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/css/pseudo-required-optional-005.html b/LayoutTests/fast/css/pseudo-required-optional-005.html
index 010e831..3ee0808 100644
--- a/LayoutTests/fast/css/pseudo-required-optional-005.html
+++ b/LayoutTests/fast/css/pseudo-required-optional-005.html
@@ -1,7 +1,7 @@
<html>
<head>
<title>required/optional CSS pseudoclasses part 5</title>
-<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
input:optional { background: lime; }
input { background: red; }
@@ -25,6 +25,6 @@
shouldBeTrue('isOptional("reset")');
shouldBeTrue('isOptional("button")');
</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/css/pseudo-required-optional-unapplied.html b/LayoutTests/fast/css/pseudo-required-optional-unapplied.html
index e6ab72d..7cd5da0 100644
--- a/LayoutTests/fast/css/pseudo-required-optional-unapplied.html
+++ b/LayoutTests/fast/css/pseudo-required-optional-unapplied.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>
:required {
background-color: red;
@@ -61,6 +61,6 @@
document.getElementById('victims').innerHTML = '';
</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/css/pseudo-target-indirect-sibling-001.html b/LayoutTests/fast/css/pseudo-target-indirect-sibling-001.html
index 1256b6e..83d7b04 100644
--- a/LayoutTests/fast/css/pseudo-target-indirect-sibling-001.html
+++ b/LayoutTests/fast/css/pseudo-target-indirect-sibling-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>
<script>
if (window.testRunner)
testRunner.waitUntilDone();
@@ -46,6 +46,6 @@
finishJSTest();
}
</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/css/pseudo-target-indirect-sibling-002.html b/LayoutTests/fast/css/pseudo-target-indirect-sibling-002.html
index e9a67eb..432c85f 100644
--- a/LayoutTests/fast/css/pseudo-target-indirect-sibling-002.html
+++ b/LayoutTests/fast/css/pseudo-target-indirect-sibling-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>
<script>
if (window.testRunner)
testRunner.waitUntilDone();
@@ -46,6 +46,6 @@
finishJSTest();
}
</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/css/pseudo-valid-001.html b/LayoutTests/fast/css/pseudo-valid-001.html
index 8e44daa..6f0da7c 100644
--- a/LayoutTests/fast/css/pseudo-valid-001.html
+++ b/LayoutTests/fast/css/pseudo-valid-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>
<style>
:valid { background: lime; }
:invalid { background: red; }
@@ -25,6 +25,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-valid-002.html b/LayoutTests/fast/css/pseudo-valid-002.html
index 3072b0e..5cbbeb5 100644
--- a/LayoutTests/fast/css/pseudo-valid-002.html
+++ b/LayoutTests/fast/css/pseudo-valid-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>
<style>
:valid { background: lime; }
:invalid { background: red; }
@@ -22,6 +22,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-valid-004.html b/LayoutTests/fast/css/pseudo-valid-004.html
index f5be530..273baad 100644
--- a/LayoutTests/fast/css/pseudo-valid-004.html
+++ b/LayoutTests/fast/css/pseudo-valid-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>
<style>
:valid { background: red; }
:invalid { background: red; }
@@ -22,6 +22,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-valid-007.html b/LayoutTests/fast/css/pseudo-valid-007.html
index 17c2a15..e962f25 100644
--- a/LayoutTests/fast/css/pseudo-valid-007.html
+++ b/LayoutTests/fast/css/pseudo-valid-007.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>
:valid { background: lime; }
:invalid { background: red; }
@@ -22,6 +22,6 @@
for (i = 0; i < v.length; i++)
shouldBe("document.defaultView.getComputedStyle(v[i], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
</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/css/pseudo-valid-dynamic.html b/LayoutTests/fast/css/pseudo-valid-dynamic.html
index 01204ed..128873a 100644
--- a/LayoutTests/fast/css/pseudo-valid-dynamic.html
+++ b/LayoutTests/fast/css/pseudo-valid-dynamic.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 id="sty">
input { background: blue; }
</style>
@@ -24,6 +24,6 @@
shouldBe("document.defaultView.getComputedStyle(v[0], null).getPropertyValue('background-color')", "'rgb(0, 255, 0)'");
shouldBe("document.defaultView.getComputedStyle(v[1], null).getPropertyValue('background-color')", "'rgb(0, 0, 255)'");
</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/css/pseudo-valid-unapplied.html b/LayoutTests/fast/css/pseudo-valid-unapplied.html
index 41c95df..ba47868 100644
--- a/LayoutTests/fast/css/pseudo-valid-unapplied.html
+++ b/LayoutTests/fast/css/pseudo-valid-unapplied.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>
:valid { background: red; }
:invalid { background: red; }
@@ -64,6 +64,6 @@
document.forms[0].style.display = '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/css/remove-attribute-style.html b/LayoutTests/fast/css/remove-attribute-style.html
index a083d34..ede6ed4 100644
--- a/LayoutTests/fast/css/remove-attribute-style.html
+++ b/LayoutTests/fast/css/remove-attribute-style.html
@@ -11,7 +11,7 @@
vertical-align: middle;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<table id="table">
@@ -63,6 +63,6 @@
document.getElementById('table').innerHTML = '';
</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/css/rgba-custom-text.html b/LayoutTests/fast/css/rgba-custom-text.html
index 97fd23f..c62b284 100644
--- a/LayoutTests/fast/css/rgba-custom-text.html
+++ b/LayoutTests/fast/css/rgba-custom-text.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>
<style>
#test {
color: rgba(0, 0, 0, 0.2);
@@ -10,4 +10,4 @@
description("Tests the CSS custom text implementation for rgba(). Note that WebKit internally stores alpha as an 8 bit value, and that 255 * 0.2 = 51 exactly. So 0.2 is able to be stored with no rounding.");
shouldBeEqualToString('getComputedStyle(document.getElementById("test"), null).color', "rgba(0, 0, 0, 0.2)");
</script>
-<script src="../../fast/js/resources/js-test-post.js"></script>
\ No newline at end of file
+<script src="../../resources/js-test-post.js"></script>
\ No newline at end of file
diff --git a/LayoutTests/fast/css/rule-selector-overflow.html b/LayoutTests/fast/css/rule-selector-overflow.html
index 26c15d3..a29dfaa 100644
--- a/LayoutTests/fast/css/rule-selector-overflow.html
+++ b/LayoutTests/fast/css/rule-selector-overflow.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>
<style id="stylebro" type="text/css">
.peb {
color: red;
@@ -90,6 +90,6 @@
shouldBe("styleElement.innerText = fatStyleSheetWithSelectorLength(16385); sheet().rules.length", "9");
</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/css/script-tests/TEMPLATE.html b/LayoutTests/fast/css/script-tests/TEMPLATE.html
index 056ea5d..d0cb77d 100644
--- a/LayoutTests/fast/css/script-tests/TEMPLATE.html
+++ b/LayoutTests/fast/css/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/css/selector-text-escape.html b/LayoutTests/fast/css/selector-text-escape.html
index cdcf34d..5d00a26 100644
--- a/LayoutTests/fast/css/selector-text-escape.html
+++ b/LayoutTests/fast/css/selector-text-escape.html
@@ -59,7 +59,7 @@
color:red;
}
</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
@@ -109,6 +109,6 @@
shouldBe("rules[" + i + "].cssText", "expectedTexts[" + i + "] + ' { color: green; }'");
}
</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/css/shorthand-mismatched-list-crash.html b/LayoutTests/fast/css/shorthand-mismatched-list-crash.html
index cdceceb..7ceefc7 100644
--- a/LayoutTests/fast/css/shorthand-mismatched-list-crash.html
+++ b/LayoutTests/fast/css/shorthand-mismatched-list-crash.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Test for WebKit bug 31559: Crash with mismatched lists and shorthands.</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description">Test for WebKit bug <a href="https://bugs.webkit.org/show_bug.cgi?id=31559">31559</a>: Crash with mismatched lists and shorthands.</p>
@@ -26,6 +26,6 @@
// the next line will crash
shouldBeEqualToString("para.style.webkitTransition", "width 1s, left 1s, top");
</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/css/shorthand-priority.html b/LayoutTests/fast/css/shorthand-priority.html
index b639835..68732c2 100644
--- a/LayoutTests/fast/css/shorthand-priority.html
+++ b/LayoutTests/fast/css/shorthand-priority.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>
<script>
@@ -33,6 +33,6 @@
document.body.removeChild(testContainer);
</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/css/shorthands-four-values.html b/LayoutTests/fast/css/shorthands-four-values.html
index d8b9f66..81d801c 100644
--- a/LayoutTests/fast/css/shorthands-four-values.html
+++ b/LayoutTests/fast/css/shorthands-four-values.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Test for WebKit bug 7987: Inspector displays incorrect summary for padding information</title>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
</head>
<body>
<p id="description">Test for WebKit bug <a href="https://bugs.webkit.org/show_bug.cgi?id=7987">7987</a>: Inspector displays incorrect summary for padding information</p>
@@ -88,6 +88,6 @@
var tests_container = document.getElementById("tests_container");
tests_container.parentNode.removeChild(tests_container);
</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/css/sibling-selectors.html b/LayoutTests/fast/css/sibling-selectors.html
index 9acd0d3..1b7dcfb 100644
--- a/LayoutTests/fast/css/sibling-selectors.html
+++ b/LayoutTests/fast/css/sibling-selectors.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#test0 * { background-color: red; }
diff --git a/LayoutTests/fast/css/square-button-appearance.html b/LayoutTests/fast/css/square-button-appearance.html
index 1268bda..531e81e 100644
--- a/LayoutTests/fast/css/square-button-appearance.html
+++ b/LayoutTests/fast/css/square-button-appearance.html
@@ -4,7 +4,7 @@
<script>
enablePixelTesting = true;
</script>
-<script src="../fast/js/resources/js-test-pre.js"></script>
+<script src="../resources/js-test-pre.js"></script>
<style>
.squarebutton {
-webkit-appearance: square-button;
@@ -16,6 +16,6 @@
<body>
<!-- Test if square-button appearance is rendered properly. -->
<div class="squarebutton"></div>
-<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/css/sticky/parsing-position-sticky.html b/LayoutTests/fast/css/sticky/parsing-position-sticky.html
index 494ac70..5fc5dfb 100644
--- a/LayoutTests/fast/css/sticky/parsing-position-sticky.html
+++ b/LayoutTests/fast/css/sticky/parsing-position-sticky.html
@@ -2,10 +2,10 @@
<html>
<head>
<style type="text/css"></style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<script src="resources/parsing-position-sticky.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/css/string-quote-binary.html b/LayoutTests/fast/css/string-quote-binary.html
index 793a3cc..11167d6 100644
--- a/LayoutTests/fast/css/string-quote-binary.html
+++ b/LayoutTests/fast/css/string-quote-binary.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/string-quote-binary.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/css/style-enumerate-properties.html b/LayoutTests/fast/css/style-enumerate-properties.html
index d709b1a..12cf09f 100644
--- a/LayoutTests/fast/css/style-enumerate-properties.html
+++ b/LayoutTests/fast/css/style-enumerate-properties.html
@@ -1,5 +1,5 @@
<head>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -51,5 +51,5 @@
}
}
</script>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/style-scoped/basic-attribute.html b/LayoutTests/fast/css/style-scoped/basic-attribute.html
index a524454..dbc69fe 100644
--- a/LayoutTests/fast/css/style-scoped/basic-attribute.html
+++ b/LayoutTests/fast/css/style-scoped/basic-attribute.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>
</head>
<body>
<p>Basic test for the <style scoped> attribute.</p>
@@ -119,6 +119,6 @@
debug("--- DONE ---");
var 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/css/style-scoped/registering-shadowroot.html b/LayoutTests/fast/css/style-scoped/registering-shadowroot.html
index 329c822..e49251a 100644
--- a/LayoutTests/fast/css/style-scoped/registering-shadowroot.html
+++ b/LayoutTests/fast/css/style-scoped/registering-shadowroot.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>
</head>
<body>
<p>Test having a <style scoped> element as a direct child of a ShadowRoot.</p>
@@ -69,6 +69,6 @@
}
var 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/css/style-scoped/registering.html b/LayoutTests/fast/css/style-scoped/registering.html
index dbc6c2c..d36dae0 100644
--- a/LayoutTests/fast/css/style-scoped/registering.html
+++ b/LayoutTests/fast/css/style-scoped/registering.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>
</head>
<body>
<p>Test [un]registering a <style scoped> element from its parent</p>
@@ -139,6 +139,6 @@
}
var 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/css/style-scoped/style-scoped-apply-author-styles.html b/LayoutTests/fast/css/style-scoped/style-scoped-apply-author-styles.html
index 6a90f7a..0cc2597 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-apply-author-styles.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-apply-author-styles.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="../../dom/shadow/resources/polyfill.js"></script>
<script>
if (window.testRunner)
@@ -218,6 +218,6 @@
</script>
</head>
<body onload="runTests()">
- <script src="../../js/resources/js-test-post.js"></script>
+ <script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/style-scoped/style-scoped-change-scoped-in-shadow.html b/LayoutTests/fast/css/style-scoped/style-scoped-change-scoped-in-shadow.html
index 95fe5ef..368fa82 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-change-scoped-in-shadow.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-change-scoped-in-shadow.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="../../dom/shadow/resources/polyfill.js"></script>
<script>
if (window.testRunner)
@@ -311,6 +311,6 @@
</script>
</head>
<body onload="runTests()">
- <script src="../../js/resources/js-test-post.js"></script>
+ <script src="../../../resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/css/style-scoped/style-scoped-in-shadow.html b/LayoutTests/fast/css/style-scoped/style-scoped-in-shadow.html
index d7c12a2..689afe9 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-in-shadow.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-in-shadow.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>
description("Tests that <style scoped> is correctly applied as child of a ShadowRoot, and that it doesn't leak out. Can only run within DRT.");
@@ -37,6 +37,6 @@
DDD
</div>
<script>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/css/style-scoped/style-scoped-nested.html b/LayoutTests/fast/css/style-scoped/style-scoped-nested.html
index 1a56314..ef42285 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-nested.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-nested.html
@@ -6,7 +6,7 @@
color: red;
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="../../dom/shadow/resources/polyfill.js"></script>
<script>
if (window.testRunner)
@@ -60,5 +60,5 @@
shouldBe("window.getComputedStyle(targetInShadow).color", '"rgb(0, 255, 0)"');
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/style-scoped/style-scoped-with-dom-operation.html b/LayoutTests/fast/css/style-scoped/style-scoped-with-dom-operation.html
index b99aa50..cc72ee0 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-with-dom-operation.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-with-dom-operation.html
@@ -6,7 +6,7 @@
background-color: green;
}
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
</head>
<body>
<div>
@@ -49,5 +49,5 @@
existingStyle.parentNode.removeChild(existingStyle);
shouldBe("window.getComputedStyle(target).backgroundColor", '"rgb(0, 128, 0)"');
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/style-scoped/style-scoped-with-important-rule.html b/LayoutTests/fast/css/style-scoped/style-scoped-with-important-rule.html
index 0a7066c..d0e4170 100644
--- a/LayoutTests/fast/css/style-scoped/style-scoped-with-important-rule.html
+++ b/LayoutTests/fast/css/style-scoped/style-scoped-with-important-rule.html
@@ -6,7 +6,7 @@
div { border-color: orange; }
div#id2 { border-color: yellow; }
</style>
-<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../../resources/js-test-pre.js"></script>
<script src="../../dom/shadow/resources/polyfill.js"></script>
</head>
<body>
@@ -114,5 +114,5 @@
shouldBe('getComputedStyle(target8).borderColor', '"rgb(0, 0, 255)"');
</script>
-<script src="../../js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/style-sharing-inline-stylesheet.html b/LayoutTests/fast/css/style-sharing-inline-stylesheet.html
index b5bcad5..8baf44e 100644
--- a/LayoutTests/fast/css/style-sharing-inline-stylesheet.html
+++ b/LayoutTests/fast/css/style-sharing-inline-stylesheet.html
@@ -1,6 +1,6 @@
<html lang=en>
<head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
.testclass { background-color: red; }
</style>
@@ -16,5 +16,5 @@
description("Test that inline stylesheet does not confuse style sharing.");
shouldBe('window.getComputedStyle(document.getElementsByClassName("testclass")[1]).backgroundColor','"rgb(0, 128, 0)"');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</body>
diff --git a/LayoutTests/fast/css/table-border-spacing.html b/LayoutTests/fast/css/table-border-spacing.html
index 2210f06..68ff6d2 100644
--- a/LayoutTests/fast/css/table-border-spacing.html
+++ b/LayoutTests/fast/css/table-border-spacing.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>
#computed-infer-vertical-border-spacing { border-spacing: 11px; }
#computed-infer-vertical-border-spacing-from-negative-horizontal-border-spacing { border-spacing: -11px; }
diff --git a/LayoutTests/fast/css/test-setting-canvas-color.html b/LayoutTests/fast/css/test-setting-canvas-color.html
index 1988064..9288ee2 100644
--- a/LayoutTests/fast/css/test-setting-canvas-color.html
+++ b/LayoutTests/fast/css/test-setting-canvas-color.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>
<canvas id="canvas">
@@ -243,5 +243,5 @@
shouldNotSuccessfullyParse("#100px");
shouldNotSuccessfullyParse('-webkit-var("test")');
</script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
</html>
diff --git a/LayoutTests/fast/css/text-overflow-ellipsis-and-floating-input-hittest.html b/LayoutTests/fast/css/text-overflow-ellipsis-and-floating-input-hittest.html
index 74d24c3..88cb3e2 100644
--- a/LayoutTests/fast/css/text-overflow-ellipsis-and-floating-input-hittest.html
+++ b/LayoutTests/fast/css/text-overflow-ellipsis-and-floating-input-hittest.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>
function offset(elem) {
diff --git a/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html b/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html
index ac965d4..cbfc873 100644
--- a/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html
+++ b/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html
@@ -1,18 +1,18 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
- .ellipsis {
- width: 200px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-</style>
-</head>
-<body>
-<div class="ellipsis">
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-</div>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ .ellipsis {
+ width: 200px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+</style>
+</head>
+<body>
+<div class="ellipsis">
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/css/transform-origin-parsing.html b/LayoutTests/fast/css/transform-origin-parsing.html
index d92fa0a..cd7c6d5 100644
--- a/LayoutTests/fast/css/transform-origin-parsing.html
+++ b/LayoutTests/fast/css/transform-origin-parsing.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/transform-origin-parsing.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/css/unicode-bidi-computed-value.html b/LayoutTests/fast/css/unicode-bidi-computed-value.html
index 68a0d41..0c0f4cc 100644
--- a/LayoutTests/fast/css/unicode-bidi-computed-value.html
+++ b/LayoutTests/fast/css/unicode-bidi-computed-value.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>
<p id="description">This tests the computed value of unicode-bidi property.</p>
<div id="container"></div>
<div id="console"></div>
diff --git a/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html b/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html
index ad272f9..d2d8bed 100644
--- a/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html
+++ b/LayoutTests/fast/css/url-with-multi-byte-unicode-escape.html
@@ -2,7 +2,7 @@
<html>
<head>
<style>#test { background-image: url("data:\100")} #test { background-color: green !important }</style>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<script>
if (window.testRunner)
testRunner.dumpAsText();
@@ -17,6 +17,6 @@
shouldBeEqualToString('document.styleSheets[0].cssRules[1].style.getPropertyValue("background-color")', 'green');
shouldBeEqualToString('window.getComputedStyle(document.getElementById("test")).getPropertyValue("background-color")', 'rgb(0, 128, 0)');
</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/css/vertical-align-length-copy-bug.html b/LayoutTests/fast/css/vertical-align-length-copy-bug.html
index 154f763..9b66b94 100644
--- a/LayoutTests/fast/css/vertical-align-length-copy-bug.html
+++ b/LayoutTests/fast/css/vertical-align-length-copy-bug.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
<style>
#testDiv a, #testDiv span{display:inline-block;border:1px solid black;}
#testDiv a{width:30px;height:30px;text-align:center;line-height:30px;}
diff --git a/LayoutTests/fast/css/xml-lang-ignored-in-html.html b/LayoutTests/fast/css/xml-lang-ignored-in-html.html
index 4b37e28..aaa2d59 100644
--- a/LayoutTests/fast/css/xml-lang-ignored-in-html.html
+++ b/LayoutTests/fast/css/xml-lang-ignored-in-html.html
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<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>
</head>
<body>
<p>This tests that the attribute in no namespace with no prefix and with the literal localname "xml:lang" is ignored in HTML. See
@@ -22,7 +22,7 @@
var 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/css/xml-stylesheet-alternate-no-title.xhtml b/LayoutTests/fast/css/xml-stylesheet-alternate-no-title.xhtml
index f5f535e..8dc91a9 100644
--- a/LayoutTests/fast/css/xml-stylesheet-alternate-no-title.xhtml
+++ b/LayoutTests/fast/css/xml-stylesheet-alternate-no-title.xhtml
@@ -4,7 +4,7 @@
<root xmlns="http://www.w3.org/1999/xhtml" >
<head>
<meta charset="utf-8"/>
- <script src="../js/resources/js-test-pre.js"></script>
+ <script src="../../resources/js-test-pre.js"></script>
<script>
description("xml alternate stylesheet with no title test");
@@ -27,6 +27,6 @@
<body>
<div id="sampleText">This text should be green</div>
- <script src="../js/resources/js-test-post.js"></script>
+ <script src="../../resources/js-test-post.js"></script>
</body>
</root>
diff --git a/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last-inherited.html b/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last-inherited.html
index 9139881..612eabb 100644
--- a/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last-inherited.html
+++ b/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last-inherited.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>
<div id="ancestor"><div id="child">hello world</div></div>
<script src="script-tests/getComputedStyle-text-align-last-inherited.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/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last.html b/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last.html
index 0f6f87d..80c3623 100644
--- a/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last.html
+++ b/LayoutTests/fast/css3-text/css3-text-align-last/getComputedStyle/getComputedStyle-text-align-last.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>
<div id="test">hello world</div>
<script src="script-tests/getComputedStyle-text-align-last.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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-color.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-color.html
index 873d197..a3e5fbb 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-color.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-color.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>
<script src="script-tests/getComputedStyle-text-decoration-color.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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-line.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-line.html
index ee1905c..ef84df1 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-line.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-line.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>
<script src="script-tests/getComputedStyle-text-decoration-line.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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-ordering.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-ordering.html
index 50327cb..0283b31 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-ordering.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand-ordering.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>
@@ -64,6 +64,6 @@
document.body.removeChild(testContainer);
</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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html
index 7d33e5b..b9ff5ab 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-shorthand.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>
@@ -67,6 +67,6 @@
document.body.removeChild(testContainer);
</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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-style.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-style.html
index 0d2b4e9..ed87db2 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-style.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-decoration-style.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/getComputedStyle-text-decoration-style.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/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html
index e45d772..3090096 100644
--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.html
+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position.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>
<script src="script-tests/getComputedStyle-text-underline-position.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/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html b/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html
index f41b964..2745622 100644
--- a/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html
+++ b/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.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>
<div id="ancestor"><div id="child"></div></div>
<script src="script-tests/getComputedStyle-text-indent-inherited.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/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html b/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html
index c4280a2..1e391df 100644
--- a/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html
+++ b/LayoutTests/fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.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>
<div id="test" style="font: 10px Ahem;"></div>
<script src="script-tests/getComputedStyle-text-indent.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/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify-inherited.html b/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify-inherited.html
index 841a93a..688d658 100644
--- a/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify-inherited.html
+++ b/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify-inherited.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>
<div id="ancestor"><div id="child">hello world</div></div>
<script src="script-tests/getComputedStyle-text-justify-inherited.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/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify.html b/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify.html
index 0f06334..5ec8345 100644
--- a/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify.html
+++ b/LayoutTests/fast/css3-text/css3-text-justify/getComputedStyle/getComputedStyle-text-justify.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>
<div id="test">hello world</div>
<script src="script-tests/getComputedStyle-text-justify.js"></script>
- <script src="../../../js/resources/js-test-post.js"></script>
+ <script src="../../../../resources/js-test-post.js"></script>
</body>
</html>
