Convert media controls from DeprecatedFlexibleBox to FlexibleBox

https://bugs.webkit.org/show_bug.cgi?id=109775

Patch by Christian Biesinger <cbiesinger@chromium.org> on 2013-02-14
Reviewed by Ojan Vafai.

Source/WebCore:

Covered by existing tests in media/.

* css/mediaControls.css:
* css/mediaControlsBlackBerry.css:
* css/mediaControlsChromium.css:
* css/mediaControlsChromiumAndroid.css:
* css/mediaControlsEfl.css:
* css/mediaControlsGtk.css:
* css/mediaControlsQt.css:
* css/mediaControlsQuickTime.css:
Automated search and replace of old flexbox CSS rules to new ones.
Minor tuning of the chromium rules.

* rendering/RenderMediaControlElements.cpp:
(WebCore::RenderMediaControlTimeDisplay::RenderMediaControlTimeDisplay):
(WebCore::RenderMediaControlTimeDisplay::layout):
* rendering/RenderMediaControlElements.h:
Make media controls inherit from RenderFlexibleBox

LayoutTests:

Rebaselined lots of tests. There were two kinds of changes:
- Replaced the RenderDeprecatedFlexibleBox class name with
RenderFlexibleBox, and minor printing differences
- Slight positioning/size changes due to a different algorithm for
shrinking elements (old flexbox shrinks elements evenly, new flexbox
shrinks in proportion to the size of the flex item)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 122d62960539f700abafa069c404f5a5b7f911b6..eff0284fafdf0e889a020d0d30ee221e7d8433bb 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-14  Christian Biesinger  <cbiesinger@chromium.org>
+
+        Convert media controls from DeprecatedFlexibleBox to FlexibleBox
+        https://bugs.webkit.org/show_bug.cgi?id=109775
+
+        Reviewed by Ojan Vafai.
+
+        Rebaselined lots of tests. There were two kinds of changes:
+        - Replaced the RenderDeprecatedFlexibleBox class name with
+        RenderFlexibleBox, and minor printing differences
+        - Slight positioning/size changes due to a different algorithm for
+        shrinking elements (old flexbox shrinks elements evenly, new flexbox
+        shrinks in proportion to the size of the flex item)
+
 2013-02-14  Ryosuke Niwa  <rniwa@webkit.org>
 
         Mac rebaseline after r142931.

diff --git a/LayoutTests/media/media-document-audio-repaint-expected.txt b/LayoutTests/media/media-document-audio-repaint-expected.txt
index 35f92cda7a9c437d692a1051d4bf78cdb4039823..d850f1d7d21c42ddcab098548e111136a8a40a0b 100644 (file)
--- a/LayoutTests/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/media/media-document-audio-repaint-expected.txt
@@ -22,22 +22,22 @@ layer at (8,42) size 384x334
     layer at (40,164) size 300x1
       RenderBlock (relative positioned) {DIV} at (0,0) size 300x1
     layer at (40,140) size 300x25
-      RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,-24) size 300x25
+      RenderFlexibleBox (positioned) {DIV} at (0,-24) size 300x25
         RenderButton {INPUT} at (6,3) size 18x18
         RenderButton {INPUT} at (32,4) size 16x16
-        RenderDeprecatedFlexibleBox {DIV} at (49,5) size 226x15
+        RenderFlexibleBox {DIV} at (49,5) size 226x15
           RenderSlider {INPUT} at (45,2) size 136x13
-            RenderDeprecatedFlexibleBox {DIV} at (0,0) size 136x13
+            RenderFlexibleBox {DIV} at (0,0) size 136x13
               RenderBlock {DIV} at (0,2) size 126x8
               RenderBlock {DIV} at (126,2) size 10x8
         RenderButton {INPUT} at (277,6) size 14x12
     layer at (89,147) size 45x11
-      RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+      RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (9,0) size 26x11
           RenderText {#text} at (0,0) size 26x11
             text run at (0,0) width 26: "00:00"
     layer at (270,147) size 45x11
-      RenderDeprecatedFlexibleBox {DIV} at (181,2) size 45x11 [color=#FFFFFF]
+      RenderFlexibleBox {DIV} at (181,2) size 45x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (7,0) size 31x11
           RenderText {#text} at (0,0) size 31x11
             text run at (0,0) width 31: "-00:00"

diff --git a/LayoutTests/platform/chromium-android/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/chromium-android/fast/hidpi/video-controls-in-hidpi-expected.txt
index 3f994b0f64cfb5830d63df2831d2aad7fb4cacb3..7cdd29f02f5ec368b3d08cf725bd5e51095cbd47 100644 (file)
--- a/LayoutTests/platform/chromium-android/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/chromium-android/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,21 +11,21 @@ layer at (0,0) size 800x600
 layer at (8,28) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,28) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderFlexibleBox {DIV} at (0,0) size 300x115
       RenderButton {INPUT} at (110,17) size 80x81
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,143) size 290x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 176x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 156x24
         RenderBlock {DIV} at (150,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
 layer at (60,149) size 32x24
-  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
+  RenderBlock {DIV} at (-7,-8) size 32x24

diff --git a/LayoutTests/platform/chromium-android/fast/layers/video-layer-expected.txt b/LayoutTests/platform/chromium-android/fast/layers/video-layer-expected.txt
index 4eb466f1326aeed553983022a9f218d652ead38a..836493c5aab65053a364f562d564f0c9d063eaf4 100644 (file)
--- a/LayoutTests/platform/chromium-android/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/chromium-android/fast/layers/video-layer-expected.txt
@@ -16,21 +16,21 @@ layer at (0,0) size 800x600
 layer at (58,114) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,115) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x115
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
+    RenderFlexibleBox {DIV} at (0,0) size 300x115
       RenderButton {INPUT} at (110,17) size 80x81
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (64,230) size 290x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 176x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 156x24
         RenderBlock {DIV} at (150,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
 layer at (111,236) size 32x24
-  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
+  RenderBlock {DIV} at (-7,-8) size 32x24

diff --git a/LayoutTests/platform/chromium-android/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/chromium-android/media/audio-controls-rendering-expected.txt
index 0712e4365c6e82356e9cfd7bd52e63b0fcc2f961..a709ce575b4af4f2de9616850cce24cabe86821b 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/audio-controls-rendering-expected.txt
@@ -15,34 +15,34 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,90) size 0x19
         RenderBR {BR} at (0,110) size 0x19
 layer at (8,44) size 300x35
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35
+  RenderFlexibleBox {DIV} at (0,0) size 300x35
     RenderBlock {DIV} at (0,0) size 300x35
 layer at (8,44) size 300x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 186x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 166x24
         RenderBlock {DIV} at (160,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:07"
 layer at (55,50) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (8,99) size 320x35
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x35
+  RenderFlexibleBox {DIV} at (0,0) size 320x35
     RenderBlock {DIV} at (0,0) size 320x35
 layer at (8,99) size 320x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 206x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 206x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 206x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 186x24
         RenderBlock {DIV} at (180,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (274,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (274,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:07"
@@ -51,17 +51,17 @@ layer at (55,105) size 32x24
 layer at (8,154) size 320x100
   RenderMedia {AUDIO} at (8,154) size 320x100 [bgcolor=#0000FF]
 layer at (8,154) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
     RenderBlock {DIV} at (0,65) size 320x35
 layer at (8,219) size 320x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 206x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 206x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 206x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 186x24
         RenderBlock {DIV} at (180,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (274,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (274,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:07"

diff --git a/LayoutTests/platform/chromium-android/media/controls-after-reload-expected.txt b/LayoutTests/platform/chromium-android/media/controls-after-reload-expected.txt
index 931ece7c5694e552860eac387fe1f57bf3fbbcbe..8d28d87b4828121bf181cd013fa4683fde64e564 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/controls-after-reload-expected.txt
@@ -11,19 +11,19 @@ layer at (0,0) size 800x600
 layer at (8,44) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/controls-strict-expected.txt b/LayoutTests/platform/chromium-android/media/controls-strict-expected.txt
index 32727d18bd9ce88f247d23b7ec654b6d15039738..84933308fdece54a783b74ef09a06c899aac5308 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/controls-strict-expected.txt
@@ -11,19 +11,19 @@ layer at (0,0) size 800x305
 layer at (8,52) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,257) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/controls-styling-expected.txt b/LayoutTests/platform/chromium-android/media/controls-styling-expected.txt
index f025b41aeade1b19c6cf80008d221c16853114b8..217c51b629be3461a82e9771624706eb3900f608 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/controls-styling-expected.txt
@@ -15,19 +15,19 @@ layer at (18,44) size 320x240
 layer at (8,284) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81 [color=#000000]
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (23,249) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
@@ -36,19 +36,19 @@ layer at (23,249) size 310x35 scrollHeight 39
 layer at (70,255) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (8,284) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,489) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/controls-styling-strict-expected.txt b/LayoutTests/platform/chromium-android/media/controls-styling-strict-expected.txt
index e0469a6d865e4c23ec86a9bdf245167d60630ee0..7d6b1491795fe5e9bfcc5b8aaed76cef217867bb 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/controls-styling-strict-expected.txt
@@ -15,19 +15,19 @@ layer at (8,52) size 320x240
 layer at (332,52) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81 [color=#000000]
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,257) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x38
       RenderButton {INPUT} at (9,2) size 35x36
     RenderSlider {INPUT} at (53,13) size 158x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 158x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 158x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 138x24
         RenderBlock {DIV} at (132,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (226,0) size 36x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (226,0) size 36x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 36x35
         RenderText {#text} at (0,7) size 36x21
           text run at (0,7) width 36: "0:00"
@@ -36,19 +36,19 @@ layer at (13,257) size 310x35 scrollHeight 39
 layer at (60,263) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (332,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (337,257) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/controls-without-preload-expected.txt b/LayoutTests/platform/chromium-android/media/controls-without-preload-expected.txt
index 2f607993854cb6bf211b897ff47075e6b620c66c..5a15a7bc01bbf13b01a723750cda7da36b2cafdb 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/controls-without-preload-expected.txt
@@ -11,19 +11,19 @@ layer at (0,0) size 800x600
 layer at (8,44) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/media-controls-clone-expected.txt b/LayoutTests/platform/chromium-android/media/media-controls-clone-expected.txt
index bbffc7822d5f4cc28ad4055bdc0c50b5e54da9e2..057d0e05e33a32ccc9f4b62291e15e10eea0fa26 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/media-controls-clone-expected.txt
@@ -12,72 +12,72 @@ layer at (8,8) size 300x150
 layer at (8,163) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderFlexibleBox {DIV} at (0,0) size 300x115
       RenderButton {INPUT} at (110,17) size 80x81
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,123) size 290x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 176x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 156x24
         RenderBlock {DIV} at (150,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
 layer at (60,129) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (308,123) size 300x35
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35
+  RenderFlexibleBox {DIV} at (0,0) size 300x35
     RenderBlock {DIV} at (0,0) size 300x35
 layer at (308,123) size 300x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 186x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 166x24
         RenderBlock {DIV} at (160,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
 layer at (355,129) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (8,163) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x115
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
+    RenderFlexibleBox {DIV} at (0,0) size 300x115
       RenderButton {INPUT} at (110,17) size 80x81
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,278) size 290x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 176x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 156x24
         RenderBlock {DIV} at (150,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
 layer at (60,284) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (308,278) size 300x35
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35
+  RenderFlexibleBox {DIV} at (0,0) size 300x35
     RenderBlock {DIV} at (0,0) size 300x35
 layer at (308,278) size 300x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 186x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 186x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 166x24
         RenderBlock {DIV} at (160,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (254,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/media-document-audio-repaint-expected.txt b/LayoutTests/platform/chromium-android/media/media-document-audio-repaint-expected.txt
index 4518c1e13628af7e9ac73e497c86c6e9889d72ff..c4f999e158dee6a8a440dbd966c9785c2ad01d1c 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/media-document-audio-repaint-expected.txt
@@ -17,19 +17,19 @@ layer at (0,0) size 800x600
           layer at (40,165) size 300x1
             RenderVideo {VIDEO} at (40,165) size 300x1
           layer at (40,165) size 300x1
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x1
-              RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x0
+            RenderFlexibleBox {DIV} at (0,0) size 300x1
+              RenderFlexibleBox {DIV} at (0,0) size 300x0
                 RenderButton {INPUT} at (110,0) size 80x80
               RenderBlock {DIV} at (0,0) size 300x35
           layer at (45,165) size 290x35 scrollHeight 39
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+            RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
               RenderBlock (anonymous) at (0,0) size 53x35
                 RenderButton {INPUT} at (9,-1) size 35x36
               RenderSlider {INPUT} at (53,13) size 176x9
-                RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+                RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
                   RenderBlock {DIV} at (1,1) size 156x24
                   RenderBlock {DIV} at (150,1) size 32x24
-              RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+              RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
                 RenderBlock (anonymous) at (0,0) size 37x35
                   RenderText {#text} at (0,7) size 37x21
                     text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/video-controls-rendering-expected.txt b/LayoutTests/platform/chromium-android/media/video-controls-rendering-expected.txt
index 0b58670827d2ebbe1285a938fcf592990cb10210..edc4be55c0c24e41d23e4c2a3f51060a36d775f8 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-controls-rendering-expected.txt
@@ -16,19 +16,19 @@ layer at (8,44) size 320x240
 layer at (8,284) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
@@ -37,19 +37,19 @@ layer at (13,249) size 310x35 scrollHeight 39
 layer at (60,255) size 32x24
   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
 layer at (8,284) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,489) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"
@@ -60,19 +60,19 @@ layer at (60,495) size 32x24
 layer at (8,524) size 320x240
   RenderVideo {VIDEO} at (8,524) size 320x240
 layer at (8,524) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,729) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/video-display-toggle-expected.txt b/LayoutTests/platform/chromium-android/media/video-display-toggle-expected.txt
index 61f8f153698b9fcd1667cb80c1e3d4fbc0a1e40d..c41a03048288deb8f2a865c0cf68f9ae3bbad865 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-display-toggle-expected.txt
@@ -10,19 +10,19 @@ layer at (0,0) size 800x600
 layer at (8,28) size 320x240
   RenderVideo {VIDEO} at (0,20) size 320x240
 layer at (8,28) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,233) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:06"

diff --git a/LayoutTests/platform/chromium-android/media/video-empty-source-expected.txt b/LayoutTests/platform/chromium-android/media/video-empty-source-expected.txt
index 54b86337a4d175b761816d6f29fa817071878825..499b2826e0577bf696bb4614372566172e56e27f 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-empty-source-expected.txt
@@ -11,19 +11,19 @@ layer at (0,0) size 800x600
 layer at (8,44) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,45) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 300x115
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
+    RenderFlexibleBox {DIV} at (0,0) size 300x115
       RenderButton {INPUT} at (110,17) size 80x81
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (14,160) size 290x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 176x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 176x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 156x24
         RenderBlock {DIV} at (150,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (244,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/video-no-audio-expected.txt b/LayoutTests/platform/chromium-android/media/video-no-audio-expected.txt
index 1b25eb24d54b083da619b8f53a909611be7fae27..f6478116007cd57efa66b6c2a4aabafa000d5f04 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-no-audio-expected.txt
@@ -11,19 +11,19 @@ layer at (0,0) size 800x600
 layer at (8,44) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,44) size 352x288
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 352x253
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
+    RenderFlexibleBox {DIV} at (0,0) size 352x253
       RenderButton {INPUT} at (136,86) size 80x81
     RenderBlock {DIV} at (0,253) size 352x35
 layer at (13,297) size 342x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 342x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 342x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 189x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 189x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 189x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 169x24
         RenderBlock {DIV} at (163,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (257,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (257,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:09"

diff --git a/LayoutTests/platform/chromium-android/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/chromium-android/media/video-playing-and-pause-expected.txt
index 735b0f568e069de1a8e24cb7abd725f14e675e69..5b16358cd05311cf4fcda848a45d65b23d148e1d 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-playing-and-pause-expected.txt
@@ -12,19 +12,19 @@ layer at (0,0) size 800x325
 layer at (8,72) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,72) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 320x205
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+    RenderFlexibleBox {DIV} at (0,0) size 320x205
       RenderButton {INPUT} at (120,62) size 80x81
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,277) size 310x35 scrollHeight 39
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x35 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 53x35
       RenderButton {INPUT} at (9,-1) size 35x36
     RenderSlider {INPUT} at (53,13) size 157x9
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 157x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 137x24
         RenderBlock {DIV} at (131,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 37x35 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 37x35
         RenderText {#text} at (0,7) size 37x21
           text run at (0,7) width 37: "0:00"

diff --git a/LayoutTests/platform/chromium-android/media/video-zoom-controls-expected.txt b/LayoutTests/platform/chromium-android/media/video-zoom-controls-expected.txt
index 98a2ec97fcc4c0d356e8d2180efe011b9395272f..35b4394669398cb494a5ab5e1c284a06723592d6 100644 (file)
--- a/LayoutTests/platform/chromium-android/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/chromium-android/media/video-zoom-controls-expected.txt
@@ -9,19 +9,19 @@ layer at (0,0) size 800x600
 layer at (57,85) size 240x180
   RenderVideo {VIDEO} at (45,73) size 240x180
 layer at (57,85) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 240x128
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
+    RenderFlexibleBox {DIV} at (0,0) size 240x128
       RenderButton {INPUT} at (60,3) size 120x121
     RenderBlock {DIV} at (0,127) size 240x53
 layer at (65,213) size 225x53 backgroundClip at (65,213) size 225x52 clip at (65,213) size 225x52 scrollWidth 267 scrollHeight 57
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x53 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (7,0) size 226x53 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 80x53
       RenderButton {INPUT} at (13,-1) size 53x53
     RenderSlider {INPUT} at (79,20) size 38x13
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 9x36
         RenderBlock {DIV} at (-1,1) size 48x36
-    RenderDeprecatedFlexibleBox {DIV} at (139,0) size 56x53 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (139,0) size 56x53 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 55x53
         RenderText {#text} at (0,10) size 55x32
           text run at (0,10) width 55: "0:00"
@@ -32,19 +32,19 @@ layer at (135,220) size 49x36
 layer at (57,310) size 240x180
   RenderVideo {VIDEO} at (45,298) size 240x180
 layer at (57,310) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
-    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 240x128
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
+    RenderFlexibleBox {DIV} at (0,0) size 240x128
       RenderButton {INPUT} at (60,3) size 120x121
     RenderBlock {DIV} at (0,127) size 240x53
 layer at (65,438) size 225x53 backgroundClip at (65,438) size 225x52 clip at (65,438) size 225x52 scrollWidth 267 scrollHeight 57
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x53 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (7,0) size 226x53 [bgcolor=#141414CC]
     RenderBlock (anonymous) at (0,0) size 80x53
       RenderButton {INPUT} at (13,-1) size 53x53
     RenderSlider {INPUT} at (79,20) size 38x13
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
+      RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,1) size 9x36
         RenderBlock {DIV} at (-1,1) size 48x36
-    RenderDeprecatedFlexibleBox {DIV} at (139,0) size 56x53 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (139,0) size 56x53 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 55x53
         RenderText {#text} at (0,10) size 55x32
           text run at (0,10) width 55: "0:00"

diff --git a/LayoutTests/platform/chromium-linux/media/audio-repaint-expected.png b/LayoutTests/platform/chromium-linux/media/audio-repaint-expected.png
index 3afe77e19beed24f789e1e2e2cfa409935ea654c..1d2d70823d7941367878b13349645271474cec12 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/audio-repaint-expected.png and b/LayoutTests/platform/chromium-linux/media/audio-repaint-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/controls-after-reload-expected.png b/LayoutTests/platform/chromium-linux/media/controls-after-reload-expected.png
index 3a2b26572b768ff7bb529d416d25ef10cc9eb46a..f4ec614f3ba7f3efb7533b2127ad2748b4d7f555 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/controls-after-reload-expected.png and b/LayoutTests/platform/chromium-linux/media/controls-after-reload-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/controls-strict-expected.png b/LayoutTests/platform/chromium-linux/media/controls-strict-expected.png
index e34bdfa1c2377ca6fb243d351050078cbb21cec0..bdb156b8ca9218314faa2061483198202e70eaa6 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/controls-strict-expected.png and b/LayoutTests/platform/chromium-linux/media/controls-strict-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png
index 991e86bf9251682f30fad35f1a7e1242503f0d3d..fdfac901d440f9ebd02464296702b50527e97e74 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png and b/LayoutTests/platform/chromium-linux/media/controls-styling-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/controls-styling-strict-expected.png b/LayoutTests/platform/chromium-linux/media/controls-styling-strict-expected.png
index b99c1cdea45a915ea54629cc39ffc216531dc145..2aafaefb03ddf69a5dce7575a26a486bc40d3ec8 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/controls-styling-strict-expected.png and b/LayoutTests/platform/chromium-linux/media/controls-styling-strict-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/controls-without-preload-expected.png b/LayoutTests/platform/chromium-linux/media/controls-without-preload-expected.png
index b56b0e9c84b903060c362497bc75cede3b4dbf46..318cea33d8f60250439b3e18f0accd412691a959 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/controls-without-preload-expected.png and b/LayoutTests/platform/chromium-linux/media/controls-without-preload-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png b/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png
index 48c561a9c3447e8b0ff6c35a9f6d8fa2755a54bf..a1c41f1de498d8e26b90ef0858ea2efe723b9f9c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png and b/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-horizontal-expected.png b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-horizontal-expected.png
index e1eeaf19215fd5e949196bd67699c97d8b0a34a3..b49e8e8a80178bc68a30490de1af58585a4e12e9 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-horizontal-expected.png and b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-horizontal-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.png b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.png
index 1ed40f74a39ec6ff0a80c40713f93d825990aea3..4ee5f7454dc7cfcf0a2ce96f048253eb6bba60ea 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.png and b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt
index ddd77d9222c9ddf22b803758dfd2ab19e53ac3ed..56fb4a9f05436781234fff3254acfbd76482643f 100644 (file)
--- a/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt
+++ b/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt
@@ -21,63 +21,56 @@ layer at (0,0) size 800x341
 layer at (8,8) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,8) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+    RenderInline {SPAN} at (0,0) size 0x0
 layer at (12,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (4,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (31,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (23,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (256,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (248,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (237,8) size 15x205 scrollX 2 scrollWidth 17
   RenderBlock (positioned) {DIV} at (229,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (309,8) size 15x205 scrollWidth 17
   RenderBlock (positioned) {DIV} at (301,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (290,8) size 15x205 scrollWidth 17
   RenderBlock (positioned) {DIV} at (282,0) size 15x205
     RenderInline {DIV} at (0,0) size 19x115 [bgcolor=#000000CC]
-      RenderText {#text} at (0,45) size 15x111
-        text run at (0,45) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 17x4 [bgcolor=#000000CC]
-layer at (13,213) size 310x30 scrollHeight 36
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+      RenderText {#text} at (0,47) size 15x111
+        text run at (0,47) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+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
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 54x24
+        RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-1,0) size 33x24
-        RenderBlock {DIV} at (48,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         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
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 3x24
+        RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
-        RenderBlock {DIV} at (-3,1) size 24x24
     RenderButton {INPUT} at (237,0) size 30x30
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-linux/media/video-controls-rendering-expected.png b/LayoutTests/platform/chromium-linux/media/video-controls-rendering-expected.png
index 4a50f9fd8e850e7d7cbe8e70c8fd4f6d1b0ec63c..84cbdc07604db2e24df0a1dc7d052a57f0309c6b 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/video-controls-rendering-expected.png and b/LayoutTests/platform/chromium-linux/media/video-controls-rendering-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/video-display-toggle-expected.png b/LayoutTests/platform/chromium-linux/media/video-display-toggle-expected.png
index 8adaf23038779ca05cbd5ef4ca57f5f09330fca4..513ab4a4acee2dc17f8c2dadeed3c68bc3805582 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/video-display-toggle-expected.png and b/LayoutTests/platform/chromium-linux/media/video-display-toggle-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/media/video-playing-and-pause-expected.png b/LayoutTests/platform/chromium-linux/media/video-playing-and-pause-expected.png
index 62b1c2a62d195a4ee98087ad54b1efceee2251db..ba85a98026bb5ed91f8af43e29dba1620300a559 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/media/video-playing-and-pause-expected.png and b/LayoutTests/platform/chromium-linux/media/video-playing-and-pause-expected.png differ

diff --git a/LayoutTests/platform/chromium-mac/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/chromium-mac/fast/hidpi/video-controls-in-hidpi-expected.txt
index 8421e7e7af9e81460a504d6fe80dd1ecb4eb64d5..d0300a3dc41620e3eee359cf72f9e53f97c54ce5 100644 (file)
--- a/LayoutTests/platform/chromium-mac/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,26) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,26) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,141) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt b/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
index 192de6b5291b7d83518926c9c6cb75d7eb042b69..7813e540dd33bb7062f549fd49bfe43716dcac0c 100644 (file)
--- a/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
@@ -16,16 +16,16 @@ layer at (0,0) size 800x600
 layer at (58,110) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,111) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (64,226) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/chromium-mac/media/audio-controls-rendering-expected.txt
index 340c1b56f136c1f644716b128ef9fe3a572ca0a4..f279c098e3ca319ed4d93695e47a4750d7449cf1 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/audio-controls-rendering-expected.txt
@@ -15,61 +15,61 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,78) size 0x18
         RenderBR {BR} at (0,96) size 0x18
 layer at (8,42) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,42) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,90) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30
+  RenderFlexibleBox {DIV} at (0,0) size 320x30
     RenderBlock {DIV} at (0,0) size 320x30
 layer at (8,90) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113x8
-      RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 125x24
+    RenderSlider {INPUT} at (48,11) size 114x8
+      RenderFlexibleBox {DIV} at (0,0) size 114x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 126x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (176,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (210,0) size 35x30
+    RenderButton {INPUT} at (210,0) size 36x30
     RenderSlider {INPUT} at (251,11) size 54x8
       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 66x24
-          RenderBlock {DIV} at (35,0) size 24x24
+          RenderBlock {DIV} at (34,0) size 25x24
 layer at (8,138) size 320x100
   RenderMedia {AUDIO} at (8,138) size 320x100 [bgcolor=#0000FF]
 layer at (8,138) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
     RenderBlock {DIV} at (0,70) size 320x30
 layer at (8,208) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113x8
-      RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 125x24
+    RenderSlider {INPUT} at (48,11) size 114x8
+      RenderFlexibleBox {DIV} at (0,0) size 114x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 126x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (176,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (210,0) size 35x30
+    RenderButton {INPUT} at (210,0) size 36x30
     RenderSlider {INPUT} at (251,11) size 54x8
       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 66x24
-          RenderBlock {DIV} at (35,0) size 24x24
+          RenderBlock {DIV} at (34,0) size 25x24

diff --git a/LayoutTests/platform/chromium-mac/media/audio-repaint-expected.txt b/LayoutTests/platform/chromium-mac/media/audio-repaint-expected.txt
index e73a5fbe4a821ac3085ff178a7f3e5b83d0daa9e..77cce31a13d03def77737854531cdab3e6299a60 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/audio-repaint-expected.txt
@@ -15,61 +15,61 @@ layer at (0,0) size 800x600
 layer at (8,72) size 300x30
   RenderMedia {AUDIO} at (0,30) size 300x30
 layer at (8,72) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,72) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,42) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,42) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,154) size 300x30
   RenderMedia {AUDIO} at (0,112) size 300x30
 layer at (8,154) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,154) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24

diff --git a/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
index 61270701293f4a95a6a3e02933e30e5d6fa52ede..548eef06325d872b87659742debb0a7c3dd8d369 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,247) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
index 4aeadaaf5f353031c64c1f06d121bb15ab68ba03..e7b39351f088dd1529529f94ff4b5551fc1f7dbd 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x302
 layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,255) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt
index 8aa60e68a5dcc832c9ad07e1dd06f27486f0bfcb..21e431615bbd0f3316df26f17d9448ccf72f7d3a 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-styling-expected.txt
@@ -15,42 +15,42 @@ layer at (18,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (23,247) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,487) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/controls-styling-strict-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-styling-strict-expected.txt
index 6294d9bc697eac1691d52cca832ea51b3365d279..3efa5858215e95e0b4653fd9a1f893618ce72b33 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-styling-strict-expected.txt
@@ -15,42 +15,42 @@ layer at (8,50) size 320x240
 layer at (332,50) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,255) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (332,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (337,255) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/controls-without-preload-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-without-preload-expected.txt
index b6ccf56c17aa5bbca13e7b06ff466d3e3425adc4..09414a68997c26ec290f17f8f43c8004352558c8 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-without-preload-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,247) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/media-controls-clone-expected.txt b/LayoutTests/platform/chromium-mac/media/media-controls-clone-expected.txt
index 2cf7a06b27c5be597492b962925c1acad8dea296..3528f4d79b3626f934c674e664bfd7ec4db1243f 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/media-controls-clone-expected.txt
@@ -12,61 +12,61 @@ layer at (8,8) size 300x150
 layer at (8,162) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,123) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (249,0) size 35x30
 layer at (308,128) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (308,128) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (259,0) size 35x30
 layer at (8,162) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,277) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (249,0) size 35x30
 layer at (308,282) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (308,282) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-mac/media/media-document-audio-repaint-expected.txt b/LayoutTests/platform/chromium-mac/media/media-document-audio-repaint-expected.txt
index d889ea473df56fabd0b883b361e18b015af984c8..941995cffbb2305b0d78b647cea3857ddcdb3466 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/media-document-audio-repaint-expected.txt
@@ -17,23 +17,23 @@ layer at (0,0) size 800x600
           layer at (40,165) size 300x1
             RenderVideo {VIDEO} at (40,164) size 300x2
           layer at (40,165) size 300x1
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x1
-              RenderBlock {DIV} at (0,0) size 300x35
-          layer at (45,165) size 290x30
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+            RenderFlexibleBox {DIV} at (0,0) size 300x1
+              RenderBlock {DIV} at (0,-34) size 300x35
+          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 98x8
-                RenderFlexibleBox {DIV} at (0,0) size 98x8 [border: (1px solid #E6E6E659)]
-                  RenderBlock {DIV} at (1,-8) size 110x24
-                    RenderBlock {DIV} at (31,0) size 33x24
-              RenderDeprecatedFlexibleBox {DIV} at (161,0) size 25x30 [color=#FFFFFF]
+              RenderSlider {INPUT} at (48,11) size 99x8
+                RenderFlexibleBox {DIV} at (0,0) size 99x8 [border: (1px solid #E6E6E659)]
+                  RenderBlock {DIV} at (1,-8) size 111x24
+                    RenderBlock {DIV} at (32,0) size 33x24
+              RenderFlexibleBox {DIV} at (161,0) size 26x30 [color=#FFFFFF]
                 RenderBlock (anonymous) at (0,0) size 25x30
                   RenderText {#text} at (0,7) size 25x15
                     text run at (0,7) width 25: "0:00"
-              RenderButton {INPUT} at (195,0) size 35x30
+              RenderButton {INPUT} at (195,0) size 36x30
               RenderSlider {INPUT} at (236,11) size 39x8
                 RenderFlexibleBox {DIV} at (0,0) size 39x8 [border: (1px solid #E6E6E659)]
                   RenderBlock {DIV} at (1,-8) size 51x24
-                    RenderBlock {DIV} at (20,0) size 24x24
+                    RenderBlock {DIV} at (19,0) size 25x24
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.txt b/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.txt
index 6ddee8174ce7160aa0aa3cd682f8757f907fd9b9..bbab838d186210863a086e8a6ead0e5fc78d3f85 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.txt
@@ -21,63 +21,56 @@ layer at (0,0) size 800x332
 layer at (8,8) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,8) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF00]
-layer at (8,8) size 320x14
-  RenderBlock (positioned) {DIV} at (0,0) size 320x14 [color=#FFFFFF]
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+    RenderInline {SPAN} at (0,0) size 0x0
+layer at (8,8) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,0) size 320x14
     RenderInline {DIV} at (0,0) size 280x18 [bgcolor=#000000CC]
       RenderText {#text} at (22,0) size 276x14
         text run at (22,0) width 276: "Cue 1: should be positioned at the top of the video."
-    RenderInline {DIV} at (0,0) size 3x18 [bgcolor=#000000CC]
-layer at (8,26) size 320x14
-  RenderBlock (positioned) {DIV} at (0,18) size 320x14 [color=#FFFFFF]
+layer at (8,26) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,18) size 320x14
     RenderInline {DIV} at (0,0) size 308x18 [bgcolor=#000000CC]
       RenderText {#text} at (8,0) size 304x14
         text run at (8,0) width 304: "Cue 2: should be the second cue and not overlap cue 1."
-    RenderInline {DIV} at (0,0) size 3x18 [bgcolor=#000000CC]
-layer at (8,44) size 320x14
-  RenderBlock (positioned) {DIV} at (0,36) size 320x14 [color=#FFFFFF]
+layer at (8,44) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,36) size 320x14
     RenderInline {DIV} at (0,0) size 300x18 [bgcolor=#000000CC]
       RenderText {#text} at (12,0) size 296x14
         text run at (12,0) width 296: "Cue 3: should become the third line from top to bottom."
-    RenderInline {DIV} at (0,0) size 2x18 [bgcolor=#000000CC]
-layer at (8,98) size 320x14
-  RenderBlock (positioned) {DIV} at (0,90) size 320x14 [color=#FFFFFF]
+layer at (8,98) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,90) size 320x14
     RenderInline {DIV} at (0,0) size 292x18 [bgcolor=#000000CC]
       RenderText {#text} at (16,0) size 288x14
         text run at (16,0) width 288: "Cue 4: should be fixed positioned around the middle."
-    RenderInline {DIV} at (0,0) size 3x18 [bgcolor=#000000CC]
-layer at (8,195) size 320x14
-  RenderBlock (positioned) {DIV} at (0,187) size 320x14 [color=#FFFFFF]
+layer at (8,195) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,187) size 320x14
     RenderInline {DIV} at (0,0) size 296x18 [bgcolor=#000000CC]
       RenderText {#text} at (14,0) size 292x14
         text run at (14,0) width 292: "Cue 5: should be displayed at the bottom of the video."
-    RenderInline {DIV} at (0,0) size 3x18 [bgcolor=#000000CC]
-layer at (8,177) size 320x14
-  RenderBlock (positioned) {DIV} at (0,169) size 320x14 [color=#FFFFFF]
+layer at (8,177) size 320x14 scrollHeight 16
+  RenderBlock (positioned) {DIV} at (0,169) size 320x14
     RenderInline {DIV} at (0,0) size 284x18 [bgcolor=#000000CC]
       RenderText {#text} at (20,0) size 280x14
         text run at (20,0) width 280: "Cue 6: should be on top of bottom positioned cue 5."
-    RenderInline {DIV} at (0,0) size 3x18 [bgcolor=#000000CC]
-layer at (13,213) size 310x30 scrollHeight 36
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+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
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 54x24
+        RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-5,0) size 33x24
-        RenderBlock {DIV} at (48,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
     RenderSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 3x24
+        RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
-        RenderBlock {DIV} at (-3,1) size 24x24
     RenderButton {INPUT} at (237,0) size 30x30
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-vertical-expected.txt b/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-vertical-expected.txt
index e96d0cb2ce6c3a9dd63d081fcb80c6a358be6ad2..a44bb4b4946298aa03aa298855857cb70a5ed3df 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-vertical-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/track/track-cue-rendering-vertical-expected.txt
@@ -21,63 +21,56 @@ layer at (0,0) size 800x332
 layer at (8,8) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,8) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF00]
+  RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+    RenderInline {SPAN} at (0,0) size 0x0
 layer at (8,8) size 18x205
-  RenderBlock (positioned) {DIV} at (0,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
+  RenderBlock (positioned) {DIV} at (0,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 1: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (26,8) size 18x205
-  RenderBlock (positioned) {DIV} at (18,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
+  RenderBlock (positioned) {DIV} at (18,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 2: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (256,8) size 18x205
-  RenderBlock (positioned) {DIV} at (248,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
+  RenderBlock (positioned) {DIV} at (248,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 3: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (238,8) size 18x205
-  RenderBlock (positioned) {DIV} at (230,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
+  RenderBlock (positioned) {DIV} at (230,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 4: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (310,8) size 18x205
-  RenderBlock (positioned) {DIV} at (302,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
+  RenderBlock (positioned) {DIV} at (302,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 5: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
 layer at (292,8) size 18x205
-  RenderBlock (positioned) {DIV} at (284,0) size 18x205 [color=#FFFFFF]
-    RenderInline {DIV} at (0,0) size 18x117 [bgcolor=#000000CC]
-      RenderText {#text} at (2,44) size 14x113
-        text run at (2,44) width 112: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
-    RenderInline {DIV} at (0,0) size 16x5 [bgcolor=#000000CC]
-layer at (13,213) size 310x30 scrollHeight 36
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderBlock (positioned) {DIV} at (284,0) size 18x205
+    RenderInline {DIV} at (0,0) size 18x115 [bgcolor=#000000CC]
+      RenderText {#text} at (2,47) size 14x111
+        text run at (2,47) width 111: "Cue 6: \x{79C1}\x{306F}\x{7ACB}\x{6D3E}\x{306A}\x{4EBA}"
+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
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 54x24
+        RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-1,0) size 33x24
-        RenderBlock {DIV} at (48,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (171,0) size 35x30
     RenderSlider {INPUT} at (212,11) size 15x8
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 3x24
+        RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
-        RenderBlock {DIV} at (-3,1) size 24x24
     RenderButton {INPUT} at (237,0) size 30x30
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/video-controls-rendering-expected.txt b/LayoutTests/platform/chromium-mac/media/video-controls-rendering-expected.txt
index 9ad23045a748a8e32dca8456943dfe0dc2214c58..a471d839b68a5119025e43eb5aea8ed351f3b891 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-controls-rendering-expected.txt
@@ -16,64 +16,64 @@ layer at (8,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,247) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,487) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,522) size 320x240
   RenderVideo {VIDEO} at (8,522) size 320x240
 layer at (8,522) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,727) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
index bc06586132090341fbddd25bad069ef8ad0e745d..14da6fafdbf2d91508b62fd4b8bcaf0fa23a0104 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
@@ -10,22 +10,22 @@ layer at (0,0) size 800x600
 layer at (8,26) size 320x240
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,231) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:06"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt b/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
index 2c1cd7121cc0205963648ad28ae39e3e4c304646..0ac35728a2c5e0c6c316f4dc555e304b2b9fc149 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,42) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,43) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (14,158) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt b/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
index 518d018694397bd2a3bbcc8a97fe394d5cd613ce..ba9ae46201983d35fa91054f41febbc238b6ce8b 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,42) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,42) size 352x288
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
 layer at (13,295) size 342x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:09"

diff --git a/LayoutTests/platform/chromium-mac/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/chromium-mac/media/video-playing-and-pause-expected.txt
index cb8ed5ae1ee924574b7b521fb78e0e1fd01cbc05..3e972d92f1c9bc2c5ba1dc228b38142d835c5247 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-playing-and-pause-expected.txt
@@ -12,22 +12,22 @@ layer at (0,0) size 800x320
 layer at (8,68) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,68) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,273) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt
index 783378edfb84526c91fbb1c04dd18ff2d4623252..86b99939a926c270f68074221cdc67802dc2d770 100644 (file)
--- a/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-zoom-controls-expected.txt
@@ -9,44 +9,44 @@ layer at (0,0) size 800x600
 layer at (57,85) size 240x180
   RenderVideo {VIDEO} at (45,73) size 240x180
 layer at (57,85) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127) size 240x53
-layer at (65,213) size 225x45 scrollWidth 329
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
-    RenderButton {INPUT} at (13,0) size 46x45
-    RenderSlider {INPUT} at (72,16) size 38x13
+layer at (65,213) size 225x45 scrollWidth 270
+  RenderFlexibleBox {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (-46,0) size 46x45
+    RenderSlider {INPUT} at (13,16) size 38x13
       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 57x36
           RenderBlock {DIV} at (-11,0) size 49x36
-    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (73,0) size 40x45 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 40x45
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
-    RenderButton {INPUT} at (185,0) size 53x45
-    RenderSlider {INPUT} at (247,16) size 23x13
+    RenderButton {INPUT} at (126,0) size 53x45
+    RenderSlider {INPUT} at (188,16) size 23x13
       RenderFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 42x36
           RenderBlock {DIV} at (-5,0) size 36x36
-    RenderButton {INPUT} at (284,0) size 46x45
+    RenderButton {INPUT} at (225,0) size 46x45
 layer at (57,310) size 240x180
   RenderVideo {VIDEO} at (45,298) size 240x180
 layer at (57,310) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127) size 240x53
-layer at (65,438) size 225x45 scrollWidth 329
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
-    RenderButton {INPUT} at (13,0) size 46x45
-    RenderSlider {INPUT} at (72,16) size 38x13
+layer at (65,438) size 225x45 scrollWidth 270
+  RenderFlexibleBox {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
+    RenderButton {INPUT} at (-46,0) size 46x45
+    RenderSlider {INPUT} at (13,16) size 38x13
       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 57x36
           RenderBlock {DIV} at (-11,0) size 49x36
-    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (73,0) size 40x45 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 40x45
         RenderText {#text} at (0,11) size 40x22
           text run at (0,11) width 40: "0:00"
-    RenderButton {INPUT} at (185,0) size 53x45
-    RenderSlider {INPUT} at (247,16) size 23x13
+    RenderButton {INPUT} at (126,0) size 53x45
+    RenderSlider {INPUT} at (188,16) size 23x13
       RenderFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 42x36
           RenderBlock {DIV} at (-5,0) size 36x36
-    RenderButton {INPUT} at (284,0) size 46x45
+    RenderButton {INPUT} at (225,0) size 46x45

diff --git a/LayoutTests/platform/chromium-mac/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/chromium-mac/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index 8421e7e7af9e81460a504d6fe80dd1ecb4eb64d5..d0300a3dc41620e3eee359cf72f9e53f97c54ce5 100644 (file)
--- a/LayoutTests/platform/chromium-mac/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/chromium-mac/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,26) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,26) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,141) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x15
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-win/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/chromium-win/fast/hidpi/video-controls-in-hidpi-expected.txt
index 3dc3b2d917d471df81da86b35d6ec07c4c254c39..1af74b71ad028e5dd55b974dffb6ce5c8545dff6 100644 (file)
--- a/LayoutTests/platform/chromium-win/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,28) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,28) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,143) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt b/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt
index 96d3a83757c16edde33700141206fb2e8566ccec..04045c83fcd0f48a88232d9f9eee5683e594c734 100644 (file)
--- a/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt
@@ -16,16 +16,16 @@ layer at (0,0) size 800x600
 layer at (58,114) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,115) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (64,230) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt
index 8e5a701ecf102f337aa77e6796b7deb73fec7a43..2bd77257a0cdcf62ef178f000c6209876e72e571 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt
@@ -15,61 +15,61 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,80) size 0x19
         RenderBR {BR} at (0,100) size 0x19
 layer at (8,44) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,44) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,94) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30
+  RenderFlexibleBox {DIV} at (0,0) size 320x30
     RenderBlock {DIV} at (0,0) size 320x30
 layer at (8,94) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113x8
-      RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 125x24
+    RenderSlider {INPUT} at (48,11) size 114x8
+      RenderFlexibleBox {DIV} at (0,0) size 114x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 126x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (176,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (210,0) size 35x30
+    RenderButton {INPUT} at (210,0) size 36x30
     RenderSlider {INPUT} at (251,11) size 54x8
       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 66x24
-          RenderBlock {DIV} at (35,0) size 24x24
+          RenderBlock {DIV} at (34,0) size 25x24
 layer at (8,144) size 320x100
   RenderMedia {AUDIO} at (8,144) size 320x100 [bgcolor=#0000FF]
 layer at (8,144) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
     RenderBlock {DIV} at (0,70) size 320x30
 layer at (8,214) size 320x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 113x8
-      RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 125x24
+    RenderSlider {INPUT} at (48,11) size 114x8
+      RenderFlexibleBox {DIV} at (0,0) size 114x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 126x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (176,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:07"
-    RenderButton {INPUT} at (210,0) size 35x30
+    RenderButton {INPUT} at (210,0) size 36x30
     RenderSlider {INPUT} at (251,11) size 54x8
       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 66x24
-          RenderBlock {DIV} at (35,0) size 24x24
+          RenderBlock {DIV} at (34,0) size 25x24

diff --git a/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt b/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt
index 06b16d09fabb4d5e0d596280b14faf8e216f0ff1..fdb9b8ab7613f6627c3e86a9334162e99b6b052c 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt
@@ -15,61 +15,61 @@ layer at (0,0) size 800x600
 layer at (8,74) size 300x30
   RenderMedia {AUDIO} at (0,30) size 300x30
 layer at (8,74) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,74) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,44) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,44) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24
 layer at (8,156) size 300x30
   RenderMedia {AUDIO} at (0,112) size 300x30
 layer at (8,156) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (8,156) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 103x8
-      RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 115x24
+    RenderSlider {INPUT} at (48,11) size 104x8
+      RenderFlexibleBox {DIV} at (0,0) size 104x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 116x24
           RenderBlock {DIV} at (34,0) size 33x24
-    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (166,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (200,0) size 35x30
+    RenderButton {INPUT} at (200,0) size 36x30
     RenderSlider {INPUT} at (241,11) size 44x8
       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 56x24
-          RenderBlock {DIV} at (25,0) size 24x24
+          RenderBlock {DIV} at (24,0) size 25x24

diff --git a/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt b/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt
index 06e2bcc049eaeefbb6aa0207b312232e2de2084c..6fef5cf8de7cd7420860bd17cbc6cb2ecff0dfdd 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x600
 layer at (8,44) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/controls-strict-expected.txt b/LayoutTests/platform/chromium-win/media/controls-strict-expected.txt
index aa1190f090b68a752a05cf23f5c9b01961f9a8c4..9b70bab230860b291991c28974ce26c88ccab3f0 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-strict-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x305
 layer at (8,52) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,257) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt b/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
index 130ff76c63ce8d985725edd115c8d7b46bafd680..e8bdffc2804fb6af27af526118086d926ba54b2f 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt
@@ -15,42 +15,42 @@ layer at (18,44) size 320x240
 layer at (8,284) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (23,249) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,284) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,489) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/controls-styling-strict-expected.txt b/LayoutTests/platform/chromium-win/media/controls-styling-strict-expected.txt
index b52d27b600cd0656a47513d5d33f23a16afe29c2..c9918a8e3c8edf9d5da54946ee579e557901ca3e 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-styling-strict-expected.txt
@@ -15,42 +15,42 @@ layer at (8,52) size 320x240
 layer at (332,52) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,257) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (332,52) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (337,257) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/controls-without-preload-expected.txt b/LayoutTests/platform/chromium-win/media/controls-without-preload-expected.txt
index cd88c3c7d721664713acaebe91717c11e5a9183a..1645a3afe448e4c5eb5a9608c3234b09562707c3 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/controls-without-preload-expected.txt
@@ -11,22 +11,22 @@ layer at (0,0) size 800x600
 layer at (8,44) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt b/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt
index 93aa527b63a67e8747ca03f46a2529d230afb10d..bb324e4fa0b0f1b3191eb4956b0724a96daddf53 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt
@@ -12,61 +12,61 @@ layer at (8,8) size 300x150
 layer at (8,163) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,123) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (249,0) size 35x30
 layer at (308,128) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (308,128) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (259,0) size 35x30
 layer at (8,163) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,278) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
     RenderButton {INPUT} at (249,0) size 35x30
 layer at (308,283) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
+  RenderFlexibleBox {DIV} at (0,0) size 300x30
     RenderBlock {DIV} at (0,0) size 300x30
 layer at (308,283) size 300x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt b/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt
index 6c34a0f33b5fc22b7db3f6acd7969726a0f75200..13e1c40b108fccaa35f8387231ffededc147edeb 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt
@@ -17,23 +17,23 @@ layer at (0,0) size 800x600
           layer at (40,165) size 300x1
             RenderVideo {VIDEO} at (40,164) size 300x2
           layer at (40,165) size 300x1
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x1
-              RenderBlock {DIV} at (0,0) size 300x35
-          layer at (45,165) size 290x30
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+            RenderFlexibleBox {DIV} at (0,0) size 300x1
+              RenderBlock {DIV} at (0,-34) size 300x35
+          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 98x8
-                RenderFlexibleBox {DIV} at (0,0) size 98x8 [border: (1px solid #E6E6E659)]
-                  RenderBlock {DIV} at (1,-8) size 110x24
-                    RenderBlock {DIV} at (31,0) size 33x24
-              RenderDeprecatedFlexibleBox {DIV} at (161,0) size 25x30 [color=#FFFFFF]
+              RenderSlider {INPUT} at (48,11) size 99x8
+                RenderFlexibleBox {DIV} at (0,0) size 99x8 [border: (1px solid #E6E6E659)]
+                  RenderBlock {DIV} at (1,-8) size 111x24
+                    RenderBlock {DIV} at (32,0) size 33x24
+              RenderFlexibleBox {DIV} at (161,0) size 26x30 [color=#FFFFFF]
                 RenderBlock (anonymous) at (0,0) size 25x30
                   RenderText {#text} at (0,7) size 25x16
                     text run at (0,7) width 25: "0:00"
-              RenderButton {INPUT} at (195,0) size 35x30
+              RenderButton {INPUT} at (195,0) size 36x30
               RenderSlider {INPUT} at (236,11) size 39x8
                 RenderFlexibleBox {DIV} at (0,0) size 39x8 [border: (1px solid #E6E6E659)]
                   RenderBlock {DIV} at (1,-8) size 51x24
-                    RenderBlock {DIV} at (20,0) size 24x24
+                    RenderBlock {DIV} at (19,0) size 25x24
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt b/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt
index fc3fb8b174d6908a7df0aa646c619e5666723a7c..660cb62ceedf799b02c52785d622455d8ac4b42c 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt
@@ -21,63 +21,56 @@ layer at (0,0) size 800x341
 layer at (8,8) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,8) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (8,8) size 320x205
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x205 [color=#FFFFFF]
+    RenderInline {SPAN} at (0,0) size 0x0
 layer at (8,8) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,0) size 320x15
     RenderInline {DIV} at (0,0) size 280x19 [bgcolor=#000000CC]
       RenderText {#text} at (22,0) size 276x15
         text run at (22,0) width 276: "Cue 1: should be positioned at the top of the video."
-    RenderInline {DIV} at (0,0) size 2x19 [bgcolor=#000000CC]
 layer at (8,27) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,19) size 320x15
     RenderInline {DIV} at (0,0) size 308x19 [bgcolor=#000000CC]
       RenderText {#text} at (8,0) size 304x15
         text run at (8,0) width 304: "Cue 2: should be the second cue and not overlap cue 1."
-    RenderInline {DIV} at (0,0) size 2x19 [bgcolor=#000000CC]
 layer at (8,46) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,38) size 320x15
     RenderInline {DIV} at (0,0) size 304x19 [bgcolor=#000000CC]
       RenderText {#text} at (10,0) size 300x15
         text run at (10,0) width 300: "Cue 3: should become the third line from top to bottom."
-    RenderInline {DIV} at (0,0) size 2x19 [bgcolor=#000000CC]
 layer at (8,103) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,95) size 320x15
     RenderInline {DIV} at (0,0) size 294x19 [bgcolor=#000000CC]
       RenderText {#text} at (15,0) size 290x15
         text run at (15,0) width 290: "Cue 4: should be fixed positioned around the middle."
-    RenderInline {DIV} at (0,0) size 3x19 [bgcolor=#000000CC]
 layer at (8,194) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,186) size 320x15
     RenderInline {DIV} at (0,0) size 296x19 [bgcolor=#000000CC]
       RenderText {#text} at (14,0) size 292x15
         text run at (14,0) width 292: "Cue 5: should be displayed at the bottom of the video."
-    RenderInline {DIV} at (0,0) size 2x19 [bgcolor=#000000CC]
 layer at (8,175) size 320x15 scrollHeight 17
   RenderBlock (positioned) {DIV} at (0,167) size 320x15
     RenderInline {DIV} at (0,0) size 286x19 [bgcolor=#000000CC]
       RenderText {#text} at (19,0) size 282x15
         text run at (19,0) width 282: "Cue 6: should be on top of bottom positioned cue 5."
-    RenderInline {DIV} at (0,0) size 2x19 [bgcolor=#000000CC]
-layer at (13,213) size 310x30 scrollHeight 36
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+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
       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 54x24
+        RenderBlock {DIV} at (1,-8) size 86x24
           RenderBlock {DIV} at (-5,0) size 33x24
-        RenderBlock {DIV} at (48,1) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         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
       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 3x24
+        RenderBlock {DIV} at (1,-8) size 27x24
           RenderBlock {DIV} at (-4,0) size 24x24
-        RenderBlock {DIV} at (-3,1) size 24x24
     RenderButton {INPUT} at (237,0) size 30x30
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/video-controls-rendering-expected.txt b/LayoutTests/platform/chromium-win/media/video-controls-rendering-expected.txt
index 46aed5c63626f89f0dcfb96187d629af7bf0d282..f4982dc57e96a3328d95d6c99d4cb23f1654b951 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-controls-rendering-expected.txt
@@ -16,64 +16,64 @@ layer at (8,44) size 320x240
 layer at (8,284) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,44) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,249) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,284) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,489) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30
 layer at (8,524) size 320x240
   RenderVideo {VIDEO} at (8,524) size 320x240
 layer at (8,524) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,729) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/video-display-toggle-expected.txt b/LayoutTests/platform/chromium-win/media/video-display-toggle-expected.txt
index d6c967d889a3d89ab045637029d2b0add77b7e2c..58899bf613ede17a09c8c8af0ff0256fc3384ef2 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-display-toggle-expected.txt
@@ -10,22 +10,22 @@ layer at (0,0) size 800x600
 layer at (8,28) size 320x240
   RenderVideo {VIDEO} at (0,20) size 320x240
 layer at (8,28) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,233) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:06"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt b/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt
index d2d51a1e2adef446d4362f02b05054283e4b434c..36414e02c5c0c02007c1fad4e01334a72d3652b7 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,44) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,45) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (14,160) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt b/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt
index bda320993ac5e5596363bad0b1ff346b4395c0a8..f1fd2d7ff831d6caed88bda54296603b824f7c82 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,44) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,44) size 352x288
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderBlock {DIV} at (0,253) size 352x35
 layer at (13,297) size 342x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:09"

diff --git a/LayoutTests/platform/chromium-win/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/chromium-win/media/video-playing-and-pause-expected.txt
index 0545c416fa14d773f1849b0067caddca5dabe73f..e137b9f800d10962517094dd96a8b558a0e953d1 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-playing-and-pause-expected.txt
@@ -12,22 +12,22 @@ layer at (0,0) size 800x325
 layer at (8,72) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,72) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderBlock {DIV} at (0,205) size 320x35
 layer at (13,277) size 310x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 310x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
-    RenderSlider {INPUT} at (48,11) size 91x8
-      RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
-        RenderBlock {DIV} at (1,-8) size 103x24
+    RenderSlider {INPUT} at (48,11) size 92x8
+      RenderFlexibleBox {DIV} at (0,0) size 92x8 [border: (1px solid #E6E6E659)]
+        RenderBlock {DIV} at (1,-8) size 104x24
           RenderBlock {DIV} at (-7,0) size 32x24
-    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (154,0) size 26x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"
-    RenderButton {INPUT} at (188,0) size 35x30
+    RenderButton {INPUT} at (188,0) size 36x30
     RenderSlider {INPUT} at (229,11) size 32x8
       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-8) size 44x24
-          RenderBlock {DIV} at (13,0) size 24x24
+          RenderBlock {DIV} at (12,0) size 25x24
     RenderButton {INPUT} at (271,0) size 30x30

diff --git a/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt
index 7e7d19188a9207064f685e4d1eab853796260d62..aa0f8e98b92dca160c94958dddcc64a43757cd06 100644 (file)
--- a/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt
@@ -9,16 +9,16 @@ layer at (0,0) size 800x600
 layer at (57,85) size 240x180
   RenderVideo {VIDEO} at (45,73) size 240x180
 layer at (57,85) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127) size 240x53
 layer at (65,213) size 225x45 scrollWidth 329
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13,0) size 46x45
     RenderSlider {INPUT} at (72,16) size 38x13
       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 57x36
           RenderBlock {DIV} at (-11,0) size 49x36
-    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 40x45
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"
@@ -31,16 +31,16 @@ layer at (65,213) size 225x45 scrollWidth 329
 layer at (57,310) size 240x180
   RenderVideo {VIDEO} at (45,298) size 240x180
 layer at (57,310) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderBlock {DIV} at (0,127) size 240x53
 layer at (65,438) size 225x45 scrollWidth 329
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (7,0) size 226x45 [bgcolor=#141414CC]
     RenderButton {INPUT} at (13,0) size 46x45
     RenderSlider {INPUT} at (72,16) size 38x13
       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
         RenderBlock {DIV} at (1,-12) size 57x36
           RenderBlock {DIV} at (-11,0) size 49x36
-    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 40x45
         RenderText {#text} at (0,10) size 40x24
           text run at (0,10) width 40: "0:00"

diff --git a/LayoutTests/platform/chromium-win/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/chromium-win/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
index 3dc3b2d917d471df81da86b35d6ec07c4c254c39..1af74b71ad028e5dd55b974dffb6ce5c8545dff6 100644 (file)
--- a/LayoutTests/platform/chromium-win/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/chromium-win/platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,16 +11,16 @@ layer at (0,0) size 800x600
 layer at (8,28) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,28) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderBlock {DIV} at (0,115) size 300x35
 layer at (13,143) size 290x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
+  RenderFlexibleBox {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
     RenderButton {INPUT} at (9,0) size 30x30
     RenderSlider {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
-    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
       RenderBlock (anonymous) at (0,0) size 25x30
         RenderText {#text} at (0,7) size 25x16
           text run at (0,7) width 25: "0:00"

diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
index 0d440acfbb47d9847f7d08020053bf95e2c346ec..9be673ae8f32f274810b38236d39c524e8524cc7 100644 (file)
--- a/LayoutTests/platform/chromium/TestExpectations
+++ b/LayoutTests/platform/chromium/TestExpectations
@@ -1381,6 +1381,16 @@ webkit.org/b/101396 svg/custom/simple-text-double-shadow.svg
 webkit.org/b/101396 svg/css/clippath-with-shadow.svg
 webkit.org/b/101396 svg/css/arrow-with-shadow.svg
 
+# Need rebaseline after https://bugs.webkit.org/show_bug.cgi?id=109775
+webkit.org/b/109775 [ Win Mac ] media/audio-controls-rendering.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/controls-after-reload.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/controls-strict.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/controls-styling-strict.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/controls-without-preload.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/video-controls-rendering.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/video-display-toggle.html [ Failure ]
+webkit.org/b/109775 [ Win Mac ] media/video-playing-and-pause.html [ Failure ]
+
 # -----------------------------------------------------------------
 # End SVG TESTS
 # -----------------------------------------------------------------

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index 6cf3576b0e2477293d9f550740ab4b2a92a932d1..c70b8db053c9d8aa80d0c53b6644112cdea0bd16 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -1879,3 +1879,12 @@ webkit.org/b/108370 editing/spelling/spelling-with-punctuation-selection.html [
 webkit.org/b/108370 editing/spelling/spelling-with-underscore-selection.html [ Skip ]
 webkit.org/b/108370 editing/spelling/spelling-with-whitespace-selection.html [ Skip ]
 
+# Need rebaseline after https://bugs.webkit.org/show_bug.cgi?id=109775
+webkit.org/b/109775 media/audio-controls-rendering.html [ Failure ]
+webkit.org/b/109775 media/controls-after-reload.html [ Failure ]
+webkit.org/b/109775 media/controls-strict.html [ Failure ]
+webkit.org/b/109775 media/controls-styling-strict.html [ Failure ]
+webkit.org/b/109775 media/controls-without-preload.html [ Failure ]
+webkit.org/b/109775 media/video-controls-rendering.html [ Failure ]
+webkit.org/b/109775 media/video-display-toggle.html [ Failure ]
+webkit.org/b/109775 media/video-playing-and-pause.html [ Failure ]

diff --git a/LayoutTests/platform/efl/fast/layers/video-layer-expected.txt b/LayoutTests/platform/efl/fast/layers/video-layer-expected.txt
index edae87b68217c61511f0c10045e0b9871998ed34..551496bc4242c9d85b0d231acdbca1f128e73503 100644 (file)
--- a/LayoutTests/platform/efl/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/efl/fast/layers/video-layer-expected.txt
@@ -16,12 +16,12 @@ layer at (0,0) size 800x600
 layer at (58,110) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,111) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
 layer at (59,241) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
+  RenderFlexibleBox {DIV} at (0,130) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/efl/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/efl/media/audio-controls-rendering-expected.txt
index 3cab118742538495892697df3b40353084849c73..cd8e7dfdf5185e136a9e85c850583152dcc73547 100644 (file)
--- a/LayoutTests/platform/efl/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/efl/media/audio-controls-rendering-expected.txt
@@ -15,12 +15,12 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,58) size 0x17
         RenderBR {BR} at (0,76) size 0x17
 layer at (8,42) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,42) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:07"
@@ -34,12 +34,12 @@ layer at (8,42) size 300x20 scrollHeight 28
 layer at (288,42) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,80) size 320x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x20
+  RenderFlexibleBox {DIV} at (0,0) size 320x20
 layer at (8,80) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x20
+  RenderFlexibleBox {DIV} at (0,0) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:07"
@@ -55,12 +55,12 @@ layer at (308,80) size 20x20
 layer at (8,118) size 320x100
   RenderMedia {AUDIO} at (8,118) size 320x100 [bgcolor=#0000FF]
 layer at (8,118) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
 layer at (8,198) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,80) size 320x20
+  RenderFlexibleBox {DIV} at (0,80) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:07"

diff --git a/LayoutTests/platform/efl/media/audio-repaint-expected.txt b/LayoutTests/platform/efl/media/audio-repaint-expected.txt
index 2166ef115890b4c3d21277c9cbe93625387d55ff..700186322a24504f4eca9fd90cff7c0d4523a537 100644 (file)
--- a/LayoutTests/platform/efl/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/efl/media/audio-repaint-expected.txt
@@ -15,12 +15,12 @@ layer at (0,0) size 800x600
 layer at (8,62) size 300x20
   RenderMedia {AUDIO} at (0,20) size 300x20
 layer at (8,62) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,62) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:01"
@@ -35,12 +35,12 @@ layer at (8,62) size 300x20 scrollHeight 28
 layer at (288,62) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,42) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,42) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:01"
@@ -57,12 +57,12 @@ layer at (288,42) size 20x20
 layer at (8,134) size 300x20
   RenderMedia {AUDIO} at (0,92) size 300x20
 layer at (8,134) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,134) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:01"

diff --git a/LayoutTests/platform/efl/media/controls-after-reload-expected.txt b/LayoutTests/platform/efl/media/controls-after-reload-expected.txt
index d67dbbb9118b05c63807334687d05271b24c84d3..1638ec33ea5a540e5c157866083b6bb6f6f457a0 100644 (file)
--- a/LayoutTests/platform/efl/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/efl/media/controls-after-reload-expected.txt
@@ -11,12 +11,12 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,262) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/controls-strict-expected.txt b/LayoutTests/platform/efl/media/controls-strict-expected.txt
index 50faa105dc3a07535457e75a0c31986e67382b3d..a2eb0174209ff7f171d21a71b6a68cf529563141 100644 (file)
--- a/LayoutTests/platform/efl/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/efl/media/controls-strict-expected.txt
@@ -11,12 +11,12 @@ layer at (0,0) size 800x302
 layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,270) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/controls-styling-expected.txt b/LayoutTests/platform/efl/media/controls-styling-expected.txt
index 5bc7539d5ffcfb6b6594a138ac7d8741489cc92f..ef87dc988e5d91eeca0a81ae47b5bf83e4764c72 100644 (file)
--- a/LayoutTests/platform/efl/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/efl/media/controls-styling-expected.txt
@@ -15,12 +15,12 @@ layer at (18,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (18,262) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28 [color=#000000]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28 [color=#000000]
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"
@@ -36,12 +36,12 @@ layer at (18,262) size 320x20 scrollHeight 28
 layer at (318,262) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,502) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/controls-styling-strict-expected.txt b/LayoutTests/platform/efl/media/controls-styling-strict-expected.txt
index 1fea2e27ebf7a91a43e81e7bb8e3587850c52413..7dbc758f52b46e495e818e222bc02da846a771ef 100644 (file)
--- a/LayoutTests/platform/efl/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/efl/media/controls-styling-strict-expected.txt
@@ -15,12 +15,12 @@ layer at (8,50) size 320x240
 layer at (332,50) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,270) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28 [color=#000000]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28 [color=#000000]
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:06"
@@ -35,12 +35,12 @@ layer at (8,270) size 320x20 scrollHeight 28
 layer at (308,270) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (332,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (332,270) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/controls-without-preload-expected.txt b/LayoutTests/platform/efl/media/controls-without-preload-expected.txt
index ade6d22e961f1244995ec1796d6b559de25d8f8e..eb458a223101f5415108a2ce967d7c62a075c45e 100644 (file)
--- a/LayoutTests/platform/efl/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/efl/media/controls-without-preload-expected.txt
@@ -11,12 +11,12 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,262) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/media-controls-clone-expected.txt b/LayoutTests/platform/efl/media/media-controls-clone-expected.txt
index d2d2caaf4a79fdf69cd86aebedb4e41e38cf8d73..96b503d6d8d8cec56c0cc057ddd945e7a66177a8 100644 (file)
--- a/LayoutTests/platform/efl/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/efl/media/media-controls-clone-expected.txt
@@ -12,12 +12,12 @@ layer at (8,8) size 300x150
 layer at (8,162) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,138) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
+  RenderFlexibleBox {DIV} at (0,130) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"
@@ -29,12 +29,12 @@ layer at (8,138) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (280,0) size 20x20
     RenderBlock {DIV} at (300,10) size 0x0
 layer at (308,138) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (308,138) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"
@@ -46,12 +46,12 @@ layer at (308,138) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (280,0) size 20x20
     RenderBlock {DIV} at (300,10) size 0x0
 layer at (8,162) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,292) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
+  RenderFlexibleBox {DIV} at (0,130) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"
@@ -63,12 +63,12 @@ layer at (8,292) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (280,0) size 20x20
     RenderBlock {DIV} at (300,10) size 0x0
 layer at (308,292) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (308,292) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/efl/media/media-document-audio-repaint-expected.txt b/LayoutTests/platform/efl/media/media-document-audio-repaint-expected.txt
index 8a875614d4f07886ae235d2fc9e84d98d7b40f2a..317f6eabd8092771b27ee8bce3791cb56fae2888 100644 (file)
--- a/LayoutTests/platform/efl/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/platform/efl/media/media-document-audio-repaint-expected.txt
@@ -17,12 +17,12 @@ layer at (0,0) size 800x600
           layer at (40,164) size 300x1
             RenderVideo {VIDEO} at (40,164) size 300x1
           layer at (40,164) size 300x1
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x1
+            RenderFlexibleBox {DIV} at (0,0) size 300x1
           layer at (40,164) size 300x20 scrollHeight 28
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+            RenderFlexibleBox {DIV} at (0,0) size 300x20
               RenderButton {INPUT} at (0,0) size 20x20
-              RenderDeprecatedFlexibleBox {DIV} at (20,0) size 200x20
-                RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+              RenderFlexibleBox {DIV} at (20,0) size 200x20
+                RenderFlexibleBox {DIV} at (0,0) size 63x28
                   RenderBlock (anonymous) at (4,4) size 55x20
                     RenderText {#text} at (0,0) size 55x12
                       text run at (0,0) width 55: "00:00 / 00:01"

diff --git a/LayoutTests/platform/efl/media/video-controls-rendering-expected.txt b/LayoutTests/platform/efl/media/video-controls-rendering-expected.txt
index b2049c40f4748db518ff96bfdc637ff20938e710..234be527004b2f11ce4df2407ff93f15285885a5 100644 (file)
--- a/LayoutTests/platform/efl/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/efl/media/video-controls-rendering-expected.txt
@@ -16,17 +16,17 @@ layer at (8,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,262) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"
       RenderSlider {INPUT} at (63,0) size 157x20
-        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
+        RenderFlexibleBox {DIV} at (2,0) size 153x20
           RenderBlock {DIV} at (0,4) size 141x12
           RenderBlock {DIV} at (141,4) size 12x12
     RenderButton {INPUT} at (240,0) size 20x20
@@ -38,17 +38,17 @@ layer at (93,266) size 12x12
 layer at (308,262) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,502) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"
       RenderSlider {INPUT} at (63,0) size 157x20
-        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
+        RenderFlexibleBox {DIV} at (2,0) size 153x20
           RenderBlock {DIV} at (0,4) size 141x12
           RenderBlock {DIV} at (141,4) size 12x12
     RenderButton {INPUT} at (240,0) size 20x20
@@ -62,17 +62,17 @@ layer at (308,502) size 20x20
 layer at (8,522) size 320x240
   RenderVideo {VIDEO} at (8,522) size 320x240
 layer at (8,522) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,742) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x12
             text run at (0,0) width 55: "00:00 / 00:06"
       RenderSlider {INPUT} at (63,0) size 157x20
-        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
+        RenderFlexibleBox {DIV} at (2,0) size 153x20
           RenderBlock {DIV} at (0,4) size 141x12
           RenderBlock {DIV} at (141,4) size 12x12
     RenderButton {INPUT} at (240,0) size 20x20

diff --git a/LayoutTests/platform/efl/media/video-display-toggle-expected.txt b/LayoutTests/platform/efl/media/video-display-toggle-expected.txt
index e6b227fc30560c74475196b6e64f4e43d5c59907..bd10e1e5ac81c5af4e21c3c79f661813e4b50335 100644 (file)
--- a/LayoutTests/platform/efl/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/efl/media/video-display-toggle-expected.txt
@@ -10,12 +10,12 @@ layer at (0,0) size 800x600
 layer at (8,26) size 320x240
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,246) size 320x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/efl/media/video-empty-source-expected.txt b/LayoutTests/platform/efl/media/video-empty-source-expected.txt
index ed9a7d5f2410b38b22e863475d40dd517b11a631..c4c6429e04d8f0ae5c999c8252564be57892c7e3 100644 (file)
--- a/LayoutTests/platform/efl/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/efl/media/video-empty-source-expected.txt
@@ -11,12 +11,12 @@ layer at (0,0) size 800x600
 layer at (8,42) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,43) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
 layer at (9,173) size 300x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
+  RenderFlexibleBox {DIV} at (0,130) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 240x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/efl/media/video-no-audio-expected.txt b/LayoutTests/platform/efl/media/video-no-audio-expected.txt
index f165cc6333291082114040b0000810aef49d9e04..dfad73a03c0ff6fb63127068ad8e09904d83060d 100644 (file)
--- a/LayoutTests/platform/efl/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/efl/media/video-no-audio-expected.txt
@@ -11,12 +11,12 @@ layer at (0,0) size 800x600
 layer at (8,42) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,42) size 352x288
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
 layer at (8,310) size 352x20 scrollHeight 28
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,268) size 352x20
+  RenderFlexibleBox {DIV} at (0,268) size 352x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 272x20
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
+    RenderFlexibleBox {DIV} at (20,0) size 272x20
+      RenderFlexibleBox {DIV} at (0,0) size 63x28
         RenderBlock (anonymous) at (4,4) size 55x20
           RenderText {#text} at (0,0) size 55x11
             text run at (0,0) width 55: "00:00 / 00:09"

diff --git a/LayoutTests/platform/efl/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/efl/media/video-playing-and-pause-expected.txt
index 6a97c2214e51e53e0bbfc802d37f7eceb908ead3..e1e50eedb4dbf81d3755eaae8678e11f3ff32e7d 100644 (file)
--- a/LayoutTests/platform/efl/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/efl/media/video-playing-and-pause-expected.txt
@@ -14,16 +14,16 @@ layer at (8,70) size 320x240
 layer at (8,70) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,290) size 320x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
+    RenderFlexibleBox {DIV} at (20,0) size 220x20
       RenderBlock (anonymous) at (0,0) size 63x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,2) size 63x28
+        RenderFlexibleBox {DIV} at (0,2) size 63x28
           RenderBlock (anonymous) at (4,4) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"
       RenderSlider {INPUT} at (63,0) size 157x20
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x20
+        RenderFlexibleBox {DIV} at (0,0) size 157x20
           RenderBlock {DIV} at (0,4) size 145x12
           RenderBlock {DIV} at (145,4) size 12x12
     RenderButton {INPUT} at (240,0) size 20x20

diff --git a/LayoutTests/platform/efl/media/video-zoom-controls-expected.txt b/LayoutTests/platform/efl/media/video-zoom-controls-expected.txt
index ea595c3cca9f6704105b048042df06c6f0d9863c..1f7a681762a91996a43af91ed5498043c7d7a0db 100644 (file)
--- a/LayoutTests/platform/efl/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/efl/media/video-zoom-controls-expected.txt
@@ -9,12 +9,12 @@ layer at (0,0) size 800x600
 layer at (57,85) size 240x180
   RenderVideo {VIDEO} at (45,73) size 240x180
 layer at (57,85) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
 layer at (57,235) size 240x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,150) size 240x30
+  RenderFlexibleBox {DIV} at (0,150) size 240x30
     RenderButton {INPUT} at (0,0) size 30x30
-    RenderDeprecatedFlexibleBox {DIV} at (30,0) size 90x30
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 0x42
+    RenderFlexibleBox {DIV} at (30,0) size 90x30
+      RenderFlexibleBox {DIV} at (0,0) size 0x42
         RenderBlock (anonymous) at (6,6) size 78x30
           RenderText {#text} at (17,0) size 44x33
             text run at (17,0) width 44: "00:00 /"
@@ -32,12 +32,12 @@ layer at (267,235) size 30x30
 layer at (57,310) size 240x180
   RenderVideo {VIDEO} at (45,298) size 240x180
 layer at (57,310) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
 layer at (57,460) size 240x30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,150) size 240x30
+  RenderFlexibleBox {DIV} at (0,150) size 240x30
     RenderButton {INPUT} at (0,0) size 30x30
-    RenderDeprecatedFlexibleBox {DIV} at (30,0) size 90x30
-      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 0x42
+    RenderFlexibleBox {DIV} at (30,0) size 90x30
+      RenderFlexibleBox {DIV} at (0,0) size 0x42
         RenderBlock (anonymous) at (6,6) size 78x30
           RenderText {#text} at (17,0) size 44x33
             text run at (17,0) width 44: "00:00 /"

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index 2a6d1014646643b9023ed7f661fbc305a7d74d1a..dbf25abe6c871ab6d10111c3300bf4f996e16abe 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -77,6 +77,17 @@ webkit.org/b/107567 svg/carto.net/combobox.svg [ Failure ]
 
 # Rebaseline required after https://webkit.org/b/95772
 webkit.org/b/109209 fast/text/international/bidi-ignored-for-first-child-inline.html [ Failure ]
+
+# Need rebaseline after https://bugs.webkit.org/show_bug.cgi?id=109775
+webkit.org/b/109775 media/audio-controls-rendering.html [ Failure ]
+webkit.org/b/109775 media/controls-after-reload.html [ Failure ]
+webkit.org/b/109775 media/controls-strict.html [ Failure ]
+webkit.org/b/109775 media/controls-styling-strict.html [ Failure ]
+webkit.org/b/109775 media/controls-without-preload.html [ Failure ]
+webkit.org/b/109775 media/video-controls-rendering.html [ Failure ]
+webkit.org/b/109775 media/video-display-toggle.html [ Failure ]
+webkit.org/b/109775 media/video-playing-and-pause.html [ Failure ]
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # Expected failures
 #////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt
index de1be1a28cf911bdded1c4d1f6be1cb45fcb742e..f12cfea23149e0cb6eca63d48b589e16de36d895 100644 (file)
--- a/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/gtk/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x600
 layer at (8,26) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,26) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,26) size 300x150 scrollHeight 160
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt b/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt
index b318ad9adda002c7da5eb8d8dd63b434f4f7284f..cb30aa8669e0e6fa30fd9d107e80c41839dda9a5 100644 (file)
--- a/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/gtk/fast/layers/video-layer-expected.txt
@@ -16,13 +16,13 @@ layer at (0,0) size 800x600
 layer at (58,110) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,111) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
 layer at (59,111) size 300x150 scrollHeight 160
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
index 90494428db5ac83af2dd2a44539a10552b7a6409..98882b65c6a18087bde6992cec4ee6f57e6055b0 100644 (file)
--- a/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
@@ -15,13 +15,13 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,58) size 0x19
         RenderBR {BR} at (0,76) size 0x19
 layer at (8,42) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,42) size 300x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:07"
@@ -35,13 +35,13 @@ layer at (8,42) size 300x20 scrollHeight 30
 layer at (288,42) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,80) size 320x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x20
+  RenderFlexibleBox {DIV} at (0,0) size 320x20
 layer at (8,80) size 320x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x20
+  RenderFlexibleBox {DIV} at (0,0) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:07"
@@ -57,13 +57,13 @@ layer at (308,80) size 20x20
 layer at (8,118) size 320x100
   RenderMedia {AUDIO} at (8,118) size 320x100 [bgcolor=#0000FF]
 layer at (8,118) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
 layer at (8,118) size 320x100 scrollHeight 110
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
     RenderButton {INPUT} at (0,80) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,80) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,80) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:07"

diff --git a/LayoutTests/platform/gtk/media/audio-repaint-expected.txt b/LayoutTests/platform/gtk/media/audio-repaint-expected.txt
index b8f0dd3b6bef21e71c29a060c3dc1978efb35120..dd5beeaaa12c720cea264a6aab2af967e5fa1ed3 100644 (file)
--- a/LayoutTests/platform/gtk/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/gtk/media/audio-repaint-expected.txt
@@ -15,13 +15,13 @@ layer at (0,0) size 800x600
 layer at (8,62) size 300x20
   RenderMedia {AUDIO} at (0,20) size 300x20
 layer at (8,62) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,62) size 300x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:01"
@@ -35,13 +35,13 @@ layer at (8,62) size 300x20 scrollHeight 30
 layer at (288,62) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,42) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,42) size 300x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:01"
@@ -57,13 +57,13 @@ layer at (288,42) size 20x20
 layer at (8,134) size 300x20
   RenderMedia {AUDIO} at (0,92) size 300x20
 layer at (8,134) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (8,134) size 300x20 scrollHeight 30
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:01"

diff --git a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
index 64a5547f5651177127181889eba089b04471a535..2f7034efe501b014b8ed317e7b1e1b4c14841fe0 100644 (file)
--- a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,42) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/controls-strict-expected.txt b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
index 1bebfc4de9bafa889c1fd2814b68bbf7825af201..73fe13e37cee4c9b62391c6490311e4ae2f47a1d 100644 (file)
--- a/LayoutTests/platform/gtk/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x301
 layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,50) size 320x240 scrollHeight 251
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/controls-styling-expected.txt b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
index 8b10a7db88187f06dc429e84c026cada0830e4da..716412cd6c09e6d97a635fb9ec27fa8bc60e123a 100644 (file)
--- a/LayoutTests/platform/gtk/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
@@ -15,13 +15,13 @@ layer at (18,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (18,42) size 320x240 scrollHeight 481
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 218x30
-        RenderDeprecatedFlexibleBox {DIV} at (10,0) size 218x30
+        RenderFlexibleBox {DIV} at (10,0) size 218x30
           RenderBlock (anonymous) at (5,5) size 208x20
             RenderText {#text} at (22,44) size 179x212
               text run at (22,44) width 174: "00:00"
@@ -38,13 +38,13 @@ layer at (18,42) size 320x240 scrollHeight 481
 layer at (318,262) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,282) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt b/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt
index 7ce00bbc2f1a56a49a4d576cefe8a4f41c580a7c..ed3a9c3eff6a8e4cbb4485a0def13ca85b2488fd 100644 (file)
--- a/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-styling-strict-expected.txt
@@ -15,13 +15,13 @@ layer at (8,50) size 320x240
 layer at (332,50) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,50) size 320x240 scrollHeight 261
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 88x41
-        RenderDeprecatedFlexibleBox {DIV} at (0,11) size 88x30
+        RenderFlexibleBox {DIV} at (0,11) size 88x30
           RenderBlock (anonymous) at (5,5) size 78x20
             RenderText {#text} at (0,0) size 78x12
               text run at (0,0) width 78: "00:00 / 00:06"
@@ -36,13 +36,13 @@ layer at (8,50) size 320x240 scrollHeight 261
 layer at (308,270) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (332,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (332,50) size 320x240 scrollHeight 251
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt b/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt
index b616ffaab9266130b4eaf972ce630fdac90d72bb..52b3fcff022d2e981c416f685b391906d4dd55f1 100644 (file)
--- a/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-without-preload-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,42) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/media-controls-clone-expected.txt b/LayoutTests/platform/gtk/media/media-controls-clone-expected.txt
index 54d297d9c662f8b3e206479f98a034d62828bc1a..9d11070eb5dc2d74578fff461b09444a21b3c04f 100644 (file)
--- a/LayoutTests/platform/gtk/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/gtk/media/media-controls-clone-expected.txt
@@ -12,13 +12,13 @@ layer at (8,8) size 300x150
 layer at (8,161) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,8) size 300x150 scrollHeight 161
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"
@@ -30,13 +30,13 @@ layer at (8,8) size 300x150 scrollHeight 161
     RenderButton {INPUT} at (280,130) size 20x20
     RenderBlock {DIV} at (300,150) size 0x0
 layer at (308,138) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (308,138) size 300x20 scrollHeight 31
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"
@@ -48,13 +48,13 @@ layer at (308,138) size 300x20 scrollHeight 31
     RenderButton {INPUT} at (280,0) size 20x20
     RenderBlock {DIV} at (300,20) size 0x0
 layer at (8,161) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,161) size 300x150 scrollHeight 161
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"
@@ -66,13 +66,13 @@ layer at (8,161) size 300x150 scrollHeight 161
     RenderButton {INPUT} at (280,130) size 20x20
     RenderBlock {DIV} at (300,150) size 0x0
 layer at (308,291) size 300x20
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
 layer at (308,291) size 300x20 scrollHeight 31
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+  RenderFlexibleBox {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/gtk/media/media-document-audio-repaint-expected.txt b/LayoutTests/platform/gtk/media/media-document-audio-repaint-expected.txt
index adbbf2ac505e1f5bcccef9786ad5c094e686545f..88c2277b01c26b409c11f30bb6bcbf8d3d50011b 100644 (file)
--- a/LayoutTests/platform/gtk/media/media-document-audio-repaint-expected.txt
+++ b/LayoutTests/platform/gtk/media/media-document-audio-repaint-expected.txt
@@ -17,13 +17,13 @@ layer at (0,0) size 800x600
           layer at (40,164) size 300x1
             RenderVideo {VIDEO} at (40,164) size 300x1
           layer at (40,164) size 300x1
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x1
+            RenderFlexibleBox {DIV} at (0,0) size 300x1
           layer at (40,164) size 300x20 scrollHeight 30
-            RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
+            RenderFlexibleBox {DIV} at (0,0) size 300x20
               RenderButton {INPUT} at (0,0) size 20x20
-              RenderDeprecatedFlexibleBox {DIV} at (20,0) size 200x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+              RenderFlexibleBox {DIV} at (20,0) size 200x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
                 RenderBlock (anonymous) at (1,0) size 65x30
-                  RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+                  RenderFlexibleBox {DIV} at (0,0) size 65x30
                     RenderBlock (anonymous) at (5,5) size 55x20
                       RenderText {#text} at (0,0) size 55x12
                         text run at (0,0) width 55: "00:00 / 00:01"

diff --git a/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt b/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
index 4ff028905b5be0a26a6873fd90caf64f39452e90..39ea6fee2e2578413d3e47654fe7daaeedb14f27 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
@@ -16,13 +16,13 @@ layer at (8,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,42) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"
@@ -37,13 +37,13 @@ layer at (8,42) size 320x240 scrollHeight 250
 layer at (308,262) size 20x20
   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,282) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"
@@ -60,13 +60,13 @@ layer at (308,502) size 20x20
 layer at (8,522) size 320x240
   RenderVideo {VIDEO} at (8,522) size 320x240
 layer at (8,522) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,522) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt b/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
index 9bd02196e91d1ebd932a3e811c2fe28f222a701d..2c6b60f4071a716debc58c68609204b39215c1fc 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
@@ -10,13 +10,13 @@ layer at (0,0) size 800x600
 layer at (8,26) size 320x240
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,26) size 320x240 scrollHeight 250
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
     RenderButton {INPUT} at (0,220) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,220) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/video-empty-source-expected.txt b/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
index 45aebbd7ca3f3f49fb1a126e749172c65ebe9d5f..d2fea5f29e20986c8ca7424bfb7493e74158550c 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x600
 layer at (8,42) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,43) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
 layer at (9,43) size 300x150 scrollHeight 160
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
     RenderButton {INPUT} at (0,130) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,130) size 240x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:00"

diff --git a/LayoutTests/platform/gtk/media/video-no-audio-expected.txt b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
index 364735b09e5ea1c5fd1c3f0b1ac69e16aa251397..ccf800c9a912085d3f96d87821808dfd1dfa0b2e 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
@@ -11,13 +11,13 @@ layer at (0,0) size 800x600
 layer at (8,42) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,42) size 352x288
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
 layer at (8,42) size 352x288 scrollHeight 298
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+  RenderFlexibleBox {DIV} at (0,0) size 352x288
     RenderButton {INPUT} at (0,268) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,268) size 272x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,268) size 272x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x30
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 65x30
+        RenderFlexibleBox {DIV} at (0,0) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:09"

diff --git a/LayoutTests/platform/gtk/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/gtk/media/video-playing-and-pause-expected.txt
index 3461ae51112c6ec315c8b3f095d1fa454ef3c257..61829c52dd783ca70e103ee87601f25518e752a0 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-playing-and-pause-expected.txt
@@ -12,13 +12,13 @@ layer at (0,0) size 800x319
 layer at (8,68) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,68) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,288) size 320x20 scrollHeight 31
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
+  RenderFlexibleBox {DIV} at (0,220) size 320x20
     RenderButton {INPUT} at (0,0) size 20x20
-    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 65x31
-        RenderDeprecatedFlexibleBox {DIV} at (0,1) size 65x30
+        RenderFlexibleBox {DIV} at (0,1) size 65x30
           RenderBlock (anonymous) at (5,5) size 55x20
             RenderText {#text} at (0,0) size 55x12
               text run at (0,0) width 55: "00:00 / 00:06"

diff --git a/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt b/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt
index 1f00b4e11006eddc4c1ca4c584ac0cf5f5fc29c5..1778fdbe7ff09c79d7c1f537da6dbdd5b965d3c0 100644 (file)
--- a/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt
@@ -9,13 +9,13 @@ layer at (0,0) size 800x600
 layer at (57,85) size 240x180
   RenderVideo {VIDEO} at (45,73) size 240x180
 layer at (57,85) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
 layer at (57,85) size 240x180 scrollHeight 194
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderButton {INPUT} at (0,150) size 30x30
-    RenderDeprecatedFlexibleBox {DIV} at (30,150) size 90x30 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (30,150) size 90x30 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 88x44
-        RenderDeprecatedFlexibleBox {DIV} at (88,0) size 0x44
+        RenderFlexibleBox {DIV} at (88,0) size 0x44
           RenderBlock (anonymous) at (7,7) size 74x30
             RenderText {#text} at (15,0) size 44x35
               text run at (15,0) width 44: "00:00 /"
@@ -33,13 +33,13 @@ layer at (267,235) size 30x30
 layer at (57,310) size 240x180
   RenderVideo {VIDEO} at (45,298) size 240x180
 layer at (57,310) size 240x180
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
 layer at (57,310) size 240x180 scrollHeight 194
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 240x180
+  RenderFlexibleBox {DIV} at (0,0) size 240x180
     RenderButton {INPUT} at (0,150) size 30x30
-    RenderDeprecatedFlexibleBox {DIV} at (30,150) size 90x30 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+    RenderFlexibleBox {DIV} at (30,150) size 90x30 [border: none (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
       RenderBlock (anonymous) at (1,0) size 88x44
-        RenderDeprecatedFlexibleBox {DIV} at (88,0) size 0x44
+        RenderFlexibleBox {DIV} at (88,0) size 0x44
           RenderBlock (anonymous) at (7,7) size 74x30
             RenderText {#text} at (15,0) size 44x35
               text run at (15,0) width 44: "00:00 /"

diff --git a/LayoutTests/platform/mac-snowleopard/media/controls-strict-expected.txt b/LayoutTests/platform/mac-snowleopard/media/controls-strict-expected.txt
index 4d5edfdc4c9d64f563aeb74280039387240d282e..5a94db19dd738621c3ba6548c6a6c85b3c21919e 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/controls-strict-expected.txt
@@ -13,21 +13,21 @@ layer at (8,50) size 320x240
 layer at (8,50) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,265) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac-snowleopard/media/controls-styling-expected.txt b/LayoutTests/platform/mac-snowleopard/media/controls-styling-expected.txt
index 4873efaf7eed57b867acbaf6ed4eb30c974fa396..8e6a586622bb3b92773afa8f28f2ca81896b68fa 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/controls-styling-expected.txt
@@ -15,25 +15,25 @@ layer at (18,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (18,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (18,257) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderBlock {DIV} at (265,6) size 25x12
 layer at (67,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (238,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
@@ -42,25 +42,25 @@ layer at (112,266) size 10x8
 layer at (285,263) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,497) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderBlock {DIV} at (265,6) size 25x12
 layer at (57,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac-snowleopard/media/controls-without-preload-expected.txt b/LayoutTests/platform/mac-snowleopard/media/controls-without-preload-expected.txt
index 7c3edb596b42ecb28c83a975a62aaf41355719f9..257ec8cd6ab4004a926e8d41c275732248e06be3 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/controls-without-preload-expected.txt
@@ -11,25 +11,25 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,257) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderBlock {DIV} at (265,6) size 25x12
 layer at (57,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac-snowleopard/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac-snowleopard/media/video-controls-rendering-expected.txt
index 190b8dbd0a2c7d0dbb33f1404d1bf4e239e03d92..839e9e183a207f46492571e4269fe57b07eed52c 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/video-controls-rendering-expected.txt
@@ -18,42 +18,42 @@ layer at (8,282) size 320x240
 layer at (8,42) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,257) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
 layer at (8,282) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,497) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
@@ -62,21 +62,21 @@ layer at (8,522) size 320x240
 layer at (8,522) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,737) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,744) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,744) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac-snowleopard/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac-snowleopard/media/video-display-toggle-expected.txt
index bdf06c3e302fd55b8bf893b06d722b4a63d269ec..2892c1793c508af2374a577f7e030200b695bec3 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/video-display-toggle-expected.txt
@@ -12,21 +12,21 @@ layer at (8,26) size 320x240
 layer at (8,26) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,241) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,248) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,248) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac-snowleopard/media/video-no-audio-expected.txt b/LayoutTests/platform/mac-snowleopard/media/video-no-audio-expected.txt
index 8a6b1855083cd69aa6199e615f7fa988bcc457f8..d7f6a102b17591770adcbe9dbd9b54ff67254765 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/mac-snowleopard/media/video-no-audio-expected.txt
@@ -13,20 +13,20 @@ layer at (8,42) size 352x288
 layer at (8,42) size 352x288
   RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
 layer at (8,305) size 352x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,263) size 352x25
+  RenderFlexibleBox (positioned) {DIV} at (0,263) size 352x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 273x15
+    RenderFlexibleBox {DIV} at (49,5) size 273x15
       RenderSlider {INPUT} at (45,2) size 183x13
         RenderBlock {DIV} at (0,2) size 10x8
     RenderButton {INPUT} at (329,4) size 16x16
 layer at (57,312) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (285,312) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (228,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (228,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:09"

diff --git a/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
index 807788b58ff0197d623e95da7e363286451ad6f5..8f7b4f15e187c7b0a2583f832df32f7333585ca2 100644 (file)
--- a/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
+++ b/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
@@ -11,9 +11,9 @@ layer at (0,0) size 800x600
 layer at (8,26) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,26) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,151) size 300x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
+  RenderFlexibleBox {DIV} at (0,125) size 300x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1

diff --git a/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt b/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
index ac29b00ee3330b0026224bd01ef7fb8a7f880929..25baf5e27b1f82f26912851222daeb4806a661c7 100644 (file)
--- a/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt
@@ -16,9 +16,9 @@ layer at (0,0) size 800x600
 layer at (58,110) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,111) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
+  RenderFlexibleBox {DIV} at (1,1) size 300x150
 layer at (59,236) size 300x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
+  RenderFlexibleBox {DIV} at (0,125) size 300x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1

diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
index fb59b348623746e8b0c9842eba7efcda1f4f7bf1..bfc478b3454016e025d92c27ef2124acce4f0c99 100644 (file)
--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -15,38 +15,48 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (0,68) size 0x18
         RenderBR {BR} at (0,86) size 0x18
 layer at (8,42) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (8,42) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
-      RenderSlider {INPUT} at (0,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderBlock {DIV} at (175,6) size 25x13
-layer at (185,49) size 14x12
+    RenderBlock {DIV} at (268,6) size 25x13
+layer at (57,49) size 45x11
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x11
+      RenderText {#text} at (0,0) size 26x11
+        text run at (0,0) width 26: "00:00"
+layer at (231,49) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (7,0) size 31x11
+      RenderText {#text} at (0,0) size 31x11
+        text run at (0,0) width 31: "-00:07"
+layer at (278,49) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12
 layer at (8,85) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x25
+  RenderFlexibleBox {DIV} at (0,0) size 320x25
 layer at (8,85) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x25
+  RenderFlexibleBox {DIV} at (0,0) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
+    RenderFlexibleBox {DIV} at (49,5) size 246x15
       RenderSlider {INPUT} at (45,2) size 156x13
         RenderFlexibleBox {DIV} at (0,0) size 156x13
           RenderBlock {DIV} at (0,2) size 156x9
             RenderBlock {DIV} at (0,0) size 10x8
     RenderBlock {DIV} at (295,6) size 25x13
 layer at (57,92) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (258,92) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:07"
@@ -55,24 +65,24 @@ layer at (305,92) size 14x12
 layer at (8,128) size 320x100
   RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
 layer at (8,128) size 320x100
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
+  RenderFlexibleBox {DIV} at (0,0) size 320x100
 layer at (8,203) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,75) size 320x25
+  RenderFlexibleBox {DIV} at (0,75) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
+    RenderFlexibleBox {DIV} at (49,5) size 246x15
       RenderSlider {INPUT} at (45,2) size 156x13
         RenderFlexibleBox {DIV} at (0,0) size 156x13
           RenderBlock {DIV} at (0,2) size 156x9
             RenderBlock {DIV} at (0,0) size 10x8
     RenderBlock {DIV} at (295,6) size 25x13
 layer at (57,210) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (258,210) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:07"

diff --git a/LayoutTests/platform/mac/media/audio-repaint-expected.txt b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
index 69de5ca0195a5a9ea658c9ffc15a99ed2d148e6a..fd4ebdf504c5847d8d0d17d362b37662eed2745c 100644 (file)
--- a/LayoutTests/platform/mac/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
@@ -15,21 +15,21 @@ layer at (0,0) size 800x600
 layer at (8,67) size 200x25
   RenderMedia {AUDIO} at (0,25) size 200x25
 layer at (8,67) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (8,67) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
-      RenderDeprecatedFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (49,5) size 126x15
+      RenderFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (9,0) size 26x11
           RenderText {#text} at (0,0) size 26x11
             text run at (0,0) width 26: "00:00"
       RenderSlider {INPUT} at (0,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
-      RenderDeprecatedFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
+      RenderFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (7,0) size 31x11
           RenderText {#text} at (0,0) size 31x11
             text run at (0,0) width 31: "-00:00"
@@ -39,21 +39,21 @@ layer at (114,76) size 10x8
 layer at (185,73) size 14x12
   RenderButton zI: 2 {INPUT} at (2,0) size 14x12
 layer at (8,42) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (8,42) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
-      RenderDeprecatedFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (49,5) size 126x15
+      RenderFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (9,0) size 26x11
           RenderText {#text} at (0,0) size 26x11
             text run at (0,0) width 26: "00:00"
       RenderSlider {INPUT} at (0,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
-      RenderDeprecatedFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
+      RenderFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (7,0) size 31x11
           RenderText {#text} at (0,0) size 31x11
             text run at (0,0) width 31: "-00:00"
@@ -65,21 +65,21 @@ layer at (185,48) size 14x12
 layer at (8,144) size 200x25
   RenderMedia {AUDIO} at (0,102) size 200x25
 layer at (8,144) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (8,144) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
-      RenderDeprecatedFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
+    RenderFlexibleBox {DIV} at (49,5) size 126x15
+      RenderFlexibleBox {DIV} at (0,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (9,0) size 26x11
           RenderText {#text} at (0,0) size 26x11
             text run at (0,0) width 26: "00:00"
       RenderSlider {INPUT} at (0,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
-      RenderDeprecatedFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
+      RenderFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
         RenderBlock (anonymous) at (7,0) size 31x11
           RenderText {#text} at (0,0) size 31x11
             text run at (0,0) width 31: "-00:00"

diff --git a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
index 05b892e1c24aa30ef7cf2de46313d4f3b4c8a154..fd209104a7749cdd77aefb1f951e35c2c1b0e641 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
@@ -11,27 +11,27 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,257) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,264) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,264) size 14x12
+layer at (278,264) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12

diff --git a/LayoutTests/platform/mac/media/controls-strict-expected.txt b/LayoutTests/platform/mac/media/controls-strict-expected.txt
index 4872f92a6a8a11bbd77a6b5793b35d3fe52e6564..5d7d92dac9a2016a14dede76b83bfcb5a04a7e4d 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-strict-expected.txt
@@ -11,27 +11,27 @@ layer at (0,0) size 800x302
 layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,265) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,272) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,272) size 14x12
+layer at (278,272) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12

diff --git a/LayoutTests/platform/mac/media/controls-styling-expected.txt b/LayoutTests/platform/mac/media/controls-styling-expected.txt
index b10acf1db461bf73dad2e04cab8ae4dfd1c28ecd..1ec62e5ce0f7957c6546fe2c4eb3e2e4730fc65c 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-styling-expected.txt
@@ -17,23 +17,23 @@ layer at (8,282) size 320x240
 layer at (18,42) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (18,257) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (67,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (238,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
@@ -42,23 +42,23 @@ layer at (112,266) size 10x8
 layer at (8,282) size 320x240
   RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
 layer at (8,497) size 320x25
-  RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x16
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+    RenderFlexibleBox {DIV} at (49,5) size 216x15
       RenderSlider {INPUT} at (45,2) size 126x13
-        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
+        RenderFlexibleBox {DIV} at (0,0) size 126x13
           RenderBlock {DIV} at (0,2) size 116x8
           RenderBlock {DIV} at (116,2) size 10x8
     RenderButton {INPUT} at (297,4) size 16x16
     RenderButton {INPUT} at (267,6) size 14x12
 layer at (57,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 26x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
 layer at (228,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"

diff --git a/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt b/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
index a0d86321ae88c4766decda63d5fb1d771fc7a447..de24cbbaa7c530bb6a6273ff588fc1fc987f3f34 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-styling-strict-expected.txt
@@ -15,52 +15,52 @@ layer at (8,50) size 320x240
 layer at (332,50) size 320x240
   RenderVideo {VIDEO} at (324,0) size 320x240
 layer at (8,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,265) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,272) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,272) size 14x12
+layer at (278,272) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12
 layer at (332,50) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (332,265) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (381,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (552,272) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (555,272) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (599,272) size 14x12
+layer at (602,272) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12

diff --git a/LayoutTests/platform/mac/media/controls-without-preload-expected.txt b/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
index 71de6b98c8d284851a02fd3ec140a0ed8dd43ffc..d787004a370c366328ee3bfc5c4ec983e1144dc1 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-without-preload-expected.txt
@@ -11,27 +11,27 @@ layer at (0,0) size 800x600
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,257) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,264) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,264) size 14x12
+layer at (278,264) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12

diff --git a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
index 8848e9efdaa85d3301008addbf0b6d6aa8fe3f92..3cf8e4251c6acd47ecf2eab056720aa4c4c2b8f2 100644 (file)
--- a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
@@ -12,30 +12,30 @@ layer at (8,8) size 300x150
 layer at (8,162) size 300x150
   RenderVideo {VIDEO} at (0,0) size 300x150
 layer at (8,8) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,133) size 300x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
+  RenderFlexibleBox {DIV} at (0,125) size 300x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1
 layer at (308,133) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (308,133) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1
 layer at (8,162) size 300x150
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+  RenderFlexibleBox {DIV} at (0,0) size 300x150
 layer at (8,287) size 300x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
+  RenderFlexibleBox {DIV} at (0,125) size 300x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1
 layer at (308,287) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
 layer at (308,287) size 200x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+  RenderFlexibleBox {DIV} at (0,0) size 200x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
     RenderBlock {DIV} at (49,12) size 0x1

diff --git a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
index 584ccb621d9e8f57f10f14fe45bdf92f4d13d209..a07c462513690816f39405652170b8569e0d6ee3 100644 (file)
--- a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
@@ -16,79 +16,79 @@ layer at (8,42) size 320x240
 layer at (8,282) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,257) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,264) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,264) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,264) size 14x12
+layer at (278,264) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12
 layer at (8,282) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,497) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,504) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,504) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,504) size 14x12
+layer at (278,504) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12
 layer at (8,522) size 320x240
   RenderVideo {VIDEO} at (8,522) size 320x240
 layer at (8,522) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,737) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,744) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,744) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (231,744) size 45x11
+  RenderFlexibleBox {DIV} at (174,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (7,0) size 31x11
       RenderText {#text} at (0,0) size 31x11
         text run at (0,0) width 31: "-00:06"
-layer at (275,744) size 14x12
+layer at (278,744) size 14x12
   RenderButton zI: 1 {INPUT} at (2,0) size 14x12

diff --git a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
index 9d63038d99780dd07b97a970955ee526523b09d9..ed62e00a8449d39413ffb13746ae5ddac9a7aa81 100644 (file)
--- a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
@@ -10,27 +10,27 @@ layer at (0,0) size 800x600
 layer at (8,26) size 320x240
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,241) size 320x25
-  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
     RenderButton {INPUT} at (6,3) size 18x18
     RenderButton {INPUT} at (32,4) size 16x17
-    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
-      RenderSlider {INPUT} at (45,2) size 126x13
-        RenderFlexibleBox {DIV} at (0,0) size 126x13
-          RenderBlock {DIV} at (0,2) size 126x9
+    RenderFlexibleBox {DIV} at (49,5) size 219x15
+      RenderSlider {INPUT} at (45,2) size 129x13
+        RenderFlexibleBox {DIV} at (0,0) size 129x13
+          RenderBlock {DIV} at (0,2) size 129x9
             RenderBlock {DIV} at (0,0) size 10x8
-    RenderButton {INPUT} at (297,4) size 16x17
-    RenderBlock {DIV} at (265,6) size 25x13
+    RenderButton {INPUT} at (300,4) size 16x17
+    RenderBlock {DIV} at (268,6) size 25x13
 layer at (57,248) size 45x11
-  RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
     RenderBlock (anonymous) at (9,0) size 27x11
       RenderText {#text} at (0,0) size 26x11
         text run at (0,0) width 26: "00:00"
-layer at (228,248) size 45x11
-  Render