From c4d086ffd3733c108091ab1cd82789eadaecd5ad Mon Sep 17 00:00:00 2001
From: "jamesr@chromium.org"
 <jamesr@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>
Date: Thu, 20 Feb 2014 22:26:24 +0000
Subject: [PATCH] Convert most of fast/repaint to use text based harness

The pixel-based repaint test harness is incompatible with compositing and
has to go.  The text-based harness can test everything that the pixel based version could.

This converts almost everything over by switching tests using f/r/resources/repaint.js
over to f/r/resources/text-based-repaint.js, fixes up a few tests to work, and
converts a few tests that are actually just pixel tests (not repaint tests) to
do only what they need to do to cover what they intend to cover.

BUG=344105

Review URL: https://codereview.chromium.org/168243002

git-svn-id: svn://svn.chromium.org/blink/trunk@167542 bbb929c8-8fbe-4397-9dbb-9b2b20218538
---
 .../WebKit/LayoutTests/TestExpectations       | 196 +++++++++++++++++-
 .../LayoutTests/fast/repaint/4776765.html     |   2 +-
 ...lute-position-change-containing-block.html |   2 +-
 .../repaint/absolute-position-changed.html    |   2 +-
 .../fast/repaint/absolute-position-moved.html |   2 +-
 .../fast/repaint/add-table-overpaint.html     |   2 +-
 .../fast/repaint/background-generated.html    |   2 +-
 .../fast/repaint/background-misaligned.html   |   2 +-
 .../fast/repaint/background-scaling.html      |   2 +-
 .../fast/repaint/backgroundSizeRepaint.html   |   2 +-
 ...yout-inline-children-float-positioned.html |   2 +-
 ...block-layout-inline-children-replaced.html |   2 +-
 .../repaint/block-no-inflow-children.html     |   2 +-
 ...ock-selection-gap-in-composited-layer.html |   5 +-
 .../block-selection-gap-in-table-cell.html    |   5 +-
 .../block-selection-gap-stale-cache-2.html    |   5 +-
 .../block-selection-gap-stale-cache.html      |   5 +-
 .../fast/repaint/body-background-image.html   |   2 +-
 .../fast/repaint/border-fit-lines.html        |   2 +-
 .../fast/repaint/border-radius-repaint.html   |   2 +-
 .../fast/repaint/border-repaint-glitch.html   |   2 +-
 .../fast/repaint/box-shadow-dynamic.html      |   2 +-
 .../repaint/box-shadow-inset-repaint.html     |   2 +-
 .../fast/repaint/bugzilla-3509.html           |   2 +-
 .../fast/repaint/bugzilla-5699.html           |   2 +-
 .../fast/repaint/bugzilla-6278.html           |   2 +-
 .../fast/repaint/bugzilla-6388.html           |   2 +-
 .../fast/repaint/bugzilla-6473.html           |   2 +-
 .../fast/repaint/bugzilla-7235.html           |   2 +-
 .../repaint/button-spurious-layout-hint.html  |   2 +-
 .../fast/repaint/canvas-putImageData.html     |   2 +-
 .../fast/repaint/caret-outside-block.html     |   2 +-
 .../repaint/caret-with-transformation.html    |   2 +-
 .../fast/repaint/change-transform.html        |   2 +-
 ...-of-sub-pixel-offset-composited-layer.html |   2 +-
 .../fast/repaint/clip-with-layout-delta.html  |   2 +-
 .../fast/repaint/clipped-relative.html        |   2 +-
 .../containing-block-position-change.html     |   2 +-
 .../fast/repaint/content-into-overflow.html   |   2 +-
 .../repaint/continuation-after-outline.html   |   5 +-
 .../fast/repaint/control-clip.html            |   2 +-
 .../fast/repaint/create-layer-repaint.html    |   2 +-
 .../repaint/delete-into-nested-block.html     |   2 +-
 ...namic-table-vertical-alignment-change.html |   2 +-
 .../fast/repaint/erase-overflow.html          |   2 +-
 .../fast/repaint/fixed-after-scroll.html      |   2 +-
 .../fixed-and-absolute-position-scrolled.html |   2 +-
 .../fixed-child-move-after-scroll.html        |   9 +-
 ...ixed-child-of-fixed-move-after-scroll.html |   9 +-
 ...hild-of-transformed-move-after-scroll.html |   9 +-
 .../fast/repaint/fixed-move-after-scroll.html |   9 +-
 ...d-position-transparency-with-overflow.html |   2 +-
 .../LayoutTests/fast/repaint/fixed-scale.html |   2 +-
 .../fast/repaint/fixed-scroll-simple.html     |   2 +-
 .../fast/repaint/fixed-table-cell.html        |   2 +-
 .../repaint/fixed-table-overflow-zindex.html  |   2 +-
 .../fast/repaint/fixed-table-overflow.html    |   2 +-
 ...relative-position-with-absolute-child.html |   2 +-
 .../fast/repaint/fixed-tranformed.html        |   2 +-
 .../LayoutTests/fast/repaint/fixed.html       |   2 +-
 .../float-in-new-block-with-layout-delta.html |   2 +-
 .../repaint/float-move-during-layout.html     |   2 +-
 .../fast/repaint/float-new-in-block.html      |   2 +-
 .../fast/repaint/float-overflow-right.html    |   2 +-
 .../fast/repaint/float-overflow.html          |   2 +-
 .../repaint/gradients-em-stops-repaint.html   |   2 +-
 .../fast/repaint/hover-pseudo-borders.html    |   2 +-
 .../fast/repaint/inline-block-resize.html     |   2 +-
 .../fast/repaint/inline-color-change.html     |   2 +-
 .../inline-horizontal-bt-overflow.html        |   2 +-
 .../fast/repaint/inline-outline-repaint.html  |   2 +-
 .../fast/repaint/inline-overflow.html         |   2 +-
 .../repaint/inline-relative-positioned.html   |   2 +-
 .../repaint/inline-vertical-lr-overflow.html  |   2 +-
 .../repaint/inline-vertical-rl-overflow.html  |   2 +-
 .../intermediate-layout-position-clip.html    |   2 +-
 .../repaint/intermediate-layout-position.html |   2 +-
 .../fast/repaint/invisible-objects.html       |   2 +-
 .../repaint/japanese-rl-selection-clear.html  |   2 +-
 .../japanese-rl-selection-repaint.html        |   2 +-
 .../repaint/layer-hide-when-needs-layout.html |   2 +-
 .../fast/repaint/layer-visibility.html        |   9 +-
 .../repaint/layout-state-only-positioned.html |   2 +-
 .../fast/repaint/layout-state-relative.html   |   2 +-
 .../repaint/layout-state-scrolloffset.html    |  15 +-
 .../repaint/layout-state-scrolloffset2.html   |  16 +-
 .../repaint/layout-state-scrolloffset3.html   |  15 +-
 .../fast/repaint/line-flow-with-floats-1.html |   1 +
 .../repaint/line-flow-with-floats-10.html     |   1 +
 .../fast/repaint/line-flow-with-floats-2.html |   1 +
 .../fast/repaint/line-flow-with-floats-3.html |   1 +
 .../fast/repaint/line-flow-with-floats-4.html |   1 +
 .../fast/repaint/line-flow-with-floats-5.html |   1 +
 .../fast/repaint/line-flow-with-floats-6.html |   1 +
 .../fast/repaint/line-flow-with-floats-7.html |   1 +
 .../fast/repaint/line-flow-with-floats-8.html |   1 +
 .../fast/repaint/line-flow-with-floats-9.html |   1 +
 .../line-in-scrolled-clipped-block.html       |   2 +-
 .../fast/repaint/line-overflow.html           |   2 +-
 .../fast/repaint/lines-with-layout-delta.html |   2 +-
 .../fast/repaint/list-marker-2.html           |   2 +-
 .../repaint/make-children-non-inline.html     |   2 +-
 ...-blend-mode-separate-stacking-context.html |   2 +-
 .../fast/repaint/multicol-repaint.html        |   2 +-
 .../repaint/nested-iframe-scroll-inner.html   |   5 +-
 .../repaint/nested-iframe-scroll-outer.html   |   5 +-
 ...paint-in-non-content-editable-element.html |   2 +-
 .../opacity-change-on-overflow-float.html     |   2 +-
 .../fast/repaint/outline-child-repaint.html   |   2 +-
 .../fast/repaint/outline-inset.html           |   2 +-
 .../fast/repaint/outline-repaint-glitch.html  |   2 +-
 .../fast/repaint/outline-shrinking.html       |   2 +-
 ...erflow-auto-in-overflow-auto-scrolled.html |   2 +-
 .../repaint/overflow-clip-subtree-layout.html |   2 +-
 .../fast/repaint/overflow-delete-line.html    |   2 +-
 .../overflow-flipped-writing-mode-block.html  |   2 +-
 ...ow-hidden-in-overflow-hidden-scrolled.html |  17 +-
 .../fast/repaint/overflow-hide.html           |   2 +-
 .../fast/repaint/overflow-into-content.html   |   2 +-
 .../repaint/overflow-outline-repaint.html     |  11 +-
 .../repaint/overflow-scroll-body-appear.html  |   2 +-
 .../fast/repaint/overflow-scroll-delete.html  |   2 +-
 ...ow-scroll-in-overflow-scroll-scrolled.html |   2 +-
 .../fast/repaint/overflow-show.html           |   2 +-
 .../overhanging-float-detach-repaint.html     |   2 +-
 ...int-caret-in-div-with-negative-indent.html |   2 +-
 .../repaint/positioned-document-element.html  |   2 +-
 .../fast/repaint/reflection-redraw.html       |   2 +-
 .../fast/repaint/reflection-repaint-test.html |   2 +-
 .../rel-positioned-inline-with-overflow.html  |   2 +-
 ...truction-by-invalidateSelection-crash.html |   4 -
 .../repaint-across-writing-mode-boundary.html |   2 +-
 .../repaint-during-scroll-with-zoom.html      |  12 +-
 .../fast/repaint/repaint-during-scroll.html   |  10 +-
 .../repaint/repaint-resized-overflow.html     |   2 +-
 ...xed-move-after-keyboard-scroll-iframe.html |  13 +-
 .../iframe-scroll-repaint-iframe.html         |  17 +-
 .../resources/line-flow-with-floats.js        |  15 +-
 .../fast/repaint/scale-page-shrink.html       |   7 +-
 ...scroll-absolute-layer-with-reflection.html |   2 +-
 ...l-fixed-layer-with-no-visible-content.html |   2 +-
 .../scroll-fixed-layer-with-reflection.html   |   2 +-
 ...d-layer-with-transformed-parent-layer.html |   2 +-
 .../repaint/scroll-fixed-reflected-layer.html |   2 +-
 .../fast/repaint/scroll-in-clipped-layer.html |   2 +-
 .../fast/repaint/scroll-in-fixed-layer.html   |   2 +-
 .../repaint/scroll-in-transformed-layer.html  |   2 +-
 .../repaint/scroll-inside-table-cell.html     |   2 +-
 ...roll-relative-table-inside-table-cell.html |   2 +-
 .../scroll-with-transformed-parent-layer.html |   2 +-
 .../fast/repaint/search-field-cancel.html     |   2 +-
 .../select-option-background-color.html       |   2 +-
 .../fast/repaint/selected-replaced.html       |   2 +-
 .../fast/repaint/selection-after-delete.html  |   2 +-
 .../fast/repaint/selection-after-remove.html  |   2 +-
 .../fast/repaint/selection-clear.html         |   2 +-
 .../selection-gap-overflow-scroll-2.html      |   2 +-
 .../selection-gap-overflow-scroll.html        |   2 +-
 .../fast/repaint/selection-rl.html            |   2 +-
 .../fast/repaint/stacked-diacritics.html      |   2 +-
 .../fast/repaint/static-to-positioned.html    |   2 +-
 .../subtree-layoutstate-transform.html        |   2 +-
 .../fast/repaint/subtree-root-clip-2.html     |   2 +-
 .../fast/repaint/subtree-root-clip-3.html     |   2 +-
 .../fast/repaint/subtree-root-clip.html       |   2 +-
 .../fast/repaint/subtree-root-skipped.html    |   2 +-
 .../repaint/table-cell-collapsed-border.html  |   2 +-
 .../fast/repaint/table-cell-move.html         |   2 +-
 .../fast/repaint/table-cell-overflow.html     |   2 +-
 .../fast/repaint/table-col-background.html    |   2 +-
 .../fast/repaint/table-collapsed-border.html  |   2 +-
 .../fast/repaint/table-extra-bottom-grow.html |   2 +-
 .../fast/repaint/table-hover-on-link.html     |  17 +-
 .../fast/repaint/table-outer-border.html      |   2 +-
 ...erflow-auto-in-overflow-auto-scrolled.html |   2 +-
 ...ow-hidden-in-overflow-hidden-scrolled.html |   8 +-
 ...ow-scroll-in-overflow-scroll-scrolled.html |   2 +-
 .../LayoutTests/fast/repaint/table-row.html   |   2 +-
 .../fast/repaint/table-section-overflow.html  |   2 +-
 .../fast/repaint/table-section-repaint.html   |   2 +-
 .../table-two-pass-layout-overpaint.html      |   2 +-
 .../fast/repaint/text-append-dirty-lines.html |   2 +-
 .../text-in-relative-positioned-inline.html   |   2 +-
 .../text-selection-rect-in-overflow-2.html    |   2 +-
 .../text-selection-rect-in-overflow.html      |   2 +-
 .../fast/repaint/textarea-set-disabled.html   |   2 +-
 ...railing-floats-root-line-box-overflow.html |   2 +-
 .../repaint/transform-absolute-child.html     |   2 +-
 ...form-absolute-in-positioned-container.html |   2 +-
 .../transform-disable-layoutstate.html        |   2 +-
 .../repaint/transform-layout-repaint.html     |   2 +-
 .../repaint/transform-relative-position.html  |   2 +-
 .../transform-repaint-descendants.html        |   2 +-
 .../repaint/transform-replaced-shadows.html   |   2 +-
 .../repaint/transform-rotate-and-remove.html  |   2 +-
 .../fast/repaint/transform-translate.html     |   2 +-
 .../fast/repaint/video-mute-repaint.html      |   2 +-
 .../repaint/view-background-from-body-1.html  |   7 +-
 .../repaint/view-background-from-body-2.html  |   2 +-
 199 files changed, 450 insertions(+), 342 deletions(-)

diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 8ce44d3485c211..d380fdb5473b4d 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -112,8 +112,6 @@ crbug.com/310679 [ Mac ] fast/events/scale-and-scroll-iframe-body.html [ ImageOn
 crbug.com/310679 [ Mac ] fast/events/scale-and-scroll-iframe-window.html [ ImageOnlyFailure Pass ]
 crbug.com/310679 [ Mac ] fast/frames/frame-set-rotation-hit.html [ ImageOnlyFailure Pass ]
 crbug.com/310679 [ Mac ] fast/frames/frame-set-scaling-hit.html [ ImageOnlyFailure Pass ]
-crbug.com/310679 [ Mac ] fast/repaint/background-scaling.html [ ImageOnlyFailure Pass ]
-crbug.com/310679 [ Mac ] fast/repaint/scale-page-shrink.html [ ImageOnlyFailure Pass ]
 crbug.com/318434 virtual/gpu/compositedscrolling/scrollbars/custom-scrollbar-with-incomplete-style.html [ ImageOnlyFailure ]
 
 # Tests failing since applyPageScaleFactorInCompositor enabled
@@ -718,6 +716,200 @@ crbug.com/320334 media/media-can-play-ogg.html [ Failure ]
 crbug.com/326139 media/video-frame-accurate-seek.html [ Pass ImageOnlyFailure ]
 crbug.com/326139 [ SnowLeopard ] media/video-frame-size-change.html [ Pass ImageOnlyFailure ]
 
+crbug.com/344105 fast/repaint/4776765.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/absolute-position-change-containing-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/absolute-position-changed.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/absolute-position-moved.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/add-table-overpaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/background-generated.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/background-misaligned.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/background-scaling.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/backgroundSizeRepaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-layout-inline-children-float-positioned.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-layout-inline-children-replaced.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-no-inflow-children.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/body-background-image.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/border-fit-lines.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/border-radius-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/border-repaint-glitch.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/box-shadow-dynamic.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/box-shadow-inset-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-3509.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-5699.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-6278.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-6388.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-6473.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/bugzilla-7235.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/button-spurious-layout-hint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/canvas-putImageData.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/caret-outside-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/caret-with-transformation.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/change-transform.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/clip-with-layout-delta.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/clipped-relative.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/containing-block-position-change.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/content-into-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/control-clip.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/create-layer-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/delete-into-nested-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/dynamic-table-vertical-alignment-change.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/erase-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-after-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-and-absolute-position-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-child-move-after-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-child-of-fixed-move-after-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-child-of-transformed-move-after-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-move-after-keyboard-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-move-after-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-position-transparency-with-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-scale.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-table-cell.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-table-overflow-zindex.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-table-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-to-relative-position-with-absolute-child.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed-tranformed.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/fixed.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/float-in-new-block-with-layout-delta.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/float-move-during-layout.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/float-new-in-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/float-overflow-right.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/float-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/gradients-em-stops-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/hover-pseudo-borders.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/iframe-scroll-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/inline-block-resize.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/inline-color-change.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/inline-horizontal-bt-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/inline-outline-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/inline-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/inline-relative-positioned.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/inline-vertical-lr-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/inline-vertical-rl-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/intermediate-layout-position-clip.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/intermediate-layout-position.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/invisible-objects.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/japanese-rl-selection-clear.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/japanese-rl-selection-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layer-hide-when-needs-layout.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layer-visibility.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layout-state-only-positioned.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layout-state-relative.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layout-state-scrolloffset.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layout-state-scrolloffset2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/layout-state-scrolloffset3.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-1.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-3.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-4.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-5.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-6.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-7.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-8.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-9.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-flow-with-floats-10.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-in-scrolled-clipped-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/line-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/lines-with-layout-delta.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/list-marker-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/make-children-non-inline.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/mix-blend-mode-separate-stacking-context.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/multicol-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/no-caret-repaint-in-non-content-editable-element.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/opacity-change-on-overflow-float.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/outline-child-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/outline-inset.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/outline-repaint-glitch.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/outline-shrinking.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-auto-in-overflow-auto-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-clip-subtree-layout.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-delete-line.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-flipped-writing-mode-block.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-hidden-in-overflow-hidden-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-hide.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-into-content.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-scroll-body-appear.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-scroll-delete.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-show.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overhanging-float-detach-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/paint-caret-in-div-with-negative-indent.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/positioned-document-element.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/reflection-redraw.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/reflection-repaint-test.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/rel-positioned-inline-with-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/repaint-across-writing-mode-boundary.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/repaint-during-scroll-with-zoom.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/repaint-during-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/repaint-resized-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scale-page-shrink.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-absolute-layer-with-reflection.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-fixed-layer-with-no-visible-content.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-fixed-layer-with-reflection.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-fixed-layer-with-transformed-parent-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-fixed-reflected-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-in-clipped-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-in-fixed-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-in-transformed-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-inside-table-cell.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-relative-table-inside-table-cell.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/scroll-with-transformed-parent-layer.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/search-field-cancel.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/select-option-background-color.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selected-replaced.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-after-delete.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-after-remove.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-clear.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-gap-overflow-scroll-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-gap-overflow-scroll.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/selection-rl.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/stacked-diacritics.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/static-to-positioned.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/subtree-layoutstate-transform.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/subtree-root-clip-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/subtree-root-clip-3.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/subtree-root-clip.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/subtree-root-skipped.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-cell-collapsed-border.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-cell-move.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-cell-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-col-background.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-collapsed-border.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-extra-bottom-grow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-outer-border.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-row.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-section-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-section-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-two-pass-layout-overpaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/text-append-dirty-lines.html [ Failure NeedsRebaseline ]
+crbug.com/344105 [ Win Linux SnowLeopard Lion MountainLion ] fast/repaint/text-in-relative-positioned-inline.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/text-selection-rect-in-overflow-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/text-selection-rect-in-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/textarea-set-disabled.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/trailing-floats-root-line-box-overflow.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-absolute-child.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-absolute-in-positioned-container.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-disable-layoutstate.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-layout-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-relative-position.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-repaint-descendants.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-replaced-shadows.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-rotate-and-remove.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/transform-translate.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/view-background-from-body-1.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/view-background-from-body-2.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-selection-gap-in-table-cell.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-selection-gap-stale-cache-2.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/block-selection-gap-stale-cache.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/continuation-after-outline.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/nested-iframe-scroll-inner.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/nested-iframe-scroll-outer.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/renderer-destruction-by-invalidateSelection-crash.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-overflow-hidden-in-overflow-hidden-scrolled.html [ ImageOnlyFailure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/overflow-outline-repaint.html [ Failure NeedsRebaseline ]
+crbug.com/344105 fast/repaint/table-hover-on-link.html [ Failure NeedsRebaseline ]
+
 crbug.com/245556 compositing/transitions/transform-on-large-layer.html [ ImageOnlyFailure ]
 crbug.com/245556 virtual/softwarecompositing/transitions/transform-on-large-layer.html [ ImageOnlyFailure ]
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/4776765.html b/third_party/WebKit/LayoutTests/fast/repaint/4776765.html
index 4f9b24b27eb076..126ce7cac86e72 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/4776765.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/4776765.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script type="text/javascript">
 function repaintTest() {
     document.execCommand("InsertParagraph");
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-change-containing-block.html b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-change-containing-block.html
index d05650023f1878..035a496be583b4 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-change-containing-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-change-containing-block.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-changed.html b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-changed.html
index 5c12a2ebb77a20..8d685604438d8d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-changed.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-changed.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-moved.html b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-moved.html
index ca90c97ade5d19..ec7fc13b8545ad 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-moved.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/absolute-position-moved.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/add-table-overpaint.html b/third_party/WebKit/LayoutTests/fast/repaint/add-table-overpaint.html
index 81ca42e182f120..d2da3d10412332 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/add-table-overpaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/add-table-overpaint.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <body onload="runRepaintTest()" style="margin: 0px">
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <style>
 td {
   height: 150px;
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/background-generated.html b/third_party/WebKit/LayoutTests/fast/repaint/background-generated.html
index 4acf0a15fdd5b2..e64ed34e708f4c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/background-generated.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/background-generated.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/background-misaligned.html b/third_party/WebKit/LayoutTests/fast/repaint/background-misaligned.html
index a3da7a7d5fffa2..60e2b17b25f553 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/background-misaligned.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/background-misaligned.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html b/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
index 6f490b17b3710a..9000673edb967a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
@@ -1,6 +1,6 @@
 <html style="background-color: green;">
 <head> 
-<script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script> 
+<script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script> 
 <script type="text/javascript"> 
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/backgroundSizeRepaint.html b/third_party/WebKit/LayoutTests/fast/repaint/backgroundSizeRepaint.html
index 129b520302c08d..01893668432c85 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/backgroundSizeRepaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/backgroundSizeRepaint.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-float-positioned.html b/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-float-positioned.html
index 6d35f426a6e242..18b3cfb509f738 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-float-positioned.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-float-positioned.html
@@ -22,7 +22,7 @@
         }
     </script>
 
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
 
     <p>This is a test for regression against <a href="https://bugs.webkit.org/show_bug.cgi?id=40142">https://bugs.webkit.org/show_bug.cgi?id=40142</a></p>
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-replaced.html b/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-replaced.html
index e1f2e71883c77c..bb5c4893e9a3c4 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-replaced.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-layout-inline-children-replaced.html
@@ -19,7 +19,7 @@
         }
     </script>
 
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
 
     <p>This is a test for regression against <a href="https://bugs.webkit.org/show_bug.cgi?id=40142">https://bugs.webkit.org/show_bug.cgi?id=40142</a></p>
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-no-inflow-children.html b/third_party/WebKit/LayoutTests/fast/repaint/block-no-inflow-children.html
index 4620f69f4aee9c..cdc3240405d3c7 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-no-inflow-children.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-no-inflow-children.html
@@ -5,7 +5,7 @@
             document.getElementById("target").innerText += " la";
         }
     </script>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <div style="height:200px; width:200px">
       <div style="position:absolute">
         <div id="target">La la la</div>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html
index 1f7c3e7d1e46d6..1ebd070db227ff 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html
@@ -1,7 +1,6 @@
 <head>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
-    function repaintTest()
+    function runTest()
     {
         var target = document.getElementById("target");
         getSelection().setBaseAndExtent(target, 0, target.nextSibling, 1);
@@ -11,7 +10,7 @@
         #target::selection { background-color: #0f0; }
     </style>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
     <div style="-webkit-transform: translateZ(0); margin-top: 50px; margin-left: 50px;">
         <div id="target" style="background-color: red; width: 100px; height: 100px; position: absolute;"><br></div>a
     </div>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-table-cell.html b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-table-cell.html
index 4231f3354adcdf..2a1b10a2122e2f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-table-cell.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-in-table-cell.html
@@ -2,15 +2,14 @@
     <style>
         ::selection { background-color: red; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
-    function repaintTest()
+    function runTest()
     {
         sel.empty();
     }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
 <table><tr><td style="width: 100px; height: 100px;"></td></tr><tr><td style="background-color: green;">&nbsp;<div id="target" style="display: inline-block; height: 100px; width: 10px;"></div></td></tr></table>
 <script>
     var sel = getSelection();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache-2.html b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache-2.html
index dd4f5b327480ab..adfd5bc1eb3a5c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache-2.html
@@ -2,15 +2,14 @@
     <style>
         ::selection { background-color: red; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
-    function repaintTest()
+    function runTest()
     {
         sel.empty();
     }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
 <div style="height: 100px; overflow-y: scroll;">
     <div style="margin-top: 50px;"><div id="target" style="display: inline-block; width: 100px; height: 100px;"></div><br></div>&nbsp;
 </div>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache.html b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache.html
index 36e5fa5c678009..f13b443d402a59 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/block-selection-gap-stale-cache.html
@@ -2,15 +2,14 @@
     <style>
         ::selection { background-color: red; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
-    function repaintTest()
+    function runTest()
     {
         sel.empty();
     }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
 <div><div id="target" style="display: inline-block; width: 100px; height: 50px;"></div><br></div>&nbsp;
 <script>
     var sel = getSelection();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/body-background-image.html b/third_party/WebKit/LayoutTests/fast/repaint/body-background-image.html
index 8b18c1a2ad6fa3..833cd49a926fab 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/body-background-image.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/body-background-image.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title></title>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/border-fit-lines.html b/third_party/WebKit/LayoutTests/fast/repaint/border-fit-lines.html
index b98eb25d816e2d..2402a5abcaade3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/border-fit-lines.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/border-fit-lines.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/border-radius-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/border-radius-repaint.html
index c4e4eed92b4d8d..0baa3862f0dfa5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/border-radius-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/border-radius-repaint.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { vertical-align: top; width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/border-repaint-glitch.html b/third_party/WebKit/LayoutTests/fast/repaint/border-repaint-glitch.html
index 858bcac9b1fbd3..db00a5c5854860 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/border-repaint-glitch.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/border-repaint-glitch.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-dynamic.html b/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-dynamic.html
index 27dd0510fcd6a9..9237da17afbece 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-dynamic.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 50px; height: 100px; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-inset-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-inset-repaint.html
index ecad41a28195fb..eecd26e2929a2c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-inset-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/box-shadow-inset-repaint.html
@@ -7,7 +7,7 @@
             box-shadow: inset cyan 0 -60px 0 0;
         }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-3509.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-3509.html
index 16cfcae9f612ab..94598667ecc326 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-3509.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-3509.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-5699.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-5699.html
index e61e20eba9dec7..a709d5e056e10c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-5699.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-5699.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6278.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6278.html
index 71eb87d227afa6..4094048e22c224 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6278.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6278.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6388.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6388.html
index 824e535de1f609..00906e689089a7 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6388.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6388.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6473.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6473.html
index a2d1bfd3918757..acf2bb35c21918 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6473.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-6473.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script type="text/javascript">
 function finish()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-7235.html b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-7235.html
index 1212f12da53175..a8d52ee918c8e7 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-7235.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/bugzilla-7235.html
@@ -16,7 +16,7 @@
         background: green;
     }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/button-spurious-layout-hint.html b/third_party/WebKit/LayoutTests/fast/repaint/button-spurious-layout-hint.html
index f56f45cce82739..d19c6bca90998e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/button-spurious-layout-hint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/button-spurious-layout-hint.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/canvas-putImageData.html b/third_party/WebKit/LayoutTests/fast/repaint/canvas-putImageData.html
index 6655af7c848c54..d56ad6d8c34201 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/canvas-putImageData.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/canvas-putImageData.html
@@ -1,6 +1,6 @@
 <!-- Test for https://bugs.webkit.org/show_bug.cgi?id=46319 -->
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
     <canvas id="canvas" width="100" height="100"></canvas> 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/caret-outside-block.html b/third_party/WebKit/LayoutTests/fast/repaint/caret-outside-block.html
index 9b28f9e039a5ca..cd9364d9bd9177 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/caret-outside-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/caret-outside-block.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/caret-with-transformation.html b/third_party/WebKit/LayoutTests/fast/repaint/caret-with-transformation.html
index 53295a73dc453a..71e1025e6419d1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/caret-with-transformation.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/caret-with-transformation.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script type="text/javascript">
 function repaintTest() {
     var div = document.getElementById("div");
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/change-transform.html b/third_party/WebKit/LayoutTests/fast/repaint/change-transform.html
index c78e2beda275e9..3e0edb9d2f2096 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/change-transform.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/change-transform.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="resources/repaint.js"></script>
+  <script src="resources/text-based-repaint.js"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/child-of-sub-pixel-offset-composited-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/child-of-sub-pixel-offset-composited-layer.html
index 72ad701e47def5..c2520db3c4b065 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/child-of-sub-pixel-offset-composited-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/child-of-sub-pixel-offset-composited-layer.html
@@ -23,7 +23,7 @@
 	border-color: green;
 }
 </style>
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body onload="runRepaintTest();">
 <div class="container">
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/clip-with-layout-delta.html b/third_party/WebKit/LayoutTests/fast/repaint/clip-with-layout-delta.html
index 82ddd9c29c3d4e..ed9c486c203a6e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/clip-with-layout-delta.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/clip-with-layout-delta.html
@@ -15,7 +15,7 @@
             background: blue;
         }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/clipped-relative.html b/third_party/WebKit/LayoutTests/fast/repaint/clipped-relative.html
index 968b05e52bd7e9..d4e5db86a5803c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/clipped-relative.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/clipped-relative.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/containing-block-position-change.html b/third_party/WebKit/LayoutTests/fast/repaint/containing-block-position-change.html
index 567a07b7da02f0..de4df5c063b58d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/containing-block-position-change.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/containing-block-position-change.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/content-into-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/content-into-overflow.html
index 5f307b8f2f6b14..8f605a7a41a2ff 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/content-into-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/content-into-overflow.html
@@ -10,7 +10,7 @@
         #main-content { float: left; width: 100px; height: 80px; }
         #target3 { display: none; clear: both; height: 20px; background: green; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/continuation-after-outline.html b/third_party/WebKit/LayoutTests/fast/repaint/continuation-after-outline.html
index 889898a600ac72..a80d01d2661549 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/continuation-after-outline.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/continuation-after-outline.html
@@ -2,15 +2,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=13680</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
     <script>
-        function repaintTest()
+        function runTest()
         {
             document.getElementById('t').style.outline = '';
         }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest();">
+<body onload="runTest();">
     <div style="width: 50px; text-align: center;">
         <span id="t" style="outline: auto;"><div style="width: 30px; height:40px; background-color: silver; margin: auto"></div>
             x
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/control-clip.html b/third_party/WebKit/LayoutTests/fast/repaint/control-clip.html
index 27ac7dfb6e6a0e..3ce4dca689023c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/control-clip.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/control-clip.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title></title>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/create-layer-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/create-layer-repaint.html
index 5dc12b3edef1b3..1553142d62ab4a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/create-layer-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/create-layer-repaint.html
@@ -19,7 +19,7 @@
       width: 500px;
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript"></script>
   <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/delete-into-nested-block.html b/third_party/WebKit/LayoutTests/fast/repaint/delete-into-nested-block.html
index 61b43b11628e40..b1e8f008744ff3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/delete-into-nested-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/delete-into-nested-block.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/dynamic-table-vertical-alignment-change.html b/third_party/WebKit/LayoutTests/fast/repaint/dynamic-table-vertical-alignment-change.html
index da3776dd2e040b..4035c08547f461 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/dynamic-table-vertical-alignment-change.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/dynamic-table-vertical-alignment-change.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/erase-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/erase-overflow.html
index 657a298ed9ba41..05f29f8d070b00 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/erase-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/erase-overflow.html
@@ -4,7 +4,7 @@
     <style type="text/css">
         div.square { width: 100px; height: 100px; }
     </style>
-    <script type="text/javascript" src="resources/repaint.js"></script>
+    <script type="text/javascript" src="resources/text-based-repaint.js"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-after-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-after-scroll.html
index 6089a7ae80e555..f566682d3f50f0 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-after-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-after-scroll.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-and-absolute-position-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-and-absolute-position-scrolled.html
index 90bdd93aa9b733..f6707468c5ff44 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-and-absolute-position-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-and-absolute-position-scrolled.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-move-after-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-move-after-scroll.html
index 80f705168b6181..410c2fdfc2cbc0 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-move-after-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-move-after-scroll.html
@@ -1,17 +1,12 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <script src="resources/text-based-repaint.js"></script>
   <script type="text/javascript">
       function scrollAndRepaint()
       {
           scrollBy(0, 200);
-          if (window.testRunner) {
-              document.body.offsetTop;
-              testRunner.display();
-              repaintTest();
-           } else {
-              setTimeout(repaintTest, 15);
-           }
+          runRepaintTest();
       }
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-fixed-move-after-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-fixed-move-after-scroll.html
index 80f705168b6181..410c2fdfc2cbc0 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-fixed-move-after-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-fixed-move-after-scroll.html
@@ -1,17 +1,12 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <script src="resources/text-based-repaint.js"></script>
   <script type="text/javascript">
       function scrollAndRepaint()
       {
           scrollBy(0, 200);
-          if (window.testRunner) {
-              document.body.offsetTop;
-              testRunner.display();
-              repaintTest();
-           } else {
-              setTimeout(repaintTest, 15);
-           }
+          runRepaintTest();
       }
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-transformed-move-after-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-transformed-move-after-scroll.html
index 64115c56aed91a..7079cbec2a1222 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-transformed-move-after-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-child-of-transformed-move-after-scroll.html
@@ -1,17 +1,12 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <script src="resources/text-based-repaint.js"></script>
   <script type="text/javascript">
       function scrollAndRepaint()
       {
           scrollBy(0, 200);
-          if (window.testRunner) {
-              document.body.offsetTop;
-              testRunner.display();
-              repaintTest();
-           } else {
-              setTimeout(repaintTest, 15);
-           }
+          runRepaintTest();
       }
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-move-after-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-move-after-scroll.html
index 9b7bcd0e406d63..8d2cd1627cdfab 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-move-after-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-move-after-scroll.html
@@ -1,17 +1,12 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <script src="resources/text-based-repaint.js"></script>
   <script type="text/javascript">
       function scrollAndRepaint()
       {
           scrollBy(0, 200);
-          if (window.testRunner) {
-              document.body.offsetTop;
-              testRunner.display();
-              repaintTest();
-           } else {
-              setTimeout(repaintTest, 15);
-           }
+          runRepaintTest();
       }
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-position-transparency-with-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-position-transparency-with-overflow.html
index fd7c5698da56ad..96ea7cace9c4e0 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-position-transparency-with-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-position-transparency-with-overflow.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-scale.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-scale.html
index 1c118b71d07226..f1a9c1ff6fe41d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-scale.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-scale.html
@@ -8,7 +8,7 @@
             -moz-transform: scale(2, 2);
         }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-scroll-simple.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-scroll-simple.html
index 8ddb377dd7e683..356f098b4ddbbe 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-scroll-simple.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-scroll-simple.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-cell.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-cell.html
index a0a3a9182edfb8..8b4817dfd08d21 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-cell.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-cell.html
@@ -6,7 +6,7 @@
         td { background: green; padding: 0px; border-style: none; border: 0px; }
         td.fixed { position: fixed; left: 50px; top: 100px; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow-zindex.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow-zindex.html
index 3ce2c10da5a1aa..94f2501861f0c5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow-zindex.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow-zindex.html
@@ -6,7 +6,7 @@
         td { background: green; padding: 0px; border-style: none; border: 0px; }
         td.fixed { position: fixed; left: 100px; top: 0px; z-index: 3; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow.html
index cbd07d3ec2f8a2..53e73608e0942d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-table-overflow.html
@@ -6,7 +6,7 @@
         td { background: green; padding: 0px; border-style: none; border: 0px; }
         td.fixed { position: fixed; left: 100px; top: 0px; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-to-relative-position-with-absolute-child.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-to-relative-position-with-absolute-child.html
index fc9cc35e23e95f..b05120e51c1695 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-to-relative-position-with-absolute-child.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-to-relative-position-with-absolute-child.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed-tranformed.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed-tranformed.html
index 62d5b875c9be84..18002904da6c83 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed-tranformed.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed-tranformed.html
@@ -21,7 +21,7 @@
         background-color: green;
     }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/fixed.html b/third_party/WebKit/LayoutTests/fast/repaint/fixed.html
index 9d4dd362bc27db..de4c8aaca05522 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/fixed.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/fixed.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title></title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html b/third_party/WebKit/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html
index 8be1af4574b835..568442d4042e15 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/float-move-during-layout.html b/third_party/WebKit/LayoutTests/fast/repaint/float-move-during-layout.html
index e76acd03824c27..e04b3e76783a98 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/float-move-during-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/float-move-during-layout.html
@@ -1,7 +1,7 @@
 <HTML>
     <HEAD>
         <TITLE></TITLE>
-        <script src="resources/repaint.js" type="text/javascript"></script>
+        <script src="resources/text-based-repaint.js" type="text/javascript"></script>
         <script type="text/javascript">
            function repaintTest()
            {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/float-new-in-block.html b/third_party/WebKit/LayoutTests/fast/repaint/float-new-in-block.html
index 7df6d4d400cba3..7412431be47758 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/float-new-in-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/float-new-in-block.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/float-overflow-right.html b/third_party/WebKit/LayoutTests/fast/repaint/float-overflow-right.html
index c81cd6d3c20ec0..062663467211c9 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/float-overflow-right.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/float-overflow-right.html
@@ -11,7 +11,7 @@
         span { font-family: Ahem; color: blue; }
         .box { display: -webkit-box; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/float-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/float-overflow.html
index 0bac917eb76108..64f874e3f52f3a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/float-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/float-overflow.html
@@ -11,7 +11,7 @@
         span { font-family: Ahem; color: blue; }
         .box { display: -webkit-box; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/gradients-em-stops-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/gradients-em-stops-repaint.html
index c03b690b0ab80c..b6173aaadf1103 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/gradients-em-stops-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/gradients-em-stops-repaint.html
@@ -23,7 +23,7 @@
       height: 20px;
     }
   </style>
-  <script type="text/javascript" src="resources/repaint.js"></script>
+  <script type="text/javascript" src="resources/text-based-repaint.js"></script>
   <script type="text/javascript">
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/hover-pseudo-borders.html b/third_party/WebKit/LayoutTests/fast/repaint/hover-pseudo-borders.html
index 78cbaf235a143f..ef2f8a3f676837 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/hover-pseudo-borders.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/hover-pseudo-borders.html
@@ -24,7 +24,7 @@
   color: green; /* Changes the right box's color. */
 }
 </style>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 function repaintTest() {
   if (!window.testRunner)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-block-resize.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-block-resize.html
index 58ef18459f93a2..64e40d47fd93f1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-block-resize.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-block-resize.html
@@ -4,7 +4,7 @@
     <style type="text/css">
       
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-color-change.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-color-change.html
index c224ca6af793c3..a339156e8cc126 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-color-change.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-color-change.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-horizontal-bt-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-horizontal-bt-overflow.html
index 94ae696fdfb6b4..3a26602c8f1843 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-horizontal-bt-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-horizontal-bt-overflow.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-outline-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-outline-repaint.html
index 16561b8117a915..c849fa57e082b1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-outline-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-outline-repaint.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <script src="../../editing/editing.js"></script>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-overflow.html
index 19502f40e773d7..83bf91236b2e85 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-overflow.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-relative-positioned.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-relative-positioned.html
index 7bfc8aceea763e..bbd758b1246a2a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-relative-positioned.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-relative-positioned.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <body onload="runRepaintTest()">
 <span style="position: relative; top: 80px;">
     <div id="target" style="display: inline-block; width: 100px; height: 100px; overflow: hidden; font-family: ahem; font-size: 100px; background: red; color: green;">p</div>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-lr-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-lr-overflow.html
index 0ccdf317ec239d..0abd64173045e5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-lr-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-lr-overflow.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-rl-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-rl-overflow.html
index 572941ca271d77..90d1512286dd17 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-rl-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/inline-vertical-rl-overflow.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position-clip.html b/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position-clip.html
index f36143b0f1a7c2..dd47df0e8ec84b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position-clip.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position-clip.html
@@ -5,7 +5,7 @@
         .float { float: right; height: 40px; width: 40px; }
         .test { height: 200px; background-color: aliceblue }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position.html b/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position.html
index 16b6456b546b34..22ea2452d69382 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/intermediate-layout-position.html
@@ -5,7 +5,7 @@
         .float { float: right; height: 40px; width: 40px; }
         .test { height: 100px; background-color: aliceblue }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/invisible-objects.html b/third_party/WebKit/LayoutTests/fast/repaint/invisible-objects.html
index 7e8e47ecafac49..8fd3d0c06c3e91 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/invisible-objects.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/invisible-objects.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-clear.html b/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-clear.html
index ed76d22d54a2cc..afea0c3a516fb3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-clear.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-clear.html
@@ -8,7 +8,7 @@
     font-size: 16pt;
 }
 </style>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 function selectStuff()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-repaint.html
index 40433f25239043..f8c2195cbb9f2e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/japanese-rl-selection-repaint.html
@@ -2,7 +2,7 @@
 <html style="border:10px solid maroon; -webkit-writing-mode:vertical-rl">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 function repaintTest()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layer-hide-when-needs-layout.html b/third_party/WebKit/LayoutTests/fast/repaint/layer-hide-when-needs-layout.html
index 263a391ba8e97d..0f6c1b2151732f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layer-hide-when-needs-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layer-hide-when-needs-layout.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=13544</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layer-visibility.html b/third_party/WebKit/LayoutTests/fast/repaint/layer-visibility.html
index 11ee8791e99531..b72198184da565 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layer-visibility.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layer-visibility.html
@@ -1,5 +1,6 @@
 <html>
 <head>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function test()
     {
@@ -8,14 +9,10 @@
         target.style.visibility = "visible";
         document.body.offsetTop;
         
-        if (window.testRunner) {
-            testRunner.display();
-            finish();
-        } else
-            setTimeout(finish, 0);
+        runRepaintTest();
     }
 
-    function finish()
+    function repaintTest()
     {
         var target = document.getElementById("target");
         target.style.left = "0";
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-only-positioned.html b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-only-positioned.html
index 1031c8d72a21e2..4575026a19c06a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-only-positioned.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-only-positioned.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-relative.html b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-relative.html
index 6a4b8ff8e8b498..3961e7828da91e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-relative.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-relative.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset.html b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset.html
index 11874ebba74f70..44fb0ab4213468 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
-<body>
+<script src="resources/text-based-repaint.js"></script>
+<body onload="runRepaintTest()">
   You should see the text 'after' in the inner box with no mangled pixels.
   <div id="parent" style="position:absolute; width:300px; height:300px; overflow:hidden; border: solid 1px red">
     <div style="position:absolute; width:100px; height:100px; left:100px; top:100px; border:solid 1px green; overflow:hidden">
@@ -13,17 +14,9 @@
   parent = document.getElementById('parent');
   parent.scrollTop = 10;
   parent.scrollLeft = 10;
-  if (window.testRunner)
-    testRunner.waitUntilDone();
-
-  window.setTimeout(function() {
-    if (window.testRunner)
-      testRunner.display();
 
+  function repaintTest() {
     document.getElementById('target').innerText = 'after';
-
-    if (window.testRunner)
-      testRunner.notifyDone();
-  }, 50);
+  }
 </script>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset2.html b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset2.html
index 211c77700aeb01..e3c6c6a6f4c673 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset2.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
-<body>
+<script src="resources/text-based-repaint.js"></script>
+<body onload="runRepaintTest()">
   You should see the text 'after' in the inner box, no mangled pixels.
   <div id="parent1" style="position:absolute; width:300px; height:300px; overflow:hidden; border: solid 1px yellow">
     <div id="parent2" style="position:absolute; width:300px; height:300px; overflow:hidden; border: solid 1px red">
@@ -20,17 +21,8 @@
   parent2.scrollTop = 7;
   parent2.scrollLeft = 7;
 
-  if (window.testRunner)
-    testRunner.waitUntilDone();
-
-  window.setTimeout(function() {
-    if (window.testRunner)
-      testRunner.display();
-
+  function repaintTest() {
     document.getElementById('target').innerText = 'after'
-
-    if (window.testRunner)
-      testRunner.notifyDone();
-  }, 50);
+  }
 </script>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset3.html b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset3.html
index e203fba6121d03..30a1c917aca105 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset3.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/layout-state-scrolloffset3.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
-<body>
+<script src="resources/text-based-repaint.js"></script>
+<body onload="runRepaintTest()">
   You should see the text 'after' in the inner box with no mangled pixels.
   <div id="parent" style="position:absolute; width:125px; height:300px; overflow:hidden; border: solid 1px red">
     <div style="position:absolute; width:100px; height:100px; left:100px; top:100px; border:solid 1px green; overflow:hidden">
@@ -13,17 +14,9 @@
   parent = document.getElementById('parent');
   parent.scrollTop = 10;
   parent.scrollLeft = 10;
-  if (window.testRunner)
-    testRunner.waitUntilDone();
-
-  window.setTimeout(function() {
-    if (window.testRunner)
-      testRunner.display();
 
+  function repaintTest() {
     document.getElementById('target').innerText = 'after';
-
-    if (window.testRunner)
-      testRunner.notifyDone();
-  }, 50);
+  }
 </script>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-1.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-1.html
index 7126c5aa642050..3231127f393750 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-1.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-1.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-10.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-10.html
index d1159acaf77ef1..53eca7e04b635b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-10.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-10.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-2.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-2.html
index 3a8babcf6a9ad6..526231ce5fc8f0 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-2.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-3.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-3.html
index 8e4f9982dc5be6..f1dd6a6537bf8d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-3.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-3.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-4.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-4.html
index abc464de07d64b..967ed21b09e45c 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-4.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-4.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-5.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-5.html
index 4d5bb586b5db2b..2e9b93b2472de4 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-5.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-5.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-6.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-6.html
index 32ca1f2d82cb7c..fc3a6dec4b9c15 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-6.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-6.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-7.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-7.html
index 24922561fe4ab7..e38173f8e5338e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-7.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-7.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-8.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-8.html
index b32ae676e02031..08c79a5a7753db 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-8.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-8.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-9.html b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-9.html
index bd34decb12a9cf..b071c7c050e6b4 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-9.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-flow-with-floats-9.html
@@ -1,4 +1,5 @@
 <body style="margin: 0;" onload="loaded()">
+    <script src="resources/text-based-repaint.js"></script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-in-scrolled-clipped-block.html b/third_party/WebKit/LayoutTests/fast/repaint/line-in-scrolled-clipped-block.html
index 492ce2e5091d4b..357f81f03b93c6 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-in-scrolled-clipped-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-in-scrolled-clipped-block.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <body onload="runRepaintTest()">
 <div id="target" style="width: 100px; height: 100px; white-space:pre; overflow: hidden;">                         FAIL     .</div>
 <script>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/line-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/line-overflow.html
index ddced8ae1c9448..65551191126d2a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/line-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/line-overflow.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/lines-with-layout-delta.html b/third_party/WebKit/LayoutTests/fast/repaint/lines-with-layout-delta.html
index 311c593e1e1be1..df323ecf4b5651 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/lines-with-layout-delta.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/lines-with-layout-delta.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/list-marker-2.html b/third_party/WebKit/LayoutTests/fast/repaint/list-marker-2.html
index b81a65d7848900..52e75fae743b34 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/list-marker-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/list-marker-2.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/make-children-non-inline.html b/third_party/WebKit/LayoutTests/fast/repaint/make-children-non-inline.html
index 1022adb8dd5927..1469dc3688f9a2 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/make-children-non-inline.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/make-children-non-inline.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title></title>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/mix-blend-mode-separate-stacking-context.html b/third_party/WebKit/LayoutTests/fast/repaint/mix-blend-mode-separate-stacking-context.html
index d89c7ed78e6a5d..d17ca18820f7bf 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/mix-blend-mode-separate-stacking-context.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/mix-blend-mode-separate-stacking-context.html
@@ -9,7 +9,7 @@
         float: left;
     }
 </style>
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <!-- Repaint test to ensure that setting a blend mode dynamically triggers this operation
     only with the contents of the nearest ancestor stacking context. -->
 <body onload="runRepaintTest()">
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/multicol-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/multicol-repaint.html
index 705745e191972f..458d46ae0ead80 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/multicol-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/multicol-repaint.html
@@ -18,7 +18,7 @@
       font-family: Ahem;
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript"></script>
   <script type="text/javascript">
      function repaintTest()
      {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-inner.html b/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-inner.html
index d68163ba4958f3..5f49235db7f889 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-inner.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-inner.html
@@ -1,17 +1,16 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
-        function repaintTest()
+        function runTest()
         {
             document.getElementById('iframe').contentDocument.getElementById('iframe').contentWindow.scrollTo(200, 200);
         }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
     <!-- You should 3 non-overlapping rectangle (from left to right): a green, a yellow and a blue. -->
     <iframe id="iframe" src="resources/iframe-outer.html" style="height: 1000px;"></iframe>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-outer.html b/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-outer.html
index f85a1be4c14f4d..1549005632db97 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-outer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/nested-iframe-scroll-outer.html
@@ -1,17 +1,16 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
-        function repaintTest()
+        function runTest()
         {
             document.getElementById('iframe').contentWindow.scrollTo(200, 200);
         }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
     <!-- You should 3 non-overlapping rectangle (from left to right): a green, a yellow and a blue. -->
     <iframe id="iframe" src="resources/iframe-outer.html"></iframe>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html b/third_party/WebKit/LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html
index 83f8c519b22bba..1c24876dcf6253 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 if (window.testRunner) {
     // By definition, when caret browsing is enabled we always paint the caret.
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/opacity-change-on-overflow-float.html b/third_party/WebKit/LayoutTests/fast/repaint/opacity-change-on-overflow-float.html
index aa29aa076c549a..017c7bad12ddd2 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/opacity-change-on-overflow-float.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/opacity-change-on-overflow-float.html
@@ -17,7 +17,7 @@
 }
 </style>
 
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script>
 function repaintTest()
 {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/outline-child-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/outline-child-repaint.html
index 7aa6a7d23a5b2c..292a79b09ec297 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/outline-child-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/outline-child-repaint.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/outline-inset.html b/third_party/WebKit/LayoutTests/fast/repaint/outline-inset.html
index 1b275996b362a7..5f5b3acf918151 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/outline-inset.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/outline-inset.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/outline-repaint-glitch.html b/third_party/WebKit/LayoutTests/fast/repaint/outline-repaint-glitch.html
index e42006d6d86f3b..9e7619683d89a3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/outline-repaint-glitch.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/outline-repaint-glitch.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/outline-shrinking.html b/third_party/WebKit/LayoutTests/fast/repaint/outline-shrinking.html
index a6f676314eb7a5..e737efe15ad2fa 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/outline-shrinking.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/outline-shrinking.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-auto-in-overflow-auto-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-auto-in-overflow-auto-scrolled.html
index 7226d618825793..2c1b96b6f71aea 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-auto-in-overflow-auto-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-auto-in-overflow-auto-scrolled.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
     function repaintTest() {
         // Now scroll once in the #innerDiv to the green area.
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-clip-subtree-layout.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-clip-subtree-layout.html
index 0380427f7fa2b2..d638cc3e69bb6f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-clip-subtree-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-clip-subtree-layout.html
@@ -1,6 +1,6 @@
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=15015 rdar://problem/5420308</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-delete-line.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-delete-line.html
index 705361c8008f81..89138083ef81f2 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-delete-line.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-delete-line.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block.html
index 05dbb8387b44fe..e84e7ab9ba879a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     onload = runRepaintTest;
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-hidden-in-overflow-hidden-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-hidden-in-overflow-hidden-scrolled.html
index b6f25f64b9bd23..24e46d196515fd 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-hidden-in-overflow-hidden-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-hidden-in-overflow-hidden-scrolled.html
@@ -30,12 +30,8 @@
             background-color: green;
         }
     </style>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
-        if (window.testRunner) {
-            testRunner.dumpAsTextWithPixelResults();
-            testRunner.waitUntilDone();
-        }
-
         function repaintTest()
         {
             window.location.hash = "#ucp";
@@ -43,19 +39,14 @@
                 testRunner.notifyDone();
         }
 
-        function runRepaintTest()
+        function runTest()
         {
             document.getElementById("outer").scrollTop = 1000;
-
-            if (window.testRunner)
-                testRunner.display();
-
-            setTimeout(repaintTest, 0);
+            runRepaintTest();
         }
-        window.addEventListener("load", runRepaintTest, false);
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
+<body onload="runTest()">
     <!-- Bug 71550 - REGRESSION (r93614): Content remains despite parent element being scrolled off page using javascript. -->
     <!-- For the test to pass you should not see any RED, only green -->
     <div id="outer">
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-hide.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-hide.html
index b324b1a8f8faa0..2e906a51acdf6b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-hide.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-hide.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-into-content.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-into-content.html
index 969979dc47abcc..9e7a08234d80ff 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-into-content.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-into-content.html
@@ -10,7 +10,7 @@
         #main-content { float: left; width: 100px; height: 80px; }
         #target3 { display: none; clear: both; height: 20px; background: green; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-outline-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-outline-repaint.html
index 1581e52341aa16..b2727143d13b3e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-outline-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-outline-repaint.html
@@ -1,14 +1,15 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
-       function repaintTest()
+       function runTest()
        {
-       document.getElementById("z").lastChild.data='Excellent! Test';
+           if (window.testRunner)
+               window.testRunner.dumpAsTextWithPixelResults();
+           document.getElementById("z").lastChild.data='Excellent! Test';
        }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()">
+<body onload="runTest()">
 If the red outline at the bottom of the div extends all the way to the scrollbar, the test passes.  If it stops short, then the test has failed, and an incomplete repaint has occurred.
 <div id="t" style="overflow-y: scroll; outline: none; width: 80px; height: 69px;">
     <br><br><br><br><br><br><br><br><br><span id="z" style="outline: 3px solid red;">Failed Test</span>
@@ -17,4 +18,4 @@
     document.getElementById("t").scrollTop = 91;
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-body-appear.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-body-appear.html
index 2348a4e8bdd76b..6c663be64a5e24 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-body-appear.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-body-appear.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-delete.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-delete.html
index 880860a45ee0a1..cb482c617105a1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-delete.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-delete.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html
index 5c77ebadd042ca..8b3b87b50e3c8e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-scroll-in-overflow-scroll-scrolled.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
     function repaintTest() {
         // Now scroll once in the #innerDiv to the green area.
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overflow-show.html b/third_party/WebKit/LayoutTests/fast/repaint/overflow-show.html
index dcad362724290d..51ab6ae29bb351 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overflow-show.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overflow-show.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css">
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/overhanging-float-detach-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/overhanging-float-detach-repaint.html
index 91eb35e133ca8a..57779c55bfa207 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/overhanging-float-detach-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/overhanging-float-detach-repaint.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent.html b/third_party/WebKit/LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent.html
index b75129aab0c8b2..d24d72a5a73383 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/paint-caret-in-div-with-negative-indent.html
@@ -13,7 +13,7 @@
         outline: none;
       }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
     function repaintTest() {
         document.getElementById('editable').focus();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/positioned-document-element.html b/third_party/WebKit/LayoutTests/fast/repaint/positioned-document-element.html
index 98f9da01d53279..b0d3d872204bb1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/positioned-document-element.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/positioned-document-element.html
@@ -13,7 +13,7 @@
       background-color: green;
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript"></script>
   <script type="text/javascript">
       function repaintTest()
       {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/reflection-redraw.html b/third_party/WebKit/LayoutTests/fast/repaint/reflection-redraw.html
index 1d001036b2b2c3..ee49b9ddf31c0b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/reflection-redraw.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/reflection-redraw.html
@@ -26,7 +26,7 @@
       }
       
     </style>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
       if (window.testRunner)
         testRunner.waitUntilDone();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/reflection-repaint-test.html b/third_party/WebKit/LayoutTests/fast/repaint/reflection-repaint-test.html
index 46739428c8be60..eefd3d9644bd0a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/reflection-repaint-test.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/reflection-repaint-test.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/rel-positioned-inline-with-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/rel-positioned-inline-with-overflow.html
index 956e10a711bcc7..4fad1b447fde25 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/rel-positioned-inline-with-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/rel-positioned-inline-with-overflow.html
@@ -4,7 +4,7 @@
   <style>
     #target { background-color:orange; }
   </style>
-  <script src="resources/repaint.js" type="text/javascript"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript"></script>
   <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html b/third_party/WebKit/LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html
index 9f51e5608760fe..02e05a6cebb394 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html
@@ -11,9 +11,5 @@
         document.getElementById("focusMe").focus();
     </script>
     <div></div>
-    <script>
-        if (window.testRunner)
-            testRunner.display();
-    </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/repaint-across-writing-mode-boundary.html b/third_party/WebKit/LayoutTests/fast/repaint/repaint-across-writing-mode-boundary.html
index 1c3fb187d7b2b5..d5a758d771bf7d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/repaint-across-writing-mode-boundary.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/repaint-across-writing-mode-boundary.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 function repaintTest() {
     if (eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll-with-zoom.html b/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll-with-zoom.html
index daa49c8941b574..17e5cd340d1656 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll-with-zoom.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll-with-zoom.html
@@ -15,8 +15,9 @@
             overflow: auto;
         }
     </style>
+    <script src="resources/text-based-repaint.js"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body>
+<body onload="runRepaintTest()">
     <iframe src="javascript:void(0);"></iframe>
     <script>
         var frame = window.frames[0];
@@ -28,7 +29,7 @@
         frame.scrollBy(100, 100);
     </script>
     <script>
-        function testScrollRepaint()
+        function repaintTest()
         {
             if (window.testRunner) {
                 testRunner.waitUntilDone();
@@ -39,13 +40,6 @@
             }
             frame.scrollBy(-90, -90);
         }
-
-        if (window.testRunner) {
-            testRunner.display();
-            testScrollRepaint();
-        } else {
-            setTimeout(testScrollRepaint, 100);
-        }
     </script>
 </body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll.html
index eca5c4e625034b..82f20fc84e13b3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/repaint-during-scroll.html
@@ -1,11 +1,11 @@
 <head>
-    <script src="resources/repaint.js"></script>
     <script>
-        function repaintTest()
+        function runTest()
         {
-            if (window.testRunner)
+            if (window.testRunner) {
+                testRunner.dumpAsTextWithPixelResults();
                 testRunner.waitUntilDone();
-            var target = document.getElementById("target");
+            }
             scrollBy(0, 100);
         }
 
@@ -18,6 +18,6 @@
         }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest()" onscroll="handleScroll()" style="height: 200%;">
+<body onload="runTest()" onscroll="handleScroll()" style="height: 200%;">
     <div id="target" style="position: absolute; top: 300px; left: 300px; background-color: red; width: 100px; height: 100px;"></div>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/repaint-resized-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/repaint-resized-overflow.html
index ab63769305e250..6c6f73e65b67f5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/repaint-resized-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/repaint-resized-overflow.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/resources/fixed-move-after-keyboard-scroll-iframe.html b/third_party/WebKit/LayoutTests/fast/repaint/resources/fixed-move-after-keyboard-scroll-iframe.html
index e7965d1e44442e..67b33536795cfd 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/resources/fixed-move-after-keyboard-scroll-iframe.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/resources/fixed-move-after-keyboard-scroll-iframe.html
@@ -1,17 +1,8 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <script src="text-based-repaint.js"></script>
   <script type="text/javascript">
-      function scrollAndRepaint()
-      {
-          if (window.testRunner) {
-              document.body.offsetTop;
-              testRunner.display();
-              repaintTest();
-          } else {
-              setTimeout(repaintTest, 15);
-          }
-      }
       function repaintTest()
       {
           document.getElementById('toMove').style.left = "150px";
@@ -21,7 +12,7 @@
       }
       if (window.testRunner)
           window.testRunner.waitUntilDone();
-      document.addEventListener("scroll", scrollAndRepaint, false);
+      document.addEventListener("scroll", runRepaintTest, false);
   </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
   <body style="height: 820;">
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/resources/iframe-scroll-repaint-iframe.html b/third_party/WebKit/LayoutTests/fast/repaint/resources/iframe-scroll-repaint-iframe.html
index 4f0173d94da55e..6acb7e2a577e30 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/resources/iframe-scroll-repaint-iframe.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/resources/iframe-scroll-repaint-iframe.html
@@ -1,16 +1,11 @@
 <!DOCTYPE html>
 <html style="background-color:#eeeeee; overflow:hidden">
-<div style="height:500px">
+<script src="text-based-repaint.js"></script>
 <script>
-if (window.testRunner)
-  testRunner.waitUntilDone()
-
-window.setTimeout(function() {
-  if (window.testRunner)
-    testRunner.display();
-
+function repaintTest() {
   document.documentElement.scrollTop = 20;
-  if (window.testRunner)
-    testRunner.notifyDone();
-}, 50);
+}
 </script>
+<body onload="runRepaintTest()">
+<div style="height:500px">
+
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/resources/line-flow-with-floats.js b/third_party/WebKit/LayoutTests/fast/repaint/resources/line-flow-with-floats.js
index ed3967c34f560a..007bc0df8e7520 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/resources/line-flow-with-floats.js
+++ b/third_party/WebKit/LayoutTests/fast/repaint/resources/line-flow-with-floats.js
@@ -6,20 +6,11 @@ function loaded()
     loadCount++;
     if (loadCount == 2) {
         document.body.offsetTop;
-        beginTest();
+        runRepaintTest();
     }
 }
 
-function beginTest()
+function repaintTest()
 {
-    if (window.testRunner) {
-        document.body.offsetTop;
-        testRunner.display();
-        test(document.getElementById("iframe").contentDocument);
-    } else setTimeout(
-        function() {
-            test(document.getElementById("iframe").contentDocument);
-        },
-        10
-    );
+    test(document.getElementById("iframe").contentDocument);
 }
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html b/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
index a1b9023436bda5..50303ba5aa38f4 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
@@ -1,16 +1,17 @@
 <html>
 <head>
-<script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
-    function repaintTest()
+    function runTest()
     {
+        if (window.testRunner)
+            window.testRunner.dumpAsTextWithPixelResults();
         if (window.eventSender)
             window.eventSender.setPageScaleFactor(0.25, 0, 0);
     }
 </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
-<body onload="runRepaintTest();">
+<body onload="runTest();">
     This test must be run in DumpRenderTree as a pixel test. There should not be visual aritfacts after scaling the page.
     <div style="width:500px; height:500px; background-color:green;"></div>
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-absolute-layer-with-reflection.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-absolute-layer-with-reflection.html
index b4d9509b51d3f9..5fa9595fd3de2e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-absolute-layer-with-reflection.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-absolute-layer-with-reflection.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content.html
index a6b302c6afefdf..3434dcc24f9b45 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-no-visible-content.html
@@ -2,7 +2,7 @@
 <head>
     <title></title>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-reflection.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-reflection.html
index c3a963aa4155a6..166e2c1b3368b5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-reflection.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-reflection.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-transformed-parent-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-transformed-parent-layer.html
index 6743e5a30bfee1..ce4202598494ed 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-transformed-parent-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-layer-with-transformed-parent-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-reflected-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-reflected-layer.html
index 99139434bf5541..42cebe25a14dae 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-reflected-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-fixed-reflected-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-clipped-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-clipped-layer.html
index 34709b9eba380e..0650ae32a89cb1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-clipped-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-clipped-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-fixed-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-fixed-layer.html
index 97532a8599c81e..46301817787d4d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-fixed-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-fixed-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-transformed-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-transformed-layer.html
index f3c17c684a7032..150ccea0124fd3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-transformed-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-in-transformed-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-inside-table-cell.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-inside-table-cell.html
index 84a8507e6151f7..3fb10a6b8dd845 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-inside-table-cell.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-inside-table-cell.html
@@ -13,7 +13,7 @@
             border: 2px solid green;
         }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-relative-table-inside-table-cell.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-relative-table-inside-table-cell.html
index 6adc8693afcf7e..e87260ffe65327 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-relative-table-inside-table-cell.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-relative-table-inside-table-cell.html
@@ -13,7 +13,7 @@
             border: 2px solid green;
         }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scroll-with-transformed-parent-layer.html b/third_party/WebKit/LayoutTests/fast/repaint/scroll-with-transformed-parent-layer.html
index 879be41e10301f..c766a043e17715 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scroll-with-transformed-parent-layer.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scroll-with-transformed-parent-layer.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <link rel="stylesheet" href="resources/default.css"></style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/search-field-cancel.html b/third_party/WebKit/LayoutTests/fast/repaint/search-field-cancel.html
index d1b1717b5ac1a8..a9fe07c4da989f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/search-field-cancel.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/search-field-cancel.html
@@ -5,7 +5,7 @@
     #searchfield {
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/select-option-background-color.html b/third_party/WebKit/LayoutTests/fast/repaint/select-option-background-color.html
index 804f79d4148c50..5f183e70eb7366 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/select-option-background-color.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/select-option-background-color.html
@@ -10,7 +10,7 @@
         }
     </script>
 
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
 
     <p>This is a test for regression against <a href="https://bugs.webkit.org/show_bug.cgi?id=49790">https://bugs.webkit.org/show_bug.cgi?id=49790</a></p>
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selected-replaced.html b/third_party/WebKit/LayoutTests/fast/repaint/selected-replaced.html
index c737b6cde56452..7b74e35f6ee0d3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selected-replaced.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selected-replaced.html
@@ -12,7 +12,7 @@
       top: 0px;
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function loaded()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-after-delete.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-after-delete.html
index 59aba1cdf751f8..41356ef1c5dd2e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-after-delete.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-after-delete.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script type="text/javascript">
 function repaintTest() {
     document.execCommand("Delete");
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-after-remove.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-after-remove.html
index 2a3bc63a12f173..f53d5b3cd817d1 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-after-remove.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-after-remove.html
@@ -1,4 +1,4 @@
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script type="text/javascript">
 function repaintTest() {
     var e = document.getElementById("removeme");
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-clear.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-clear.html
index 9e0cff1cc2237b..3ad8551c25dd72 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-clear.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-clear.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html
index c64a60edcac84d..f76a2399072396 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll-2.html
@@ -5,7 +5,7 @@
         div#overflow { margin: 5px; padding: 10px; border: medium solid; width: 100px; height: 100px; overflow: auto; }
         ::selection { background-color: red; }
     </style>
-    <script type="text/javascript" src="resources/repaint.js"></script>
+    <script type="text/javascript" src="resources/text-based-repaint.js"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll.html
index b473c8bf0c4c4a..fe6ff6457bc0e6 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-gap-overflow-scroll.html
@@ -5,7 +5,7 @@
         div#overflow { margin: 5px; padding: 10px; border: medium solid; width: 100px; height: 100px; overflow: auto; }
         ::selection { background-color: red; }
     </style>
-    <script type="text/javascript" src="resources/repaint.js"></script>
+    <script type="text/javascript" src="resources/text-based-repaint.js"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/selection-rl.html b/third_party/WebKit/LayoutTests/fast/repaint/selection-rl.html
index 4c5ab0bb99fd92..40b9c9185113e7 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/selection-rl.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/selection-rl.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
 function repaintTest() {
     if (eventSender) {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/stacked-diacritics.html b/third_party/WebKit/LayoutTests/fast/repaint/stacked-diacritics.html
index 63c7ec2438b6c5..2d6a0bc1c1aa74 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/stacked-diacritics.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/stacked-diacritics.html
@@ -5,7 +5,7 @@
 <style type="text/css">
     div.test { width: 200px; height: 120px; border: 1px solid blue; padding: 10px; }
 </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/static-to-positioned.html b/third_party/WebKit/LayoutTests/fast/repaint/static-to-positioned.html
index ea46a848d68eed..13b76df503bcbb 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/static-to-positioned.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/static-to-positioned.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/subtree-layoutstate-transform.html b/third_party/WebKit/LayoutTests/fast/repaint/subtree-layoutstate-transform.html
index 4a2ffa9139a553..75aba01c76d994 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/subtree-layoutstate-transform.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/subtree-layoutstate-transform.html
@@ -16,7 +16,7 @@
       background-color: red;
     }
   </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-2.html b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-2.html
index daa7dea503c15e..ea5a18ba6a1eec 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-2.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-3.html b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-3.html
index c54eaf09fabf54..756118cd3e9794 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-3.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip-3.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip.html b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip.html
index cc454db57f426b..46a2876c632bb8 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-clip.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-skipped.html b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-skipped.html
index 4d262f676d39ca..04dbd772c2942d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-skipped.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/subtree-root-skipped.html
@@ -1,6 +1,6 @@
 <head>
     <title>Repaint test for bug 16034</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-collapsed-border.html b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-collapsed-border.html
index 57100853437b5c..78ddb78ce0aef6 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-collapsed-border.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-collapsed-border.html
@@ -4,7 +4,7 @@
         table { border-collapse: collapse; }
         td { background: silver; width: 100px; height: 100px; }
     </style>
-	<script src="resources/repaint.js" type="text/javascript"></script>
+	<script src="resources/text-based-repaint.js" type="text/javascript"></script>
 	<script type="text/javascript">
 	   function repaintTest()
 	   {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-move.html b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-move.html
index bc9061efae013a..25487b2bfbb8fc 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-move.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-move.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-overflow.html
index 2ea5eebfe24710..c3913cb7dfad9b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-cell-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-cell-overflow.html
@@ -1,5 +1,5 @@
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-col-background.html b/third_party/WebKit/LayoutTests/fast/repaint/table-col-background.html
index e1e4cea8603878..b3fbc11f958dd9 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-col-background.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-col-background.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=5821</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-collapsed-border.html b/third_party/WebKit/LayoutTests/fast/repaint/table-collapsed-border.html
index db9454e27847e1..4501558f0ede84 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-collapsed-border.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-collapsed-border.html
@@ -6,7 +6,7 @@
             margin: 10px 0 10px 0;
         }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-extra-bottom-grow.html b/third_party/WebKit/LayoutTests/fast/repaint/table-extra-bottom-grow.html
index 365826de00ce47..4b84a7850fdab5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-extra-bottom-grow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-extra-bottom-grow.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-<script src="resources/repaint.js"></script>
+<script src="resources/text-based-repaint.js"></script>
 <script>
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-hover-on-link.html b/third_party/WebKit/LayoutTests/fast/repaint/table-hover-on-link.html
index d8be6c1cf52251..5a07f301ed5a9d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-hover-on-link.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-hover-on-link.html
@@ -21,23 +21,24 @@
 	overflow: hidden;
 }
 </style>
-<script src="resources/repaint.js"></script>
 <script>
-    function repaintTest()
+    function runTest()
     {
-        if (!window.testRunner)
-            return;
+        if (window.testRunner)
+            window.testRunner.dumpAsTextWithPixelResults();
 
         var table = document.getElementById("table");
         var tableBox = table.getBoundingClientRect();
         var tableCenterX = (tableBox.left + tableBox.right) / 2;
         var tableCenterY = (tableBox.top + tableBox.bottom) / 2;
 
-        eventSender.mouseMoveTo(tableCenterX, tableCenterY);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
+        if (window.eventSender) {
+            eventSender.mouseMoveTo(tableCenterX, tableCenterY);
+            eventSender.mouseDown();
+            eventSender.mouseUp();
+        }
     }
-    window.addEventListener("load", runRepaintTest);
+    window.addEventListener("load", runTest);
 </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-outer-border.html b/third_party/WebKit/LayoutTests/fast/repaint/table-outer-border.html
index 3a4f771ae369a8..bafdb2f6335a71 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-outer-border.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-outer-border.html
@@ -18,7 +18,7 @@
             border-color: green;
         }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html
index 99824adfe42345..ac3c68fd6ae169 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-auto-in-overflow-auto-scrolled.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
     function repaintTest() {
         // Now scroll once in the #innerDiv to the green area.
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-hidden-in-overflow-hidden-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-hidden-in-overflow-hidden-scrolled.html
index 53741d85ed45b5..cc2f7bdb4b9573 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-hidden-in-overflow-hidden-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-hidden-in-overflow-hidden-scrolled.html
@@ -43,16 +43,12 @@
                 testRunner.notifyDone();
         }
 
-        function runRepaintTest()
+        function runTest()
         {
             document.getElementById("outer").scrollTop = 1000;
-
-            if (window.testRunner)
-                testRunner.display();
-
             setTimeout(repaintTest, 0);
         }
-        window.addEventListener("load", runRepaintTest, false);
+        window.addEventListener("load", runTest, false);
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html
index 23657919e303b9..f746e801ae454d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-overflow-scroll-in-overflow-scroll-scrolled.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
     function repaintTest() {
         // Now scroll once in the #innerDiv to the green area.
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-row.html b/third_party/WebKit/LayoutTests/fast/repaint/table-row.html
index 898319878ab936..dc8629997c26c3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-row.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-row.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=14056</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-section-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/table-section-overflow.html
index c99ffa4160fb7b..87e8499af20284 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-section-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-section-overflow.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=12079</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-section-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/table-section-repaint.html
index 528f995f2a621e..9811094631528e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-section-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-section-repaint.html
@@ -10,7 +10,7 @@
         .half { height: 30px; width: 60px; }
         .full { height: 60px; width: 60px; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/table-two-pass-layout-overpaint.html b/third_party/WebKit/LayoutTests/fast/repaint/table-two-pass-layout-overpaint.html
index 946b03d51dee41..d049351b0ccc1f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/table-two-pass-layout-overpaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/table-two-pass-layout-overpaint.html
@@ -5,7 +5,7 @@
         td { width: 100px; height: 50px; }
         div#target { height: 25px; background-color: lightgreen; }
     </style>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/text-append-dirty-lines.html b/third_party/WebKit/LayoutTests/fast/repaint/text-append-dirty-lines.html
index 6111882f68fffd..e358ff1d1f1786 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/text-append-dirty-lines.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/text-append-dirty-lines.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/text-in-relative-positioned-inline.html b/third_party/WebKit/LayoutTests/fast/repaint/text-in-relative-positioned-inline.html
index 94093f5ba3189d..b29e4f22a3e732 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/text-in-relative-positioned-inline.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/text-in-relative-positioned-inline.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow-2.html b/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow-2.html
index 4f0aee8fc63a09..aef4cbad57c611 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow-2.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title>Test for http://bugs.webkit.org/show_bug.cgi?id=14329</title>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow.html
index 1a774e63e7e6e5..9e6e02b1739b07 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/text-selection-rect-in-overflow.html
@@ -6,7 +6,7 @@
         span#q { background-color: green; }
         span#q::selection { background-color: red; }
     </style>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/textarea-set-disabled.html b/third_party/WebKit/LayoutTests/fast/repaint/textarea-set-disabled.html
index bf40aa97a4b02c..e63a2098fea44a 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/textarea-set-disabled.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/textarea-set-disabled.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script>
         if (window.testRunner)
             testRunner.dumpAsTextWithPixelResults();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/trailing-floats-root-line-box-overflow.html b/third_party/WebKit/LayoutTests/fast/repaint/trailing-floats-root-line-box-overflow.html
index e342b7ec629e41..0e8f0c60d88cc5 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/trailing-floats-root-line-box-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/trailing-floats-root-line-box-overflow.html
@@ -1,5 +1,5 @@
 <head>
-    <script src="resources/repaint.js"></script>
+    <script src="resources/text-based-repaint.js"></script>
     <script>
         function repaintTest()
         {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-child.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-child.html
index 214de1e0036309..ba0f9c8bf73d53 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-child.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-child.html
@@ -25,7 +25,7 @@
         background-color: gray;
      }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html
index 63d57cb8ac58d3..c056333cc112b8 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html
@@ -26,7 +26,7 @@
       -webkit-transform: rotate(45deg);
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-disable-layoutstate.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-disable-layoutstate.html
index 73b26a8c77fcb7..948bfc64aafb1f 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-disable-layoutstate.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-disable-layoutstate.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-layout-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-layout-repaint.html
index 76c4deff3ed500..b2427705496d99 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-layout-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-layout-repaint.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
-    <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript">
        function repaintTest()
        {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-relative-position.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-relative-position.html
index 288caafe8fdbcb..b89fdbc732310b 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-relative-position.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-relative-position.html
@@ -19,7 +19,7 @@
       -webkit-transform: rotate(45deg);
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-repaint-descendants.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-repaint-descendants.html
index 32a7c4a9c10c20..cb5269c77af486 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-repaint-descendants.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-repaint-descendants.html
@@ -23,7 +23,7 @@
       background-color: #555;
     }
   </style>
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     if (window.testRunner)
       testRunner.waitUntilDone();
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-replaced-shadows.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-replaced-shadows.html
index 8cc978ad32e020..7305327a866938 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-replaced-shadows.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-replaced-shadows.html
@@ -17,7 +17,7 @@
     }
   </style>
 
-  <script src="resources/repaint.js" type="text/javascript" charset="utf-8"></script>
+  <script src="resources/text-based-repaint.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     function repaintTest()
     {
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-rotate-and-remove.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-rotate-and-remove.html
index 27c84743a0f2c6..b8698ba7b1f343 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-rotate-and-remove.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-rotate-and-remove.html
@@ -9,7 +9,7 @@
                 -webkit-transform:rotate(50deg);
             }
         </style>
-        <script src="resources/repaint.js" type="text/javascript"></script>
+        <script src="resources/text-based-repaint.js" type="text/javascript"></script>
         <script>
             function repaintTest() {
                 document.getElementById('rel').classList.remove('rotated');
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/transform-translate.html b/third_party/WebKit/LayoutTests/fast/repaint/transform-translate.html
index 933bbc0ef489a7..1a0031c6cf07f3 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/transform-translate.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/transform-translate.html
@@ -1,6 +1,6 @@
 <head>
 <title>Repaint test for bug 15719</title>
-<script src="resources/repaint.js" type="text/javascript"></script>
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body onload="runRepaintTest()">
 <h1>Repaint test for bug 15719</h1>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/video-mute-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/video-mute-repaint.html
index b009985d7737aa..479717408e43ae 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/video-mute-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/video-mute-repaint.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>Test for crbug.com/190880</title>
-<script src="resources/text-based-repaint.js"></script>
+<script src="resources/text-based-text-based-repaint.js"></script>
 <style>
     video { width: 700px; }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-1.html b/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-1.html
index 131983081475d7..17b963dcdc0a6e 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-1.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-1.html
@@ -1,12 +1,13 @@
 <head>
     <!-- The entire viewport should be white, with no red margin. -->
-    <script src="resources/repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
-       function repaintTest()
+       if (window.testRunner)
+          window.testRunner.dumpAsTextWithPixelResults();
+       function runTest()
        {
             document.body.style.display = "none";
        }
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runRepaintTest();" style="margin: 50px; background-color: red;">
+<body onload="runTest();" style="margin: 50px; background-color: red;">
 </body>
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-2.html b/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-2.html
index a1d17095e39f93..0ca22898601b43 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-2.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/view-background-from-body-2.html
@@ -1,6 +1,6 @@
 <head>
     <!-- The entire viewport should be solid blue, with no white margin. -->
-    <script src="resources/repaint.js" type="text/javascript"></script>
+    <script src="resources/text-based-repaint.js" type="text/javascript"></script>
     <script type="text/javascript">
        function repaintTest()
        {