Changeset 131367 in webkit


Ignore:
Timestamp:
Oct 15, 2012 3:02:31 PM (11 years ago)
Author:
tony@chromium.org
Message:

input[type=range] as a flex item renders thumb at wrong position
https://bugs.webkit.org/show_bug.cgi?id=98666

Reviewed by Ojan Vafai.

Source/WebCore:

Replace RenderSlider implementation with new flexbox and clean up the shadow DOM.
The previous code was trying to set the height to 100% and had a bunch of hacks in
the renderer code to set an explicit height. Using the new flexbox allows us to
remove these renderer hacks.

Test: css3/flexbox/flexitem-stretch-range.html

  • css/html.css:

(input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container): Use new flexbox.
(input[type="range"]::-webkit-slider-runnable-track): Use new flexbox.
(input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb): Remove relative positioning since we're
no longer setting top/left in the layout code.

  • css/mediaControlsChromium.css: Remove redundant styles and bottom: 1px hack.
  • css/mediaControlsChromiumAndroid.css: Remove redundant styles and bottom: 1px hack.
  • html/RangeInputType.cpp:

(WebCore::RangeInputType::listAttributeTargetChanged): We need to force a layout
since the height of the control should change when adding/removing a datalist.

  • html/shadow/SliderThumbElement.cpp:

(WebCore::RenderSliderContainer::RenderSliderContainer): Use new flexbox.
(WebCore::RenderSliderContainer::computeLogicalHeight): Rather than setting style()->height() in layout, just compute the correct
height when asked. If we have a datalist, we increase the height (same code as before). If we're vertical,
we use the intrinsic size.
(WebCore::RenderSliderContainer::layout): Remove extra layout code, but handle the position of the thumb.
This used to be handled in the thumb's layout method, but I deleted that.

  • html/shadow/SliderThumbElement.h:
  • rendering/RenderSlider.cpp:

(WebCore::RenderSlider::RenderSlider): Use new flexbox.
(WebCore::RenderSlider::layout): Set the limiter size to the size of the thumb. This is necessary
for fast/css/unknown-pseudo-element-matching.html which tries to set the height of the thumb to 1px
and expects the input to also have a height of 1px. It worked before because the height of the input
didn't depend on the height of its children.

  • rendering/RenderSlider.h: Fix indentation.

(RenderSlider): Use new flexible box.

LayoutTests:

Changing the render tree to use RenderFlexibleBox instead of RenderDeprecatedFlexibleBox
and not using a RenderLayer unless noted otherwise.

  • css3/flexbox/flexitem-stretch-range-expected.html: Added.
  • css3/flexbox/flexitem-stretch-range.html: Added. New test to verify stretched flex item has the

thumb in the correct place.

  • 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: Changed the default height to

129px for vertical controls. This makes more sense than having a height of 100%.

  • platform/chromium-linux/fast/forms/input-appearance-height-expected.txt:
  • platform/chromium-linux/fast/forms/range/input-appearance-range-expected.png: The thumb now appears below the

focus ring. This matches other form controls like buttons and textareas.

  • 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:
Location:
trunk
Files:
2 added
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r131361 r131367  
     12012-10-12  Tony Chang  <tony@chromium.org>
     2
     3        input[type=range] as a flex item renders thumb at wrong position
     4        https://bugs.webkit.org/show_bug.cgi?id=98666
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Changing the render tree to use RenderFlexibleBox instead of RenderDeprecatedFlexibleBox
     9        and not using a RenderLayer unless noted otherwise.
     10
     11        * css3/flexbox/flexitem-stretch-range-expected.html: Added.
     12        * css3/flexbox/flexitem-stretch-range.html: Added. New test to verify stretched flex item has the
     13        thumb in the correct place.
     14        * platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt:
     15        * platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-styled-expected.txt:
     16        * platform/chromium-linux/fast/forms/box-shadow-override-expected.txt:
     17        * platform/chromium-linux/fast/forms/datalist/input-appearance-range-with-datalist-expected.png: Changed the default height to
     18        129px for vertical controls. This makes more sense than having a height of 100%.
     19        * platform/chromium-linux/fast/forms/input-appearance-height-expected.txt:
     20        * platform/chromium-linux/fast/forms/range/input-appearance-range-expected.png: The thumb now appears below the
     21        focus ring. This matches other form controls like buttons and textareas.
     22        * platform/chromium-linux/fast/forms/range/input-appearance-range-expected.txt:
     23        * platform/chromium-linux/fast/forms/range/range-thumb-height-percentage-expected.txt:
     24        * platform/chromium-linux/fast/forms/range/slider-padding-expected.txt:
     25        * platform/chromium-linux/fast/forms/range/slider-thumb-shared-style-expected.txt:
     26        * platform/chromium-linux/fast/forms/range/slider-thumb-stylability-expected.txt:
     27        * platform/chromium-linux/fast/hidpi/video-controls-in-hidpi-expected.txt:
     28        * platform/chromium-linux/fast/multicol/client-rects-expected.txt:
     29        * platform/chromium-linux/fast/repaint/slider-thumb-drag-release-expected.txt:
     30        * platform/chromium-linux/fast/repaint/slider-thumb-float-expected.txt:
     31        * platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt:
     32        * platform/chromium-win/fast/layers/video-layer-expected.txt:
     33        * platform/chromium-win/media/audio-controls-rendering-expected.txt:
     34        * platform/chromium-win/media/audio-repaint-expected.txt:
     35        * platform/chromium-win/media/controls-after-reload-expected.txt:
     36        * platform/chromium-win/media/controls-strict-expected.txt:
     37        * platform/chromium-win/media/controls-styling-expected.txt:
     38        * platform/chromium-win/media/controls-styling-strict-expected.txt:
     39        * platform/chromium-win/media/controls-without-preload-expected.txt:
     40        * platform/chromium-win/media/media-controls-clone-expected.txt:
     41        * platform/chromium-win/media/media-document-audio-repaint-expected.txt:
     42        * platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt:
     43        * platform/chromium-win/media/video-controls-rendering-expected.txt:
     44        * platform/chromium-win/media/video-display-toggle-expected.txt:
     45        * platform/chromium-win/media/video-empty-source-expected.txt:
     46        * platform/chromium-win/media/video-no-audio-expected.txt:
     47        * platform/chromium-win/media/video-playing-and-pause-expected.txt:
     48        * platform/chromium-win/media/video-zoom-controls-expected.txt:
     49
    1502012-10-15  Chris Rogers  <crogers@google.com>
    251
  • trunk/LayoutTests/platform/chromium-linux/fast/dom/HTMLInputElement/input-slider-update-expected.txt

    r120411 r131367  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     7        RenderFlexibleBox {DIV} at (0,0) size 129x21
    88          RenderBlock {DIV} at (0,0) size 118x21
     9            RenderBlock {DIV} at (118,0) size 11x21
    910          RenderBlock {DIV} at (118,0) size 11x21
    1011      RenderText {#text} at (0,0) size 0x0
    11 layer 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

    r120411 r131367  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x10
     7        RenderFlexibleBox {DIV} at (0,0) size 100x10
    88          RenderBlock {DIV} at (0,0) size 90x10
     9            RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    910          RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    1011      RenderText {#text} at (0,0) size 0x0
    11 layer 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

    r120411 r131367  
    3939          text run at (45,9) width 4: " "
    4040        RenderSlider {INPUT} at (51,3) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    41           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     41          RenderFlexibleBox {DIV} at (0,0) size 129x21
    4242            RenderBlock {DIV} at (0,0) size 118x21
     43              RenderBlock {DIV} at (59,0) size 11x21
    4344            RenderBlock {DIV} at (118,0) size 11x21
    4445        RenderText {#text} at (182,9) size 4x19
     
    8283layer at (36,137) size 114x16
    8384  RenderBlock {DIV} at (0,0) size 114x16
    84 layer 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

    r120411 r131367  
    5151          text run at (0,148) width 37: "range "
    5252        RenderSlider {INPUT} at (39,142) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    53           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     53          RenderFlexibleBox {DIV} at (0,0) size 129x21
    5454            RenderBlock {DIV} at (0,0) size 118x21
     55              RenderBlock {DIV} at (59,0) size 11x21
    5556            RenderBlock {DIV} at (118,0) size 11x21
    5657        RenderText {#text} at (170,148) size 4x19
     
    105106layer at (57,305) size 136x16
    106107  RenderBlock {DIV} at (0,0) size 136x16
    107 layer 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

    r120451 r131367  
    66      RenderBlock {DIV} at (0,0) size 784x37
    77        RenderSlider {INPUT} at (2,2) size 129x30 [color=#9D968E] [bgcolor=#FFFFFF]
    8           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x30
     8          RenderFlexibleBox {DIV} at (0,0) size 129x30
    99            RenderBlock {DIV} at (0,4) size 118x22
    10             RenderBlock {DIV} at (118,4) size 11x22
     10              RenderBlock {DIV} at (59,0) size 11x21
     11            RenderBlock {DIV} at (118,0) size 11x21
    1112      RenderBlock {DIV} at (0,37) size 784x28
    1213        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    13           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     14          RenderFlexibleBox {DIV} at (0,0) size 129x21
    1415            RenderBlock {DIV} at (0,0) size 118x21
     16              RenderBlock {DIV} at (0,0) size 11x21
    1517            RenderBlock {DIV} at (118,0) size 11x21
    1618      RenderBlock {DIV} at (0,65) size 784x28
    1719        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    18           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     20          RenderFlexibleBox {DIV} at (0,0) size 129x21
    1921            RenderBlock {DIV} at (0,0) size 118x21
     22              RenderBlock {DIV} at (118,0) size 11x21
    2023            RenderBlock {DIV} at (118,0) size 11x21
    2124      RenderBlock {DIV} at (0,93) size 784x147
    2225        RenderSlider {INPUT} at (64,2) size 129x140 [color=#9D968E] [bgcolor=#FFFFFF]
    23           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x140
     26          RenderFlexibleBox {DIV} at (0,0) size 129x140
    2427            RenderBlock {DIV} at (54,0) size 21x129
    25             RenderBlock {DIV} at (54,129) size 21x11
     28              RenderBlock {DIV} at (0,64) size 21x12
     29            RenderBlock {DIV} at (0,129) size 21x11
    2630      RenderBlock {DIV} at (0,240) size 784x28
    27 layer at (69,15) size 11x21
    28   RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
    29 layer at (10,47) size 11x21
    30   RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
    31 layer at (128,75) size 11x21
    32   RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
    33 layer at (126,168) size 21x11
    34   RenderBlock (relative positioned) {DIV} at (0,0) size 21x11
    3531layer at (10,250) size 129x21
    3632  RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    37     RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     33    RenderFlexibleBox {DIV} at (0,0) size 129x21
    3834      RenderBlock {DIV} at (0,0) size 118x21
     35        RenderBlock {DIV} at (88,0) size 12x21
    3936      RenderBlock {DIV} at (118,0) size 11x21
    40 layer 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

    r120446 r131367  
    99      RenderBlock (anonymous) at (0,36) size 784x24
    1010        RenderSlider {INPUT} at (2,2) size 200x20 [color=#9D968E] [bgcolor=#C0C0C0]
    11           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 200x20
     11          RenderFlexibleBox {DIV} at (0,0) size 200x20
    1212            RenderBlock {DIV} at (0,5) size 190x10
    13             RenderBlock {DIV} at (190,5) size 10x10 [bgcolor=#008000]
     13              RenderBlock {DIV} at (95,0) size 10x10 [bgcolor=#008000]
     14            RenderBlock {DIV} at (190,0) size 10x10 [bgcolor=#008000]
    1415        RenderText {#text} at (0,0) size 0x0
    15 layer 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

    r120446 r131367  
    1010      RenderBlock {DIV} at (0,20) size 784x45 [bgcolor=#ADD8E6]
    1111        RenderSlider {INPUT} at (2,2) size 100x41 [color=#9D968E] [bgcolor=#FFFFFF]
    12           RenderDeprecatedFlexibleBox {DIV} at (10,10) size 80x21
     12          RenderFlexibleBox {DIV} at (10,10) size 80x21
    1313            RenderBlock {DIV} at (0,0) size 69x21
     14              RenderBlock {DIV} at (0,0) size 11x21
    1415            RenderBlock {DIV} at (69,0) size 11x21
    1516        RenderText {#text} at (0,0) size 0x0
    1617      RenderBlock {PRE} at (0,78) size 784x0
    17 layer 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

    r120446 r131367  
    2121      RenderBlock {DIV} at (0,72) size 784x50
    2222        RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    23           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     23          RenderFlexibleBox {DIV} at (0,0) size 129x21
    2424            RenderBlock {DIV} at (0,0) size 118x21
     25              RenderBlock {DIV} at (0,0) size 11x21
    2526            RenderBlock {DIV} at (118,0) size 11x21
    2627        RenderBR {BR} at (133,23) size 0x0
    2728        RenderSlider {INPUT} at (2,27) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    28           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     29          RenderFlexibleBox {DIV} at (0,0) size 129x21
    2930            RenderBlock {DIV} at (0,0) size 118x21
     31              RenderBlock {DIV} at (118,0) size 11x21
    3032            RenderBlock {DIV} at (118,0) size 11x21
    3133        RenderText {#text} at (0,0) size 0x0
    32 layer at (10,82) size 11x21
    33   RenderBlock (relative positioned) {DIV} at (0,0) size 11x21
    34 layer 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

    r120411 r131367  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x20 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x20
     7        RenderFlexibleBox {DIV} at (0,0) size 129x20
    88          RenderBlock {DIV} at (0,0) size 109x20
     9            RenderBlock {DIV} at (0,0) size 20x20 [bgcolor=#008000]
    910          RenderBlock {DIV} at (109,0) size 20x20 [bgcolor=#008000]
    1011      RenderText {#text} at (0,0) size 0x0
    11 layer 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

    r123490 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 152x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 132x24
     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
    2223        RenderBlock {DIV} at (126,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    2627          text run at (0,7) width 25: "0:00"
    2728    RenderButton {INPUT} at (249,0) size 35x30
    28 layer 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

    r120440 r131367  
    6262      RenderBR {BR} at (0,0) size 0x25
    6363      RenderSlider {INPUT} at (2,27) size 25x25 [color=#9D968E] [bgcolor=#ADD8E6]
    64         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 25x25
     64        RenderFlexibleBox {DIV} at (0,0) size 25x25
    6565          RenderBlock {DIV} at (0,12) size 25x1
    66           RenderBlock {DIV} at (25,12) size 0x1
     66            RenderBlock {DIV} at (12,0) size 26x0
     67          RenderBlock {DIV} at (25,0) size 0x25
    6768layer at (8,484) size 136x76
    6869  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

    r120411 r131367  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 129x21 [color=#9D968E] [bgcolor=#FFFFFF]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x21
     7        RenderFlexibleBox {DIV} at (0,0) size 129x21
    88          RenderBlock {DIV} at (0,0) size 118x21
     9            RenderBlock {DIV} at (118,0) size 11x21
    910          RenderBlock {DIV} at (118,0) size 11x21
    1011      RenderText {#text} at (0,0) size 0x0
    11 layer 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

    r120411 r131367  
    55    RenderBody {BODY} at (8,8) size 784x584
    66      RenderSlider {INPUT} at (2,2) size 100x10 [color=#9D968E] [bgcolor=#FF0000]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x10
     7        RenderFlexibleBox {DIV} at (0,0) size 100x10
    88          RenderBlock {DIV} at (0,0) size 90x10
     9            RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    910          RenderBlock {DIV} at (90,0) size 10x10 [bgcolor=#008000]
    10 layer 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

    r127836 r131367  
    6666    RenderButton {INPUT} at (9,0) size 30x30
    6767    RenderSlider {INPUT} at (48,11) size 74x8
    68       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,1) size 54x24
     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
    7071        RenderBlock {DIV} at (48,1) size 32x24
    7172    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
     
    7576    RenderButton {INPUT} at (171,0) size 35x30
    7677    RenderSlider {INPUT} at (212,11) size 15x8
    77       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
    78         RenderBlock {DIV} at (1,1) size 3x24
     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
    7981        RenderBlock {DIV} at (-3,1) size 24x24
    8082    RenderButton {INPUT} at (237,0) size 30x30
    8183    RenderButton {INPUT} at (271,0) size 30x30
    82 layer at (62,216) size 32x24
    83   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    84 layer 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

    r123271 r131367  
    2323    RenderButton {INPUT} at (9,0) size 30x30
    2424    RenderSlider {INPUT} at (48,11) size 152x8
    25       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    26         RenderBlock {DIV} at (1,1) size 132x24
     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
    2728        RenderBlock {DIV} at (126,1) size 32x24
    2829    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    3132          text run at (0,7) width 25: "0:00"
    3233    RenderButton {INPUT} at (249,0) size 35x30
    33 layer 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

    r123271 r131367  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 103x8
    24       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,1) size 83x24
     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
    2627        RenderBlock {DIV} at (77,1) size 32x24
    2728    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    3132    RenderButton {INPUT} at (200,0) size 35x30
    3233    RenderSlider {INPUT} at (241,11) size 44x8
    33       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    34         RenderBlock {DIV} at (1,1) size 32x24
     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
    3537        RenderBlock {DIV} at (26,1) size 24x24
    36 layer at (50,47) size 32x24
    37   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    38 layer at (275,47) size 24x24
    39   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4038layer at (8,94) size 320x30
    4139  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30
     
    4543    RenderButton {INPUT} at (9,0) size 30x30
    4644    RenderSlider {INPUT} at (48,11) size 113x8
    47       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
    48         RenderBlock {DIV} at (1,1) size 93x24
     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
    4948        RenderBlock {DIV} at (87,1) size 32x24
    5049    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
     
    5453    RenderButton {INPUT} at (210,0) size 35x30
    5554    RenderSlider {INPUT} at (251,11) size 54x8
    56       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
    57         RenderBlock {DIV} at (1,1) size 42x24
     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
    5858        RenderBlock {DIV} at (36,1) size 24x24
    59 layer at (50,97) size 32x24
    60   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    61 layer at (295,97) size 24x24
    62   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    6359layer at (8,144) size 320x100
    6460  RenderMedia {AUDIO} at (8,144) size 320x100 [bgcolor=#0000FF]
     
    7066    RenderButton {INPUT} at (9,0) size 30x30
    7167    RenderSlider {INPUT} at (48,11) size 113x8
    72       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
    73         RenderBlock {DIV} at (1,1) size 93x24
     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
    7471        RenderBlock {DIV} at (87,1) size 32x24
    7572    RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
     
    7976    RenderButton {INPUT} at (210,0) size 35x30
    8077    RenderSlider {INPUT} at (251,11) size 54x8
    81       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
    82         RenderBlock {DIV} at (1,1) size 42x24
     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
    8381        RenderBlock {DIV} at (36,1) size 24x24
    84 layer at (50,217) size 32x24
    85   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    86 layer 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

    r123271 r131367  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 103x8
    24       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,1) size 83x24
     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
    2627        RenderBlock {DIV} at (77,1) size 32x24
    2728    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    3132    RenderButton {INPUT} at (200,0) size 35x30
    3233    RenderSlider {INPUT} at (241,11) size 44x8
    33       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    34         RenderBlock {DIV} at (1,1) size 32x24
     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
    3537        RenderBlock {DIV} at (26,1) size 24x24
    36 layer at (91,77) size 32x24
    37   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    38 layer at (275,77) size 24x24
    39   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4038layer at (8,44) size 300x30
    4139  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    4543    RenderButton {INPUT} at (9,0) size 30x30
    4644    RenderSlider {INPUT} at (48,11) size 103x8
    47       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    48         RenderBlock {DIV} at (1,1) size 83x24
     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
    4948        RenderBlock {DIV} at (77,1) size 32x24
    5049    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    5453    RenderButton {INPUT} at (200,0) size 35x30
    5554    RenderSlider {INPUT} at (241,11) size 44x8
    56       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    57         RenderBlock {DIV} at (1,1) size 32x24
     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
    5858        RenderBlock {DIV} at (26,1) size 24x24
    59 layer at (91,47) size 32x24
    60   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    61 layer at (275,47) size 24x24
    62   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    6359layer at (8,156) size 300x30
    6460  RenderMedia {AUDIO} at (0,112) size 300x30
     
    7066    RenderButton {INPUT} at (9,0) size 30x30
    7167    RenderSlider {INPUT} at (48,11) size 103x8
    72       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
    73         RenderBlock {DIV} at (1,1) size 83x24
     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
    7471        RenderBlock {DIV} at (77,1) size 32x24
    7572    RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
     
    7976    RenderButton {INPUT} at (200,0) size 35x30
    8077    RenderSlider {INPUT} at (241,11) size 44x8
    81       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
    82         RenderBlock {DIV} at (1,1) size 32x24
     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
    8381        RenderBlock {DIV} at (26,1) size 24x24
  • trunk/LayoutTests/platform/chromium-win/media/controls-after-reload-expected.txt

    r123271 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 71x24
     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
    2223        RenderBlock {DIV} at (65,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2728    RenderButton {INPUT} at (188,0) size 35x30
    2829    RenderSlider {INPUT} at (229,11) size 32x8
    29       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    30         RenderBlock {DIV} at (1,1) size 20x24
     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
    3133        RenderBlock {DIV} at (14,1) size 24x24
    3234    RenderButton {INPUT} at (271,0) size 30x30
    33 layer at (55,252) size 32x24
    34   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    35 layer 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

    r123271 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 71x24
     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
    2223        RenderBlock {DIV} at (65,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2728    RenderButton {INPUT} at (188,0) size 35x30
    2829    RenderSlider {INPUT} at (229,11) size 32x8
    29       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    30         RenderBlock {DIV} at (1,1) size 20x24
     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
    3133        RenderBlock {DIV} at (14,1) size 24x24
    3234    RenderButton {INPUT} at (271,0) size 30x30
    33 layer at (55,260) size 32x24
    34   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    35 layer 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

    r123271 r131367  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 91x8
    24       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,1) size 71x24
     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
    2627        RenderBlock {DIV} at (65,1) size 32x24
    2728    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3132    RenderButton {INPUT} at (188,0) size 35x30
    3233    RenderSlider {INPUT} at (229,11) size 32x8
    33       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    34         RenderBlock {DIV} at (1,1) size 20x24
     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
    3537        RenderBlock {DIV} at (14,1) size 24x24
    3638    RenderButton {INPUT} at (271,0) size 30x30
    37 layer at (65,252) size 32x24
    38   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    39 layer at (266,252) size 24x24
    40   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4139layer at (8,284) size 320x240
    4240  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4644    RenderButton {INPUT} at (9,0) size 30x30
    4745    RenderSlider {INPUT} at (48,11) size 91x8
    48       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    49         RenderBlock {DIV} at (1,1) size 71x24
     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
    5049        RenderBlock {DIV} at (65,1) size 32x24
    5150    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5554    RenderButton {INPUT} at (188,0) size 35x30
    5655    RenderSlider {INPUT} at (229,11) size 32x8
    57       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    58         RenderBlock {DIV} at (1,1) size 20x24
     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
    5959        RenderBlock {DIV} at (14,1) size 24x24
    6060    RenderButton {INPUT} at (271,0) size 30x30
    61 layer at (55,492) size 32x24
    62   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    63 layer 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

    r123278 r131367  
    2222    RenderButton {INPUT} at (9,0) size 30x30
    2323    RenderSlider {INPUT} at (48,11) size 91x8
    24       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    25         RenderBlock {DIV} at (1,1) size 71x24
     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
    2627        RenderBlock {DIV} at (65,1) size 32x24
    2728    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3132    RenderButton {INPUT} at (188,0) size 35x30
    3233    RenderSlider {INPUT} at (229,11) size 32x8
    33       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    34         RenderBlock {DIV} at (1,1) size 20x24
     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
    3537        RenderBlock {DIV} at (14,1) size 24x24
    3638    RenderButton {INPUT} at (271,0) size 30x30
    37 layer at (55,260) size 32x24
    38   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    39 layer at (256,260) size 24x24
    40   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4139layer at (332,52) size 320x240
    4240  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4644    RenderButton {INPUT} at (9,0) size 30x30
    4745    RenderSlider {INPUT} at (48,11) size 91x8
    48       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    49         RenderBlock {DIV} at (1,1) size 71x24
     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
    5049        RenderBlock {DIV} at (65,1) size 32x24
    5150    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5554    RenderButton {INPUT} at (188,0) size 35x30
    5655    RenderSlider {INPUT} at (229,11) size 32x8
    57       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    58         RenderBlock {DIV} at (1,1) size 20x24
     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
    5959        RenderBlock {DIV} at (14,1) size 24x24
    6060    RenderButton {INPUT} at (271,0) size 30x30
    61 layer at (379,260) size 32x24
    62   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    63 layer 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

    r123271 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 91x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 71x24
     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
    2223        RenderBlock {DIV} at (65,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2728    RenderButton {INPUT} at (188,0) size 35x30
    2829    RenderSlider {INPUT} at (229,11) size 32x8
    29       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    30         RenderBlock {DIV} at (1,1) size 20x24
     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
    3133        RenderBlock {DIV} at (14,1) size 24x24
    3234    RenderButton {INPUT} at (271,0) size 30x30
    33 layer at (55,252) size 32x24
    34   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    35 layer 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

    r123271 r131367  
    1919    RenderButton {INPUT} at (9,0) size 30x30
    2020    RenderSlider {INPUT} at (48,11) size 152x8
    21       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    22         RenderBlock {DIV} at (1,1) size 132x24
     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
    2324        RenderBlock {DIV} at (126,1) size 32x24
    2425    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    2728          text run at (0,7) width 25: "0:00"
    2829    RenderButton {INPUT} at (249,0) size 35x30
    29 layer at (55,126) size 32x24
    30   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    3130layer at (308,128) size 300x30
    3231  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    3635    RenderButton {INPUT} at (9,0) size 30x30
    3736    RenderSlider {INPUT} at (48,11) size 162x8
    38       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
    39         RenderBlock {DIV} at (1,1) size 142x24
     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
    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
    46 layer at (350,131) size 32x24
    47   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    4846layer at (8,163) size 300x150
    4947  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
     
    5351    RenderButton {INPUT} at (9,0) size 30x30
    5452    RenderSlider {INPUT} at (48,11) size 152x8
    55       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
    56         RenderBlock {DIV} at (1,1) size 132x24
     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
    5756        RenderBlock {DIV} at (126,1) size 32x24
    5857    RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
     
    6160          text run at (0,7) width 25: "0:00"
    6261    RenderButton {INPUT} at (249,0) size 35x30
    63 layer at (55,281) size 32x24
    64   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    6562layer at (308,283) size 300x30
    6663  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
     
    7067    RenderButton {INPUT} at (9,0) size 30x30
    7168    RenderSlider {INPUT} at (48,11) size 162x8
    72       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
    73         RenderBlock {DIV} at (1,1) size 142x24
     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
    7472        RenderBlock {DIV} at (136,1) size 32x24
    7573    RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
     
    7876          text run at (0,7) width 25: "0:00"
    7977    RenderButton {INPUT} at (259,0) size 35x30
    80 layer 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

    r131202 r131367  
    2424              RenderButton {INPUT} at (9,0) size 30x30
    2525              RenderSlider {INPUT} at (48,11) size 98x8
    26                 RenderDeprecatedFlexibleBox {DIV} at (0,0) size 98x8 [border: (1px solid #E6E6E659)]
    27                   RenderBlock {DIV} at (1,1) size 78x24
     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
    2829                  RenderBlock {DIV} at (72,1) size 32x24
    2930              RenderDeprecatedFlexibleBox {DIV} at (161,0) size 25x30 [color=#FFFFFF]
     
    3334              RenderButton {INPUT} at (195,0) size 35x30
    3435              RenderSlider {INPUT} at (236,11) size 39x8
    35                 RenderDeprecatedFlexibleBox {DIV} at (0,0) size 39x8 [border: (1px solid #E6E6E659)]
    36                   RenderBlock {DIV} at (1,1) size 27x24
     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
    3739                  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
    4240        RenderText {#text} at (0,0) size 0x0
    4341        RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt

    r127844 r131367  
    6666    RenderButton {INPUT} at (9,0) size 30x30
    6767    RenderSlider {INPUT} at (48,11) size 74x8
    68       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 74x8 [border: (1px solid #E6E6E659)]
    69         RenderBlock {DIV} at (1,1) size 54x24
     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
    7071        RenderBlock {DIV} at (48,1) size 32x24
    7172    RenderDeprecatedFlexibleBox {DIV} at (137,0) size 25x30 [color=#FFFFFF]
     
    7576    RenderButton {INPUT} at (171,0) size 35x30
    7677    RenderSlider {INPUT} at (212,11) size 15x8
    77       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 15x8 [border: (1px solid #E6E6E659)]
    78         RenderBlock {DIV} at (1,1) size 3x24
     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
    7981        RenderBlock {DIV} at (-3,1) size 24x24
    8082    RenderButton {INPUT} at (237,0) size 30x30
    8183    RenderButton {INPUT} at (271,0) size 30x30
    82 layer at (57,216) size 32x24
    83   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    84 layer 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

    r123271 r131367  
    2323    RenderButton {INPUT} at (9,0) size 30x30
    2424    RenderSlider {INPUT} at (48,11) size 91x8
    25       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    26         RenderBlock {DIV} at (1,1) size 71x24
     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
    2728        RenderBlock {DIV} at (65,1) size 32x24
    2829    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    3233    RenderButton {INPUT} at (188,0) size 35x30
    3334    RenderSlider {INPUT} at (229,11) size 32x8
    34       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    35         RenderBlock {DIV} at (1,1) size 20x24
     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
    3638        RenderBlock {DIV} at (14,1) size 24x24
    3739    RenderButton {INPUT} at (271,0) size 30x30
    38 layer at (55,252) size 32x24
    39   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    40 layer at (256,252) size 24x24
    41   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    4240layer at (8,284) size 320x240
    4341  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
     
    4745    RenderButton {INPUT} at (9,0) size 30x30
    4846    RenderSlider {INPUT} at (48,11) size 91x8
    49       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    50         RenderBlock {DIV} at (1,1) size 71x24
     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
    5150        RenderBlock {DIV} at (65,1) size 32x24
    5251    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    5655    RenderButton {INPUT} at (188,0) size 35x30
    5756    RenderSlider {INPUT} at (229,11) size 32x8
    58       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    59         RenderBlock {DIV} at (1,1) size 20x24
     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
    6060        RenderBlock {DIV} at (14,1) size 24x24
    6161    RenderButton {INPUT} at (271,0) size 30x30
    62 layer at (55,492) size 32x24
    63   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    64 layer at (256,492) size 24x24
    65   RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
    6662layer at (8,524) size 320x240
    6763  RenderVideo {VIDEO} at (8,524) size 320x240
     
    7369    RenderButton {INPUT} at (9,0) size 30x30
    7470    RenderSlider {INPUT} at (48,11) size 91x8
    75       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    76         RenderBlock {DIV} at (1,1) size 71x24
     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
    7774        RenderBlock {DIV} at (65,1) size 32x24
    7875    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    8279    RenderButton {INPUT} at (188,0) size 35x30
    8380    RenderSlider {INPUT} at (229,11) size 32x8
    84       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    85         RenderBlock {DIV} at (1,1) size 20x24
     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
    8684        RenderBlock {DIV} at (14,1) size 24x24
    8785    RenderButton {INPUT} at (271,0) size 30x30
    88 layer at (55,732) size 32x24
    89   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    90 layer 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

    r123271 r131367  
    1717    RenderButton {INPUT} at (9,0) size 30x30
    1818    RenderSlider {INPUT} at (48,11) size 91x8
    19       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    20         RenderBlock {DIV} at (1,1) size 71x24
     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
    2122        RenderBlock {DIV} at (65,1) size 32x24
    2223    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2627    RenderButton {INPUT} at (188,0) size 35x30
    2728    RenderSlider {INPUT} at (229,11) size 32x8
    28       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    29         RenderBlock {DIV} at (1,1) size 20x24
     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
    3032        RenderBlock {DIV} at (14,1) size 24x24
    3133    RenderButton {INPUT} at (271,0) size 30x30
    32 layer at (55,236) size 32x24
    33   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    34 layer 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

    r123271 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 193x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 193x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 173x24
     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
    2223        RenderBlock {DIV} at (167,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (256,0) size 25x30 [color=#FFFFFF]
     
    2526        RenderText {#text} at (0,7) size 25x16
    2627          text run at (0,7) width 25: "0:00"
    27 layer 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

    r123271 r131367  
    1818    RenderButton {INPUT} at (9,0) size 30x30
    1919    RenderSlider {INPUT} at (48,11) size 170x8
    20       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
    21         RenderBlock {DIV} at (1,1) size 150x24
     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
    2223        RenderBlock {DIV} at (144,1) size 32x24
    2324    RenderDeprecatedFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
     
    2728    RenderButton {INPUT} at (267,0) size 35x30
    2829    RenderButton {INPUT} at (303,0) size 30x30
    29 layer 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

    r123271 r131367  
    1919    RenderButton {INPUT} at (9,0) size 30x30
    2020    RenderSlider {INPUT} at (48,11) size 91x8
    21       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 91x8 [border: (1px solid #E6E6E659)]
    22         RenderBlock {DIV} at (1,1) size 71x24
     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
    2324        RenderBlock {DIV} at (65,1) size 32x24
    2425    RenderDeprecatedFlexibleBox {DIV} at (154,0) size 25x30 [color=#FFFFFF]
     
    2829    RenderButton {INPUT} at (188,0) size 35x30
    2930    RenderSlider {INPUT} at (229,11) size 32x8
    30       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 32x8 [border: (1px solid #E6E6E659)]
    31         RenderBlock {DIV} at (1,1) size 20x24
     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
    3234        RenderBlock {DIV} at (14,1) size 24x24
    3335    RenderButton {INPUT} at (271,0) size 30x30
    34 layer at (55,280) size 32x24
    35   RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
    36 layer 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

    r129386 r131367  
    1616    RenderButton {INPUT} at (13,0) size 46x45
    1717    RenderSlider {INPUT} at (72,16) size 38x13
    18       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
    19         RenderBlock {DIV} at (1,1) size 9x36
     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
    2021        RenderBlock {DIV} at (-1,1) size 48x36
    2122    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
     
    2526    RenderButton {INPUT} at (185,0) size 53x45
    2627    RenderSlider {INPUT} at (247,16) size 23x13
    27       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
    28         RenderBlock {DIV} at (1,1) size 6x36
     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
    2931        RenderBlock {DIV} at (-4,1) size 36x36
    3032    RenderButton {INPUT} at (284,0) size 46x45
    31 layer 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       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
    43         RenderBlock {DIV} at (1,1) size 9x36
     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
    4445        RenderBlock {DIV} at (-1,1) size 48x36
    4546    RenderDeprecatedFlexibleBox {DIV} at (132,0) size 40x45 [color=#FFFFFF]
     
    4950    RenderButton {INPUT} at (185,0) size 53x45
    5051    RenderSlider {INPUT} at (247,16) size 23x13
    51       RenderDeprecatedFlexibleBox {DIV} at (0,0) size 23x12 [border: (1px solid #E6E6E659)]
    52         RenderBlock {DIV} at (1,1) size 6x36
     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
    5355        RenderBlock {DIV} at (-4,1) size 36x36
    5456    RenderButton {INPUT} at (284,0) size 46x45
    55 layer 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

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

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

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

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

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

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

    r131366 r131367  
     12012-10-12  Tony Chang  <tony@chromium.org>
     2
     3        input[type=range] as a flex item renders thumb at wrong position
     4        https://bugs.webkit.org/show_bug.cgi?id=98666
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Replace RenderSlider implementation with new flexbox and clean up the shadow DOM.
     9        The previous code was trying to set the height to 100% and had a bunch of hacks in
     10        the renderer code to set an explicit height. Using the new flexbox allows us to
     11        remove these renderer hacks.
     12
     13        Test: css3/flexbox/flexitem-stretch-range.html
     14
     15        * css/html.css:
     16        (input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container): Use new flexbox.
     17        (input[type="range"]::-webkit-slider-runnable-track): Use new flexbox.
     18        (input[type="range"]::-webkit-slider-thumb, input[type="range"]::-webkit-media-slider-thumb): Remove relative positioning since we're
     19        no longer setting top/left in the layout code.
     20        * css/mediaControlsChromium.css: Remove redundant styles and bottom: 1px hack.
     21        * css/mediaControlsChromiumAndroid.css: Remove redundant styles and bottom: 1px hack.
     22        * html/RangeInputType.cpp:
     23        (WebCore::RangeInputType::listAttributeTargetChanged): We need to force a layout
     24        since the height of the control should change when adding/removing a datalist.
     25        * html/shadow/SliderThumbElement.cpp:
     26        (WebCore::RenderSliderContainer::RenderSliderContainer): Use new flexbox.
     27        (WebCore::RenderSliderContainer::computeLogicalHeight): Rather than setting style()->height() in layout, just compute the correct
     28        height when asked.  If we have a datalist, we increase the height (same code as before).  If we're vertical,
     29        we use the intrinsic size.
     30        (WebCore::RenderSliderContainer::layout): Remove extra layout code, but handle the position of the thumb.
     31        This used to be handled in the thumb's layout method, but I deleted that.
     32        * html/shadow/SliderThumbElement.h:
     33        * rendering/RenderSlider.cpp:
     34        (WebCore::RenderSlider::RenderSlider): Use new flexbox.
     35        (WebCore::RenderSlider::layout): Set the limiter size to the size of the thumb. This is necessary
     36        for fast/css/unknown-pseudo-element-matching.html which tries to set the height of the thumb to 1px
     37        and expects the input to also have a height of 1px.  It worked before because the height of the input
     38        didn't depend on the height of its children.
     39        * rendering/RenderSlider.h: Fix indentation.
     40        (RenderSlider): Use new flexible box.
     41
    1422012-10-15  Julien Chaffraix  <jchaffraix@webkit.org>
    243
  • trunk/Source/WebCore/css/html.css

    r130598 r131367  
    747747
    748748input[type="range"]::-webkit-slider-container, input[type="range"]::-webkit-media-slider-container {
    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%;
     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;
    756756}
    757757
    758758input[type="range"]::-webkit-slider-runnable-track {
    759     -webkit-box-flex: 1;
     759    -webkit-flex: 1;
     760    min-width: 0;
     761    -webkit-align-self: center;
     762
    760763    box-sizing: border-box;
    761764    -webkit-user-modify: read-only !important;
     
    768771    -webkit-user-modify: read-only !important;
    769772    display: block;
    770     position: relative;
    771773}
    772774
  • trunk/Source/WebCore/css/mediaControlsChromium.css

    r130339 r131367  
    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;
    177172    margin-left: -7px;
    178173    margin-right: -7px;
  • trunk/Source/WebCore/css/mediaControlsChromiumAndroid.css

    r130683 r131367  
    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;
    194189    margin-left: -7px;
    195190    margin-right: -7px;
  • trunk/Source/WebCore/html/RangeInputType.cpp

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

    r131111 r131367  
    4141#include "HTMLParserIdioms.h"
    4242#include "MouseEvent.h"
    43 #include "RenderDeprecatedFlexibleBox.h"
     43#include "RenderFlexibleBox.h"
    4444#include "RenderSlider.h"
    4545#include "RenderTheme.h"
     
    122122}
    123123
    124 void RenderSliderThumb::layout()
    125 {
    126     // Do not cast node() to SliderThumbElement. This renderer is used for
    127     // TrackLimitElement too.
     124// --------------------------------
     125
     126// FIXME: Find a way to cascade appearance and adjust heights, and get rid of this class.
     127// http://webkit.org/b/62535
     128class RenderSliderContainer : public RenderFlexibleBox {
     129public:
     130    RenderSliderContainer(Node* node)
     131        : RenderFlexibleBox(node) { }
     132public:
     133    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
     134
     135private:
     136    virtual void layout() OVERRIDE;
     137};
     138
     139void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
     140{
    128141    HTMLInputElement* input = node()->shadowHost()->toInputElement();
    129142    bool isVertical = hasVerticalAppearance(input);
    130143
    131     double fraction = (sliderPosition(input) * 100).toDouble();
     144#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);
     153        }
     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
    132162    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 
    142 // --------------------------------
    143 
    144 // FIXME: Find a way to cascade appearance and adjust heights, and get rid of this class.
    145 // http://webkit.org/b/62535
    146 class RenderSliderContainer : public RenderDeprecatedFlexibleBox {
    147 public:
    148     RenderSliderContainer(Node* node)
    149         : RenderDeprecatedFlexibleBox(node) { }
    150 
    151 private:
    152     virtual void layout();
    153 };
     163        logicalHeight = RenderSlider::defaultTrackLength;
     164    RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
     165}
    154166
    155167void RenderSliderContainer::layout()
     
    157169    HTMLInputElement* input = node()->shadowHost()->toInputElement();
    158170    bool isVertical = hasVerticalAppearance(input);
    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();
    171 #if ENABLE(DATALIST_ELEMENT)
    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             }
    194         }
    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     }
     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);
    206192}
    207193
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.h

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

    r128130 r131367  
    4747namespace WebCore {
    4848
    49 static const int defaultTrackLength = 129;
     49const int RenderSlider::defaultTrackLength = 129;
    5050
    5151RenderSlider::RenderSlider(HTMLInputElement* element)
    52     : RenderBlock(element)
     52    : RenderFlexibleBox(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());
     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        }
    113117    }
    114118
    115119    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));
    122120}
    123121
  • trunk/Source/WebCore/rendering/RenderSlider.h

    r124556 r131367  
    2222#define RenderSlider_h
    2323
    24 #include "RenderBlock.h"
     24#include "RenderFlexibleBox.h"
    2525
    2626namespace WebCore {
    2727
    28     class HTMLInputElement;
    29     class MouseEvent;
    30     class SliderThumbElement;
    31    
    32     class RenderSlider : public RenderBlock {
    33     public:
    34         RenderSlider(HTMLInputElement*);
    35         virtual ~RenderSlider();
     28class HTMLInputElement;
     29class MouseEvent;
     30class SliderThumbElement;
    3631
    37         bool inDragMode() const;
     32class RenderSlider : public RenderFlexibleBox {
     33public:
     34    static const int defaultTrackLength;
    3835
    39     private:
    40         virtual const char* renderName() const { return "RenderSlider"; }
    41         virtual bool isSlider() const { return true; }
    42         virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     36    RenderSlider(HTMLInputElement*);
     37    virtual ~RenderSlider();
    4338
    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     };
     39    bool inDragMode() const;
    4940
    50     inline RenderSlider* toRenderSlider(RenderObject* object)
    51     {
    52         ASSERT(!object || object->isSlider());
    53         return static_cast<RenderSlider*>(object);
    54     }
     41private:
     42    virtual const char* renderName() const { return "RenderSlider"; }
     43    virtual bool isSlider() const { return true; }
     44    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
    5545
    56     // This will catch anyone doing an unnecessary cast.
    57     void toRenderSlider(const RenderSlider*);
     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
     52inline 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.
     59void toRenderSlider(const RenderSlider*);
    5860
    5961} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.