Changeset 51527 in webkit


Ignore:
Timestamp:
Nov 30, 2009 11:37:14 PM (14 years ago)
Author:
hamaji@chromium.org
Message:

2009-11-30 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Dan Bernstein.

css2.1/t1205-c566-list-stl-00-e-ag.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=23264
css2.1/t1205-c565-list-pos-00-b.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=23263

Ignore whitespaces after list markers.
Rendering of this was already done for the case where inside=false.
This fixes the rendering of inside=true case and calcInlinePrefWidths.

Test: fast/lists/calc-width-with-space.html

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::calcInlinePrefWidths):
  • rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::findNextLineBreak):

2009-11-30 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Dan Bernstein.

css2.1/t1205-c566-list-stl-00-e-ag.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=23264

  • editing/pasteboard/copy-crash-expected.txt:
  • fast/lists/calc-width-with-space-expected.txt: Added.
  • fast/lists/calc-width-with-space.html: Added.
  • platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum:
  • platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png:
  • platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt:
  • platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum:
  • platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png:
  • platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt:
  • platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum:
  • platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png:
  • platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
  • platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum:
  • platform/mac/fast/block/positioning/complex-percentage-height-expected.png:
  • platform/mac/fast/block/positioning/complex-percentage-height-expected.txt:
  • platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum:
  • platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png:
  • platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt:
  • platform/mac/fast/repaint/list-marker-expected.checksum:
  • platform/mac/fast/repaint/list-marker-expected.png:
  • platform/mac/fast/repaint/list-marker-expected.txt:
  • platform/qt/Skipped:
Location:
trunk
Files:
2 added
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r51522 r51527  
     12009-11-30  Shinichiro Hamaji  <hamaji@chromium.org>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        css2.1/t1205-c566-list-stl-00-e-ag.html is failing
     6        https://bugs.webkit.org/show_bug.cgi?id=23264
     7
     8        * editing/pasteboard/copy-crash-expected.txt:
     9        * fast/lists/calc-width-with-space-expected.txt: Added.
     10        * fast/lists/calc-width-with-space.html: Added.
     11        * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum:
     12        * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png:
     13        * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt:
     14        * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum:
     15        * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png:
     16        * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt:
     17        * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum:
     18        * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png:
     19        * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
     20        * platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum:
     21        * platform/mac/fast/block/positioning/complex-percentage-height-expected.png:
     22        * platform/mac/fast/block/positioning/complex-percentage-height-expected.txt:
     23        * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum:
     24        * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png:
     25        * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt:
     26        * platform/mac/fast/repaint/list-marker-expected.checksum:
     27        * platform/mac/fast/repaint/list-marker-expected.png:
     28        * platform/mac/fast/repaint/list-marker-expected.txt:
     29        * platform/qt/Skipped:
     30
    1312009-11-30  Enrica Casucci  <enrica@apple.com>
    232

  • trunk/LayoutTests/editing/pasteboard/copy-crash-expected.txt

    r38863 r51527  
    22
    33This test checks the fix for https://bugs.webkit.org/show_bug.cgi?id=18506. To test it manually:
    4  Hover mouse over "Mouse Over" link
    5  Quickly jump to the yellow box that pops up and select "Select" link
    6  Move mouse away so that pop up disappears
    7  Press the "Copy" keyboard accelerator - this should not cause any crash
     4Hover mouse over "Mouse Over" link
     5Quickly jump to the yellow box that pops up and select "Select" link
     6Move mouse away so that pop up disappears
     7Press the "Copy" keyboard accelerator - this should not cause any crash

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum

    r38122 r51527  
    1 2b34a5c8a7bfdb2404f15ad98193f305
     1c981a1604d0acab41c03a2ade5976056

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt

    r25970 r51527  
    99      RenderListItem {DIV} at (0,34) size 784x18 [color=#000080]
    1010        RenderListMarker at (0,0) size 16x18: "1"
    11         RenderText {#text} at (16,0) size 155x18
    12           text run at (16,0) width 155: " This should be line one."
     11        RenderText {#text} at (16,0) size 151x18
     12          text run at (16,0) width 151: "This should be line one."
    1313      RenderBlock {DIV} at (0,52) size 784x18 [color=#000080]
    1414        RenderText {#text} at (0,0) size 168x18

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum

    r38122 r51527  
    1 46d4d532d748c69d57a0a20cdb8571ed
     1372bfeb496e4437cda7029069c957f7b

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt

    r25970 r51527  
    1818        RenderListItem {LI} at (0,0) size 160x18
    1919          RenderListMarker at (0,0) size 16x18: "1"
    20           RenderInline {SPAN} at (0,0) size 31x18 [color=#FFFFFF]
    21             RenderText {#text} at (16,0) size 31x18
    22               text run at (16,0) width 31: " Test"
     20          RenderInline {SPAN} at (0,0) size 27x18 [color=#FFFFFF]
     21            RenderText {#text} at (16,0) size 27x18
     22              text run at (16,0) width 27: "Test"

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum

    r38122 r51527  
    1 f51f10c52adf75a0e527562909041c1f
     1890c459839c732d1ae63b46aaf1298d9

  • trunk/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt

    r25970 r51527  
    1111          RenderListMarker at (0,0) size 45x15: "A"
    1212          RenderText {#text} at (45,0) size 90x45
    13             text run at (45,0) width 30: " x"
    14             text run at (0,15) width 60: "x xx"
    15             text run at (0,30) width 90: "xx x x"
     13            text run at (45,0) width 45: "x x"
     14            text run at (0,15) width 75: "xx xx"
     15            text run at (0,30) width 45: "x x"

  • trunk/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum

    r38121 r51527  
    1 cd3ed5b4147c3257eb22a6a5912aa8d0
     1d3d2c1237d98f6e596100059972e1de8

  • trunk/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.txt

    r30635 r51527  
    1111          RenderListItem {LI} at (0,0) size 735x18
    1212            RenderListMarker at (-1,0) size 7x18: bullet
    13             RenderText {#text} at (14,0) size 415x18
    14               text run at (14,0) width 4: " "
    15               text run at (18,0) width 411: "Blue div has 400px width, dynamic height, and position: relative."
     13            RenderText {#text} at (14,0) size 411x18
     14              text run at (14,0) width 411: "Blue div has 400px width, dynamic height, and position: relative."
    1615          RenderListItem {LI} at (0,25) size 735x36
    1716            RenderListMarker at (-1,0) size 7x18: bullet
    18             RenderText {#text} at (14,0) size 545x18
    19               text run at (14,0) width 4: " "
    20               text run at (18,0) width 541: "Inside blue div there are 3 other div with height: 40px (and has some bottom margin..)"
    21             RenderBR {BR} at (559,0) size 0x18
     17            RenderText {#text} at (14,0) size 541x18
     18              text run at (14,0) width 541: "Inside blue div there are 3 other div with height: 40px (and has some bottom margin..)"
     19            RenderBR {BR} at (555,0) size 0x18
    2220            RenderText {#text} at (0,18) size 386x18
    2321              text run at (0,18) width 386: "the height of the blue div expands with the green divs inside.."
    2422          RenderListItem {LI} at (0,68) size 735x54
    2523            RenderListMarker at (-1,0) size 7x18: bullet
    26             RenderText {#text} at (14,0) size 542x18
    27               text run at (14,0) width 4: " "
    28               text run at (18,0) width 538: "Yellow div has position absolute (and positioned in the top left corner of the blue div)"
    29             RenderBR {BR} at (556,0) size 0x18
     24            RenderText {#text} at (14,0) size 538x18
     25              text run at (14,0) width 538: "Yellow div has position absolute (and positioned in the top left corner of the blue div)"
     26            RenderBR {BR} at (552,0) size 0x18
    3027            RenderText {#text} at (0,18) size 138x18
    3128              text run at (0,18) width 138: "it's height set to 100%"
    … …  
    3532          RenderListItem {LI} at (0,129) size 735x18
    3633            RenderListMarker at (-1,0) size 7x18: bullet
    37             RenderText {#text} at (14,0) size 416x18
    38               text run at (14,0) width 4: " "
    39               text run at (18,0) width 412: "Red div is inserted into the yellow div, and it's height set to 100%"
     34            RenderText {#text} at (14,0) size 412x18
     35              text run at (14,0) width 412: "Red div is inserted into the yellow div, and it's height set to 100%"
    4036        RenderBlock {H3} at (0,194) size 735x22
    4137          RenderText {#text} at (0,0) size 76x22

  • trunk/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum

    r38121 r51527  
    1 fa350d7ab2094c06a0c85de99384ee7e
     1eec87fe7f04c7c6c5a49faec862d93d6

  • trunk/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt

    r30635 r51527  
    2323        RenderListItem {LI} at (0,0) size 125x36
    2424          RenderListMarker at (-1,0) size 7x18: bullet
    25           RenderText {#text} at (14,0) size 102x36
    26             text run at (14,0) width 4: " "
    27             text run at (18,0) width 84: "Lorem ipsum"
     25          RenderText {#text} at (14,0) size 98x36
     26            text run at (14,0) width 84: "Lorem ipsum"
    2827            text run at (0,18) width 85: "dolor sit amet"

  • trunk/LayoutTests/platform/mac/fast/repaint/list-marker-expected.checksum

    r38121 r51527  
    1 448b1ea7ae59733b03f04fe2cc7a7169
     1d4cd04dd0e73614278b8ef3dc41e8c60

  • trunk/LayoutTests/platform/mac/fast/repaint/list-marker-expected.txt

    r30635 r51527  
    2828          RenderBlock (anonymous) at (0,0) size 744x18
    2929            RenderListMarker at (-1,0) size 7x18: bullet
    30             RenderText {#text} at (14,0) size 24x18
    31               text run at (14,0) width 4: " "
    32               text run at (18,0) width 20: "bar"
     30            RenderText {#text} at (14,0) size 20x18
     31              text run at (14,0) width 20: "bar"
    3332          RenderBlock {DIV} at (10,28) size 724x0
    3433      RenderBlock {UL} at (0,120) size 784x18
    … …  
    4342          RenderBlock (anonymous) at (0,0) size 744x18
    4443            RenderListMarker at (738,0) size 7x18: bullet
    45             RenderText {#text} at (706,0) size 24x18
    46               text run at (706,0) width 20: "bar"
    47               text run at (726,0) width 4 RTL: " "
     44            RenderText {#text} at (710,0) size 20x18
     45              text run at (710,0) width 20: "bar"
    4846          RenderBlock {DIV} at (10,28) size 724x0

  • trunk/LayoutTests/platform/qt/Skipped

    r51482 r51527  
    52615261# hamaji will look into this.
    52625262editing/selection/last-empty-inline.html
     5263
     5264# Need to update the expectations.
     5265# See: https://bugs.webkit.org/show_bug.cgi?id=23264
     5266css2.1/t1205-c561-list-displ-00-b.html
     5267css2.1/t1205-c565-list-pos-00-b.html
     5268css2.1/t1205-c566-list-stl-00-e-ag.html
     5269fast/block/positioning/complex-percentage-height.html
     5270fast/lists/item-not-in-list-line-wrapping.html

  • trunk/WebCore/ChangeLog

    r51524 r51527  
     12009-11-30  Shinichiro Hamaji  <hamaji@chromium.org>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        css2.1/t1205-c566-list-stl-00-e-ag.html is failing
     6        https://bugs.webkit.org/show_bug.cgi?id=23264
     7        css2.1/t1205-c565-list-pos-00-b.html is failing
     8        https://bugs.webkit.org/show_bug.cgi?id=23263
     9
     10        Ignore whitespaces after list markers.
     11        Rendering of this was already done for the case where inside=false.
     12        This fixes the rendering of inside=true case and calcInlinePrefWidths.
     13
     14        Test: fast/lists/calc-width-with-space.html
     15
     16        * rendering/RenderBlock.cpp:
     17        (WebCore::RenderBlock::calcInlinePrefWidths):
     18        * rendering/RenderBlockLineLayout.cpp:
     19        (WebCore::RenderBlock::findNextLineBreak):
     20
    1212009-11-30  Fumitoshi Ukai  <ukai@chromium.org>
    222

  • trunk/WebCore/rendering/RenderBlock.cpp

    r51517 r51527  
    42134213                    inlineMax += childMax;
    42144214            }
     4215
     4216            // Ignore spaces after a list marker.
     4217            if (child->isListMarker())
     4218                stripFrontSpaces = true;
    42154219        } else {
    42164220            m_minPrefWidth = max(inlineMin, m_minPrefWidth);

  • trunk/WebCore/rendering/RenderBlockLineLayout.cpp

    r47517 r51527  
    17701770            currentCharacterIsWS = false;
    17711771            trailingSpaceObject = 0;
    1772            
     1772
    17731773            // Optimize for a common case. If we can't find whitespace after the list
    17741774            // item, then this is all moot. -dwh
    1775             if (o->isListMarker() && !toRenderListMarker(o)->isInside()) {
     1775            if (o->isListMarker()) {
    17761776                if (style()->collapseWhiteSpace() && shouldSkipWhitespaceAfterStartObject(this, o, lineMidpointState)) {
    17771777                    // Like with inline flows, we start ignoring spaces to make sure that any
    … …  
    17811781                    ignoringSpaces = true;
    17821782                }
     1783                if (toRenderListMarker(o)->isInside())
     1784                    tmpW += replacedBox->width() + replacedBox->marginLeft() + replacedBox->marginRight() + inlineWidth(o);
    17831785            } else
    17841786                tmpW += replacedBox->width() + replacedBox->marginLeft() + replacedBox->marginRight() + inlineWidth(o);
Note: See TracChangeset for help on using the changeset viewer.