Changeset 85726 in webkit


Ignore:
Timestamp:
May 4, 2011 2:41:19 AM (13 years ago)
Author:
satish@chromium.org
Message:

2011-05-04 Satish Sampath <​satish@chromium.org>

Reviewed by Tony Gentilcore.

Layout the speech input button to the left of outer spin button properly.
​https://bugs.webkit.org/show_bug.cgi?id=59742

  • platform/chromium-mac/fast/speech/input-appearance-numberandspeech-expected.png:
  • platform/chromium-mac/fast/speech/input-appearance-numberandspeech-expected.txt:
  • platform/chromium/test_expectations.txt:

2011-05-04 Satish Sampath <​satish@chromium.org>

Reviewed by Tony Gentilcore.

Layout the speech input button to the left of outer spin button properly.
​https://bugs.webkit.org/show_bug.cgi?id=59742

  • rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::layout):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r85722 r85726  
     12011-05-04  Satish Sampath  <satish@chromium.org>
     2
     3        Reviewed by Tony Gentilcore.
     4
     5        Layout the speech input button to the left of outer spin button properly.
     6        https://bugs.webkit.org/show_bug.cgi?id=59742
     7
     8        * platform/chromium-mac/fast/speech/input-appearance-numberandspeech-expected.png:
     9        * platform/chromium-mac/fast/speech/input-appearance-numberandspeech-expected.txt:
     10        * platform/chromium/test_expectations.txt:
     11
    1122011-05-03  Yury Semikhatsky  <yurys@chromium.org>
    213

  • trunk/LayoutTests/platform/chromium-mac/fast/speech/input-appearance-numberandspeech-expected.txt

    r83163 r85726  
    1717                  RenderBR {BR} at (100,11) size 0x0
    1818                  RenderTextControl {INPUT} at (0,16) size 100x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    19                     RenderBlock {DIV} at (70,3) size 10x10
     19                    RenderBlock {DIV} at (74,3) size 10x10
    2020                  RenderBR {BR} at (100,27) size 0x0
    2121                  RenderTextControl {INPUT} at (0,32) size 102x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    2222                  RenderBR {BR} at (102,44) size 0x0
    2323                  RenderTextControl {INPUT} at (0,49) size 102x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    24                     RenderBlock {DIV} at (71,3) size 11x11
     24                    RenderBlock {DIV} at (75,3) size 11x11
    2525                  RenderBR {BR} at (102,61) size 0x0
    2626                  RenderTextControl {INPUT} at (0,66) size 104x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    2727                  RenderBR {BR} at (104,79) size 0x0
    2828                  RenderTextControl {INPUT} at (0,84) size 104x18 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    29                     RenderBlock {DIV} at (72,3) size 12x12
     29                    RenderBlock {DIV} at (76,3) size 12x12
    3030                  RenderBR {BR} at (104,97) size 0x0
    3131                  RenderTextControl {INPUT} at (2,104) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    3232                  RenderBR {BR} at (129,118) size 0x0
    3333                  RenderTextControl {INPUT} at (2,127) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    34                     RenderBlock {DIV} at (91,2) size 14x14
     34                    RenderBlock {DIV} at (95,2) size 14x14
    3535                  RenderBR {BR} at (129,141) size 0x0
    3636                  RenderTextControl {INPUT} at (2,150) size 127x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    3737                  RenderBR {BR} at (131,165) size 0x0
    3838                  RenderTextControl {INPUT} at (2,175) size 127x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    39                     RenderBlock {DIV} at (92,3) size 15x15
     39                    RenderBlock {DIV} at (96,3) size 15x15
    4040                  RenderBR {BR} at (131,190) size 0x0
    4141                  RenderTextControl {INPUT} at (2,200) size 148x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    4242                  RenderBR {BR} at (152,216) size 0x0
    4343                  RenderTextControl {INPUT} at (2,226) size 148x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    44                     RenderBlock {DIV} at (110,3) size 16x16
     44                    RenderBlock {DIV} at (114,3) size 16x16
    4545                  RenderBR {BR} at (152,242) size 0x0
    4646                  RenderTextControl {INPUT} at (2,252) size 150x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    4747                  RenderBR {BR} at (154,269) size 0x0
    4848                  RenderTextControl {INPUT} at (2,279) size 150x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    49                     RenderBlock {DIV} at (111,3) size 17x17
     49                    RenderBlock {DIV} at (115,3) size 17x17
    5050                  RenderBR {BR} at (154,296) size 0x0
    5151              RenderTableCell {TD} at (160,5) size 203x300 [r=0 c=1 rs=1 cs=1]
    … …  
    5454                  RenderBR {BR} at (174,20) size 0x0
    5555                  RenderTextControl {INPUT} at (2,30) size 170x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    56                     RenderBlock {DIV} at (130,3) size 18x18
     56                    RenderBlock {DIV} at (134,3) size 18x18
    5757                  RenderBR {BR} at (174,48) size 0x0
    5858                  RenderTextControl {INPUT} at (2,58) size 172x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    5959                  RenderBR {BR} at (176,76) size 0x0
    6060                  RenderTextControl {INPUT} at (2,86) size 172x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    61                     RenderBlock {DIV} at (130,2) size 20x20
     61                    RenderBlock {DIV} at (134,2) size 20x20
    6262                  RenderBR {BR} at (176,104) size 0x0
    6363                  RenderTextControl {INPUT} at (2,114) size 174x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    6464                  RenderBR {BR} at (178,133) size 0x0
    6565                  RenderTextControl {INPUT} at (2,144) size 174x26 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    66                     RenderBlock {DIV} at (131,2) size 21x21
     66                    RenderBlock {DIV} at (135,2) size 21x21
    6767                  RenderBR {BR} at (178,163) size 0x0
    6868                  RenderTextControl {INPUT} at (2,174) size 195x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    6969                  RenderBR {BR} at (199,194) size 0x0
    7070                  RenderTextControl {INPUT} at (2,205) size 195x27 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    71                     RenderBlock {DIV} at (147,2) size 22x22
     71                    RenderBlock {DIV} at (151,2) size 22x22
    7272                  RenderBR {BR} at (199,225) size 0x0
    7373                  RenderTextControl {INPUT} at (2,236) size 197x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    7474                  RenderBR {BR} at (201,257) size 0x0
    7575                  RenderTextControl {INPUT} at (2,268) size 197x28 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    76                     RenderBlock {DIV} at (148,2) size 23x23
     76                    RenderBlock {DIV} at (152,2) size 23x23
    7777                  RenderBR {BR} at (201,289) size 0x0
    7878              RenderTableCell {TD} at (365,14) size 249x282 [r=0 c=2 rs=1 cs=1]
    … …  
    8181                  RenderBR {BR} at (222,24) size 0x0
    8282                  RenderTextControl {INPUT} at (2,35) size 218x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    83                     RenderBlock {DIV} at (167,2) size 25x25
     83                    RenderBlock {DIV} at (171,2) size 25x25
    8484                  RenderBR {BR} at (222,57) size 0x0
    8585                  RenderTextControl {INPUT} at (2,68) size 220x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    8686                  RenderBR {BR} at (224,91) size 0x0
    8787                  RenderTextControl {INPUT} at (2,102) size 220x30 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    88                     RenderBlock {DIV} at (168,2) size 26x26
     88                    RenderBlock {DIV} at (172,2) size 26x26
    8989                  RenderBR {BR} at (224,125) size 0x0
    9090                  RenderTextControl {INPUT} at (2,136) size 241x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    9191                  RenderBR {BR} at (245,160) size 0x0
    9292                  RenderTextControl {INPUT} at (2,172) size 241x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    93                     RenderBlock {DIV} at (188,2) size 27x27
     93                    RenderBlock {DIV} at (192,2) size 27x27
    9494                  RenderBR {BR} at (245,196) size 0x0
    9595                  RenderTextControl {INPUT} at (2,208) size 243x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    9696                  RenderBR {BR} at (247,233) size 0x0
    9797                  RenderTextControl {INPUT} at (2,245) size 243x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
    98                     RenderBlock {DIV} at (189,2) size 28x28
     98                    RenderBlock {DIV} at (193,2) size 28x28
    9999                  RenderBR {BR} at (247,270) size 0x0
    100100layer at (14,48) size 76x10 scrollWidth 172

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r85714 r85726  
    39423942BUGWK60105 DEBUG : fast/css/empty-pseudo-class.html = PASS TEXT
    39433943
    3944 // Also affected by WK50661
    3945 BUGWK59742 MAC : fast/speech/input-appearance-numberandspeech.html = IMAGE+TEXT PASS
    3946 
    39473944BUGWK59782 WIN LINUX : fast/box-shadow/single-pixel-shadow.html = IMAGE
    39483945BUGWK59782 WIN MAC LINUX RELEASE : svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr.html = IMAGE

  • trunk/Source/WebCore/ChangeLog

    r85724 r85726  
     12011-05-04  Satish Sampath  <satish@chromium.org>
     2
     3        Reviewed by Tony Gentilcore.
     4
     5        Layout the speech input button to the left of outer spin button properly.
     6        https://bugs.webkit.org/show_bug.cgi?id=59742
     7
     8        * rendering/RenderTextControlSingleLine.cpp:
     9        (WebCore::RenderTextControlSingleLine::layout):
     10
    1112011-05-04  Yury Semikhatsky  <yurys@chromium.org>
    212

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

    r85190 r85726  
    310310        } else {
    311311            int x = width() - borderRight() - paddingRight() - button->width();
     312            if (m_outerSpinButton && m_outerSpinButton->renderBox())
     313                x -= m_outerSpinButton->renderBox()->width();
     314
    312315            RenderBox* spinBox = m_innerSpinButton ? m_innerSpinButton->renderBox() : 0;
    313316            if (style()->isLeftToRightDirection())
Note: See TracChangeset for help on using the changeset viewer.