Changeset 131378 in webkit


Ignore:
Timestamp:
Oct 15, 2012 4:17:48 PM (12 years ago)
Author:
tony@chromium.org
Message:

Unreviewed, rolling out r131367.
http://trac.webkit.org/changeset/131367
https://bugs.webkit.org/show_bug.cgi?id=98666

crashes on Apple Mac

Source/WebCore:

  • css/html.css:

(input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container):
(input[type="range"]::-webkit-slider-runnable-track):
(input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb):

  • css/mediaControlsChromium.css:

(input[type="range"]::-webkit-media-slider-thumb):

  • css/mediaControlsChromiumAndroid.css:

(input[type="range"]::-webkit-media-slider-thumb):

  • html/RangeInputType.cpp:

(WebCore::RangeInputType::listAttributeTargetChanged):

  • html/shadow/SliderThumbElement.cpp:

(WebCore::RenderSliderThumb::layout):
(WebCore):
(WebCore::RenderSliderContainer::RenderSliderContainer):
(RenderSliderContainer):
(WebCore::RenderSliderContainer::layout):

  • html/shadow/SliderThumbElement.h:

(RenderSliderThumb):

  • rendering/RenderSlider.cpp:

(WebCore):
(WebCore::RenderSlider::RenderSlider):
(WebCore::RenderSlider::layout):

  • rendering/RenderSlider.h:

(WebCore):
(RenderSlider):
(WebCore::RenderSlider::renderName):
(WebCore::RenderSlider::isSlider):
(WebCore::RenderSlider::requiresForcedStyleRecalcPropagation):
(WebCore::toRenderSlider):

LayoutTests:

  • css3/flexbox/flexitem-stretch-range-expected.html: Removed.
  • css3/flexbox/flexitem-stretch-range.html: Removed.
  • platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt:
  • platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt:
  • platform/chromium-linux/fast/forms/box-shadow-override-expected.txt:
  • platform/chromium-linux/fast/forms/datalist/input-appearance-range-with-datalist-expected.png:
  • platform/chromium-linux/fast/forms/input-appearance-height-expected.txt:
  • platform/chromium-linux/fast/forms/range/input-appearance-range-expected.png:
  • platform/chromium-linux/fast/forms/range/input-appearance-range-expected.txt:
  • platform/chromium-linux/fast/forms/range/range-thumb-height-percentage-expected.txt:
  • platform/chromium-linux/fast/forms/range/slider-padding-expected.txt:
  • platform/chromium-linux/fast/forms/range/slider-thumb-shared-style-expected.txt:
  • platform/chromium-linux/fast/forms/range/slider-thumb-stylability-expected.txt:
  • platform/chromium-linux/fast/hidpi/video-controls-in-hidpi-expected.txt:
  • platform/chromium-linux/fast/multicol/client-rects-expected.txt:
  • platform/chromium-linux/fast/repaint/slider-thumb-drag-release-expected.txt:
  • platform/chromium-linux/fast/repaint/slider-thumb-float-expected.txt:
  • platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt:
  • platform/chromium-win/fast/layers/video-layer-expected.txt:
  • platform/chromium-win/media/audio-controls-rendering-expected.txt:
  • platform/chromium-win/media/audio-repaint-expected.txt:
  • platform/chromium-win/media/controls-after-reload-expected.txt:
  • platform/chromium-win/media/controls-strict-expected.txt:
  • platform/chromium-win/media/controls-styling-expected.txt:
  • platform/chromium-win/media/controls-styling-strict-expected.txt:
  • platform/chromium-win/media/controls-without-preload-expected.txt:
  • platform/chromium-win/media/media-controls-clone-expected.txt:
  • platform/chromium-win/media/media-document-audio-repaint-expected.txt:
  • platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt:
  • platform/chromium-win/media/video-controls-rendering-expected.txt:
  • platform/chromium-win/media/video-display-toggle-expected.txt:
  • platform/chromium-win/media/video-empty-source-expected.txt:
  • platform/chromium-win/media/video-no-audio-expected.txt:
  • platform/chromium-win/media/video-playing-and-pause-expected.txt:
  • platform/chromium-win/media/video-zoom-controls-expected.txt:
  • platform/chromium/TestExpectations:
  • platform/efl/TestExpectations:
  • platform/gtk/TestExpectations:
  • platform/mac/TestExpectations:
  • platform/qt/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk
Files:
2 deleted
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r131376 r131378  
     12012-10-15  Tony Chang  <tony@chromium.org>
     2
     3        Unreviewed, rolling out r131367.
     4        http://trac.webkit.org/changeset/131367
     5        https://bugs.webkit.org/show_bug.cgi?id=98666
     6
     7        crashes on Apple Mac
     8
     9        * css3/flexbox/flexitem-stretch-range-expected.html: Removed.
     10        * css3/flexbox/flexitem-stretch-range.html: Removed.
     11        * platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt:
     12        * platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt:
     13        * platform/chromium-linux/fast/forms/box-shadow-override-expected.txt:
     14        * platform/chromium-linux/fast/forms/datalist/input-appearance-range-with-datalist-expected.png:
     15        * platform/chromium-linux/fast/forms/input-appearance-height-expected.txt:
     16        * platform/chromium-linux/fast/forms/range/input-appearance-range-expected.png:
     17        * platform/chromium-linux/fast/forms/range/input-appearance-range-expected.txt:
     18        * platform/chromium-linux/fast/forms/range/range-thumb-height-percentage-expected.txt:
     19        * platform/chromium-linux/fast/forms/range/slider-padding-expected.txt:
     20        * platform/chromium-linux/fast/forms/range/slider-thumb-shared-style-expected.txt:
     21        * platform/chromium-linux/fast/forms/range/slider-thumb-stylability-expected.txt:
     22        * platform/chromium-linux/fast/hidpi/video-controls-in-hidpi-expected.txt:
     23        * platform/chromium-linux/fast/multicol/client-rects-expected.txt:
     24        * platform/chromium-linux/fast/repaint/slider-thumb-drag-release-expected.txt:
     25        * platform/chromium-linux/fast/repaint/slider-thumb-float-expected.txt:
     26        * platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt:
     27        * platform/chromium-win/fast/layers/video-layer-expected.txt:
     28        * platform/chromium-win/media/audio-controls-rendering-expected.txt:
     29        * platform/chromium-win/media/audio-repaint-expected.txt:
     30        * platform/chromium-win/media/controls-after-reload-expected.txt:
     31        * platform/chromium-win/media/controls-strict-expected.txt:
     32        * platform/chromium-win/media/controls-styling-expected.txt:
     33        * platform/chromium-win/media/controls-styling-strict-expected.txt:
     34        * platform/chromium-win/media/controls-without-preload-expected.txt:
     35        * platform/chromium-win/media/media-controls-clone-expected.txt:
     36        * platform/chromium-win/media/media-document-audio-repaint-expected.txt:
     37        * platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt:
     38        * platform/chromium-win/media/video-controls-rendering-expected.txt:
     39        * platform/chromium-win/media/video-display-toggle-expected.txt:
     40        * platform/chromium-win/media/video-empty-source-expected.txt:
     41        * platform/chromium-win/media/video-no-audio-expected.txt:
     42        * platform/chromium-win/media/video-playing-and-pause-expected.txt:
     43        * platform/chromium-win/media/video-zoom-controls-expected.txt:
     44        * platform/chromium/TestExpectations:
     45        * platform/efl/TestExpectations:
     46        * platform/gtk/TestExpectations:
     47        * platform/mac/TestExpectations:
     48        * platform/qt/TestExpectations:
     49        * platform/win/TestExpectations:
     50
    1512012-10-15  Chris Rogers  <crogers@google.com>
    252
  • trunk/LayoutTests/platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt

    r131367 r131378  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderFlexibleBox {DIV} at (0,0) size 129x21
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    88          RenderBlock {DIV} at (0,0) size 118x21
    9             RenderBlock {DIV} at (118,0) size 11x21
    109          RenderBlock {DIV} at (118,0) size 11x21
    1110      RenderText {#text} at (0,0) size 0x0
     11layer at (128,10) size 11x21
     12  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt

    r131367 r131378  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
    7         RenderFlexibleBox {DIV} at (0,0) size 100x10
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x10
    88          RenderBlock {DIV} at (0,0) size 90x10
    9             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    109          RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    1110      RenderText {#text} at (0,0) size 0x0
     11layer at (100,10) size 10x10
     12  RenderBlock (relative positioned) {DIV} at (0,0) size 10x10 [bgcolor=#008000]
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/box-shadow-override-expected.txt

    r131367 r131378  
    3939          text run at (45,9) width 4: " "
    4040        RenderSlider {INPUT} at (51,3) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    41           RenderFlexibleBox {DIV} at (0,0) size 129x21
     41          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    4242            RenderBlock {DIV} at (0,0) size 118x21
    43               RenderBlock {DIV} at (59,0) size 11x21
    4443            RenderBlock {DIV} at (118,0) size 11x21
    4544        RenderText {#text} at (182,9) size 4x19
     
    8382layer at (36,137) size 114x16
    8483  RenderBlock {DIV} at (0,0) size 114x16
     84layer at (118,161) size 11x21
     85  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/input-appearance-height-expected.txt

    r131367 r131378  
    5151          text run at (0,148) width 37: "range "
    5252        RenderSlider {INPUT} at (39,142) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    53           RenderFlexibleBox {DIV} at (0,0) size 129x21
     53          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    5454            RenderBlock {DIV} at (0,0) size 118x21
    55               RenderBlock {DIV} at (59,0) size 11x21
    5655            RenderBlock {DIV} at (118,0) size 11x21
    5756        RenderText {#text} at (170,148) size 4x19
     
    106105layer at (57,305) size 136x16
    107106  RenderBlock {DIV} at (0,0) size 136x16
     107layer at (106,170) size 11x21
     108  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/range/input-appearance-range-expected.txt

    r131367 r131378  
    66      RenderBlock {DIV} at (0,0) size 784x37
    77        RenderSlider {INPUT} at (2,2) size 129x30 [color=#9D968E] [bgcolor=#FFFFFF]
    8           RenderFlexibleBox {DIV} at (0,0) size 129x30
     8          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x30
    99            RenderBlock {DIV} at (0,4) size 118x22
    10               RenderBlock {DIV} at (59,0) size 11x21
    11             RenderBlock {DIV} at (118,0) size 11x21
     10            RenderBlock {DIV} at (118,4) size 11x22
    1211      RenderBlock {DIV} at (0,37) size 784x28
    1312        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    14           RenderFlexibleBox {DIV} at (0,0) size 129x21
     13          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    1514            RenderBlock {DIV} at (0,0) size 118x21
    16               RenderBlock {DIV} at (0,0) size 11x21
    1715            RenderBlock {DIV} at (118,0) size 11x21
    1816      RenderBlock {DIV} at (0,65) size 784x28
    1917        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    20           RenderFlexibleBox {DIV} at (0,0) size 129x21
     18          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    2119            RenderBlock {DIV} at (0,0) size 118x21
    22               RenderBlock {DIV} at (118,0) size 11x21
    2320            RenderBlock {DIV} at (118,0) size 11x21
    2421      RenderBlock {DIV} at (0,93) size 784x147
    2522        RenderSlider {INPUT} at (64,2) size 129x140 [color=#9D968E] [bgcolor=#FFFFFF]
    26           RenderFlexibleBox {DIV} at (0,0) size 129x140
     23          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x140
    2724            RenderBlock {DIV} at (54,0) size 21x129
    28               RenderBlock {DIV} at (0,64) size 21x12
    29             RenderBlock {DIV} at (0,129) size 21x11
     25            RenderBlock {DIV} at (54,129) size 21x11
    3026      RenderBlock {DIV} at (0,240) size 784x28
     27layer at (69,15) size 11x21
     28  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
     29layer at (10,47) size 11x21
     30  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
     31layer at (128,75) size 11x21
     32  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
     33layer at (126,168) size 21x11
     34  RenderBlock (relative positioned) {DIV} at (0,0) size 21x11
    3135layer at (10,250) size 129x21
    3236  RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    33     RenderFlexibleBox {DIV} at (0,0) size 129x21
     37    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    3438      RenderBlock {DIV} at (0,0) size 118x21
    35         RenderBlock {DIV} at (88,0) size 12x21
    3639      RenderBlock {DIV} at (118,0) size 11x21
     40layer at (99,250) size 11x21
     41  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/range/range-thumb-height-percentage-expected.txt

    r131367 r131378  
    99      RenderBlock (anonymous) at (0,36) size 784x24
    1010        RenderSlider {INPUT} at (2,2) size 200x20 [color=#9D968E] [bgcolor=#C0C0C0]
    11           RenderFlexibleBox {DIV} at (0,0) size 200x20
     11          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 200x20
    1212            RenderBlock {DIV} at (0,5) size 190x10
    13               RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
    14             RenderBlock {DIV} at (190,0) size 10x10 [bgcolor=#008000]
     13            RenderBlock {DIV} at (190,5) size 10x10 [bgcolor=#008000]
    1514        RenderText {#text} at (0,0) size 0x0
     15layer at (105,51) size 10x10
     16  RenderBlock (relative positioned) {DIV} at (0,0) size 10x10 [bgcolor=#008000]
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/range/slider-padding-expected.txt

    r131367 r131378  
    1010      RenderBlock {DIV} at (0,20) size 784x45 [bgcolor=#ADD8E6]
    1111        RenderSlider {INPUT} at (2,2) size 100x41 [color=#9D968E] [bgcolor=#FFFFFF]
    12           RenderFlexibleBox {DIV} at (10,10) size 80x21
     12          RenderDeprecatedFlexibleBox {DIV} at (10,10) size 80x21
    1313            RenderBlock {DIV} at (0,0) size 69x21
    14               RenderBlock {DIV} at (0,0) size 11x21
    1514            RenderBlock {DIV} at (69,0) size 11x21
    1615        RenderText {#text} at (0,0) size 0x0
    1716      RenderBlock {PRE} at (0,78) size 784x0
     17layer at (20,40) size 11x21
     18  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/range/slider-thumb-shared-style-expected.txt

    r131367 r131378  
    2121      RenderBlock {DIV} at (0,72) size 784x50
    2222        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    23           RenderFlexibleBox {DIV} at (0,0) size 129x21
     23          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    2424            RenderBlock {DIV} at (0,0) size 118x21
    25               RenderBlock {DIV} at (0,0) size 11x21
    2625            RenderBlock {DIV} at (118,0) size 11x21
    2726        RenderBR {BR} at (133,23) size 0x0
    2827        RenderSlider {INPUT} at (2,27) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    29           RenderFlexibleBox {DIV} at (0,0) size 129x21
     28          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    3029            RenderBlock {DIV} at (0,0) size 118x21
    31               RenderBlock {DIV} at (118,0) size 11x21
    3230            RenderBlock {DIV} at (118,0) size 11x21
    3331        RenderText {#text} at (0,0) size 0x0
     32layer at (10,82) size 11x21
     33  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
     34layer at (128,107) size 11x21
     35  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/forms/range/slider-thumb-stylability-expected.txt

    r131367 r131378  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x20 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderFlexibleBox {DIV} at (0,0) size 129x20
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x20
    88          RenderBlock {DIV} at (0,0) size 109x20
    9             RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
    109          RenderBlock {DIV} at (109,0) size 20x20 [bgcolor=#008000]
    1110      RenderText {#text} at (0,0) size 0x0
     11layer at (10,10) size 20x20
     12  RenderBlock (relative positioned) {DIV} at (0,0) size 20x20 [bgcolor=#008000]
  • trunk/LayoutTests/platform/chromium-linux/fast/hidpi/video-controls-in-hidpi-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 152x8
    20       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 132x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 132x24
    2322        RenderBlock {DIV} at (126,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    2726          text run at (0,7) width 25: "0:00"
    2827    RenderButton {INPUT} at (249,0) size 35x30
     28layer at (55,146) size 32x24
     29  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
  • trunk/LayoutTests/platform/chromium-linux/fast/multicol/client-rects-expected.txt

    r131367 r131378  
    6262      RenderBR {BR} at (0,0) size 0x25
    6363      RenderSlider {INPUT} at (2,27) size 25x25 [color=#9D968E] [bgcolor=#ADD8E6]
    64         RenderFlexibleBox {DIV} at (0,0) size 25x25
     64        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 25x25
    6565          RenderBlock {DIV} at (0,12) size 25x1
    66             RenderBlock {DIV} at (12,0) size 26x0
    67           RenderBlock {DIV} at (25,0) size 0x25
     66          RenderBlock {DIV} at (25,12) size 0x1
    6867layer at (8,484) size 136x76
    6968  RenderBlock {DIV} at (0,476) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
  • trunk/LayoutTests/platform/chromium-linux/fast/repaint/slider-thumb-drag-release-expected.txt

    r131367 r131378  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderFlexibleBox {DIV} at (0,0) size 129x21
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
    88          RenderBlock {DIV} at (0,0) size 118x21
    9             RenderBlock {DIV} at (118,0) size 11x21
    109          RenderBlock {DIV} at (118,0) size 11x21
    1110      RenderText {#text} at (0,0) size 0x0
     11layer at (128,10) size 11x21
     12  RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
  • trunk/LayoutTests/platform/chromium-linux/fast/repaint/slider-thumb-float-expected.txt

    r131367 r131378  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
    7         RenderFlexibleBox {DIV} at (0,0) size 100x10
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x10
    88          RenderBlock {DIV} at (0,0) size 90x10
    9             RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    109          RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
     10layer at (100,10) size 10x10
     11  RenderBlock (relative positioned) {DIV} at (0,0) size 10x10 [bgcolor=#008000]
  • trunk/LayoutTests/platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt

    r131367 r131378  
    6666    RenderButton {INPUT} at (9,0) size 30x30
    6767    RenderSlider {INPUT} at (48,11) size 74x8
    68       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,-8) size 54x24
    70           RenderBlock {DIV} at (-1,0) size 33x24
     68      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
     69        RenderBlock {DIV} at (1,1) size 54x24
    7170        RenderBlock {DIV} at (48,1) size 32x24
    7271    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
     
    7675    RenderButton {INPUT} at (171,0) size 35x30
    7776    RenderSlider {INPUT} at (212,11) size 15x8
    78       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
    79         RenderBlock {DIV} at (1,-8) size 3x24
    80           RenderBlock {DIV} at (-4,0) size 24x24
     77      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
     78        RenderBlock {DIV} at (1,1) size 3x24
    8179        RenderBlock {DIV} at (-3,1) size 24x24
    8280    RenderButton {INPUT} at (237,0) size 30x30
    8381    RenderButton {INPUT} at (271,0) size 30x30
     82layer at (62,216) size 32x24
     83  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     84layer at (222,216) size 24x24
     85  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt

    r131367 r131378  
    2323    RenderButton {INPUT} at (9,0) size 30x30
    2424    RenderSlider {INPUT} at (48,11) size 152x8
    25       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    26         RenderBlock {DIV} at (1,-8) size 132x24
    27           RenderBlock {DIV} at (-7,0) size 32x24
     25      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
     26        RenderBlock {DIV} at (1,1) size 132x24
    2827        RenderBlock {DIV} at (126,1) size 32x24
    2928    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    3231          text run at (0,7) width 25: "0:00"
    3332    RenderButton {INPUT} at (249,0) size 35x30
     33layer at (106,233) size 32x24
     34  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
  • trunk/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt

    r131367 r131378  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 103x8
    24       RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,-8) size 83x24
    26           RenderBlock {DIV} at (-7,0) size 32x24
     24      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
     25        RenderBlock {DIV} at (1,1) size 83x24
    2726        RenderBlock {DIV} at (77,1) size 32x24
    2827    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    3231    RenderButton {INPUT} at (200,0) size 35x30
    3332    RenderSlider {INPUT} at (241,11) size 44x8
    34       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    35         RenderBlock {DIV} at (1,-8) size 32x24
    36           RenderBlock {DIV} at (25,0) size 24x24
     33      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
     34        RenderBlock {DIV} at (1,1) size 32x24
    3735        RenderBlock {DIV} at (26,1) size 24x24
     36layer at (50,47) size 32x24
     37  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     38layer at (275,47) size 24x24
     39  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    3840layer at (8,94) size 320x30
    3941  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30
     
    4345    RenderButton {INPUT} at (9,0) size 30x30
    4446    RenderSlider {INPUT} at (48,11) size 113x8
    45       RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
    46         RenderBlock {DIV} at (1,-8) size 93x24
    47           RenderBlock {DIV} at (-7,0) size 32x24
     47      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
     48        RenderBlock {DIV} at (1,1) size 93x24
    4849        RenderBlock {DIV} at (87,1) size 32x24
    4950    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
     
    5354    RenderButton {INPUT} at (210,0) size 35x30
    5455    RenderSlider {INPUT} at (251,11) size 54x8
    55       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
    56         RenderBlock {DIV} at (1,-8) size 42x24
    57           RenderBlock {DIV} at (35,0) size 24x24
     56      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
     57        RenderBlock {DIV} at (1,1) size 42x24
    5858        RenderBlock {DIV} at (36,1) size 24x24
     59layer at (50,97) size 32x24
     60  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     61layer at (295,97) size 24x24
     62  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    5963layer at (8,144) size 320x100
    6064  RenderMedia {AUDIO} at (8,144) size 320x100 [bgcolor=#0000FF]
     
    6670    RenderButton {INPUT} at (9,0) size 30x30
    6771    RenderSlider {INPUT} at (48,11) size 113x8
    68       RenderFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,-8) size 93x24
    70           RenderBlock {DIV} at (-7,0) size 32x24
     72      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
     73        RenderBlock {DIV} at (1,1) size 93x24
    7174        RenderBlock {DIV} at (87,1) size 32x24
    7275    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
     
    7679    RenderButton {INPUT} at (210,0) size 35x30
    7780    RenderSlider {INPUT} at (251,11) size 54x8
    78       RenderFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
    79         RenderBlock {DIV} at (1,-8) size 42x24
    80           RenderBlock {DIV} at (35,0) size 24x24
     81      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
     82        RenderBlock {DIV} at (1,1) size 42x24
    8183        RenderBlock {DIV} at (36,1) size 24x24
     84layer at (50,217) size 32x24
     85  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     86layer at (295,217) size 24x24
     87  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt

    r131367 r131378  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 103x8
    24       RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,-8) size 83x24
    26           RenderBlock {DIV} at (34,0) size 33x24
     24      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
     25        RenderBlock {DIV} at (1,1) size 83x24
    2726        RenderBlock {DIV} at (77,1) size 32x24
    2827    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    3231    RenderButton {INPUT} at (200,0) size 35x30
    3332    RenderSlider {INPUT} at (241,11) size 44x8
    34       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    35         RenderBlock {DIV} at (1,-8) size 32x24
    36           RenderBlock {DIV} at (25,0) size 24x24
     33      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
     34        RenderBlock {DIV} at (1,1) size 32x24
    3735        RenderBlock {DIV} at (26,1) size 24x24
     36layer at (91,77) size 32x24
     37  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     38layer at (275,77) size 24x24
     39  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    3840layer at (8,44) size 300x30
    3941  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    4345    RenderButton {INPUT} at (9,0) size 30x30
    4446    RenderSlider {INPUT} at (48,11) size 103x8
    45       RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    46         RenderBlock {DIV} at (1,-8) size 83x24
    47           RenderBlock {DIV} at (34,0) size 33x24
     47      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
     48        RenderBlock {DIV} at (1,1) size 83x24
    4849        RenderBlock {DIV} at (77,1) size 32x24
    4950    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    5354    RenderButton {INPUT} at (200,0) size 35x30
    5455    RenderSlider {INPUT} at (241,11) size 44x8
    55       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    56         RenderBlock {DIV} at (1,-8) size 32x24
    57           RenderBlock {DIV} at (25,0) size 24x24
     56      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
     57        RenderBlock {DIV} at (1,1) size 32x24
    5858        RenderBlock {DIV} at (26,1) size 24x24
     59layer at (91,47) size 32x24
     60  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     61layer at (275,47) size 24x24
     62  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    5963layer at (8,156) size 300x30
    6064  RenderMedia {AUDIO} at (0,112) size 300x30
     
    6670    RenderButton {INPUT} at (9,0) size 30x30
    6771    RenderSlider {INPUT} at (48,11) size 103x8
    68       RenderFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,-8) size 83x24
    70           RenderBlock {DIV} at (34,0) size 33x24
     72      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
     73        RenderBlock {DIV} at (1,1) size 83x24
    7174        RenderBlock {DIV} at (77,1) size 32x24
    7275    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    7679    RenderButton {INPUT} at (200,0) size 35x30
    7780    RenderSlider {INPUT} at (241,11) size 44x8
    78       RenderFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    79         RenderBlock {DIV} at (1,-8) size 32x24
    80           RenderBlock {DIV} at (25,0) size 24x24
     81      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
     82        RenderBlock {DIV} at (1,1) size 32x24
    8183        RenderBlock {DIV} at (26,1) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 71x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 71x24
    2322        RenderBlock {DIV} at (65,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2827    RenderButton {INPUT} at (188,0) size 35x30
    2928    RenderSlider {INPUT} at (229,11) size 32x8
    30       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    31         RenderBlock {DIV} at (1,-8) size 20x24
    32           RenderBlock {DIV} at (13,0) size 24x24
     29      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     30        RenderBlock {DIV} at (1,1) size 20x24
    3331        RenderBlock {DIV} at (14,1) size 24x24
    3432    RenderButton {INPUT} at (271,0) size 30x30
     33layer at (55,252) size 32x24
     34  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     35layer at (256,252) size 24x24
     36  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-strict-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 71x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 71x24
    2322        RenderBlock {DIV} at (65,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2827    RenderButton {INPUT} at (188,0) size 35x30
    2928    RenderSlider {INPUT} at (229,11) size 32x8
    30       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    31         RenderBlock {DIV} at (1,-8) size 20x24
    32           RenderBlock {DIV} at (13,0) size 24x24
     29      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     30        RenderBlock {DIV} at (1,1) size 20x24
    3331        RenderBlock {DIV} at (14,1) size 24x24
    3432    RenderButton {INPUT} at (271,0) size 30x30
     33layer at (55,260) size 32x24
     34  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     35layer at (256,260) size 24x24
     36  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-styling-expected.txt

    r131367 r131378  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 91x8
    24       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,-8) size 71x24
    26           RenderBlock {DIV} at (-7,0) size 32x24
     24      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     25        RenderBlock {DIV} at (1,1) size 71x24
    2726        RenderBlock {DIV} at (65,1) size 32x24
    2827    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3231    RenderButton {INPUT} at (188,0) size 35x30
    3332    RenderSlider {INPUT} at (229,11) size 32x8
    34       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    35         RenderBlock {DIV} at (1,-8) size 20x24
    36           RenderBlock {DIV} at (13,0) size 24x24
     33      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     34        RenderBlock {DIV} at (1,1) size 20x24
    3735        RenderBlock {DIV} at (14,1) size 24x24
    3836    RenderButton {INPUT} at (271,0) size 30x30
     37layer at (65,252) size 32x24
     38  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     39layer at (266,252) size 24x24
     40  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    3941layer at (8,284) size 320x240
    4042  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4446    RenderButton {INPUT} at (9,0) size 30x30
    4547    RenderSlider {INPUT} at (48,11) size 91x8
    46       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    47         RenderBlock {DIV} at (1,-8) size 71x24
    48           RenderBlock {DIV} at (-7,0) size 32x24
     48      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     49        RenderBlock {DIV} at (1,1) size 71x24
    4950        RenderBlock {DIV} at (65,1) size 32x24
    5051    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5455    RenderButton {INPUT} at (188,0) size 35x30
    5556    RenderSlider {INPUT} at (229,11) size 32x8
    56       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    57         RenderBlock {DIV} at (1,-8) size 20x24
    58           RenderBlock {DIV} at (13,0) size 24x24
     57      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     58        RenderBlock {DIV} at (1,1) size 20x24
    5959        RenderBlock {DIV} at (14,1) size 24x24
    6060    RenderButton {INPUT} at (271,0) size 30x30
     61layer at (55,492) size 32x24
     62  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     63layer at (256,492) size 24x24
     64  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-styling-strict-expected.txt

    r131367 r131378  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 91x8
    24       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,-8) size 71x24
    26           RenderBlock {DIV} at (-7,0) size 32x24
     24      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     25        RenderBlock {DIV} at (1,1) size 71x24
    2726        RenderBlock {DIV} at (65,1) size 32x24
    2827    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3231    RenderButton {INPUT} at (188,0) size 35x30
    3332    RenderSlider {INPUT} at (229,11) size 32x8
    34       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    35         RenderBlock {DIV} at (1,-8) size 20x24
    36           RenderBlock {DIV} at (13,0) size 24x24
     33      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     34        RenderBlock {DIV} at (1,1) size 20x24
    3735        RenderBlock {DIV} at (14,1) size 24x24
    3836    RenderButton {INPUT} at (271,0) size 30x30
     37layer at (55,260) size 32x24
     38  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     39layer at (256,260) size 24x24
     40  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    3941layer at (332,52) size 320x240
    4042  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4446    RenderButton {INPUT} at (9,0) size 30x30
    4547    RenderSlider {INPUT} at (48,11) size 91x8
    46       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    47         RenderBlock {DIV} at (1,-8) size 71x24
    48           RenderBlock {DIV} at (-7,0) size 32x24
     48      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     49        RenderBlock {DIV} at (1,1) size 71x24
    4950        RenderBlock {DIV} at (65,1) size 32x24
    5051    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5455    RenderButton {INPUT} at (188,0) size 35x30
    5556    RenderSlider {INPUT} at (229,11) size 32x8
    56       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    57         RenderBlock {DIV} at (1,-8) size 20x24
    58           RenderBlock {DIV} at (13,0) size 24x24
     57      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     58        RenderBlock {DIV} at (1,1) size 20x24
    5959        RenderBlock {DIV} at (14,1) size 24x24
    6060    RenderButton {INPUT} at (271,0) size 30x30
     61layer at (379,260) size 32x24
     62  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     63layer at (580,260) size 24x24
     64  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-without-preload-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 71x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 71x24
    2322        RenderBlock {DIV} at (65,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2827    RenderButton {INPUT} at (188,0) size 35x30
    2928    RenderSlider {INPUT} at (229,11) size 32x8
    30       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    31         RenderBlock {DIV} at (1,-8) size 20x24
    32           RenderBlock {DIV} at (13,0) size 24x24
     29      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     30        RenderBlock {DIV} at (1,1) size 20x24
    3331        RenderBlock {DIV} at (14,1) size 24x24
    3432    RenderButton {INPUT} at (271,0) size 30x30
     33layer at (55,252) size 32x24
     34  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     35layer at (256,252) size 24x24
     36  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt

    r131367 r131378  
    1919    RenderButton {INPUT} at (9,0) size 30x30
    2020    RenderSlider {INPUT} at (48,11) size 152x8
    21       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    22         RenderBlock {DIV} at (1,-8) size 132x24
    23           RenderBlock {DIV} at (-7,0) size 32x24
     21      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
     22        RenderBlock {DIV} at (1,1) size 132x24
    2423        RenderBlock {DIV} at (126,1) size 32x24
    2524    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    2827          text run at (0,7) width 25: "0:00"
    2928    RenderButton {INPUT} at (249,0) size 35x30
     29layer at (55,126) size 32x24
     30  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    3031layer at (308,128) size 300x30
    3132  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    3536    RenderButton {INPUT} at (9,0) size 30x30
    3637    RenderSlider {INPUT} at (48,11) size 162x8
    37       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
    38         RenderBlock {DIV} at (1,-8) size 142x24
    39           RenderBlock {DIV} at (-7,0) size 32x24
     38      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
     39        RenderBlock {DIV} at (1,1) size 142x24
    4040        RenderBlock {DIV} at (136,1) size 32x24
    4141    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
     
    4444          text run at (0,7) width 25: "0:00"
    4545    RenderButton {INPUT} at (259,0) size 35x30
     46layer at (350,131) size 32x24
     47  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    4648layer at (8,163) size 300x150
    4749  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
     
    5153    RenderButton {INPUT} at (9,0) size 30x30
    5254    RenderSlider {INPUT} at (48,11) size 152x8
    53       RenderFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    54         RenderBlock {DIV} at (1,-8) size 132x24
    55           RenderBlock {DIV} at (-7,0) size 32x24
     55      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
     56        RenderBlock {DIV} at (1,1) size 132x24
    5657        RenderBlock {DIV} at (126,1) size 32x24
    5758    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    6061          text run at (0,7) width 25: "0:00"
    6162    RenderButton {INPUT} at (249,0) size 35x30
     63layer at (55,281) size 32x24
     64  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    6265layer at (308,283) size 300x30
    6366  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    6770    RenderButton {INPUT} at (9,0) size 30x30
    6871    RenderSlider {INPUT} at (48,11) size 162x8
    69       RenderFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
    70         RenderBlock {DIV} at (1,-8) size 142x24
    71           RenderBlock {DIV} at (-7,0) size 32x24
     72      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
     73        RenderBlock {DIV} at (1,1) size 142x24
    7274        RenderBlock {DIV} at (136,1) size 32x24
    7375    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
     
    7678          text run at (0,7) width 25: "0:00"
    7779    RenderButton {INPUT} at (259,0) size 35x30
     80layer at (350,286) size 32x24
     81  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
  • trunk/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt

    r131367 r131378  
    2424              RenderButton {INPUT} at (9,0) size 30x30
    2525              RenderSlider {INPUT} at (48,11) size 98x8
    26                 RenderFlexibleBox {DIV} at (0,0) size 98x8 [border: (1px solid #E6E6E659)]
    27                   RenderBlock {DIV} at (1,-8) size 78x24
    28                     RenderBlock {DIV} at (31,0) size 33x24
     26                RenderDeprecatedFlexibleBox {DIV} at (0,0) size 98x8 [border: (1px solid #E6E6E659)]
     27                  RenderBlock {DIV} at (1,1) size 78x24
    2928                  RenderBlock {DIV} at (72,1) size 32x24
    3029              RenderDeprecatedFlexibleBox {DIV} at (161,0) size 25x30 [color=#FFFFFF]
     
    3433              RenderButton {INPUT} at (195,0) size 35x30
    3534              RenderSlider {INPUT} at (236,11) size 39x8
    36                 RenderFlexibleBox {DIV} at (0,0) size 39x8 [border: (1px solid #E6E6E659)]
    37                   RenderBlock {DIV} at (1,-8) size 27x24
    38                     RenderBlock {DIV} at (20,0) size 24x24
     35                RenderDeprecatedFlexibleBox {DIV} at (0,0) size 39x8 [border: (1px solid #E6E6E659)]
     36                  RenderBlock {DIV} at (1,1) size 27x24
    3937                  RenderBlock {DIV} at (21,1) size 24x24
     38          layer at (126,168) size 32x24
     39            RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     40          layer at (302,168) size 24x24
     41            RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4042        RenderText {#text} at (0,0) size 0x0
    4143        RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt

    r131367 r131378  
    6666    RenderButton {INPUT} at (9,0) size 30x30
    6767    RenderSlider {INPUT} at (48,11) size 74x8
    68       RenderFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,-8) size 54x24
    70           RenderBlock {DIV} at (-5,0) size 33x24
     68      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
     69        RenderBlock {DIV} at (1,1) size 54x24
    7170        RenderBlock {DIV} at (48,1) size 32x24
    7271    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
     
    7675    RenderButton {INPUT} at (171,0) size 35x30
    7776    RenderSlider {INPUT} at (212,11) size 15x8
    78       RenderFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
    79         RenderBlock {DIV} at (1,-8) size 3x24
    80           RenderBlock {DIV} at (-4,0) size 24x24
     77      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
     78        RenderBlock {DIV} at (1,1) size 3x24
    8179        RenderBlock {DIV} at (-3,1) size 24x24
    8280    RenderButton {INPUT} at (237,0) size 30x30
    8381    RenderButton {INPUT} at (271,0) size 30x30
     82layer at (57,216) size 32x24
     83  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     84layer at (222,216) size 24x24
     85  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/video-controls-rendering-expected.txt

    r131367 r131378  
    2323    RenderButton {INPUT} at (9,0) size 30x30
    2424    RenderSlider {INPUT} at (48,11) size 91x8
    25       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    26         RenderBlock {DIV} at (1,-8) size 71x24
    27           RenderBlock {DIV} at (-7,0) size 32x24
     25      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     26        RenderBlock {DIV} at (1,1) size 71x24
    2827        RenderBlock {DIV} at (65,1) size 32x24
    2928    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3332    RenderButton {INPUT} at (188,0) size 35x30
    3433    RenderSlider {INPUT} at (229,11) size 32x8
    35       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    36         RenderBlock {DIV} at (1,-8) size 20x24
    37           RenderBlock {DIV} at (13,0) size 24x24
     34      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     35        RenderBlock {DIV} at (1,1) size 20x24
    3836        RenderBlock {DIV} at (14,1) size 24x24
    3937    RenderButton {INPUT} at (271,0) size 30x30
     38layer at (55,252) size 32x24
     39  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     40layer at (256,252) size 24x24
     41  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4042layer at (8,284) size 320x240
    4143  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4547    RenderButton {INPUT} at (9,0) size 30x30
    4648    RenderSlider {INPUT} at (48,11) size 91x8
    47       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    48         RenderBlock {DIV} at (1,-8) size 71x24
    49           RenderBlock {DIV} at (-7,0) size 32x24
     49      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     50        RenderBlock {DIV} at (1,1) size 71x24
    5051        RenderBlock {DIV} at (65,1) size 32x24
    5152    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5556    RenderButton {INPUT} at (188,0) size 35x30
    5657    RenderSlider {INPUT} at (229,11) size 32x8
    57       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    58         RenderBlock {DIV} at (1,-8) size 20x24
    59           RenderBlock {DIV} at (13,0) size 24x24
     58      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     59        RenderBlock {DIV} at (1,1) size 20x24
    6060        RenderBlock {DIV} at (14,1) size 24x24
    6161    RenderButton {INPUT} at (271,0) size 30x30
     62layer at (55,492) size 32x24
     63  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     64layer at (256,492) size 24x24
     65  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    6266layer at (8,524) size 320x240
    6367  RenderVideo {VIDEO} at (8,524) size 320x240
     
    6973    RenderButton {INPUT} at (9,0) size 30x30
    7074    RenderSlider {INPUT} at (48,11) size 91x8
    71       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    72         RenderBlock {DIV} at (1,-8) size 71x24
    73           RenderBlock {DIV} at (-7,0) size 32x24
     75      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     76        RenderBlock {DIV} at (1,1) size 71x24
    7477        RenderBlock {DIV} at (65,1) size 32x24
    7578    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    7982    RenderButton {INPUT} at (188,0) size 35x30
    8083    RenderSlider {INPUT} at (229,11) size 32x8
    81       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    82         RenderBlock {DIV} at (1,-8) size 20x24
    83           RenderBlock {DIV} at (13,0) size 24x24
     84      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     85        RenderBlock {DIV} at (1,1) size 20x24
    8486        RenderBlock {DIV} at (14,1) size 24x24
    8587    RenderButton {INPUT} at (271,0) size 30x30
     88layer at (55,732) size 32x24
     89  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     90layer at (256,732) size 24x24
     91  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/video-display-toggle-expected.txt

    r131367 r131378  
    1717    RenderButton {INPUT} at (9,0) size 30x30
    1818    RenderSlider {INPUT} at (48,11) size 91x8
    19       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    20         RenderBlock {DIV} at (1,-8) size 71x24
    21           RenderBlock {DIV} at (-7,0) size 32x24
     19      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     20        RenderBlock {DIV} at (1,1) size 71x24
    2221        RenderBlock {DIV} at (65,1) size 32x24
    2322    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2726    RenderButton {INPUT} at (188,0) size 35x30
    2827    RenderSlider {INPUT} at (229,11) size 32x8
    29       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    30         RenderBlock {DIV} at (1,-8) size 20x24
    31           RenderBlock {DIV} at (13,0) size 24x24
     28      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     29        RenderBlock {DIV} at (1,1) size 20x24
    3230        RenderBlock {DIV} at (14,1) size 24x24
    3331    RenderButton {INPUT} at (271,0) size 30x30
     32layer at (55,236) size 32x24
     33  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     34layer at (256,236) size 24x24
     35  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 193x8
    20       RenderFlexibleBox {DIV} at (0,0) size 193x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 173x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 193x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 173x24
    2322        RenderBlock {DIV} at (167,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (256,0) size 25x30 [color=#FFFFFF]
     
    2625        RenderText {#text} at (0,7) size 25x16
    2726          text run at (0,7) width 25: "0:00"
     27layer at (56,163) size 32x24
     28  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
  • trunk/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt

    r131367 r131378  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 170x8
    20       RenderFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,-8) size 150x24
    22           RenderBlock {DIV} at (-7,0) size 32x24
     20      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
     21        RenderBlock {DIV} at (1,1) size 150x24
    2322        RenderBlock {DIV} at (144,1) size 32x24
    2423    RenderDeprecatedFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
     
    2827    RenderButton {INPUT} at (267,0) size 35x30
    2928    RenderButton {INPUT} at (303,0) size 30x30
     29layer at (55,300) size 32x24
     30  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
  • trunk/LayoutTests/platform/chromium-win/media/video-playing-and-pause-expected.txt

    r131367 r131378  
    1919    RenderButton {INPUT} at (9,0) size 30x30
    2020    RenderSlider {INPUT} at (48,11) size 91x8
    21       RenderFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    22         RenderBlock {DIV} at (1,-8) size 71x24
    23           RenderBlock {DIV} at (-7,0) size 32x24
     21      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
     22        RenderBlock {DIV} at (1,1) size 71x24
    2423        RenderBlock {DIV} at (65,1) size 32x24
    2524    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2928    RenderButton {INPUT} at (188,0) size 35x30
    3029    RenderSlider {INPUT} at (229,11) size 32x8
    31       RenderFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    32         RenderBlock {DIV} at (1,-8) size 20x24
    33           RenderBlock {DIV} at (13,0) size 24x24
     30      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
     31        RenderBlock {DIV} at (1,1) size 20x24
    3432        RenderBlock {DIV} at (14,1) size 24x24
    3533    RenderButton {INPUT} at (271,0) size 30x30
     34layer at (55,280) size 32x24
     35  RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
     36layer at (256,280) size 24x24
     37  RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/video-zoom-controls-expected.txt

    r131367 r131378  
    1616    RenderButton {INPUT} at (13,0) size 46x45
    1717    RenderSlider {INPUT} at (72,16) size 38x13
    18       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
    19         RenderBlock {DIV} at (1,-12) size 9x36
    20           RenderBlock {DIV} at (-11,0) size 49x36
     18      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
     19        RenderBlock {DIV} at (1,1) size 9x36
    2120        RenderBlock {DIV} at (-1,1) size 48x36
    2221    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
     
    2625    RenderButton {INPUT} at (185,0) size 53x45
    2726    RenderSlider {INPUT} at (247,16) size 23x13
    28       RenderFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
    29         RenderBlock {DIV} at (1,-12) size 6x36
    30           RenderBlock {DIV} at (-5,0) size 36x36
     27      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
     28        RenderBlock {DIV} at (1,1) size 6x36
    3129        RenderBlock {DIV} at (-4,1) size 36x36
    3230    RenderButton {INPUT} at (284,0) size 46x45
     31layer at (127,217) size 49x36
     32  RenderBlock (relative positioned) {DIV} at (-11,-12) size 49x36
    3333layer at (57,310) size 240x180
    3434  RenderVideo {VIDEO} at (45,298) size 240x180
     
    4040    RenderButton {INPUT} at (13,0) size 46x45
    4141    RenderSlider {INPUT} at (72,16) size 38x13
    42       RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
    43         RenderBlock {DIV} at (1,-12) size 9x36
    44           RenderBlock {DIV} at (-11,0) size 49x36
     42      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
     43        RenderBlock {DIV} at (1,1) size 9x36
    4544        RenderBlock {DIV} at (-1,1) size 48x36
    4645    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
     
    5049    RenderButton {INPUT} at (185,0) size 53x45
    5150    RenderSlider {INPUT} at (247,16) size 23x13
    52       RenderFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
    53         RenderBlock {DIV} at (1,-12) size 6x36
    54           RenderBlock {DIV} at (-5,0) size 36x36
     51      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
     52        RenderBlock {DIV} at (1,1) size 6x36
    5553        RenderBlock {DIV} at (-4,1) size 36x36
    5654    RenderButton {INPUT} at (284,0) size 46x45
     55layer at (127,442) size 49x36 backgroundClip at (60,417) size 225x45 clip at (60,417) size 225x45 outlineClip at (60,417) size 225x45
     56  RenderBlock (relative positioned) {DIV} at (-11,-12) size 49x36
  • trunk/LayoutTests/platform/chromium/TestExpectations

    r131367 r131378  
    40084008webkit.org/b/98275 media/event-queue-crash.html [ Skip ]
    40094009
    4010 webkit.org/b/98666 [ Win Mac ] fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    4011 webkit.org/b/98666 [ Win Mac ] fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    4012 webkit.org/b/98666 [ Win Mac ] fast/forms/box-shadow-override.html [ Failure ]
    4013 webkit.org/b/98666 [ Win Mac ] fast/forms/datalist/input-appearance-range-with-datalist.html [ Failure ]
    4014 webkit.org/b/98666 [ Win Mac ] fast/forms/input-appearance-height.html [ Failure ]
    4015 webkit.org/b/98666 [ Win Mac ] fast/forms/range/input-appearance-range.html [ Failure ]
    4016 webkit.org/b/98666 [ Win Mac ] fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    4017 webkit.org/b/98666 [ Win Mac ] fast/forms/range/slider-padding.html [ Failure ]
    4018 webkit.org/b/98666 [ Win Mac ] fast/forms/range/slider-thumb-shared-style.html [ Failure ]
    4019 webkit.org/b/98666 [ Win Mac ] fast/forms/range/slider-thumb-stylability.html [ Failure ]
    4020 webkit.org/b/98666 [ Win Mac ] fast/hidpi/video-controls-in-hidpi.html [ Failure ]
    4021 webkit.org/b/98666 [ Win Mac ] fast/multicol/client-rects.html [ Failure ]
    4022 webkit.org/b/98666 [ Win Mac ] fast/repaint/slider-thumb-drag-release.html [ Failure ]
    4023 webkit.org/b/98666 [ Win Mac ] fast/repaint/slider-thumb-float.html [ Failure ]
    4024 webkit.org/b/98666 [ Win Mac ] media/track/track-cue-rendering-vertical.html [ Failure ]
    4025 webkit.org/b/98666 [ Mac ] fast/layers/video-layer.html [ Failure ]
    4026 webkit.org/b/98666 [ Mac ] media/audio-controls-rendering.html [ Failure ]
    4027 webkit.org/b/98666 [ Mac ] media/audio-repaint.html [ Failure ]
    4028 webkit.org/b/98666 [ Mac ] media/controls-after-reload.html [ Failure ]
    4029 webkit.org/b/98666 [ Mac ] media/controls-strict.html [ Failure ]
    4030 webkit.org/b/98666 [ Mac ] media/controls-styling.html [ Failure ]
    4031 webkit.org/b/98666 [ Mac ] media/controls-styling-strict.html [ Failure ]
    4032 webkit.org/b/98666 [ Mac ] media/controls-without-preload.html [ Failure ]
    4033 webkit.org/b/98666 [ Mac ] media/media-controls-clone.html [ Failure ]
    4034 webkit.org/b/98666 [ Mac ] media/media-document-audio-repaint.html [ Failure ]
    4035 webkit.org/b/98666 [ Mac ] media/track/track-cue-rendering-horizontal.html [ Failure ]
    4036 webkit.org/b/98666 [ Mac ] media/video-controls-rendering.html [ Failure ]
    4037 webkit.org/b/98666 [ Mac ] media/video-display-toggle.html [ Failure ]
    4038 webkit.org/b/98666 [ Mac ] media/video-empty-source.html [ Failure ]
    4039 webkit.org/b/98666 [ Mac ] media/video-no-audio.html [ Failure ]
    4040 webkit.org/b/98666 [ Mac ] media/video-playing-and-pause.html [ Failure ]
    4041 webkit.org/b/98666 [ Mac ] media/video-zoom-controls.html [ Failure ]
    4042 
    40434010# These are real failues due to 95121.
    40444011# This is spilling caused by LANCZOS3 scaling algorithm that samples outside the source rect.
  • trunk/LayoutTests/platform/efl/TestExpectations

    r131367 r131378  
    15291529webkit.org/b/10890 fast/selectors/unqualified-hover-strict.html [ Failure Pass ]
    15301530
    1531 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    1532 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    1533 webkit.org/b/98666 fast/forms/box-shadow-override.html [ Failure ]
    1534 webkit.org/b/98666 fast/forms/datalist/input-appearance-range-with-datalist.html [ Failure ]
    1535 webkit.org/b/98666 fast/forms/input-appearance-height.html [ Failure ]
    1536 webkit.org/b/98666 fast/forms/range/input-appearance-range.html [ Failure ]
    1537 webkit.org/b/98666 fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    1538 webkit.org/b/98666 fast/forms/range/slider-padding.html [ Failure ]
    1539 webkit.org/b/98666 fast/forms/range/slider-thumb-shared-style.html [ Failure ]
    1540 webkit.org/b/98666 fast/forms/range/slider-thumb-stylability.html [ Failure ]
    1541 webkit.org/b/98666 fast/multicol/client-rects.html [ Failure ]
    1542 webkit.org/b/98666 fast/repaint/slider-thumb-drag-release.html [ Failure ]
    1543 webkit.org/b/98666 fast/repaint/slider-thumb-float.html [ Failure ]
    1544 webkit.org/b/98666 media/track/track-cue-rendering-vertical.html [ Failure ]
    1545 webkit.org/b/98666 fast/layers/video-layer.html [ Failure ]
    1546 webkit.org/b/98666 media/audio-controls-rendering.html [ Failure ]
    1547 webkit.org/b/98666 media/audio-repaint.html [ Failure ]
    1548 webkit.org/b/98666 media/controls-after-reload.html [ Failure ]
    1549 webkit.org/b/98666 media/controls-strict.html [ Failure ]
    1550 webkit.org/b/98666 media/controls-styling.html [ Failure ]
    1551 webkit.org/b/98666 media/controls-styling-strict.html [ Failure ]
    1552 webkit.org/b/98666 media/controls-without-preload.html [ Failure ]
    1553 webkit.org/b/98666 media/media-controls-clone.html [ Failure ]
    1554 webkit.org/b/98666 media/media-document-audio-repaint.html [ Failure ]
    1555 webkit.org/b/98666 media/track/track-cue-rendering-horizontal.html [ Failure ]
    1556 webkit.org/b/98666 media/video-display-toggle.html [ Failure ]
    1557 webkit.org/b/98666 media/video-empty-source.html [ Failure ]
    1558 webkit.org/b/98666 media/video-no-audio.html [ Failure ]
    1559 webkit.org/b/98666 media/video-zoom-controls.html [ Failure ]
    1560 
    15611531# Regressions after r130699
    15621532webkit.org/b/98729 fast/css/import-style-update.html [ Failure ]
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r131367 r131378  
    462462webkit.org/b/44199 perf [ Skip ]
    463463
     464webkit.org/b/68878 media/video-playing-and-pause.html [ Failure Pass ]
    464465webkit.org/b/55126 media/video-aspect-ratio.html [ Failure Pass ]
    465466
     
    13491350webkit.org/b/98585 fast/exclusions/shape-inside/shape-inside-rounded-rectangle-003.html [ ImageOnlyFailure ]
    13501351
    1351 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    1352 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    1353 webkit.org/b/98666 fast/forms/box-shadow-override.html [ Failure ]
    1354 webkit.org/b/98666 fast/forms/input-appearance-height.html [ Failure ]
    1355 webkit.org/b/98666 fast/forms/range/input-appearance-range.html [ Failure ]
    1356 webkit.org/b/98666 fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    1357 webkit.org/b/98666 fast/forms/range/slider-padding.html [ Failure ]
    1358 webkit.org/b/98666 fast/forms/range/slider-thumb-shared-style.html [ Failure ]
    1359 webkit.org/b/98666 fast/forms/range/slider-thumb-stylability.html [ Failure ]
    1360 webkit.org/b/98666 fast/hidpi/video-controls-in-hidpi.html [ Failure ]
    1361 webkit.org/b/98666 fast/multicol/client-rects.html [ Failure ]
    1362 webkit.org/b/98666 fast/repaint/slider-thumb-drag-release.html [ Failure ]
    1363 webkit.org/b/98666 fast/repaint/slider-thumb-float.html [ Failure ]
    1364 webkit.org/b/98666 media/track/track-cue-rendering-vertical.html [ Failure ]
    1365 webkit.org/b/98666 fast/layers/video-layer.html [ Failure ]
    1366 webkit.org/b/98666 media/audio-controls-rendering.html [ Failure ]
    1367 webkit.org/b/98666 media/audio-repaint.html [ Failure ]
    1368 webkit.org/b/98666 media/controls-after-reload.html [ Failure ]
    1369 webkit.org/b/98666 media/controls-strict.html [ Failure ]
    1370 webkit.org/b/98666 media/controls-styling.html [ Failure ]
    1371 webkit.org/b/98666 media/controls-styling-strict.html [ Failure ]
    1372 webkit.org/b/98666 media/controls-without-preload.html [ Failure ]
    1373 webkit.org/b/98666 media/media-controls-clone.html [ Failure ]
    1374 webkit.org/b/98666 media/media-document-audio-repaint.html [ Failure ]
    1375 webkit.org/b/98666 media/track/track-cue-rendering-horizontal.html [ Failure ]
    1376 webkit.org/b/98666 media/video-controls-rendering.html [ Failure ]
    1377 webkit.org/b/98666 media/video-display-toggle.html [ Failure ]
    1378 webkit.org/b/98666 media/video-empty-source.html [ Failure ]
    1379 webkit.org/b/98666 media/video-no-audio.html [ Failure ]
    1380 webkit.org/b/68878 webkit.org/b/98666 media/video-playing-and-pause.html [ Failure Pass ]
    1381 webkit.org/b/98666 media/video-zoom-controls.html [ Failure ]
    1382 
    13831352webkit.org/b/98587 fast/writing-mode/vertical-subst-font-vert-no-dflt.html [ ImageOnlyFailure ]
    13841353
  • trunk/LayoutTests/platform/mac/TestExpectations

    r131367 r131378  
    12911291webkit.org/b/95501 http/tests/security/inactive-document-with-empty-security-origin.html [ Skip ]
    12921292
    1293 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    1294 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    1295 webkit.org/b/98666 fast/forms/box-shadow-override.html [ Failure ]
    1296 webkit.org/b/98666 fast/forms/input-appearance-height.html [ Failure ]
    1297 webkit.org/b/98666 fast/forms/range/input-appearance-range.html [ Failure ]
    1298 webkit.org/b/98666 fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    1299 webkit.org/b/98666 fast/forms/range/slider-padding.html [ Failure ]
    1300 webkit.org/b/98666 fast/forms/range/slider-thumb-shared-style.html [ Failure ]
    1301 webkit.org/b/98666 fast/forms/range/slider-thumb-stylability.html [ Failure ]
    1302 webkit.org/b/98666 fast/hidpi/video-controls-in-hidpi.html [ Failure ]
    1303 webkit.org/b/98666 fast/multicol/client-rects.html [ Failure ]
    1304 webkit.org/b/98666 fast/repaint/slider-thumb-drag-release.html [ Failure ]
    1305 webkit.org/b/98666 fast/repaint/slider-thumb-float.html [ Failure ]
    1306 webkit.org/b/98666 fast/layers/video-layer.html [ Failure ]
    1307 webkit.org/b/98666 media/audio-controls-rendering.html [ Failure ]
    1308 webkit.org/b/98666 media/controls-after-reload.html [ Failure ]
    1309 webkit.org/b/98666 media/controls-strict.html [ Failure ]
    1310 webkit.org/b/98666 media/controls-styling-strict.html [ Failure ]
    1311 webkit.org/b/98666 media/controls-without-preload.html [ Failure ]
    1312 webkit.org/b/98666 media/media-controls-clone.html [ Failure ]
    1313 webkit.org/b/98666 media/video-controls-rendering.html [ Failure ]
    1314 webkit.org/b/98666 media/video-display-toggle.html [ Failure ]
    1315 webkit.org/b/98666 media/video-empty-source.html [ Failure ]
    1316 webkit.org/b/98666 media/video-no-audio.html [ Failure ]
    1317 webkit.org/b/98666 media/video-playing-and-pause.html [ Failure ]
    1318 
    13191293# Paints black behind the test image instead of the expected green.
    13201294webkit.org/b/95707 http/tests/images/png-partial-load-no-alpha.html [ ImageOnlyFailure ]
  • trunk/LayoutTests/platform/qt/TestExpectations

    r131367 r131378  
    24142414webkit.org/b/91379 http/tests/security/contentSecurityPolicy/object-src-none-allowed.html [ Failure Pass ]
    24152415
    2416 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    2417 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    2418 webkit.org/b/98666 fast/forms/box-shadow-override.html [ Failure ]
    2419 webkit.org/b/98666 fast/forms/datalist/input-appearance-range-with-datalist.html [ Failure ]
    2420 webkit.org/b/98666 fast/forms/range/input-appearance-range.html [ Failure ]
    2421 webkit.org/b/98666 fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    2422 webkit.org/b/98666 fast/forms/range/slider-padding.html [ Failure ]
    2423 webkit.org/b/98666 fast/multicol/client-rects.html [ Failure ]
    2424 webkit.org/b/98666 fast/repaint/slider-thumb-drag-release.html [ Failure ]
    2425 webkit.org/b/98666 fast/repaint/slider-thumb-float.html [ Failure ]
    2426 webkit.org/b/98666 media/track/track-cue-rendering-vertical.html [ Failure ]
    2427 webkit.org/b/98666 media/controls-styling-strict.html [ Failure ]
    2428 webkit.org/b/98666 media/media-controls-clone.html [ Failure ]
    2429 webkit.org/b/98666 media/track/track-cue-rendering-horizontal.html [ Failure ]
    2430 webkit.org/b/98666 media/video-playing-and-pause.html [ Failure ]
    2431 
    24322416webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
    24332417
  • trunk/LayoutTests/platform/win/TestExpectations

    r131367 r131378  
    23052305http/tests/security/inactive-document-with-empty-security-origin.html
    23062306
    2307 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update.html [ Failure ]
    2308 webkit.org/b/98666 fast/dom/HTMLInputElement/input-slider-update-styled.html [ Failure ]
    2309 webkit.org/b/98666 fast/forms/input-appearance-height.html [ Failure ]
    2310 webkit.org/b/98666 fast/forms/range/input-appearance-range.html [ Failure ]
    2311 webkit.org/b/98666 fast/forms/range/range-thumb-height-percentage.html [ Failure ]
    2312 webkit.org/b/98666 fast/forms/range/slider-padding.html [ Failure ]
    2313 webkit.org/b/98666 fast/forms/range/slider-thumb-shared-style.html [ Failure ]
    2314 webkit.org/b/98666 fast/forms/range/slider-thumb-stylability.html [ Failure ]
    2315 webkit.org/b/98666 fast/multicol/client-rects.html [ Failure ]
    2316 webkit.org/b/98666 fast/repaint/slider-thumb-drag-release.html [ Failure ]
    2317 webkit.org/b/98666 fast/repaint/slider-thumb-float.html [ Failure ]
    2318 webkit.org/b/98666 media/track/track-cue-rendering-vertical.html [ Failure ]
    2319 webkit.org/b/98666 media/track/track-cue-rendering-horizontal.html [ Failure ]
    2320 
    23212307#https://bugs.webkit.org/show_bug.cgi?id=98079
    23222308http/tests/security/cross-origin-local-storage-wk1.html
  • trunk/Source/WebCore/ChangeLog

    r131377 r131378  
     12012-10-15  Tony Chang  <tony@chromium.org>
     2
     3        Unreviewed, rolling out r131367.
     4        http://trac.webkit.org/changeset/131367
     5        https://bugs.webkit.org/show_bug.cgi?id=98666
     6
     7        crashes on Apple Mac
     8
     9        * css/html.css:
     10        (input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container):
     11        (input[type="range"]::-webkit-slider-runnable-track):
     12        (input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb):
     13        * css/mediaControlsChromium.css:
     14        (input[type="range"]::-webkit-media-slider-thumb):
     15        * css/mediaControlsChromiumAndroid.css:
     16        (input[type="range"]::-webkit-media-slider-thumb):
     17        * html/RangeInputType.cpp:
     18        (WebCore::RangeInputType::listAttributeTargetChanged):
     19        * html/shadow/SliderThumbElement.cpp:
     20        (WebCore::RenderSliderThumb::layout):
     21        (WebCore):
     22        (WebCore::RenderSliderContainer::RenderSliderContainer):
     23        (RenderSliderContainer):
     24        (WebCore::RenderSliderContainer::layout):
     25        * html/shadow/SliderThumbElement.h:
     26        (RenderSliderThumb):
     27        * rendering/RenderSlider.cpp:
     28        (WebCore):
     29        (WebCore::RenderSlider::RenderSlider):
     30        (WebCore::RenderSlider::layout):
     31        * rendering/RenderSlider.h:
     32        (WebCore):
     33        (RenderSlider):
     34        (WebCore::RenderSlider::renderName):
     35        (WebCore::RenderSlider::isSlider):
     36        (WebCore::RenderSlider::requiresForcedStyleRecalcPropagation):
     37        (WebCore::toRenderSlider):
     38
    1392012-10-15  Dan Bernstein  <mitz@apple.com>
    240
  • trunk/Source/WebCore/css/html.css

    r131367 r131378  
    747747
    748748input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container {
    749     -webkit-flex: 1;
    750     min-width: 0;
    751 
    752     box-sizing: border-box;
    753     -webkit-user-modify: read-only !important;
    754     display: -webkit-flex;
    755     -webkit-align-contents: center;
     749    -webkit-box-align: center;
     750    -webkit-box-orient: horizontal; /* This property is updated by C++ code. */
     751    box-sizing: border-box;
     752    -webkit-user-modify: read-only !important;
     753    display: -webkit-box;
     754    height: 100%;
     755    width: 100%;
    756756}
    757757
    758758input[type="range"]::-webkit-slider-runnable-track {
    759     -webkit-flex: 1;
    760     min-width: 0;
    761     -webkit-align-self: center;
    762 
     759    -webkit-box-flex: 1;
    763760    box-sizing: border-box;
    764761    -webkit-user-modify: read-only !important;
     
    771768    -webkit-user-modify: read-only !important;
    772769    display: block;
     770    position: relative;
    773771}
    774772
  • trunk/Source/WebCore/css/mediaControlsChromium.css

    r131367 r131378  
    170170
    171171input[type="range"]::-webkit-media-slider-thumb {
     172    display: block;
     173    -webkit-appearance: sliderthumb-horizontal;
     174    box-sizing: border-box;
     175    position: relative;
     176    bottom: 1px;
    172177    margin-left: -7px;
    173178    margin-right: -7px;
  • trunk/Source/WebCore/css/mediaControlsChromiumAndroid.css

    r131367 r131378  
    187187
    188188input[type="range"]::-webkit-media-slider-thumb {
     189    display: block;
     190    -webkit-appearance: sliderthumb-horizontal;
     191    box-sizing: border-box;
     192    position: relative;
     193    bottom: 1px;
    189194    margin-left: -7px;
    190195    margin-right: -7px;
  • trunk/Source/WebCore/html/RangeInputType.cpp

    r131367 r131378  
    341341{
    342342    m_tickMarkValuesDirty = true;
    343     if (element()->renderer())
    344         element()->renderer()->setNeedsLayout(true);
     343    element()->setNeedsStyleRecalc();
    345344}
    346345
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r131367 r131378  
    4141#include "HTMLParserIdioms.h"
    4242#include "MouseEvent.h"
    43 #include "RenderFlexibleBox.h"
     43#include "RenderDeprecatedFlexibleBox.h"
    4444#include "RenderSlider.h"
    4545#include "RenderTheme.h"
     
    122122}
    123123
     124void RenderSliderThumb::layout()
     125{
     126    // Do not cast node() to SliderThumbElement. This renderer is used for
     127    // TrackLimitElement too.
     128    HTMLInputElement* input = node()->shadowHost()->toInputElement();
     129    bool isVertical = hasVerticalAppearance(input);
     130
     131    double fraction = (sliderPosition(input) * 100).toDouble();
     132    if (isVertical)
     133        style()->setTop(Length(100 - fraction, Percent));
     134    else if (style()->isLeftToRightDirection())
     135        style()->setLeft(Length(fraction, Percent));
     136    else
     137        style()->setRight(Length(fraction, Percent));
     138
     139    RenderBlock::layout();
     140}
     141
    124142// --------------------------------
    125143
    126144// FIXME: Find a way to cascade appearance and adjust heights, and get rid of this class.
    127145// http://webkit.org/b/62535
    128 class RenderSliderContainer : public RenderFlexibleBox {
     146class RenderSliderContainer : public RenderDeprecatedFlexibleBox {
    129147public:
    130148    RenderSliderContainer(Node* node)
    131         : RenderFlexibleBox(node) { }
    132 public:
    133     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
     149        : RenderDeprecatedFlexibleBox(node) { }
    134150
    135151private:
    136     virtual void layout() OVERRIDE;
     152    virtual void layout();
    137153};
    138154
    139 void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     155void RenderSliderContainer::layout()
    140156{
    141157    HTMLInputElement* input = node()->shadowHost()->toInputElement();
    142158    bool isVertical = hasVerticalAppearance(input);
    143 
     159    style()->setBoxOrient(isVertical ? VERTICAL : HORIZONTAL);
     160    // Sets the concrete height if the height of the <input> is not fixed or a
     161    // percentage value because a percentage height value of this box won't be
     162    // based on the <input> height in such case.
     163    if (input->renderer()->isSlider()) {
     164        if (!isVertical) {
     165            RenderObject* trackRenderer = node()->firstChild()->renderer();
     166            Length inputHeight = input->renderer()->style()->height();
     167            if (!inputHeight.isSpecified()) {
     168                RenderObject* thumbRenderer = input->sliderThumbElement()->renderer();
     169                if (thumbRenderer) {
     170                    Length height = thumbRenderer->style()->height();
    144171#if ENABLE(DATALIST_ELEMENT)
    145     if (input->renderer()->isSlider() && !isVertical && input->list()) {
    146         int offsetFromCenter = theme()->sliderTickOffsetFromTrackCenter();
    147         LayoutUnit trackHeight = 0;
    148         if (offsetFromCenter < 0)
    149             trackHeight = -2 * offsetFromCenter;
    150         else {
    151             int tickLength = theme()->sliderTickSize().height();
    152             trackHeight = 2 * (offsetFromCenter + tickLength);
     172                    if (input && input->list()) {
     173                        int offsetFromCenter = theme()->sliderTickOffsetFromTrackCenter();
     174                        int trackHeight = 0;
     175                        if (offsetFromCenter < 0)
     176                            trackHeight = -2 * offsetFromCenter;
     177                        else {
     178                            int tickLength = theme()->sliderTickSize().height();
     179                            trackHeight = 2 * (offsetFromCenter + tickLength);
     180                        }
     181                        float zoomFactor = style()->effectiveZoom();
     182                        if (zoomFactor != 1.0)
     183                            trackHeight *= zoomFactor;
     184                        height = Length(trackHeight, Fixed);
     185                    }
     186#endif
     187                    style()->setHeight(height);
     188                }
     189            } else {
     190                style()->setHeight(Length(100, Percent));
     191                if (trackRenderer)
     192                    trackRenderer->style()->setHeight(Length());
     193            }
    153194        }
    154         float zoomFactor = style()->effectiveZoom();
    155         if (zoomFactor != 1.0)
    156             trackHeight *= zoomFactor;
    157 
    158         RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
    159         return;
    160     }
    161 #endif
    162     if (isVertical)
    163         logicalHeight = RenderSlider::defaultTrackLength;
    164     RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
    165 }
    166 
    167 void RenderSliderContainer::layout()
    168 {
    169     HTMLInputElement* input = node()->shadowHost()->toInputElement();
    170     bool isVertical = hasVerticalAppearance(input);
    171     style()->setFlexDirection(isVertical ? FlowColumn : FlowRow);
    172 
    173     RenderFlexibleBox::layout();
    174 
    175     // These should always exist, unless someone mutates the shadow DOM (e.g., in the inspector).
    176     if (!input->sliderThumbElement() || !input->sliderThumbElement()->renderer())
    177         return;
    178     RenderBox* thumb = toRenderBox(input->sliderThumbElement()->renderer());
    179     RenderBox* track = toRenderBox(thumb->parent());
    180 
    181     double percentageOffset = sliderPosition(input).toDouble();
    182     LayoutUnit availableExtent = isVertical ? track->contentHeight() : track->contentWidth();
    183     LayoutUnit offset = percentageOffset * availableExtent;
    184     LayoutPoint thumbLocation = thumb->location();
    185     if (isVertical)
    186         thumbLocation.setY(thumbLocation.y() + track->contentHeight() - offset);
    187     else if (style()->isLeftToRightDirection())
    188         thumbLocation.setX(thumbLocation.x() + offset);
    189     else
    190         thumbLocation.setX(thumbLocation.x() - offset);
    191     thumb->setLocation(thumbLocation);
     195    }
     196
     197    RenderDeprecatedFlexibleBox::layout();
     198
     199    // Percentage 'top' for the thumb doesn't work if the parent style has no
     200    // concrete height.
     201    Node* track = node()->firstChild();
     202    if (track && track->renderer()->isBox()) {
     203        RenderBox* trackBox = track->renderBox();
     204        trackBox->style()->setHeight(Length(trackBox->height() - trackBox->borderAndPaddingHeight(), Fixed));
     205    }
    192206}
    193207
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.h

    r131367 r131378  
    112112private:
    113113    virtual bool isSliderThumb() const;
     114    virtual void layout();
    114115};
    115116
  • trunk/Source/WebCore/rendering/RenderSlider.cpp

    r131367 r131378  
    4747namespace WebCore {
    4848
    49 const int RenderSlider::defaultTrackLength = 129;
     49static const int defaultTrackLength = 129;
    5050
    5151RenderSlider::RenderSlider(HTMLInputElement* element)
    52     : RenderFlexibleBox(element)
     52    : RenderBlock(element)
    5353{
    5454    // We assume RenderSlider works only with <input type=range>.
     
    106106    // http://webkit.org/b/62535
    107107    RenderBox* thumbBox = sliderThumbElementOf(node())->renderBox();
    108     if (thumbBox && thumbBox->isSliderThumb()) {
     108    if (thumbBox && thumbBox->isSliderThumb())
    109109        static_cast<RenderSliderThumb*>(thumbBox)->updateAppearance(style());
    110         if (RenderObject* limiterRenderer = trackLimiterElementOf(node())->renderer()) {
    111             if (limiterRenderer->isSliderThumb()) {
    112                 static_cast<RenderSliderThumb*>(limiterRenderer)->updateAppearance(style());
    113                 limiterRenderer->style()->setWidth(thumbBox->style()->width());
    114                 limiterRenderer->style()->setHeight(thumbBox->style()->height());
    115             }
    116         }
     110    if (RenderObject* limiterRenderer = trackLimiterElementOf(node())->renderer()) {
     111        if (limiterRenderer->isSliderThumb())
     112          static_cast<RenderSliderThumb*>(limiterRenderer)->updateAppearance(style());
    117113    }
    118114
    119115    RenderBlock::layout();
     116
     117    if (!thumbBox)
     118        return;
     119    LayoutUnit heightDiff = thumbBox->height() - contentHeight();
     120    if (heightDiff > 0)
     121        thumbBox->setY(thumbBox->y() - (heightDiff / 2));
    120122}
    121123
  • trunk/Source/WebCore/rendering/RenderSlider.h

    r131367 r131378  
    2222#define RenderSlider_h
    2323
    24 #include "RenderFlexibleBox.h"
     24#include "RenderBlock.h"
    2525
    2626namespace WebCore {
    2727
    28 class HTMLInputElement;
    29 class MouseEvent;
    30 class SliderThumbElement;
     28    class HTMLInputElement;
     29    class MouseEvent;
     30    class SliderThumbElement;
     31   
     32    class RenderSlider : public RenderBlock {
     33    public:
     34        RenderSlider(HTMLInputElement*);
     35        virtual ~RenderSlider();
    3136
    32 class RenderSlider : public RenderFlexibleBox {
    33 public:
    34     static const int defaultTrackLength;
     37        bool inDragMode() const;
    3538
    36     RenderSlider(HTMLInputElement*);
    37     virtual ~RenderSlider();
     39    private:
     40        virtual const char* renderName() const { return "RenderSlider"; }
     41        virtual bool isSlider() const { return true; }
     42        virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
    3843
    39     bool inDragMode() const;
     44        virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
     45        virtual void computePreferredLogicalWidths();
     46        virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
     47        virtual void layout();
     48    };
    4049
    41 private:
    42     virtual const char* renderName() const { return "RenderSlider"; }
    43     virtual bool isSlider() const { return true; }
    44     virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     50    inline RenderSlider* toRenderSlider(RenderObject* object)
     51    {
     52        ASSERT(!object || object->isSlider());
     53        return static_cast<RenderSlider*>(object);
     54    }
    4555
    46     virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
    47     virtual void computePreferredLogicalWidths();
    48     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
    49     virtual void layout();
    50 };
    51 
    52 inline RenderSlider* toRenderSlider(RenderObject* object)
    53 {
    54     ASSERT(!object || object->isSlider());
    55     return static_cast<RenderSlider*>(object);
    56 }
    57 
    58 // This will catch anyone doing an unnecessary cast.
    59 void toRenderSlider(const RenderSlider*);
     56    // This will catch anyone doing an unnecessary cast.
     57    void toRenderSlider(const RenderSlider*);
    6058
    6159} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.