Changeset 126401 in webkit


Ignore:
Timestamp:
Aug 23, 2012 12:54:41 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Use vertical slider theme when the slider is vertical
https://bugs.webkit.org/show_bug.cgi?id=93838

Patch by KwangYong Choi <ky0.choi@samsung.com> on 2012-08-23
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Applied vertical slider theme to the vertical sliders. The height
of the vertical slider is wrong when it's applied horizontal
slider theme.

And do not resize slider when its size is not specified. It's natural
to use the default value of renderer.

No new tests. It's covered by existing range and datalist tests.

  • platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::adjustSliderTrackStyle):

LayoutTests:

Updated expected result because theme of the slider is changed.

The size of the renderSlider is changed to 129x12 from 129x11
because it has the slider thumb 12x12 and it is not resized when
the size is not specified.

  • platform/efl/fast/dom/HTMLInputElement/input-slider-update-expected.txt:
  • platform/efl/fast/forms/box-shadow-override-expected.png:
  • platform/efl/fast/forms/box-shadow-override-expected.txt:
  • platform/efl/fast/forms/datalist/input-appearance-range-with-datalist-expected.png: Added.
  • platform/efl/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png: Added.
  • platform/efl/fast/forms/input-appearance-height-expected.png:
  • platform/efl/fast/forms/input-appearance-height-expected.txt:
  • platform/efl/fast/forms/range/input-appearance-range-expected.png:
  • platform/efl/fast/forms/range/input-appearance-range-expected.txt:
  • platform/efl/fast/forms/range/slider-padding-expected.png:
  • platform/efl/fast/forms/range/slider-padding-expected.txt:
  • platform/efl/fast/forms/range/slider-thumb-shared-style-expected.png:
  • platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt:
  • platform/efl/fast/repaint/slider-thumb-drag-release-expected.txt:
Location:
trunk
Files:
2 added
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r126400 r126401  
     12012-08-23  KwangYong Choi  <ky0.choi@samsung.com>
     2
     3        [EFL] Use vertical slider theme when the slider is vertical
     4        https://bugs.webkit.org/show_bug.cgi?id=93838
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Updated expected result because theme of the slider is changed.
     9
     10        The size of the renderSlider is changed to 129x12 from 129x11
     11        because it has the slider thumb 12x12 and it is not resized when
     12        the size is not specified.
     13
     14        * platform/efl/fast/dom/HTMLInputElement/input-slider-update-expected.txt:
     15        * platform/efl/fast/forms/box-shadow-override-expected.png:
     16        * platform/efl/fast/forms/box-shadow-override-expected.txt:
     17        * platform/efl/fast/forms/datalist/input-appearance-range-with-datalist-expected.png: Added.
     18        * platform/efl/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png: Added.
     19        * platform/efl/fast/forms/input-appearance-height-expected.png:
     20        * platform/efl/fast/forms/input-appearance-height-expected.txt:
     21        * platform/efl/fast/forms/range/input-appearance-range-expected.png:
     22        * platform/efl/fast/forms/range/input-appearance-range-expected.txt:
     23        * platform/efl/fast/forms/range/slider-padding-expected.png:
     24        * platform/efl/fast/forms/range/slider-padding-expected.txt:
     25        * platform/efl/fast/forms/range/slider-thumb-shared-style-expected.png:
     26        * platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt:
     27        * platform/efl/fast/repaint/slider-thumb-drag-release-expected.txt:
     28
    1292012-08-23  Zan Dobersek  <zandobersek@gmail.com>
    230
  • trunk/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-slider-update-expected.txt

    r120441 r126401  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderSlider {INPUT} at (2,2) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     6      RenderSlider {INPUT} at (2,2) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    88          RenderBlock {DIV} at (0,0) size 117x12
    99          RenderBlock {DIV} at (117,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/forms/box-shadow-override-expected.txt

    r120441 r126401  
    3838        RenderText {#text} at (44,14) size 4x19
    3939          text run at (44,14) width 4: " "
    40         RenderSlider {INPUT} at (50,18) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    41           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     40        RenderSlider {INPUT} at (50,17) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     41          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    4242            RenderBlock {DIV} at (0,0) size 117x12
    4343            RenderBlock {DIV} at (117,0) size 12x12
     
    8181layer at (14,148) size 186x18
    8282  RenderBlock {DIV} at (0,0) size 186x18
    83 layer at (116,190) size 12x12
     83layer at (116,189) size 12x12
    8484  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/forms/input-appearance-height-expected.txt

    r120441 r126401  
    5050        RenderText {#text} at (0,164) size 39x19
    5151          text run at (0,164) width 39: "range "
    52         RenderSlider {INPUT} at (41,168) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    53           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     52        RenderSlider {INPUT} at (41,167) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     53          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    5454            RenderBlock {DIV} at (0,0) size 117x12
    5555            RenderBlock {DIV} at (117,0) size 12x12
     
    105105layer at (58,360) size 186x18
    106106  RenderBlock {DIV} at (0,0) size 186x18
    107 layer at (107,194) size 12x12
     107layer at (107,193) size 12x12
    108108  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/forms/range/input-appearance-range-expected.txt

    r120441 r126401  
    1010            RenderBlock {DIV} at (117,9) size 12x12
    1111      RenderBlock {DIV} at (0,35) size 784x18
    12         RenderSlider {INPUT} at (2,4) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    13           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     12        RenderSlider {INPUT} at (2,3) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     13          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    1414            RenderBlock {DIV} at (0,0) size 117x12
    1515            RenderBlock {DIV} at (117,0) size 12x12
    1616      RenderBlock {DIV} at (0,53) size 784x18
    17         RenderSlider {INPUT} at (2,4) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    18           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     17        RenderSlider {INPUT} at (2,3) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     18          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    1919            RenderBlock {DIV} at (0,0) size 117x12
    2020            RenderBlock {DIV} at (117,0) size 12x12
     
    2727layer at (68,19) size 12x12
    2828  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    29 layer at (10,47) size 12x12
     29layer at (10,46) size 12x12
    3030  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    31 layer at (127,65) size 12x12
     31layer at (127,64) size 12x12
    3232  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    3333layer at (130,145) size 12x12
    3434  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    35 layer at (10,228) size 129x11
    36   RenderSlider {INPUT} at (2,4) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    37     RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     35layer at (10,227) size 129x12
     36  RenderSlider {INPUT} at (2,3) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     37    RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    3838      RenderBlock {DIV} at (0,0) size 117x12
    3939      RenderBlock {DIV} at (117,0) size 12x12
    40 layer at (97,228) size 12x12
     40layer at (97,227) size 12x12
    4141  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/forms/range/slider-padding-expected.txt

    r120441 r126401  
    88          text run at (0,0) width 321: "This tests that the slider control considers padding. "
    99        RenderBR {BR} at (0,0) size 0x0
    10       RenderBlock {DIV} at (0,18) size 784x15 [bgcolor=#ADD8E6]
    11         RenderSlider {INPUT} at (2,2) size 100x11 [color=#909090] [bgcolor=#FFFFFF]
    12           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x11
     10      RenderBlock {DIV} at (0,18) size 784x16 [bgcolor=#ADD8E6]
     11        RenderSlider {INPUT} at (2,2) size 100x12 [color=#909090] [bgcolor=#FFFFFF]
     12          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x12
    1313            RenderBlock {DIV} at (0,0) size 88x12
    1414            RenderBlock {DIV} at (88,0) size 12x12
    1515        RenderText {#text} at (0,0) size 0x0
    16       RenderBlock {PRE} at (0,46) size 784x0
     16      RenderBlock {PRE} at (0,47) size 784x0
    1717layer at (10,28) size 12x12
    1818  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt

    r120441 r126401  
    1919        RenderText {#text} at (0,0) size 282x19
    2020          text run at (0,0) width 282: "The first slider\x{2019}s thumb should be on the left."
    21       RenderBlock {DIV} at (0,68) size 784x30
    22         RenderSlider {INPUT} at (2,2) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    23           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     21      RenderBlock {DIV} at (0,68) size 784x32
     22        RenderSlider {INPUT} at (2,2) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     23          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    2424            RenderBlock {DIV} at (0,0) size 117x12
    2525            RenderBlock {DIV} at (117,0) size 12x12
    26         RenderBR {BR} at (133,13) size 0x0
    27         RenderSlider {INPUT} at (2,17) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    28           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     26        RenderBR {BR} at (133,14) size 0x0
     27        RenderSlider {INPUT} at (2,18) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     28          RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    2929            RenderBlock {DIV} at (0,0) size 117x12
    3030            RenderBlock {DIV} at (117,0) size 12x12
     
    3232layer at (10,78) size 12x12
    3333  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    34 layer at (127,93) size 12x12
     34layer at (127,94) size 12x12
    3535  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
  • trunk/LayoutTests/platform/efl/fast/repaint/slider-thumb-drag-release-expected.txt

    r120441 r126401  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x584
    6       RenderSlider {INPUT} at (2,2) size 129x11 [color=#909090] [bgcolor=#FFFFFF]
    7         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
     6      RenderSlider {INPUT} at (2,2) size 129x12 [color=#909090] [bgcolor=#FFFFFF]
     7        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x12
    88          RenderBlock {DIV} at (0,0) size 117x12
    99          RenderBlock {DIV} at (117,0) size 12x12
  • trunk/Source/WebCore/ChangeLog

    r126399 r126401  
     12012-08-23  KwangYong Choi  <ky0.choi@samsung.com>
     2
     3        [EFL] Use vertical slider theme when the slider is vertical
     4        https://bugs.webkit.org/show_bug.cgi?id=93838
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Applied vertical slider theme to the vertical sliders. The height
     9        of the vertical slider is wrong when it's applied horizontal
     10        slider theme.
     11
     12        And do not resize slider when its size is not specified. It's natural
     13        to use the default value of renderer.
     14
     15        No new tests. It's covered by existing range and datalist tests.
     16
     17        * platform/efl/RenderThemeEfl.cpp:
     18        (WebCore::RenderThemeEfl::adjustSliderTrackStyle):
     19
    1202012-08-23  Kentaro Hara  <haraken@chromium.org>
    221
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r126359 r126401  
    768768    }
    769769
    770     adjustSizeConstraints(style, SliderHorizontal);
     770    const ThemePartDesc* desc;
     771    if (style->appearance() == SliderHorizontalPart) {
     772        adjustSizeConstraints(style, SliderHorizontal);
     773        desc = m_partDescs + static_cast<size_t>(SliderHorizontal);
     774    } else {
     775        adjustSizeConstraints(style, SliderVertical);
     776        desc = m_partDescs + static_cast<size_t>(SliderVertical);
     777    }
    771778    style->resetBorder();
    772 
    773     const struct ThemePartDesc *desc = m_partDescs + (size_t)SliderHorizontal;
    774     if (style->width().value() < desc->min.width().value())
     779    if (style->width().value() > 0 && style->width().value() < desc->min.width().value())
    775780        style->setWidth(desc->min.width());
    776     if (style->height().value() < desc->min.height().value())
     781    if (style->height().value() > 0 && style->height().value() < desc->min.height().value())
    777782        style->setHeight(desc->min.height());
    778783}
Note: See TracChangeset for help on using the changeset viewer.