Move rendering/RenderSlider* to layout/LayoutSlider*.

This CL moves the RenderSlider classes over to layout/. BUG=450612 TBR=jchaffraix@chromium.org Review URL: https://codereview.chromium.org/869063002 git-svn-id: svn://svn.chromium.org/blink/trunk@188854 bbb929c8-8fbe-4397-9dbb-9b2b20218538
author: dsinclair@chromium.org <dsinclair@chromium.org> 2015-01-23 05:29:52 +0000
committer: dsinclair@chromium.org <dsinclair@chromium.org> 2015-01-23 05:29:52 +0000
commit: 82129bc087dd1ac238e1794fd2071da6f4bc3762 (patch)
tree: a908c0fb2d3c70cf6bc629f915c2fafa95765387
parent: ebcd8e3ec327f8b75625e828a6b7fde4957889fb (diff)
download: chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.zip
chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.tar.gz
chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.tar.bz2
151 files changed, 440 insertions, 440 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-expected.txt
index bfbe4c2..41d1775 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (114,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
index ea293e0..053c01d 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#909090] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#909090] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-drag-release-expected.txt b/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-drag-release-expected.txt
index bfbe4c2..41d1775 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-drag-release-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-drag-release-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (114,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-float-expected.txt b/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-float-expected.txt
index f85d7d2..f882ab9 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-float-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-float-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#909090] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#909090] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/forms/input-appearance-height-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/forms/input-appearance-height-expected.txt
index 9ae3096..dfb42b6 100644
--- a/third_party/WebKit/LayoutTests/platform/android/fast/forms/input-appearance-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/forms/input-appearance-height-expected.txt
@@ -49,7 +49,7 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (60,123) size 0x0
         RenderText {#text} at (0,136) size 37x19
           text run at (0,136) width 37: "range "
-        RenderSlider {INPUT} at (39,130) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (39,130) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt
index 1af74b7..faf8a7a 100644
--- a/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -16,7 +16,7 @@ layer at (8,28) size 300x150
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt
index fb92653..287f3f5 100644
--- a/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/fast/layers/video-layer-expected.txt
@@ -21,7 +21,7 @@ layer at (59,115) size 300x150
 layer at (64,230) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt
index a1a5de7..84ac320 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-after-reload-expected.txt
@@ -16,7 +16,7 @@ layer at (8,44) size 320x240
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -25,7 +25,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt
index b705b57..4f9faba 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-strict-expected.txt
@@ -16,7 +16,7 @@ layer at (8,52) size 320x240
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -25,7 +25,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt
index 5a5205a..395cb9e 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-expected.txt
@@ -20,7 +20,7 @@ layer at (18,44) size 320x240
 layer at (23,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -29,7 +29,7 @@ layer at (23,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -40,7 +40,7 @@ layer at (8,284) size 320x240
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -49,7 +49,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt
index 2bf40cd..9070867 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-styling-strict-expected.txt
@@ -20,7 +20,7 @@ layer at (8,52) size 320x240
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -29,7 +29,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -40,7 +40,7 @@ layer at (332,52) size 320x240
 layer at (337,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -49,7 +49,7 @@ layer at (337,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt
index 56299e4..e98a321 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/controls-without-preload-expected.txt
@@ -16,7 +16,7 @@ layer at (8,44) size 320x240
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -25,7 +25,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt
index ca103ed..67bfedb 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/media-controls-clone-expected.txt
@@ -19,7 +19,7 @@ layer at (8,8) size 300x150
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -34,7 +34,7 @@ layer at (308,128) size 300x30
 layer at (308,128) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -49,7 +49,7 @@ layer at (8,163) size 300x150
 layer at (13,278) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -64,7 +64,7 @@ layer at (308,283) size 300x30
 layer at (308,283) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/media-document-audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/media-document-audio-repaint-expected.txt
index 96e38ee..d4e6786 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/media-document-audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/media-document-audio-repaint-expected.txt
@@ -25,7 +25,7 @@ layer at (8,44) size 384x334
     layer at (45,131) size 290x30
       RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
         RenderButton {INPUT} at (9,0) size 30x30
-        RenderSlider {INPUT} at (48,11) size 98.47x8
+        LayoutSlider {INPUT} at (48,11) size 98.47x8
           RenderFlexibleBox {DIV} at (0,0) size 98.47x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 110.47x24
               RenderBlock {DIV} at (32.22,0) size 32x24
@@ -34,7 +34,7 @@ layer at (8,44) size 384x334
             RenderText {#text} at (0,7) size 25x16
               text run at (0,7) width 25: "0:00"
         RenderButton {INPUT} at (195.47,0) size 35x30
-        RenderSlider {INPUT} at (236.47,11) size 38.53x8
+        LayoutSlider {INPUT} at (236.47,11) size 38.53x8
           RenderFlexibleBox {DIV} at (0,0) size 38.53x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 50.53x24
               RenderBlock {DIV} at (19.53,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt
index 42413e1..0766db9 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-horizontal-expected.txt
@@ -62,7 +62,7 @@ layer at (8,175) size 320x15 scrollHeight 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-4.77,0) size 32x24
@@ -71,7 +71,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt
index e48d9c6..4f8b1eb 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/track/track-cue-rendering-vertical-expected.txt
@@ -62,7 +62,7 @@ layer at (290,8) size 15x205 scrollWidth 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-0.28,0) size 32x24
@@ -71,7 +71,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt
index 4db0f57..c073e96 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-rendering-expected.txt
@@ -21,7 +21,7 @@ layer at (8,44) size 320x240
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -30,7 +30,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -41,7 +41,7 @@ layer at (8,284) size 320x240
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -50,7 +50,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -63,7 +63,7 @@ layer at (8,524) size 320x240
 layer at (13,729) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -72,7 +72,7 @@ layer at (13,729) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-controls-with-cast-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-with-cast-rendering-expected.txt
index cac2e91..9f63b13 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-controls-with-cast-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-controls-with-cast-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -46,7 +46,7 @@ layer at (8,297) size 320x205
 layer at (13,502) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -55,7 +55,7 @@ layer at (13,502) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -71,7 +71,7 @@ layer at (8,542) size 320x205
 layer at (13,747) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -80,7 +80,7 @@ layer at (13,747) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt
index 8af1137..ca21a33 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-display-toggle-expected.txt
@@ -15,7 +15,7 @@ layer at (8,28) size 320x240
 layer at (13,233) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -24,7 +24,7 @@ layer at (13,233) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:06"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt
index 36414e0..85a5b98 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-empty-source-expected.txt
@@ -16,7 +16,7 @@ layer at (9,45) size 300x150
 layer at (14,160) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt
index f1fd2d7ff..4565c41 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-no-audio-expected.txt
@@ -16,7 +16,7 @@ layer at (8,44) size 352x288
 layer at (13,297) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 170x8
+    LayoutSlider {INPUT} at (48,11) size 170x8
       RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 182x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt
index 24af02e..6c68e2a 100644
--- a/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/android/media/video-zoom-controls-expected.txt
@@ -14,7 +14,7 @@ layer at (57,85) size 240x180
 layer at (65,213) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -23,7 +23,7 @@ layer at (65,213) size 225x45 scrollWidth 329
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
@@ -36,7 +36,7 @@ layer at (57,310) size 240x180
 layer at (65,438) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -45,7 +45,7 @@ layer at (65,438) size 225x45 scrollWidth 329
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt
index b8b6737..4c54610 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
index 6b9b6c0..eef2f2d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-appearance-height-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-appearance-height-expected.txt
index 3516553..2c3c3f7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-appearance-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-appearance-height-expected.txt
@@ -49,7 +49,7 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (60,123) size 0x0
         RenderText {#text} at (0,136) size 37x19
           text run at (0,136) width 37: "range "
-        RenderSlider {INPUT} at (39,130) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (39,130) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/input-appearance-range-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/input-appearance-range-expected.txt
index 3f3d263..0caf947 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/input-appearance-range-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/input-appearance-range-expected.txt
@@ -4,28 +4,28 @@ layer at (0,0) size 800x284
   RenderBlock {HTML} at (0,0) size 800x284
     RenderBody {BODY} at (8,8) size 784x268
       RenderBlock {DIV} at (0,0) size 784x37
-        RenderSlider {INPUT} at (2,2) size 129x30 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x30 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x30
             RenderBlock {DIV} at (0,4.50) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
       RenderBlock {DIV} at (0,37) size 784x28
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
       RenderBlock {DIV} at (0,65) size 784x28
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
       RenderBlock {DIV} at (0,93) size 784x147
-        RenderSlider {INPUT} at (64,2) size 129x140 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (64,2) size 129x140 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x140
             RenderBlock {DIV} at (54,0) size 21x140
               RenderBlock {DIV} at (0,64.50) size 21x11
       RenderBlock {DIV} at (0,240) size 784x28
 layer at (10,250) size 129x21
-  RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+  LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
     RenderFlexibleBox {DIV} at (0,0) size 129x21
       RenderBlock {DIV} at (0,0) size 129x21
         RenderBlock {DIV} at (88.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-appearance-basic-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-appearance-basic-expected.txt
index 0baf8bd..fed6f99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-appearance-basic-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-appearance-basic-expected.txt
@@ -3,66 +3,66 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x209
   RenderBlock {HTML} at (0,0) size 800x209
     RenderBody {BODY} at (8,8) size 784x193
-      RenderSlider {INPUT} at (4,4) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,4) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,10) size 4x19
         text run at (137,10) width 4: " "
       RenderBR {BR} at (141,10) size 0x19
-      RenderSlider {INPUT} at (4,34) size 135x27 [color=#9D968E] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
+      LayoutSlider {INPUT} at (4,34) size 135x27 [color=#9D968E] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
         RenderFlexibleBox {DIV} at (3,3) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (143,46) size 4x19
         text run at (143,46) width 4: " "
-      RenderSlider {INPUT} at (151,40) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (151,40) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (284,46) size 4x19
         text run at (284,46) width 4: " "
       RenderBR {BR} at (288,46) size 0x19
-      RenderSlider {INPUT} at (4,70) size 129x21 [color=#9D968E]
+      LayoutSlider {INPUT} at (4,70) size 129x21 [color=#9D968E]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,76) size 4x19
         text run at (137,76) width 4: " "
       RenderBR {BR} at (141,76) size 0x19
-      RenderSlider {INPUT} at (4,100) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,100) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,106) size 4x19
         text run at (137,106) width 4: " "
       RenderBR {BR} at (141,106) size 0x19
-      RenderSlider {INPUT} at (4,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (48,136) size 4x19
         text run at (48,136) width 4: " "
-      RenderSlider {INPUT} at (56,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (56,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (100,136) size 4x19
         text run at (100,136) width 4: " "
-      RenderSlider {INPUT} at (108,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (108,130) size 40x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (152,136) size 4x19
         text run at (152,136) width 4: " "
       RenderBR {BR} at (156,136) size 0x19
-      RenderSlider {INPUT} at (6,164) size 193.50x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (6,164) size 193.50x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 193.50x21
           RenderBlock {DIV} at (0,0) size 193.50x21
             RenderBlock {DIV} at (91.25,0) size 11x21
       RenderText {#text} at (205,170) size 5x19
         text run at (205,170) width 5: " "
-      RenderSlider {INPUT} at (217.50,164) size 258x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (217.50,164) size 258x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 258x21
           RenderBlock {DIV} at (0,0) size 258x21
             RenderBlock {DIV} at (123.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-thumb-height-percentage-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-thumb-height-percentage-expected.txt
index a117f4d..62be80c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-thumb-height-percentage-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/range-thumb-height-percentage-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 512x19
           text run at (0,0) width 512: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
       RenderBlock (anonymous) at (0,36) size 784x24
-        RenderSlider {INPUT} at (2,2) size 200x20 [color=#9D968E] [bgcolor=#C0C0C0]
+        LayoutSlider {INPUT} at (2,2) size 200x20 [color=#9D968E] [bgcolor=#C0C0C0]
           RenderFlexibleBox {DIV} at (0,0) size 200x20
             RenderBlock {DIV} at (0,5) size 200x10
               RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-padding-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-padding-expected.txt
index 9ce0b12..ce90415 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-padding-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-padding-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x600
           text run at (0,0) width 307: "This tests that the slider control considers padding. "
         RenderBR {BR} at (0,0) size 0x0
       RenderBlock {DIV} at (0,20) size 784x45 [bgcolor=#ADD8E6]
-        RenderSlider {INPUT} at (2,2) size 100x41 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 100x41 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (10,10) size 80x21
             RenderBlock {DIV} at (0,0) size 80x21
               RenderBlock {DIV} at (0,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-shared-style-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-shared-style-expected.txt
index 74f5b8b..819c8a5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-shared-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-shared-style-expected.txt
@@ -19,12 +19,12 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 266x19
           text run at (0,0) width 266: "The first slider\x{2019}s thumb should be on the left."
       RenderBlock {DIV} at (0,72) size 784x50
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
         RenderBR {BR} at (133,23) size 0x0
-        RenderSlider {INPUT} at (2,27) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,27) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-stylability-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-stylability-expected.txt
index 2af93ba..d688be0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-stylability-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/range/slider-thumb-stylability-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x20 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x20 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x20
           RenderBlock {DIV} at (0,0) size 129x20
             RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
index 97d1cc6..3e997f5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -18,7 +18,7 @@ layer at (8,28) size 300x115
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
index 32d3d65..1e0f917 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/video-layer-expected.txt
@@ -23,7 +23,7 @@ layer at (59,115) size 300x115
 layer at (64,230) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-drag-release-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-drag-release-expected.txt
index b8b6737..4c54610 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-drag-release-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-drag-release-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-float-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-float-expected.txt
index e0285d8..3cecb98 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-float-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/repaint/slider-thumb-float-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/audio-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/audio-controls-rendering-expected.txt
index 9ecd5ad..e51745d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/audio-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/audio-controls-rendering-expected.txt
@@ -22,7 +22,7 @@ layer at (8,44) size 300x30
 layer at (8,44) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (8,44) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -41,7 +41,7 @@ layer at (8,94) size 320x30
 layer at (8,94) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -50,7 +50,7 @@ layer at (8,94) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
@@ -62,7 +62,7 @@ layer at (8,144) size 320x100
 layer at (8,214) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -71,7 +71,7 @@ layer at (8,214) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/audio-repaint-expected.txt
index 93aa775..c831ecf8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/audio-repaint-expected.txt
@@ -19,7 +19,7 @@ layer at (8,44) size 300x30
 layer at (8,44) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -28,7 +28,7 @@ layer at (8,44) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -40,7 +40,7 @@ layer at (8,74) size 300x30
 layer at (8,74) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -49,7 +49,7 @@ layer at (8,74) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -61,7 +61,7 @@ layer at (8,156) size 300x30
 layer at (8,156) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -70,7 +70,7 @@ layer at (8,156) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
index f5e2cd4..433c647 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
index b9d1424..0f7e7bb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.txt
@@ -18,7 +18,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
index 82593f4..a00eb4b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.txt
@@ -22,7 +22,7 @@ layer at (18,44) size 320x205
 layer at (23,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (23,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (8,284) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
index 3339f24..255fd53 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.txt
@@ -22,7 +22,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (332,52) size 320x205
 layer at (337,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (337,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
index 34bf3bf..47d9f70 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
index 14a937e..45d0679e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/media-controls-clone-expected.txt
@@ -21,7 +21,7 @@ layer at (8,8) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -36,7 +36,7 @@ layer at (308,128) size 300x30
 layer at (308,128) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (8,163) size 300x115
 layer at (13,278) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -68,7 +68,7 @@ layer at (308,283) size 300x30
 layer at (308,283) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/media-document-audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/media-document-audio-repaint-expected.txt
index 9db18aa..1c4c743 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/media-document-audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/media-document-audio-repaint-expected.txt
@@ -27,7 +27,7 @@ layer at (8,44) size 384x334
     layer at (45,131) size 290x30
       RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
         RenderButton {INPUT} at (9,0) size 30x30
-        RenderSlider {INPUT} at (48,11) size 98.47x8
+        LayoutSlider {INPUT} at (48,11) size 98.47x8
           RenderFlexibleBox {DIV} at (0,0) size 98.47x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 110.47x24
               RenderBlock {DIV} at (32.22,0) size 32x24
@@ -36,7 +36,7 @@ layer at (8,44) size 384x334
             RenderText {#text} at (0,7) size 25x16
               text run at (0,7) width 25: "0:00"
         RenderButton {INPUT} at (195.47,0) size 35x30
-        RenderSlider {INPUT} at (236.47,11) size 38.53x8
+        LayoutSlider {INPUT} at (236.47,11) size 38.53x8
           RenderFlexibleBox {DIV} at (0,0) size 38.53x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 50.53x24
               RenderBlock {DIV} at (19.53,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
index 16e3f31..5bddf9c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-horizontal-expected.txt
@@ -64,7 +64,7 @@ layer at (8,175) size 320x15 scrollHeight 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-4.77,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
index 411a568..13c09b0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.txt
@@ -64,7 +64,7 @@ layer at (290,8) size 15x205 scrollWidth 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-0.28,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
index d733867..00e8ea7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -45,7 +45,7 @@ layer at (8,284) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -54,7 +54,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -69,7 +69,7 @@ layer at (8,524) size 320x205 backgroundClip at (8,524) size 320x76 clip at (8,5
 layer at (13,729) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -78,7 +78,7 @@ layer at (13,729) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-with-cast-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-with-cast-rendering-expected.txt
index 6b57fb6..165a355 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-with-cast-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-controls-with-cast-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -46,7 +46,7 @@ layer at (8,297) size 320x205
 layer at (13,502) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -55,7 +55,7 @@ layer at (13,502) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -71,7 +71,7 @@ layer at (8,542) size 320x205 backgroundClip at (8,542) size 320x58 clip at (8,5
 layer at (13,747) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -80,7 +80,7 @@ layer at (13,747) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
index 37865fa..9d2b564 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.txt
@@ -17,7 +17,7 @@ layer at (8,28) size 320x205
 layer at (13,233) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -26,7 +26,7 @@ layer at (13,233) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:06"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
index 0384a7b..626bf65 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-empty-source-expected.txt
@@ -18,7 +18,7 @@ layer at (9,45) size 300x115
 layer at (14,160) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
index fcae4ee..140c99f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-no-audio-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 352x253
 layer at (13,297) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 170x8
+    LayoutSlider {INPUT} at (48,11) size 170x8
       RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 182x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
index 48420c2..96f50fe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-controls-expected.txt
@@ -16,7 +16,7 @@ layer at (57,85) size 240x128 scrollHeight 127
 layer at (65,213) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -25,7 +25,7 @@ layer at (65,213) size 225x45 scrollWidth 329
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
@@ -40,7 +40,7 @@ layer at (57,310) size 240x128 scrollHeight 127
 layer at (65,438) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -49,7 +49,7 @@ layer at (65,438) size 225x45 scrollWidth 329
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index 1af74b7..faf8a7a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -16,7 +16,7 @@ layer at (8,28) size 300x150
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt
index a039390..59e4eb6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt
@@ -49,7 +49,7 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (58,104) size 1x0
         RenderText {#text} at (0,114) size 40x16
           text run at (0,114) width 40: "range "
-        RenderSlider {INPUT} at (41.53,111) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (41.53,111) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (0,0) size 129x15
               RenderBlock {DIV} at (57,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.txt
index a92415d..7af4ce0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.txt
@@ -4,28 +4,28 @@ layer at (0,0) size 800x261
   RenderBlock {HTML} at (0,0) size 800x261
     RenderBody {BODY} at (8,8) size 784x245
       RenderBlock {DIV} at (0,0) size 784x36
-        RenderSlider {INPUT} at (2,2) size 129x30 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x30 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x30
             RenderBlock {DIV} at (0,7.50) size 129x15
               RenderBlock {DIV} at (57,0) size 15x15
       RenderBlock {DIV} at (0,36) size 784x21
-        RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (0,0) size 129x15
               RenderBlock {DIV} at (0,0) size 15x15
       RenderBlock {DIV} at (0,57) size 784x21
-        RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (0,0) size 129x15
               RenderBlock {DIV} at (114,0) size 15x15
       RenderBlock {DIV} at (0,78) size 784x146
-        RenderSlider {INPUT} at (64,2) size 129x140 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (64,2) size 129x140 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x140
             RenderBlock {DIV} at (57,0) size 15x140
               RenderBlock {DIV} at (0,62.50) size 15x15
       RenderBlock {DIV} at (0,224) size 784x21
 layer at (10,234) size 129x15
-  RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+  LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
     RenderFlexibleBox {DIV} at (0,0) size 129x15
       RenderBlock {DIV} at (0,0) size 129x15
         RenderBlock {DIV} at (85.50,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.txt
index 0920408..6adf453 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.txt
@@ -3,66 +3,66 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x183
   RenderBlock {HTML} at (0,0) size 800x183
     RenderBody {BODY} at (8,8) size 784x167
-      RenderSlider {INPUT} at (4,4) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,4) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (57,0) size 15x15
       RenderText {#text} at (137,7) size 4x16
         text run at (137,7) width 4: " "
       RenderBR {BR} at (141,7) size 0x16
-      RenderSlider {INPUT} at (4,27) size 135x21 [color=#909090] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
+      LayoutSlider {INPUT} at (4,27) size 135x21 [color=#909090] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
         RenderFlexibleBox {DIV} at (3,3) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (57,0) size 15x15
       RenderText {#text} at (143,36) size 4x16
         text run at (143,36) width 4: " "
-      RenderSlider {INPUT} at (151,33) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (151,33) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (57,0) size 15x15
       RenderText {#text} at (284,36) size 4x16
         text run at (284,36) width 4: " "
       RenderBR {BR} at (288,36) size 0x16
-      RenderSlider {INPUT} at (4,56) size 129x15 [color=#909090]
+      LayoutSlider {INPUT} at (4,56) size 129x15 [color=#909090]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (57,0) size 15x15
       RenderText {#text} at (137,59) size 4x16
         text run at (137,59) width 4: " "
       RenderBR {BR} at (141,59) size 0x16
-      RenderSlider {INPUT} at (4,79) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,79) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x15
           RenderBlock {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (57,0) size 15x15
       RenderText {#text} at (137,82) size 4x16
         text run at (137,82) width 4: " "
       RenderBR {BR} at (141,82) size 0x16
-      RenderSlider {INPUT} at (4,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x15
           RenderBlock {DIV} at (0,0) size 40x15
             RenderBlock {DIV} at (12.50,0) size 15x15
       RenderText {#text} at (48,105) size 4x16
         text run at (48,105) width 4: " "
-      RenderSlider {INPUT} at (56,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (56,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x15
           RenderBlock {DIV} at (0,0) size 40x15
             RenderBlock {DIV} at (12.50,0) size 15x15
       RenderText {#text} at (100,105) size 4x16
         text run at (100,105) width 4: " "
-      RenderSlider {INPUT} at (108,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (108,102) size 40x15 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x15
           RenderBlock {DIV} at (0,0) size 40x15
             RenderBlock {DIV} at (12.50,0) size 15x15
       RenderText {#text} at (152,105) size 4x16
         text run at (152,105) width 4: " "
       RenderBR {BR} at (156,105) size 0x16
-      RenderSlider {INPUT} at (6,137) size 193.50x22 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (6,137) size 193.50x22 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 193.50x22
           RenderBlock {DIV} at (0,0) size 193.50x22
             RenderBlock {DIV} at (85.75,0) size 22x22
       RenderText {#text} at (205,147) size 5x16
         text run at (205,147) width 5: " "
-      RenderSlider {INPUT} at (217.50,129) size 258x30 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (217.50,129) size 258x30 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 258x30
           RenderBlock {DIV} at (0,0) size 258x30
             RenderBlock {DIV} at (114,0) size 30x30
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-thumb-height-percentage-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-thumb-height-percentage-expected.txt
index cb5afa6..54a556b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-thumb-height-percentage-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-thumb-height-percentage-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 546x16
           text run at (0,0) width 546: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
       RenderBlock (anonymous) at (0,32) size 784x24
-        RenderSlider {INPUT} at (2,2) size 200x20 [color=#909090] [bgcolor=#C0C0C0]
+        LayoutSlider {INPUT} at (2,2) size 200x20 [color=#909090] [bgcolor=#C0C0C0]
           RenderFlexibleBox {DIV} at (0,0) size 200x20
             RenderBlock {DIV} at (0,5) size 200x10
               RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.txt
index a4f816f..6299f67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x600
           text run at (0,0) width 330: "This tests that the slider control considers padding. "
         RenderBR {BR} at (0,0) size 0x0
       RenderBlock {DIV} at (0,16) size 784x39 [bgcolor=#ADD8E6]
-        RenderSlider {INPUT} at (2,2) size 100x35 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 100x35 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (10,10) size 80x15
             RenderBlock {DIV} at (0,0) size 80x15
               RenderBlock {DIV} at (0,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.txt
index f9f1808..bb848db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.txt
@@ -19,12 +19,12 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 290x16
           text run at (0,0) width 290: "The first slider\x{2019}s thumb should be on the left."
       RenderBlock {DIV} at (0,64) size 784x38
-        RenderSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (0,0) size 129x15
               RenderBlock {DIV} at (0,0) size 15x15
         RenderBR {BR} at (133,17) size 0x0
-        RenderSlider {INPUT} at (2,21) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,21) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x15
             RenderBlock {DIV} at (0,0) size 129x15
               RenderBlock {DIV} at (114,0) size 15x15
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-stylability-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-stylability-expected.txt
index f3925d70..19d2aa2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-stylability-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-stylability-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x20 [color=#909090] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x20 [color=#909090] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x20
           RenderBlock {DIV} at (0,0) size 129x20
             RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
index 8e0ed5eb..8b9597f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -18,7 +18,7 @@ layer at (8,24) size 300x115
 layer at (13,139) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.98x8
+    LayoutSlider {INPUT} at (48,11) size 150.98x8
       RenderFlexibleBox {DIV} at (0,0) size 150.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
index 7c4d12a..ca8aed0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
@@ -23,7 +23,7 @@ layer at (59,107) size 300x115
 layer at (64,222) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.98x8
+    LayoutSlider {INPUT} at (48,11) size 150.98x8
       RenderFlexibleBox {DIV} at (0,0) size 150.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
index d350643..800148f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -22,7 +22,7 @@ layer at (8,40) size 300x30
 layer at (8,40) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 102.89x8
+    LayoutSlider {INPUT} at (48,11) size 102.89x8
       RenderFlexibleBox {DIV} at (0,0) size 102.89x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 114.89x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (8,40) size 300x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:07"
     RenderButton {INPUT} at (200.91,0) size 35x30
-    RenderSlider {INPUT} at (241.91,11) size 43.09x8
+    LayoutSlider {INPUT} at (241.91,11) size 43.09x8
       RenderFlexibleBox {DIV} at (0,0) size 43.09x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.09x24
           RenderBlock {DIV} at (24.09,0) size 24x24
@@ -41,7 +41,7 @@ layer at (8,86) size 320x30
 layer at (8,86) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 112.75x8
+    LayoutSlider {INPUT} at (48,11) size 112.75x8
       RenderFlexibleBox {DIV} at (0,0) size 112.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 124.75x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -50,7 +50,7 @@ layer at (8,86) size 320x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:07"
     RenderButton {INPUT} at (210.77,0) size 35x30
-    RenderSlider {INPUT} at (251.77,11) size 53.23x8
+    LayoutSlider {INPUT} at (251.77,11) size 53.23x8
       RenderFlexibleBox {DIV} at (0,0) size 53.23x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.23x24
           RenderBlock {DIV} at (34.23,0) size 24x24
@@ -62,7 +62,7 @@ layer at (8,132) size 320x100
 layer at (8,202) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 112.75x8
+    LayoutSlider {INPUT} at (48,11) size 112.75x8
       RenderFlexibleBox {DIV} at (0,0) size 112.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 124.75x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -71,7 +71,7 @@ layer at (8,202) size 320x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:07"
     RenderButton {INPUT} at (210.77,0) size 35x30
-    RenderSlider {INPUT} at (251.77,11) size 53.23x8
+    LayoutSlider {INPUT} at (251.77,11) size 53.23x8
       RenderFlexibleBox {DIV} at (0,0) size 53.23x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.23x24
           RenderBlock {DIV} at (34.23,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/audio-repaint-expected.txt
index 0e4a4e2..1b9eae8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/audio-repaint-expected.txt
@@ -19,7 +19,7 @@ layer at (8,40) size 300x30
 layer at (8,40) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 102.89x8
+    LayoutSlider {INPUT} at (48,11) size 102.89x8
       RenderFlexibleBox {DIV} at (0,0) size 102.89x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 114.89x24
           RenderBlock {DIV} at (34.44,0) size 32x24
@@ -28,7 +28,7 @@ layer at (8,40) size 300x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (200.91,0) size 35x30
-    RenderSlider {INPUT} at (241.91,11) size 43.09x8
+    LayoutSlider {INPUT} at (241.91,11) size 43.09x8
       RenderFlexibleBox {DIV} at (0,0) size 43.09x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.09x24
           RenderBlock {DIV} at (24.09,0) size 24x24
@@ -40,7 +40,7 @@ layer at (8,70) size 300x30
 layer at (8,70) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 102.89x8
+    LayoutSlider {INPUT} at (48,11) size 102.89x8
       RenderFlexibleBox {DIV} at (0,0) size 102.89x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 114.89x24
           RenderBlock {DIV} at (34.44,0) size 32x24
@@ -49,7 +49,7 @@ layer at (8,70) size 300x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (200.91,0) size 35x30
-    RenderSlider {INPUT} at (241.91,11) size 43.09x8
+    LayoutSlider {INPUT} at (241.91,11) size 43.09x8
       RenderFlexibleBox {DIV} at (0,0) size 43.09x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.09x24
           RenderBlock {DIV} at (24.09,0) size 24x24
@@ -61,7 +61,7 @@ layer at (8,152) size 300x30
 layer at (8,152) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 102.89x8
+    LayoutSlider {INPUT} at (48,11) size 102.89x8
       RenderFlexibleBox {DIV} at (0,0) size 102.89x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 114.89x24
           RenderBlock {DIV} at (34.44,0) size 32x24
@@ -70,7 +70,7 @@ layer at (8,152) size 300x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (200.91,0) size 35x30
-    RenderSlider {INPUT} at (241.91,11) size 43.09x8
+    LayoutSlider {INPUT} at (241.91,11) size 43.09x8
       RenderFlexibleBox {DIV} at (0,0) size 43.09x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.09x24
           RenderBlock {DIV} at (24.09,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
index 2805393..b7a9591 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,40) size 320x205
 layer at (13,245) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,245) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
index ef3f98d..1230d3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-strict-expected.txt
@@ -18,7 +18,7 @@ layer at (8,48) size 320x205
 layer at (13,253) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,253) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
index 7a9a672..521072a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-expected.txt
@@ -22,7 +22,7 @@ layer at (18,40) size 320x205
 layer at (23,245) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (23,245) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
@@ -44,7 +44,7 @@ layer at (8,280) size 320x205
 layer at (13,485) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (13,485) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
index e582e49..a761a63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
@@ -22,7 +22,7 @@ layer at (8,48) size 320x205
 layer at (13,253) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (13,253) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
@@ -44,7 +44,7 @@ layer at (332,48) size 320x205
 layer at (337,253) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (337,253) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
index 4e1d618..9da4015 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,40) size 320x205
 layer at (13,245) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,245) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
index 43a363a..7a16528 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
@@ -21,7 +21,7 @@ layer at (8,8) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.98x8
+    LayoutSlider {INPUT} at (48,11) size 150.98x8
       RenderFlexibleBox {DIV} at (0,0) size 150.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -36,7 +36,7 @@ layer at (308,128) size 300x30
 layer at (308,128) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 160.98x8
+    LayoutSlider {INPUT} at (48,11) size 160.98x8
       RenderFlexibleBox {DIV} at (0,0) size 160.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 172.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (8,162) size 300x115
 layer at (13,277) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.98x8
+    LayoutSlider {INPUT} at (48,11) size 150.98x8
       RenderFlexibleBox {DIV} at (0,0) size 150.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -68,7 +68,7 @@ layer at (308,282) size 300x30
 layer at (308,282) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 160.98x8
+    LayoutSlider {INPUT} at (48,11) size 160.98x8
       RenderFlexibleBox {DIV} at (0,0) size 160.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 172.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt
index 6531299..7f9d588 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt
@@ -27,7 +27,7 @@ layer at (8,40) size 384x334
     layer at (45,131) size 290x30
       RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
         RenderButton {INPUT} at (9,0) size 30x30
-        RenderSlider {INPUT} at (48,11) size 97.97x8
+        LayoutSlider {INPUT} at (48,11) size 97.97x8
           RenderFlexibleBox {DIV} at (0,0) size 97.97x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 109.97x24
               RenderBlock {DIV} at (31.97,0) size 32x24
@@ -36,7 +36,7 @@ layer at (8,40) size 384x334
             RenderText {#text} at (0,7) size 27x15
               text run at (0,7) width 27: "0:00"
         RenderButton {INPUT} at (195.98,0) size 35x30
-        RenderSlider {INPUT} at (236.98,11) size 38.02x8
+        LayoutSlider {INPUT} at (236.98,11) size 38.02x8
           RenderFlexibleBox {DIV} at (0,0) size 38.02x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 50.02x24
               RenderBlock {DIV} at (19.02,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
index b619a4b..1c4dcb5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
@@ -64,7 +64,7 @@ layer at (8,181) size 320x12 scrollHeight 14
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 72.98x8
+    LayoutSlider {INPUT} at (48,11) size 72.98x8
       RenderFlexibleBox {DIV} at (0,0) size 72.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 84.98x24
           RenderBlock {DIV} at (-4.81,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
index 967912d..98c3f6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/track/track-cue-rendering-vertical-expected.txt
@@ -64,7 +64,7 @@ layer at (200,8) size 18x205
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 72.98x8
+    LayoutSlider {INPUT} at (48,11) size 72.98x8
       RenderFlexibleBox {DIV} at (0,0) size 72.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 84.98x24
           RenderBlock {DIV} at (-0.41,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
index bdd3458..2731436 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,40) size 320x205
 layer at (13,245) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,245) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
@@ -45,7 +45,7 @@ layer at (8,280) size 320x205
 layer at (13,485) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -54,7 +54,7 @@ layer at (13,485) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
@@ -69,7 +69,7 @@ layer at (8,520) size 320x205 backgroundClip at (8,520) size 320x80 clip at (8,5
 layer at (13,725) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -78,7 +78,7 @@ layer at (13,725) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-with-cast-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-with-cast-rendering-expected.txt
index 32af57b..f7c97c9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-with-cast-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-controls-with-cast-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,48) size 320x205
 layer at (13,253) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 72.98x8
+    LayoutSlider {INPUT} at (48,11) size 72.98x8
       RenderFlexibleBox {DIV} at (0,0) size 72.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 84.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,253) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -46,7 +46,7 @@ layer at (8,292) size 320x205
 layer at (13,497) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 72.98x8
+    LayoutSlider {INPUT} at (48,11) size 72.98x8
       RenderFlexibleBox {DIV} at (0,0) size 72.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 84.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -55,7 +55,7 @@ layer at (13,497) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -71,7 +71,7 @@ layer at (8,536) size 320x205 backgroundClip at (8,536) size 320x64 clip at (8,5
 layer at (13,741) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 72.98x8
+    LayoutSlider {INPUT} at (48,11) size 72.98x8
       RenderFlexibleBox {DIV} at (0,0) size 72.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 84.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -80,7 +80,7 @@ layer at (13,741) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
index dcba8f1..61dc48e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
@@ -17,7 +17,7 @@ layer at (8,24) size 320x205
 layer at (13,229) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.08x8
+    LayoutSlider {INPUT} at (48,11) size 91.08x8
       RenderFlexibleBox {DIV} at (0,0) size 91.08x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.08x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -26,7 +26,7 @@ layer at (13,229) size 310x30
         RenderText {#text} at (0,7) size 27x15
           text run at (0,7) width 27: "0:06"
     RenderButton {INPUT} at (189.09,0) size 35x30
-    RenderSlider {INPUT} at (230.09,11) size 30.91x8
+    LayoutSlider {INPUT} at (230.09,11) size 30.91x8
       RenderFlexibleBox {DIV} at (0,0) size 30.91x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 42.91x24
           RenderBlock {DIV} at (11.91,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
index ad66eea..55bab70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-empty-source-expected.txt
@@ -18,7 +18,7 @@ layer at (9,41) size 300x115
 layer at (14,156) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.98x8
+    LayoutSlider {INPUT} at (48,11) size 150.98x8
       RenderFlexibleBox {DIV} at (0,0) size 150.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
index a433c11..baf209d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-no-audio-expected.txt
@@ -18,7 +18,7 @@ layer at (8,40) size 352x253
 layer at (13,293) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 168.98x8
+    LayoutSlider {INPUT} at (48,11) size 168.98x8
       RenderFlexibleBox {DIV} at (0,0) size 168.98x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 180.98x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
index 073435d..f8e0a57 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt
@@ -16,7 +16,7 @@ layer at (57,81) size 240x128 scrollHeight 127
 layer at (65,209) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -25,7 +25,7 @@ layer at (65,209) size 225x45 scrollWidth 328
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (184.52,0) size 52.50x45
-    RenderSlider {INPUT} at (246.02,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (246.02,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
@@ -40,7 +40,7 @@ layer at (57,306) size 240x128 scrollHeight 127
 layer at (65,434) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -49,7 +49,7 @@ layer at (65,434) size 225x45 scrollWidth 328
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (184.52,0) size 52.50x45
-    RenderSlider {INPUT} at (246.02,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (246.02,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index d0300a3..1da1bd5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -16,7 +16,7 @@ layer at (8,26) size 300x150
 layer at (13,141) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/input-appearance-height-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/input-appearance-height-expected.txt
index b8bead7..d6c563c 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/input-appearance-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/input-appearance-height-expected.txt
@@ -49,7 +49,7 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (60,123) size 0x0
         RenderText {#text} at (0,136) size 37x19
           text run at (0,136) width 37: "range "
-        RenderSlider {INPUT} at (39,130) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (39,130) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/input-appearance-range-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/input-appearance-range-expected.txt
index 442f4a8..af9b12c 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/input-appearance-range-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/input-appearance-range-expected.txt
@@ -4,28 +4,28 @@ layer at (0,0) size 800x284
   RenderBlock {HTML} at (0,0) size 800x284
     RenderBody {BODY} at (8,8) size 784x268
       RenderBlock {DIV} at (0,0) size 784x37
-        RenderSlider {INPUT} at (2,2) size 129x30 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x30 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x30
             RenderBlock {DIV} at (0,4.50) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
       RenderBlock {DIV} at (0,37) size 784x28
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
       RenderBlock {DIV} at (0,65) size 784x28
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
       RenderBlock {DIV} at (0,93) size 784x147
-        RenderSlider {INPUT} at (64,2) size 129x140 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (64,2) size 129x140 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x140
             RenderBlock {DIV} at (54,0) size 21x140
               RenderBlock {DIV} at (0,64.50) size 21x11
       RenderBlock {DIV} at (0,240) size 784x28
 layer at (10,250) size 129x21
-  RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+  LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
     RenderFlexibleBox {DIV} at (0,0) size 129x21
       RenderBlock {DIV} at (0,0) size 129x21
         RenderBlock {DIV} at (88.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-appearance-basic-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-appearance-basic-expected.txt
index 5f8e25d..4e09ba4 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-appearance-basic-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-appearance-basic-expected.txt
@@ -3,66 +3,66 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x209
   RenderBlock {HTML} at (0,0) size 800x209
     RenderBody {BODY} at (8,8) size 784x193
-      RenderSlider {INPUT} at (4,4) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,4) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,10) size 4x19
         text run at (137,10) width 4: " "
       RenderBR {BR} at (141,10) size 0x19
-      RenderSlider {INPUT} at (4,34) size 135x27 [color=#C4C4C4] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
+      LayoutSlider {INPUT} at (4,34) size 135x27 [color=#C4C4C4] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
         RenderFlexibleBox {DIV} at (3,3) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (143,46) size 4x19
         text run at (143,46) width 4: " "
-      RenderSlider {INPUT} at (151,40) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (151,40) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (284,46) size 4x19
         text run at (284,46) width 4: " "
       RenderBR {BR} at (288,46) size 0x19
-      RenderSlider {INPUT} at (4,70) size 129x21 [color=#C4C4C4]
+      LayoutSlider {INPUT} at (4,70) size 129x21 [color=#C4C4C4]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,76) size 4x19
         text run at (137,76) width 4: " "
       RenderBR {BR} at (141,76) size 0x19
-      RenderSlider {INPUT} at (4,100) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,100) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,106) size 4x19
         text run at (137,106) width 4: " "
       RenderBR {BR} at (141,106) size 0x19
-      RenderSlider {INPUT} at (4,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (48,136) size 4x19
         text run at (48,136) width 4: " "
-      RenderSlider {INPUT} at (56,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (56,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (100,136) size 4x19
         text run at (100,136) width 4: " "
-      RenderSlider {INPUT} at (108,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (108,130) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (152,136) size 4x19
         text run at (152,136) width 4: " "
       RenderBR {BR} at (156,136) size 0x19
-      RenderSlider {INPUT} at (6,164) size 193.50x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (6,164) size 193.50x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 193.50x21
           RenderBlock {DIV} at (0,0) size 193.50x21
             RenderBlock {DIV} at (91.25,0) size 11x21
       RenderText {#text} at (205,170) size 5x19
         text run at (205,170) width 5: " "
-      RenderSlider {INPUT} at (217.50,164) size 258x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (217.50,164) size 258x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 258x21
           RenderBlock {DIV} at (0,0) size 258x21
             RenderBlock {DIV} at (123.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-thumb-height-percentage-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-thumb-height-percentage-expected.txt
index 017bca6..c1284c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-thumb-height-percentage-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/range-thumb-height-percentage-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 512x19
           text run at (0,0) width 512: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
       RenderBlock (anonymous) at (0,36) size 784x24
-        RenderSlider {INPUT} at (2,2) size 200x20 [color=#C4C4C4] [bgcolor=#C0C0C0]
+        LayoutSlider {INPUT} at (2,2) size 200x20 [color=#C4C4C4] [bgcolor=#C0C0C0]
           RenderFlexibleBox {DIV} at (0,0) size 200x20
             RenderBlock {DIV} at (0,5) size 200x10
               RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-padding-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-padding-expected.txt
index 1d43b2d..4793f19 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-padding-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-padding-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x600
           text run at (0,0) width 307: "This tests that the slider control considers padding. "
         RenderBR {BR} at (0,0) size 0x0
       RenderBlock {DIV} at (0,20) size 784x45 [bgcolor=#ADD8E6]
-        RenderSlider {INPUT} at (2,2) size 100x41 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 100x41 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (10,10) size 80x21
             RenderBlock {DIV} at (0,0) size 80x21
               RenderBlock {DIV} at (0,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-thumb-shared-style-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-thumb-shared-style-expected.txt
index c8d28a1..d335529 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-thumb-shared-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/forms/range/slider-thumb-shared-style-expected.txt
@@ -19,12 +19,12 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 266x19
           text run at (0,0) width 266: "The first slider\x{2019}s thumb should be on the left."
       RenderBlock {DIV} at (0,72) size 784x50
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
         RenderBR {BR} at (133,23) size 0x0
-        RenderSlider {INPUT} at (2,27) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,27) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
index 97d1cc6..3e997f5 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -18,7 +18,7 @@ layer at (8,28) size 300x115
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
index 32d3d65..1e0f917 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/layers/video-layer-expected.txt
@@ -23,7 +23,7 @@ layer at (59,115) size 300x115
 layer at (64,230) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-controls-rendering-expected.txt
index 9ecd5ad..e51745d 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-controls-rendering-expected.txt
@@ -22,7 +22,7 @@ layer at (8,44) size 300x30
 layer at (8,44) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (8,44) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -41,7 +41,7 @@ layer at (8,94) size 320x30
 layer at (8,94) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -50,7 +50,7 @@ layer at (8,94) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
@@ -62,7 +62,7 @@ layer at (8,144) size 320x100
 layer at (8,214) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -71,7 +71,7 @@ layer at (8,214) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-repaint-expected.txt
index 93aa775..c831ecf8 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/audio-repaint-expected.txt
@@ -19,7 +19,7 @@ layer at (8,44) size 300x30
 layer at (8,44) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -28,7 +28,7 @@ layer at (8,44) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -40,7 +40,7 @@ layer at (8,74) size 300x30
 layer at (8,74) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -49,7 +49,7 @@ layer at (8,74) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -61,7 +61,7 @@ layer at (8,156) size 300x30
 layer at (8,156) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -70,7 +70,7 @@ layer at (8,156) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
index f5e2cd4..433c647 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-after-reload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
index b9d1424..0f7e7bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-strict-expected.txt
@@ -18,7 +18,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
index 82593f4..a00eb4b 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-expected.txt
@@ -22,7 +22,7 @@ layer at (18,44) size 320x205
 layer at (23,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (23,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (8,284) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
index 3339f24..255fd53 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-styling-strict-expected.txt
@@ -22,7 +22,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (332,52) size 320x205
 layer at (337,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (337,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
index 34bf3bf..47d9f70 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/controls-without-preload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
index 14a937e..45d0679e 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-controls-clone-expected.txt
@@ -21,7 +21,7 @@ layer at (8,8) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -36,7 +36,7 @@ layer at (308,128) size 300x30
 layer at (308,128) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (8,163) size 300x115
 layer at (13,278) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -68,7 +68,7 @@ layer at (308,283) size 300x30
 layer at (308,283) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-document-audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-document-audio-repaint-expected.txt
index 9db18aa..1c4c743 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/media-document-audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/media-document-audio-repaint-expected.txt
@@ -27,7 +27,7 @@ layer at (8,44) size 384x334
     layer at (45,131) size 290x30
       RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
         RenderButton {INPUT} at (9,0) size 30x30
-        RenderSlider {INPUT} at (48,11) size 98.47x8
+        LayoutSlider {INPUT} at (48,11) size 98.47x8
           RenderFlexibleBox {DIV} at (0,0) size 98.47x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 110.47x24
               RenderBlock {DIV} at (32.22,0) size 32x24
@@ -36,7 +36,7 @@ layer at (8,44) size 384x334
             RenderText {#text} at (0,7) size 25x16
               text run at (0,7) width 25: "0:00"
         RenderButton {INPUT} at (195.47,0) size 35x30
-        RenderSlider {INPUT} at (236.47,11) size 38.53x8
+        LayoutSlider {INPUT} at (236.47,11) size 38.53x8
           RenderFlexibleBox {DIV} at (0,0) size 38.53x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 50.53x24
               RenderBlock {DIV} at (19.53,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
index 16e3f31..5bddf9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-horizontal-expected.txt
@@ -64,7 +64,7 @@ layer at (8,175) size 320x15 scrollHeight 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-4.77,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
index 411a568..13c09b0 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/track/track-cue-rendering-vertical-expected.txt
@@ -64,7 +64,7 @@ layer at (290,8) size 15x205 scrollWidth 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-0.28,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
index d733867..00e8ea7 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,44) size 320x205
 layer at (13,249) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,249) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -45,7 +45,7 @@ layer at (8,284) size 320x205
 layer at (13,489) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -54,7 +54,7 @@ layer at (13,489) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -69,7 +69,7 @@ layer at (8,524) size 320x205 backgroundClip at (8,524) size 320x76 clip at (8,5
 layer at (13,729) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -78,7 +78,7 @@ layer at (13,729) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-with-cast-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-with-cast-rendering-expected.txt
index 6b57fb6..165a355 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-with-cast-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-controls-with-cast-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,52) size 320x205
 layer at (13,257) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,257) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -46,7 +46,7 @@ layer at (8,297) size 320x205
 layer at (13,502) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -55,7 +55,7 @@ layer at (13,502) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -71,7 +71,7 @@ layer at (8,542) size 320x205 backgroundClip at (8,542) size 320x58 clip at (8,5
 layer at (13,747) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -80,7 +80,7 @@ layer at (13,747) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
index 37865fa..9d2b564 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-display-toggle-expected.txt
@@ -17,7 +17,7 @@ layer at (8,28) size 320x205
 layer at (13,233) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -26,7 +26,7 @@ layer at (13,233) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:06"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
index 0384a7b..626bf65 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-empty-source-expected.txt
@@ -18,7 +18,7 @@ layer at (9,45) size 300x115
 layer at (14,160) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
index fcae4ee..140c99f 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-no-audio-expected.txt
@@ -18,7 +18,7 @@ layer at (8,44) size 352x253
 layer at (13,297) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 170x8
+    LayoutSlider {INPUT} at (48,11) size 170x8
       RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 182x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
index 1555c03..432a23d 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/media/video-zoom-controls-expected.txt
@@ -16,7 +16,7 @@ layer at (57,85) size 240x128 scrollHeight 127
 layer at (65,213) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -25,7 +25,7 @@ layer at (65,213) size 225x45 scrollWidth 329
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
@@ -40,7 +40,7 @@ layer at (57,310) size 240x128 scrollHeight 127
 layer at (65,438) size 225x45 scrollWidth 329
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -49,7 +49,7 @@ layer at (65,438) size 225x45 scrollWidth 329
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (185.50,0) size 52.50x45
-    RenderSlider {INPUT} at (247,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (247,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index 1af74b7..faf8a7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -16,7 +16,7 @@ layer at (8,28) size 300x150
 layer at (13,143) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-expected.txt
index 5463405..6b04fe2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
index ccb6864..7c184e3f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#C4C4C4] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#C4C4C4] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-appearance-height-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-appearance-height-expected.txt
index 6d05aa9..6394a25 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-appearance-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-appearance-height-expected.txt
@@ -49,7 +49,7 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (61,120) size 1x0
         RenderText {#text} at (0,133) size 40x17
           text run at (0,133) width 40: "range "
-        RenderSlider {INPUT} at (41.53,126) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (41.53,126) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/input-appearance-range-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/input-appearance-range-expected.txt
index abd5ddc..e049204 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/input-appearance-range-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/input-appearance-range-expected.txt
@@ -4,28 +4,28 @@ layer at (0,0) size 800x279
   RenderBlock {HTML} at (0,0) size 800x279
     RenderBody {BODY} at (8,8) size 784x263
       RenderBlock {DIV} at (0,0) size 784x36
-        RenderSlider {INPUT} at (2,2) size 129x30 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x30 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x30
             RenderBlock {DIV} at (0,4.50) size 129x21
               RenderBlock {DIV} at (59,0) size 11x21
       RenderBlock {DIV} at (0,36) size 784x27
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
       RenderBlock {DIV} at (0,63) size 784x27
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
       RenderBlock {DIV} at (0,90) size 784x146
-        RenderSlider {INPUT} at (64,2) size 129x140 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (64,2) size 129x140 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x140
             RenderBlock {DIV} at (54,0) size 21x140
               RenderBlock {DIV} at (0,64.50) size 21x11
       RenderBlock {DIV} at (0,236) size 784x27
 layer at (10,246) size 129x21
-  RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+  LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
     RenderFlexibleBox {DIV} at (0,0) size 129x21
       RenderBlock {DIV} at (0,0) size 129x21
         RenderBlock {DIV} at (88.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-appearance-basic-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-appearance-basic-expected.txt
index eac685e..9c4333e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-appearance-basic-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-appearance-basic-expected.txt
@@ -3,66 +3,66 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x204
   RenderBlock {HTML} at (0,0) size 800x204
     RenderBody {BODY} at (8,8) size 784x188
-      RenderSlider {INPUT} at (4,4) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,4) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,11) size 4x17
         text run at (137,11) width 4: " "
       RenderBR {BR} at (141,11) size 0x17
-      RenderSlider {INPUT} at (4,33) size 135x27 [color=#C4C4C4] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
+      LayoutSlider {INPUT} at (4,33) size 135x27 [color=#C4C4C4] [bgcolor=#FFFFFF] [border: (3px solid #00FF00)]
         RenderFlexibleBox {DIV} at (3,3) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (143,46) size 4x17
         text run at (143,46) width 4: " "
-      RenderSlider {INPUT} at (151,39) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (151,39) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (284,46) size 4x17
         text run at (284,46) width 4: " "
       RenderBR {BR} at (288,46) size 0x17
-      RenderSlider {INPUT} at (4,68) size 129x21 [color=#C4C4C4]
+      LayoutSlider {INPUT} at (4,68) size 129x21 [color=#C4C4C4]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,75) size 4x17
         text run at (137,75) width 4: " "
       RenderBR {BR} at (141,75) size 0x17
-      RenderSlider {INPUT} at (4,97) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,97) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (59,0) size 11x21
       RenderText {#text} at (137,104) size 4x17
         text run at (137,104) width 4: " "
       RenderBR {BR} at (141,104) size 0x17
-      RenderSlider {INPUT} at (4,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (4,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (48,133) size 4x17
         text run at (48,133) width 4: " "
-      RenderSlider {INPUT} at (56,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (56,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (100,133) size 4x17
         text run at (100,133) width 4: " "
-      RenderSlider {INPUT} at (108,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (108,126) size 40x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 40x21
           RenderBlock {DIV} at (0,0) size 40x21
             RenderBlock {DIV} at (14.50,0) size 11x21
       RenderText {#text} at (152,133) size 4x17
         text run at (152,133) width 4: " "
       RenderBR {BR} at (156,133) size 0x17
-      RenderSlider {INPUT} at (6,159) size 193.50x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (6,159) size 193.50x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 193.50x21
           RenderBlock {DIV} at (0,0) size 193.50x21
             RenderBlock {DIV} at (91.25,0) size 11x21
       RenderText {#text} at (205,166) size 5x17
         text run at (205,166) width 5: " "
-      RenderSlider {INPUT} at (217.50,159) size 258x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (217.50,159) size 258x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 258x21
           RenderBlock {DIV} at (0,0) size 258x21
             RenderBlock {DIV} at (123.50,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-thumb-height-percentage-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-thumb-height-percentage-expected.txt
index 07dc815..0456302 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-thumb-height-percentage-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/range-thumb-height-percentage-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 546x17
           text run at (0,0) width 546: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
       RenderBlock (anonymous) at (0,34) size 784x24
-        RenderSlider {INPUT} at (2,2) size 200x20 [color=#C4C4C4] [bgcolor=#C0C0C0]
+        LayoutSlider {INPUT} at (2,2) size 200x20 [color=#C4C4C4] [bgcolor=#C0C0C0]
           RenderFlexibleBox {DIV} at (0,0) size 200x20
             RenderBlock {DIV} at (0,5) size 200x10
               RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-padding-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-padding-expected.txt
index faa698e..94f2234 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-padding-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-padding-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 800x600
           text run at (0,0) width 330: "This tests that the slider control considers padding. "
         RenderBR {BR} at (0,0) size 0x0
       RenderBlock {DIV} at (0,18) size 784x45 [bgcolor=#ADD8E6]
-        RenderSlider {INPUT} at (2,2) size 100x41 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 100x41 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (10,10) size 80x21
             RenderBlock {DIV} at (0,0) size 80x21
               RenderBlock {DIV} at (0,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-shared-style-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-shared-style-expected.txt
index d52f5bc..9a0b54d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-shared-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-shared-style-expected.txt
@@ -19,12 +19,12 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 290x17
           text run at (0,0) width 290: "The first slider\x{2019}s thumb should be on the left."
       RenderBlock {DIV} at (0,68) size 784x50
-        RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (0,0) size 11x21
         RenderBR {BR} at (133,23) size 0x0
-        RenderSlider {INPUT} at (2,27) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+        LayoutSlider {INPUT} at (2,27) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
           RenderFlexibleBox {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (0,0) size 129x21
               RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-stylability-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-stylability-expected.txt
index fb714dd..929448c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-stylability-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/range/slider-thumb-stylability-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x20 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x20 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x20
           RenderBlock {DIV} at (0,0) size 129x20
             RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
index 8331cb6..23024e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -18,7 +18,7 @@ layer at (8,26) size 300x115
 layer at (13,141) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
index e4ea573..8f2bdf3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
@@ -23,7 +23,7 @@ layer at (59,111) size 300x115
 layer at (64,226) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-drag-release-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-drag-release-expected.txt
index 5463405..6b04fe2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-drag-release-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-drag-release-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
+      LayoutSlider {INPUT} at (2,2) size 129x21 [color=#C4C4C4] [bgcolor=#FFFFFF]
         RenderFlexibleBox {DIV} at (0,0) size 129x21
           RenderBlock {DIV} at (0,0) size 129x21
             RenderBlock {DIV} at (118,0) size 11x21
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-float-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-float-expected.txt
index ad58d39..6d1d9e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-float-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/repaint/slider-thumb-float-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSlider {INPUT} at (2,2) size 100x10 [color=#C4C4C4] [bgcolor=#FF0000]
+      LayoutSlider {INPUT} at (2,2) size 100x10 [color=#C4C4C4] [bgcolor=#FF0000]
         RenderFlexibleBox {DIV} at (0,0) size 100x10
           RenderBlock {DIV} at (0,0) size 100x10
             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt
index 113a29e..0e3f506 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt
@@ -22,7 +22,7 @@ layer at (8,42) size 300x30
 layer at (8,42) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (8,42) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -41,7 +41,7 @@ layer at (8,90) size 320x30
 layer at (8,90) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -50,7 +50,7 @@ layer at (8,90) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
@@ -62,7 +62,7 @@ layer at (8,138) size 320x100
 layer at (8,208) size 320x30
   RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113.25x8
+    LayoutSlider {INPUT} at (48,11) size 113.25x8
       RenderFlexibleBox {DIV} at (0,0) size 113.25x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 125.25x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -71,7 +71,7 @@ layer at (8,208) size 320x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
     RenderButton {INPUT} at (210.25,0) size 35x30
-    RenderSlider {INPUT} at (251.25,11) size 53.75x8
+    LayoutSlider {INPUT} at (251.25,11) size 53.75x8
       RenderFlexibleBox {DIV} at (0,0) size 53.75x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 65.75x24
           RenderBlock {DIV} at (34.75,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/audio-repaint-expected.txt
index a5766a89..494cbe6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/audio-repaint-expected.txt
@@ -19,7 +19,7 @@ layer at (8,42) size 300x30
 layer at (8,42) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -28,7 +28,7 @@ layer at (8,42) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -40,7 +40,7 @@ layer at (8,72) size 300x30
 layer at (8,72) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -49,7 +49,7 @@ layer at (8,72) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
@@ -61,7 +61,7 @@ layer at (8,154) size 300x30
 layer at (8,154) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103.39x8
+    LayoutSlider {INPUT} at (48,11) size 103.39x8
       RenderFlexibleBox {DIV} at (0,0) size 103.39x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 115.39x24
           RenderBlock {DIV} at (34.69,0) size 32x24
@@ -70,7 +70,7 @@ layer at (8,154) size 300x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (200.39,0) size 35x30
-    RenderSlider {INPUT} at (241.39,11) size 43.61x8
+    LayoutSlider {INPUT} at (241.39,11) size 43.61x8
       RenderFlexibleBox {DIV} at (0,0) size 43.61x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 55.61x24
           RenderBlock {DIV} at (24.61,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index 2d06f8d..833c9e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,42) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,247) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
index acb5300..8c3c750c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.txt
@@ -18,7 +18,7 @@ layer at (8,50) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,255) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
index f0935e7..7967cd9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -22,7 +22,7 @@ layer at (18,42) size 320x205
 layer at (23,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (23,247) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (8,282) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (13,487) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
index 7af025b..ce8b00c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.txt
@@ -22,7 +22,7 @@ layer at (8,50) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -31,7 +31,7 @@ layer at (13,255) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -44,7 +44,7 @@ layer at (332,50) size 320x205
 layer at (337,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (337,255) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
index b303313..90d6b26 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.txt
@@ -18,7 +18,7 @@ layer at (8,42) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -27,7 +27,7 @@ layer at (13,247) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
index 385666d..231713d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt
@@ -21,7 +21,7 @@ layer at (8,8) size 300x115
 layer at (13,123) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -36,7 +36,7 @@ layer at (308,128) size 300x30
 layer at (308,128) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -53,7 +53,7 @@ layer at (8,162) size 300x115
 layer at (13,277) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -68,7 +68,7 @@ layer at (308,282) size 300x30
 layer at (308,282) size 300x30
   RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 162x8
+    LayoutSlider {INPUT} at (48,11) size 162x8
       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 174x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/media-document-audio-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/media-document-audio-repaint-expected.txt
index 3a1bfda..d933265 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/media-document-audio-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/media-document-audio-repaint-expected.txt
@@ -27,7 +27,7 @@ layer at (8,42) size 384x334
     layer at (45,131) size 290x30
       RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
         RenderButton {INPUT} at (9,0) size 30x30
-        RenderSlider {INPUT} at (48,11) size 98.47x8
+        LayoutSlider {INPUT} at (48,11) size 98.47x8
           RenderFlexibleBox {DIV} at (0,0) size 98.47x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 110.47x24
               RenderBlock {DIV} at (32.22,0) size 32x24
@@ -36,7 +36,7 @@ layer at (8,42) size 384x334
             RenderText {#text} at (0,7) size 25x16
               text run at (0,7) width 25: "0:00"
         RenderButton {INPUT} at (195.47,0) size 35x30
-        RenderSlider {INPUT} at (236.47,11) size 38.53x8
+        LayoutSlider {INPUT} at (236.47,11) size 38.53x8
           RenderFlexibleBox {DIV} at (0,0) size 38.53x8 [border: (1px solid #E6E6E659)]
             RenderBlock {DIV} at (1,-8) size 50.53x24
               RenderBlock {DIV} at (19.53,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
index 5320e40..98d2348 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.txt
@@ -64,7 +64,7 @@ layer at (8,175) size 320x15 scrollHeight 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-4.77,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
index cf4e03b..c1b5f01 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.txt
@@ -64,7 +64,7 @@ layer at (290,8) size 15x205 scrollWidth 17
 layer at (13,213) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-0.28,0) size 32x24
@@ -73,7 +73,7 @@ layer at (13,213) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
index 4009d4e..206131d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,42) size 320x205
 layer at (13,247) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,247) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -45,7 +45,7 @@ layer at (8,282) size 320x205
 layer at (13,487) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -54,7 +54,7 @@ layer at (13,487) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
@@ -69,7 +69,7 @@ layer at (8,522) size 320x205 backgroundClip at (8,522) size 320x78 clip at (8,5
 layer at (13,727) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -78,7 +78,7 @@ layer at (13,727) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-with-cast-rendering-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-with-cast-rendering-expected.txt
index 1b05793..02ffd01 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-controls-with-cast-rendering-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-controls-with-cast-rendering-expected.txt
@@ -23,7 +23,7 @@ layer at (8,50) size 320x205
 layer at (13,255) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -32,7 +32,7 @@ layer at (13,255) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -46,7 +46,7 @@ layer at (8,294) size 320x205
 layer at (13,499) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -55,7 +55,7 @@ layer at (13,499) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
@@ -71,7 +71,7 @@ layer at (8,538) size 320x205 backgroundClip at (8,538) size 320x62 clip at (8,5
 layer at (13,743) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 outlineClip at (0,0) size 785x600
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 74x8
+    LayoutSlider {INPUT} at (48,11) size 74x8
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -80,7 +80,7 @@ layer at (13,743) size 310x30 backgroundClip at (0,0) size 0x0 clip at (0,0) siz
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
-    RenderSlider {INPUT} at (212,11) size 15x8
+    LayoutSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index a26aa9c..e1579d97 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.txt
@@ -17,7 +17,7 @@ layer at (8,26) size 320x205
 layer at (13,231) size 310x30
   RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91.58x8
+    LayoutSlider {INPUT} at (48,11) size 91.58x8
       RenderFlexibleBox {DIV} at (0,0) size 91.58x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 103.58x24
           RenderBlock {DIV} at (-7,0) size 32x24
@@ -26,7 +26,7 @@ layer at (13,231) size 310x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:06"
     RenderButton {INPUT} at (188.58,0) size 35x30
-    RenderSlider {INPUT} at (229.58,11) size 31.42x8
+    LayoutSlider {INPUT} at (229.58,11) size 31.42x8
       RenderFlexibleBox {DIV} at (0,0) size 31.42x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 43.42x24
           RenderBlock {DIV} at (12.42,0) size 24x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
index 2a4827e..b1f2000 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-empty-source-expected.txt
@@ -18,7 +18,7 @@ layer at (9,43) size 300x115
 layer at (14,158) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 152x8
+    LayoutSlider {INPUT} at (48,11) size 152x8
       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 164x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
index 5430485..6bd6be4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-no-audio-expected.txt
@@ -18,7 +18,7 @@ layer at (8,42) size 352x253
 layer at (13,295) size 342x30
   RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 170x8
+    LayoutSlider {INPUT} at (48,11) size 170x8
       RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 182x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
index 8824b4e..57753d6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.txt
@@ -16,7 +16,7 @@ layer at (57,84) size 240x128 scrollHeight 127
 layer at (65,212) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -25,7 +25,7 @@ layer at (65,212) size 225x45 scrollWidth 328
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (184.52,0) size 52.50x45
-    RenderSlider {INPUT} at (246.02,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (246.02,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
@@ -40,7 +40,7 @@ layer at (57,309) size 240x128 scrollHeight 127
 layer at (65,437) size 225x45 scrollWidth 328
   RenderFlexibleBox {DIV} at (7.50,0) size 225x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13.50,0) size 45x45
-    RenderSlider {INPUT} at (72,16.50) size 37.50x12
+    LayoutSlider {INPUT} at (72,16.50) size 37.50x12
       RenderFlexibleBox {DIV} at (0,0) size 37.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 56.50x36
           RenderBlock {DIV} at (-10.50,0) size 48x36
@@ -49,7 +49,7 @@ layer at (65,437) size 225x45 scrollWidth 328
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
     RenderButton {INPUT} at (184.52,0) size 52.50x45
-    RenderSlider {INPUT} at (246.02,16.50) size 22.50x12
+    LayoutSlider {INPUT} at (246.02,16.50) size 22.50x12
       RenderFlexibleBox {DIV} at (0,0) size 22.50x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 41.50x36
           RenderBlock {DIV} at (-5,0) size 36x36
diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index 99919c5..13bc2b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -16,7 +16,7 @@ layer at (8,26) size 300x150
 layer at (13,141) size 290x30
   RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 150.97x8
+    LayoutSlider {INPUT} at (48,11) size 150.97x8
       RenderFlexibleBox {DIV} at (0,0) size 150.97x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 162.97x24
           RenderBlock {DIV} at (-7,0) size 32x24
diff --git a/third_party/WebKit/Source/core/core.gypi b/third_party/WebKit/Source/core/core.gypi
index 6571cb6..080f8b4 100644
--- a/third_party/WebKit/Source/core/core.gypi
+++ b/third_party/WebKit/Source/core/core.gypi
@@ -1364,6 +1364,12 @@
             'inspector/WorkerInspectorController.h',
             'inspector/WorkerRuntimeAgent.cpp',
             'inspector/WorkerRuntimeAgent.h',
+            'layout/LayoutSlider.cpp',
+            'layout/LayoutSlider.h',
+            'layout/LayoutSliderContainer.cpp',
+            'layout/LayoutSliderContainer.h',
+            'layout/LayoutSliderThumb.cpp',
+            'layout/LayoutSliderThumb.h',
             'layout/LayoutTreeAsText.cpp',
             'loader/BeaconLoader.cpp',
             'loader/BeaconLoader.h',
@@ -1756,12 +1762,6 @@
             'rendering/RenderSearchField.cpp',
             'rendering/RenderSearchField.h',
             'rendering/RenderSelectionInfo.h',
-            'rendering/RenderSlider.cpp',
-            'rendering/RenderSlider.h',
-            'rendering/RenderSliderContainer.cpp',
-            'rendering/RenderSliderContainer.h',
-            'rendering/RenderSliderThumb.cpp',
-            'rendering/RenderSliderThumb.h',
             'rendering/RenderTable.cpp',
             'rendering/RenderTable.h',
             'rendering/RenderTableCaption.cpp',
diff --git a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
index 2fe4ad3..0ca2214 100644
--- a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
@@ -52,7 +52,7 @@
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/SliderThumbElement.h"
-#include "core/rendering/RenderSlider.h"
+#include "core/layout/LayoutSlider.h"
 #include "platform/PlatformMouseEvent.h"
 #include "wtf/MathExtras.h"
 #include "wtf/NonCopyingSort.h"
@@ -246,7 +246,7 @@ void RangeInputType::createShadowSubtree()
 
 RenderObject* RangeInputType::createRenderer(RenderStyle*) const
 {
-    return new RenderSlider(&element());
+    return new LayoutSlider(&element());
 }
 
 Decimal RangeInputType::parseToNumber(const String& src, const Decimal& defaultValue) const
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
index 8ac1dde..7b60394 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
@@ -42,9 +42,9 @@
 #include "core/html/shadow/MediaControls.h"
 #include "core/html/track/TextTrack.h"
 #include "core/html/track/vtt/VTTRegionList.h"
+#include "core/layout/LayoutSlider.h"
 #include "core/page/EventHandler.h"
 #include "core/rendering/RenderMediaControlElements.h"
-#include "core/rendering/RenderSlider.h"
 #include "core/rendering/RenderTheme.h"
 #include "core/rendering/RenderVideo.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ -394,7 +394,7 @@ void MediaControlTimelineElement::defaultEventHandler(Event* event)
         }
     }
 
-    RenderSlider* slider = toRenderSlider(renderer());
+    LayoutSlider* slider = toLayoutSlider(renderer());
     if (slider && slider->inDragMode())
         mediaControls().updateCurrentTimeDisplay();
 }
diff --git a/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp b/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp
index 272e340..ea28a7d 100644
--- a/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/SliderThumbElement.cpp
@@ -40,11 +40,11 @@
 #include "core/html/forms/StepRange.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/ShadowElementNames.h"
+#include "core/layout/LayoutSlider.h"
+#include "core/layout/LayoutSliderContainer.h"
+#include "core/layout/LayoutSliderThumb.h"
 #include "core/page/EventHandler.h"
 #include "core/rendering/RenderFlexibleBox.h"
-#include "core/rendering/RenderSlider.h"
-#include "core/rendering/RenderSliderContainer.h"
-#include "core/rendering/RenderSliderThumb.h"
 #include "core/rendering/RenderTheme.h"
 
 namespace blink {
@@ -74,7 +74,7 @@ PassRefPtrWillBeRawPtr<SliderThumbElement> SliderThumbElement::create(Document&
 
 void SliderThumbElement::setPositionFromValue()
 {
-    // Since the code to calculate position is in the RenderSliderThumb layout
+    // Since the code to calculate position is in the LayoutSliderThumb layout
     // path, we don't actually update the value here. Instead, we poke at the
     // renderer directly to trigger layout.
     if (renderer())
@@ -83,7 +83,7 @@ void SliderThumbElement::setPositionFromValue()
 
 RenderObject* SliderThumbElement::createRenderer(RenderStyle*)
 {
-    return new RenderSliderThumb(this);
+    return new LayoutSliderThumb(this);
 }
 
 bool SliderThumbElement::isDisabledFormControl() const
@@ -308,7 +308,7 @@ DEFINE_NODE_FACTORY(SliderContainerElement)
 
 RenderObject* SliderContainerElement::createRenderer(RenderStyle*)
 {
-    return new RenderSliderContainer(this);
+    return new LayoutSliderContainer(this);
 }
 
 const AtomicString& SliderContainerElement::shadowPseudoId() const
diff --git a/third_party/WebKit/Source/core/rendering/RenderSlider.cpp b/third_party/WebKit/Source/core/layout/LayoutSlider.cpp
index 6902c94..a5e68ad 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSlider.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutSlider.cpp
@@ -19,64 +19,64 @@
  */
 
 #include "config.h"
-#include "core/rendering/RenderSlider.h"
+#include "core/layout/LayoutSlider.h"
 
 #include "core/InputTypeNames.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/SliderThumbElement.h"
-#include "core/rendering/RenderSliderThumb.h"
+#include "core/layout/LayoutSliderThumb.h"
 #include "wtf/MathExtras.h"
 
-using std::min;
+using namespace::std;
 
 namespace blink {
 
-const int RenderSlider::defaultTrackLength = 129;
+const int LayoutSlider::defaultTrackLength = 129;
 
-RenderSlider::RenderSlider(HTMLInputElement* element)
+LayoutSlider::LayoutSlider(HTMLInputElement* element)
     : RenderFlexibleBox(element)
 {
-    // We assume RenderSlider works only with <input type=range>.
+    // We assume LayoutSlider works only with <input type=range>.
     ASSERT(element->type() == InputTypeNames::range);
 }
 
-RenderSlider::~RenderSlider()
+LayoutSlider::~LayoutSlider()
 {
 }
 
-int RenderSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirectionMode, LinePositionMode linePositionMode) const
+int LayoutSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirectionMode, LinePositionMode linePositionMode) const
 {
     ASSERT(linePositionMode == PositionOnContainingLine);
     // FIXME: Patch this function for writing-mode.
     return size().height() + marginTop();
 }
 
-void RenderSlider::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+void LayoutSlider::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
 {
     maxLogicalWidth = defaultTrackLength * style()->effectiveZoom();
     if (!style()->width().isPercent())
         minLogicalWidth = maxLogicalWidth;
 }
 
-inline SliderThumbElement* RenderSlider::sliderThumbElement() const
+inline SliderThumbElement* LayoutSlider::sliderThumbElement() const
 {
     return toSliderThumbElement(toElement(node())->userAgentShadowRoot()->getElementById(ShadowElementNames::sliderThumb()));
 }
 
-void RenderSlider::layout()
+void LayoutSlider::layout()
 {
     // FIXME: Find a way to cascade appearance.
     // http://webkit.org/b/62535
     RenderBox* thumbBox = sliderThumbElement()->renderBox();
     if (thumbBox && thumbBox->isSliderThumb())
-        toRenderSliderThumb(thumbBox)->updateAppearance(style());
+        toLayoutSliderThumb(thumbBox)->updateAppearance(style());
 
     RenderFlexibleBox::layout();
 }
 
-bool RenderSlider::inDragMode() const
+bool LayoutSlider::inDragMode() const
 {
     return sliderThumbElement()->active();
 }
diff --git a/third_party/WebKit/Source/core/rendering/RenderSlider.h b/third_party/WebKit/Source/core/layout/LayoutSlider.h
index 0683856..4f21d69 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSlider.h
+++ b/third_party/WebKit/Source/core/layout/LayoutSlider.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef RenderSlider_h
-#define RenderSlider_h
+#ifndef LayoutSlider_h
+#define LayoutSlider_h
 
 #include "core/rendering/RenderFlexibleBox.h"
 
@@ -28,17 +28,17 @@ namespace blink {
 class HTMLInputElement;
 class SliderThumbElement;
 
-class RenderSlider final : public RenderFlexibleBox {
+class LayoutSlider final : public RenderFlexibleBox {
 public:
     static const int defaultTrackLength;
 
-    explicit RenderSlider(HTMLInputElement*);
-    virtual ~RenderSlider();
+    explicit LayoutSlider(HTMLInputElement*);
+    virtual ~LayoutSlider();
 
     bool inDragMode() const;
 
 private:
-    virtual const char* renderName() const override { return "RenderSlider"; }
+    virtual const char* renderName() const override { return "LayoutSlider"; }
     virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSlider || RenderFlexibleBox::isOfType(type); }
 
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
@@ -48,8 +48,8 @@ private:
     SliderThumbElement* sliderThumbElement() const;
 };
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSlider, isSlider());
+DEFINE_RENDER_OBJECT_TYPE_CASTS(LayoutSlider, isSlider());
 
 } // namespace blink
 
-#endif // RenderSlider_h
+#endif // LayoutSlider_h
diff --git a/third_party/WebKit/Source/core/rendering/RenderSliderContainer.cpp b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp
index 145920d..25ef34c 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSliderContainer.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.cpp
@@ -30,20 +30,20 @@
  */
 
 #include "config.h"
-#include "core/rendering/RenderSliderContainer.h"
+#include "core/layout/LayoutSliderContainer.h"
 
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/SliderThumbElement.h"
+#include "core/layout/LayoutSlider.h"
 #include "core/rendering/RenderFlexibleBox.h"
-#include "core/rendering/RenderSlider.h"
 #include "core/rendering/RenderTheme.h"
 
 namespace blink {
 
-RenderSliderContainer::RenderSliderContainer(SliderContainerElement* element)
+LayoutSliderContainer::LayoutSliderContainer(SliderContainerElement* element)
     : RenderFlexibleBox(element)
 {
 }
@@ -63,7 +63,7 @@ inline static bool hasVerticalAppearance(HTMLInputElement* input)
     return sliderStyle->appearance() == SliderVerticalPart;
 }
 
-void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
+void LayoutSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
 {
     HTMLInputElement* input = toHTMLInputElement(node()->shadowHost());
     bool isVertical = hasVerticalAppearance(input);
@@ -88,7 +88,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
         return;
     }
     if (isVertical)
-        logicalHeight = RenderSlider::defaultTrackLength;
+        logicalHeight = LayoutSlider::defaultTrackLength;
 
     // FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack.
     setIntrinsicContentLogicalHeight(logicalHeight);
@@ -96,7 +96,7 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
 }
 
-void RenderSliderContainer::layout()
+void LayoutSliderContainer::layout()
 {
     HTMLInputElement* input = toHTMLInputElement(node()->shadowHost());
     bool isVertical = hasVerticalAppearance(input);
diff --git a/third_party/WebKit/Source/core/rendering/RenderSliderContainer.h b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.h
index 2d3ab03..bf69784 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSliderContainer.h
+++ b/third_party/WebKit/Source/core/layout/LayoutSliderContainer.h
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderSliderContainer_h
-#define RenderSliderContainer_h
+#ifndef LayoutSliderContainer_h
+#define LayoutSliderContainer_h
 
 #include "core/rendering/RenderFlexibleBox.h"
 
@@ -40,9 +40,9 @@ class SliderContainerElement;
 
 // FIXME: Find a way to cascade appearance and adjust heights, and get rid of this class.
 // http://webkit.org/b/62535
-class RenderSliderContainer : public RenderFlexibleBox {
+class LayoutSliderContainer : public RenderFlexibleBox {
 public:
-    RenderSliderContainer(SliderContainerElement*);
+    LayoutSliderContainer(SliderContainerElement*);
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
 
 private:
@@ -51,4 +51,4 @@ private:
 
 } // namespace blink
 
-#endif // RenderSliderContainer_h
+#endif // LayoutSliderContainer_h
diff --git a/third_party/WebKit/Source/core/rendering/RenderSliderThumb.cpp b/third_party/WebKit/Source/core/layout/LayoutSliderThumb.cpp
index 86cf24d..726ac1b 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSliderThumb.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutSliderThumb.cpp
@@ -30,19 +30,19 @@
  */
 
 #include "config.h"
-#include "core/rendering/RenderSliderThumb.h"
+#include "core/layout/LayoutSliderThumb.h"
 
 #include "core/rendering/RenderTheme.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace blink {
 
-RenderSliderThumb::RenderSliderThumb(SliderThumbElement* element)
+LayoutSliderThumb::LayoutSliderThumb(SliderThumbElement* element)
     : RenderBlockFlow(element)
 {
 }
 
-void RenderSliderThumb::updateAppearance(RenderStyle* parentStyle)
+void LayoutSliderThumb::updateAppearance(RenderStyle* parentStyle)
 {
     if (parentStyle->appearance() == SliderVerticalPart)
         style()->setAppearance(SliderThumbVerticalPart);
diff --git a/third_party/WebKit/Source/core/rendering/RenderSliderThumb.h b/third_party/WebKit/Source/core/layout/LayoutSliderThumb.h
index 7b4897c..f3bc72c 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSliderThumb.h
+++ b/third_party/WebKit/Source/core/layout/LayoutSliderThumb.h
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderSliderThumb_h
-#define RenderSliderThumb_h
+#ifndef LayoutSliderThumb_h
+#define LayoutSliderThumb_h
 
 #include "core/html/shadow/SliderThumbElement.h"
 #include "core/rendering/RenderBlockFlow.h"
@@ -39,17 +39,17 @@ namespace blink {
 
 class SliderThumbElement;
 
-class RenderSliderThumb final : public RenderBlockFlow {
+class LayoutSliderThumb final : public RenderBlockFlow {
 public:
-    RenderSliderThumb(SliderThumbElement*);
+    LayoutSliderThumb(SliderThumbElement*);
     void updateAppearance(RenderStyle* parentStyle);
 
 private:
     virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSliderThumb || RenderBlockFlow::isOfType(type); }
 };
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSliderThumb, isSliderThumb());
+DEFINE_RENDER_OBJECT_TYPE_CASTS(LayoutSliderThumb, isSliderThumb());
 
 } // namespace blink
 
-#endif // RenderSliderThumb_h
+#endif // LayoutSliderThumb_h
diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
index 53e4abd..d08bd8a 100644
--- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumAndroid.cpp
@@ -29,11 +29,11 @@
 #include "core/CSSValueKeywords.h"
 #include "core/InputTypeNames.h"
 #include "core/UserAgentStyleSheets.h"
+#include "core/layout/LayoutSlider.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderMediaControls.h"
 #include "core/rendering/RenderObject.h"
 #include "core/rendering/RenderProgress.h"
-#include "core/rendering/RenderSlider.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/graphics/Color.h"
 #include "platform/scroll/ScrollbarTheme.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
index c115c95..3eaa0b6 100644
--- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
+++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
@@ -34,13 +34,13 @@
 #import "core/html/HTMLMeterElement.h"
 #import "core/html/TimeRanges.h"
 #import "core/html/shadow/MediaControlElements.h"
+#import "core/layout/LayoutSlider.h"
 #import "core/rendering/PaintInfo.h"
 #import "core/rendering/RenderLayer.h"
 #import "core/rendering/RenderMedia.h"
 #import "core/rendering/RenderMediaControls.h"
 #import "core/rendering/RenderMeter.h"
 #import "core/rendering/RenderProgress.h"
-#import "core/rendering/RenderSlider.h"
 #import "core/rendering/RenderView.h"
 #import "core/rendering/style/ShadowList.h"
 #import "platform/LayoutTestSupport.h"
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
index 23ce834..5d36f77 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp
@@ -39,6 +39,7 @@
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLabelElement.h"
+#include "core/layout/LayoutSlider.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
@@ -47,7 +48,6 @@
 #include "core/rendering/RenderListBox.h"
 #include "core/rendering/RenderMenuList.h"
 #include "core/rendering/RenderProgress.h"
-#include "core/rendering/RenderSlider.h"
 #include "core/rendering/RenderTable.h"
 #include "core/rendering/RenderTableCell.h"
 #include "core/rendering/RenderTableRow.h"
@@ -302,7 +302,7 @@ PassRefPtr<AXObject> AXObjectCacheImpl::createFromRenderer(RenderObject* rendere
 
         // input type=range
         if (cssBox->isSlider())
-            return AXSlider::create(toRenderSlider(cssBox), this);
+            return AXSlider::create(toLayoutSlider(cssBox), this);
     }
 
     return AXRenderObject::create(renderer, this);
diff --git a/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp b/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp
index 90cd9d5..32d37ec 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXSlider.cpp
@@ -121,7 +121,7 @@ void AXSlider::setValue(const String& value)
 
     input->setValue(value);
 
-    // Fire change event manually, as RenderSlider::setValueForPosition does.
+    // Fire change event manually, as LayoutSlider::setValueForPosition does.
     input->dispatchFormControlChangeEvent();
 }
author	dsinclair@chromium.org <dsinclair@chromium.org>	2015-01-23 05:29:52 +0000
committer	dsinclair@chromium.org <dsinclair@chromium.org>	2015-01-23 05:29:52 +0000
commit	82129bc087dd1ac238e1794fd2071da6f4bc3762 (patch)
tree	a908c0fb2d3c70cf6bc629f915c2fafa95765387
parent	ebcd8e3ec327f8b75625e828a6b7fde4957889fb (diff)
download	chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.zip chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.tar.gz chromium_src-82129bc087dd1ac238e1794fd2071da6f4bc3762.tar.bz2