Changeset 72527 in webkit


Ignore:
Timestamp:
Nov 22, 2010 7:13:52 AM (13 years ago)
Author:
reni@webkit.org
Message:

Outside list bullets ignore text-align style.
​https://bugs.webkit.org/show-bug.cgi?id=15713

Patch by Renata Hodovan <​reni@webkit.org> on 2010-11-22
Reviewed by Andreas Kling.

WebCore:

Fix the position of outside markers by setting its logicalLeft member. Embedded markers need special treatment.
First, the total width of markers should be calculated. Subtracting it from logicalLeft we get the outermost bullet's
position. As for the others, this sum should be decremented with the previous marker's width.
In case of vertical markers the padding is unneeded.

Test: fast/lists/outSideListMarkers.html

  • rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::placeBoxesInInlineDirection):

  • rendering/RenderListItem.cpp:

(WebCore::RenderListItem::positionListMarker):

LayoutTests:

Add new test for checking outside marker's position and update the related expecteds of tests.

  • fast/lists/outSideListMarkers-expected.txt: Added.
  • fast/lists/outSideListMarkers.html: Added.
  • platform/mac-leopard/css1/box_properties/margin_right-expected.checksum:
  • platform/mac-leopard/css1/box_properties/margin_right-expected.png:
  • platform/mac-leopard/css1/box_properties/padding_right-expected.checksum:
  • platform/mac-leopard/css1/box_properties/padding_right-expected.png:
  • platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum:
  • platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png:
  • platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum:
  • platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png:
  • platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/empty-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png:
  • platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum:
  • platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png:
  • platform/mac-leopard/fast/doctypes/002-expected.checksum:
  • platform/mac-leopard/fast/doctypes/002-expected.png:
  • platform/mac-leopard/fast/lists/001-expected.checksum:
  • platform/mac-leopard/fast/lists/001-expected.png:
  • platform/mac-leopard/fast/lists/002-expected.checksum:
  • platform/mac-leopard/fast/lists/002-expected.png:
  • platform/mac-leopard/fast/lists/003-expected.checksum:
  • platform/mac-leopard/fast/lists/003-expected.png:
  • platform/mac/css1/box_properties/margin_right-expected.txt:
  • platform/mac/css1/box_properties/padding_right-expected.txt:
  • platform/mac/editing/pasteboard/merge-end-list-expected.txt:
  • platform/mac/editing/selection/extend-by-word-002-expected.checksum:
  • platform/mac/editing/selection/extend-by-word-002-expected.png:
  • platform/mac/editing/selection/extend-by-word-002-expected.txt:
  • platform/mac/fast/css/background-shorthand-invalid-url-expected.txt:
  • platform/mac/fast/css/empty-pseudo-class-expected.txt:
  • platform/mac/fast/css/first-child-pseudo-class-expected.txt:
  • platform/mac/fast/css/first-of-type-pseudo-class-expected.txt:
  • platform/mac/fast/css/last-child-pseudo-class-expected.txt:
  • platform/mac/fast/css/last-of-type-pseudo-class-expected.txt:
  • platform/mac/fast/css/only-child-pseudo-class-expected.txt:
  • platform/mac/fast/css/only-of-type-pseudo-class-expected.txt:
  • platform/mac/fast/doctypes/002-expected.txt:
  • platform/mac/fast/lists/001-expected.txt:
  • platform/mac/fast/lists/001-vertical-expected.checksum:
  • platform/mac/fast/lists/001-vertical-expected.png:
  • platform/mac/fast/lists/001-vertical-expected.txt:
  • platform/mac/fast/lists/002-expected.txt:
  • platform/mac/fast/lists/002-vertical-expected.checksum:
  • platform/mac/fast/lists/002-vertical-expected.png:
  • platform/mac/fast/lists/002-vertical-expected.txt:
  • platform/mac/fast/lists/003-expected.txt:
  • platform/mac/fast/lists/003-vertical-expected.checksum:
  • platform/mac/fast/lists/003-vertical-expected.png:
  • platform/mac/fast/lists/003-vertical-expected.txt:
  • platform/mac/fast/lists/007-vertical-expected.checksum:
  • platform/mac/fast/lists/007-vertical-expected.png:
  • platform/mac/fast/lists/007-vertical-expected.txt:
  • platform/mac/fast/lists/008-vertical-expected.checksum:
  • platform/mac/fast/lists/008-vertical-expected.png:
  • platform/mac/fast/lists/008-vertical-expected.txt:
  • platform/mac/fast/lists/outSideListMarkers-expected.checksum: Added.
  • platform/mac/fast/lists/outSideListMarkers-expected.png: Added.
Location:
trunk
Files:
4 added
67 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r72526 r72527  
     12010-11-22  Renata Hodovan  <reni@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        Outside list bullets ignore text-align style.
     6        https://bugs.webkit.org/show-bug.cgi?id=15713
     7
     8        Add new test for checking outside marker's position and update the related expecteds of tests.
     9
     10        * fast/lists/outSideListMarkers-expected.txt: Added.
     11        * fast/lists/outSideListMarkers.html: Added.
     12        * platform/mac-leopard/css1/box_properties/margin_right-expected.checksum:
     13        * platform/mac-leopard/css1/box_properties/margin_right-expected.png:
     14        * platform/mac-leopard/css1/box_properties/padding_right-expected.checksum:
     15        * platform/mac-leopard/css1/box_properties/padding_right-expected.png:
     16        * platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum:
     17        * platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png:
     18        * platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum:
     19        * platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png:
     20        * platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum:
     21        * platform/mac-leopard/fast/css/empty-pseudo-class-expected.png:
     22        * platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum:
     23        * platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png:
     24        * platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum:
     25        * platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png:
     26        * platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum:
     27        * platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png:
     28        * platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum:
     29        * platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png:
     30        * platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum:
     31        * platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png:
     32        * platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum:
     33        * platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png:
     34        * platform/mac-leopard/fast/doctypes/002-expected.checksum:
     35        * platform/mac-leopard/fast/doctypes/002-expected.png:
     36        * platform/mac-leopard/fast/lists/001-expected.checksum:
     37        * platform/mac-leopard/fast/lists/001-expected.png:
     38        * platform/mac-leopard/fast/lists/002-expected.checksum:
     39        * platform/mac-leopard/fast/lists/002-expected.png:
     40        * platform/mac-leopard/fast/lists/003-expected.checksum:
     41        * platform/mac-leopard/fast/lists/003-expected.png:
     42        * platform/mac/css1/box_properties/margin_right-expected.txt:
     43        * platform/mac/css1/box_properties/padding_right-expected.txt:
     44        * platform/mac/editing/pasteboard/merge-end-list-expected.txt:
     45        * platform/mac/editing/selection/extend-by-word-002-expected.checksum:
     46        * platform/mac/editing/selection/extend-by-word-002-expected.png:
     47        * platform/mac/editing/selection/extend-by-word-002-expected.txt:
     48        * platform/mac/fast/css/background-shorthand-invalid-url-expected.txt:
     49        * platform/mac/fast/css/empty-pseudo-class-expected.txt:
     50        * platform/mac/fast/css/first-child-pseudo-class-expected.txt:
     51        * platform/mac/fast/css/first-of-type-pseudo-class-expected.txt:
     52        * platform/mac/fast/css/last-child-pseudo-class-expected.txt:
     53        * platform/mac/fast/css/last-of-type-pseudo-class-expected.txt:
     54        * platform/mac/fast/css/only-child-pseudo-class-expected.txt:
     55        * platform/mac/fast/css/only-of-type-pseudo-class-expected.txt:
     56        * platform/mac/fast/doctypes/002-expected.txt:
     57        * platform/mac/fast/lists/001-expected.txt:
     58        * platform/mac/fast/lists/001-vertical-expected.checksum:
     59        * platform/mac/fast/lists/001-vertical-expected.png:
     60        * platform/mac/fast/lists/001-vertical-expected.txt:
     61        * platform/mac/fast/lists/002-expected.txt:
     62        * platform/mac/fast/lists/002-vertical-expected.checksum:
     63        * platform/mac/fast/lists/002-vertical-expected.png:
     64        * platform/mac/fast/lists/002-vertical-expected.txt:
     65        * platform/mac/fast/lists/003-expected.txt:
     66        * platform/mac/fast/lists/003-vertical-expected.checksum:
     67        * platform/mac/fast/lists/003-vertical-expected.png:
     68        * platform/mac/fast/lists/003-vertical-expected.txt:
     69        * platform/mac/fast/lists/007-vertical-expected.checksum:
     70        * platform/mac/fast/lists/007-vertical-expected.png:
     71        * platform/mac/fast/lists/007-vertical-expected.txt:
     72        * platform/mac/fast/lists/008-vertical-expected.checksum:
     73        * platform/mac/fast/lists/008-vertical-expected.png:
     74        * platform/mac/fast/lists/008-vertical-expected.txt:
     75        * platform/mac/fast/lists/outSideListMarkers-expected.checksum: Added.
     76        * platform/mac/fast/lists/outSideListMarkers-expected.png: Added.
     77
    1782010-11-22  Yael Aharon  <yael.aharon@nokia.com>
    279

  • trunk/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum

    r60205 r72527  
    1 535d07180f66e0a374faafc4b54b8962
     155d672967e8ddbf87246a11f92c9c729

  • trunk/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum

    r60205 r72527  
    1 8fb1e154e79643ac7bbe9205dea3d03b
     1fdd2eaba37bae8295f9aec88acefcb78

  • trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum

    r60107 r72527  
    1 d012e6bdb5ad2f5b2e533bedcbbc6789
     160d707dab81ad84c1f511fdfc375a655

  • trunk/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum

    r71088 r72527  
    1 870fc7a4b6d7194a482d5d782ed12201
     1bb6c3f97d3127b0e75e47ce1f426302a

  • trunk/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum

    r71088 r72527  
    1 26b8e5f280430642b910f5238dc1c23f
     174690022d6e9696f8a57d7fac76ef9f5

  • trunk/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum

    r71088 r72527  
    1 5ccd68b5eda1a8a6fdc3a2c3ad642323
     1cecb5833db1b0399f740243dfa067554

  • trunk/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum

    r71088 r72527  
    1 c3536f4b6e48b311bff7d09886204332
     1d1ac2a47cf24b1fa807281fd778ec6e2

  • trunk/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum

    r71088 r72527  
    1 d2b02cccba673c34576738f4fc873ad0
     1e45354862040a03e31b2190fb43f6979

  • trunk/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum

    r71088 r72527  
    1 3f7d246c4306b7b150771e8bbc17b769
     1f36f002bef42315364af485a1f0d8113

  • trunk/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum

    r71088 r72527  
    1 085a3864adb1ffffc229133ac8519785
     1cc2f8143bac591ec5cd34b08554c22f0

  • trunk/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum

    r71088 r72527  
    1 34a12633ff0f6d7d22e42deeeb2b01ce
     1cc72d41312ddd9889eb9887f5c3f1266

  • trunk/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum

    r72333 r72527  
    1 1a8adaeca723f7629201cdbfeb9b12be
     148e1e5d5fb2689ebd477a505cae7252c

  • trunk/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum

    r71189 r72527  
    1 fa6148a3e615abad86aea15059ac7bd5
     1a5c9bfd57b632e5d90ef2256fc137b06

  • trunk/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum

    r71189 r72527  
    1 fdb1d40544f0c806f99f0bb14517df6b
     1b3bf0281f9f2f3b3718defa2a510996f

  • trunk/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum

    r71189 r72527  
    1 c3e0d7953236beb9ebb61441399383e4
     1645fe17dbe15c1dc22b2e49efcf60584

  • trunk/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt

    r25970 r72527  
    4040      RenderBlock {UL} at (0,343) size 744x90 [bgcolor=#808080]
    4141        RenderListItem {LI} at (40,0) size 704x18
    42           RenderListMarker at (-17,0) size 7x18: bullet
     42          RenderListMarker at (-13,0) size 7x18: bullet
    4343          RenderText {#text} at (4,0) size 700x18
    4444            text run at (4,0) width 700: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray."
    4545        RenderListItem {LI} at (40,18) size 679x54 [bgcolor=#FFFFFF]
    46           RenderListMarker at (-17,0) size 7x18: bullet
     46          RenderListMarker at (6,0) size 7x18: bullet
    4747          RenderText {#text} at (23,0) size 677x54
    4848            text run at (23,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
    … …  
    5151            text run at (199,36) width 480: "to make 50 pixels of margin, and its background-color has been set to white."
    5252        RenderListItem {LI} at (40,72) size 704x18
    53           RenderListMarker at (-17,0) size 7x18: bullet
     53          RenderListMarker at (508,0) size 7x18: bullet
    5454          RenderText {#text} at (525,0) size 179x18
    5555            text run at (525,0) width 179: "This is an unclassed list item"
    … …  
    9494              RenderBlock {UL} at (4,192) size 722x108 [bgcolor=#808080]
    9595                RenderListItem {LI} at (40,0) size 682x36
    96                   RenderListMarker at (-17,0) size 7x18: bullet
     96                  RenderListMarker at (1,0) size 7x18: bullet
    9797                  RenderText {#text} at (18,0) size 664x36
    9898                    text run at (18,0) width 664: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to"
    9999                    text run at (650,18) width 32: "gray."
    100100                RenderListItem {LI} at (40,36) size 657x54 [bgcolor=#FFFFFF]
    101                   RenderListMarker at (-17,0) size 7x18: bullet
     101                  RenderListMarker at (-16,0) size 7x18: bullet
    102102                  RenderText {#text} at (1,0) size 656x54
    103103                    text run at (1,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
    … …  
    106106                    text run at (129,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white."
    107107                RenderListItem {LI} at (40,90) size 682x18
    108                   RenderListMarker at (-17,0) size 7x18: bullet
     108                  RenderListMarker at (486,0) size 7x18: bullet
    109109                  RenderText {#text} at (503,0) size 179x18
    110110                    text run at (503,0) width 179: "This is an unclassed list item"

  • trunk/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt

    r25970 r72527  
    5555      RenderBlock {UL} at (0,469) size 769x72 [bgcolor=#808080]
    5656        RenderListItem {LI} at (40,0) size 704x36
    57           RenderListMarker at (-17,0) size 7x18: bullet
     57          RenderListMarker at (-10,0) size 7x18: bullet
    5858          RenderText {#text} at (7,0) size 697x36
    5959            text run at (7,0) width 697: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to"
    6060            text run at (679,18) width 25: "test."
    6161        RenderListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF]
    62           RenderListMarker at (-17,0) size 7x18: bullet
     62          RenderListMarker at (2,0) size 7x18: bullet
    6363          RenderText {#text} at (19,0) size 660x36
    6464            text run at (19,0) width 660: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL"
    … …  
    117117              RenderBlock {UL} at (4,336) size 747x72 [bgcolor=#808080]
    118118                RenderListItem {LI} at (40,0) size 682x36
    119                   RenderListMarker at (-17,0) size 7x18: bullet
     119                  RenderListMarker at (-16,0) size 7x18: bullet
    120120                  RenderText {#text} at (1,0) size 681x36
    121121                    text run at (1,0) width 681: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order"
    122122                    text run at (641,18) width 41: "to test."
    123123                RenderListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF]
    124                   RenderListMarker at (-17,0) size 7x18: bullet
     124                  RenderListMarker at (6,0) size 7x18: bullet
    125125                  RenderText {#text} at (23,0) size 634x36
    126126                    text run at (23,0) width 634: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the"

  • trunk/LayoutTests/platform/mac/editing/pasteboard/merge-end-list-expected.txt

    r63291 r72527  
    4646          RenderListItem {LI} at (40,0) size 744x36
    4747            RenderBlock {DIV} at (0,0) size 744x18
    48               RenderListMarker at (-17,0) size 7x18: bullet
     48              RenderListMarker at (-85,0) size 7x18: bullet
    4949              RenderText {#text} at (0,0) size 28x18
    5050                text run at (0,0) width 28: "Item"

  • trunk/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum

    r71609 r72527  
    1 4e7ba809b66454d9631f978228c525d4
     1ee21a1f286cc3d39f06fa65c430473d4

  • trunk/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt

    r63291 r72527  
    1616        RenderBlock {UL} at (14,14) size 120x138
    1717          RenderListItem {LI} at (0,0) size 120x21
    18             RenderListMarker at (-14,6) size 5x12: bullet
     18            RenderListMarker at (-25,6) size 5x12: bullet
    1919            RenderInline (generated) at (0,0) size 14x24
    2020              RenderText {#text} at (5,-4) size 14x24
    … …  
    2525                text run at (19,6) width 52: "Appetizers"
    2626          RenderListItem {LI} at (0,21) size 120x21
    27             RenderListMarker at (-14,6) size 5x12: bullet
     27            RenderListMarker at (-25,6) size 5x12: bullet
    2828            RenderInline (generated) at (0,0) size 14x24
    2929              RenderText {#text} at (5,-4) size 14x24
    … …  
    3434                text run at (19,6) width 78: "Soups & Salads"
    3535          RenderListItem {LI} at (0,42) size 120x33
    36             RenderListMarker at (-14,6) size 5x12: bullet
     36            RenderListMarker at (-25,6) size 5x12: bullet
    3737            RenderInline (generated) at (0,0) size 14x24
    3838              RenderText {#text} at (5,-4) size 14x24
    … …  
    4545                text run at (16,18) width 38: "Burgers"
    4646          RenderListItem {LI} at (0,75) size 120x21
    47             RenderListMarker at (-14,6) size 5x12: bullet
     47            RenderListMarker at (-25,6) size 5x12: bullet
    4848            RenderInline (generated) at (0,0) size 14x24
    4949              RenderText {#text} at (5,-4) size 14x24
    … …  
    5454                text run at (19,6) width 65: "Steak & Ribs"
    5555          RenderListItem {LI} at (0,96) size 120x21
    56             RenderListMarker at (-14,6) size 5x12: bullet
     56            RenderListMarker at (-25,6) size 5x12: bullet
    5757            RenderInline (generated) at (0,0) size 14x24
    5858              RenderText {#text} at (5,-4) size 14x24
    … …  
    6363                text run at (19,6) width 41: "Seafood"
    6464          RenderListItem {LI} at (0,117) size 120x21
    65             RenderListMarker at (-14,6) size 5x12: bullet
     65            RenderListMarker at (-25,6) size 5x12: bullet
    6666            RenderInline (generated) at (0,0) size 14x24
    6767              RenderText {#text} at (5,-4) size 14x24

  • trunk/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt

    r30635 r72527  
    1111          RenderListItem {LI} at (40,0) size 744x91 [border: (1px solid #FF0000)]
    1212            RenderBlock {SPAN} at (1,1) size 304x89 [border: (2px solid #008000)]
    13               RenderListMarker at (-18,2) size 7x18: bullet
     13              RenderListMarker at (-16,2) size 7x18: bullet
    1414              RenderText {#text} at (2,2) size 4x18
    1515                text run at (2,2) width 4: " "

  • trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 88x61
    3232              text run at (6,8) width 64: ":empty {"
    … …  
    4343            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    4444          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    45             RenderListMarker at (-37,6) size 17x17: "2"
     45            RenderListMarker at (-31,6) size 17x17: "2"
    4646            RenderText {#text} at (6,8) size 272x61
    4747              text run at (6,8) width 64: ":empty {"
    … …  
    5858            RenderBlock {DIV} at (0,0) size 583x24
    5959          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    60             RenderListMarker at (-37,6) size 17x17: "3"
     60            RenderListMarker at (-31,6) size 17x17: "3"
    6161            RenderText {#text} at (6,8) size 96x61
    6262              text run at (6,8) width 64: ":empty {"
    … …  
    7272          RenderBlock {DIV} at (16,16) size 583x42 [bgcolor=#009900]
    7373            RenderBlock {DIV} at (0,0) size 583x42
    74               RenderListMarker at (-37,12) size 17x17: "4"
     74              RenderListMarker at (-25,12) size 17x17: "4"
    7575              RenderText {#text} at (12,12) size 4x17
    7676                text run at (12,12) width 4: "."
    … …  
    9595              RenderBlock {BLOCKQUOTE} at (12,12) size 559x0 [bgcolor=#990000]
    9696          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    97             RenderListMarker at (-37,6) size 17x17: "5"
     97            RenderListMarker at (-31,6) size 17x17: "5"
    9898            RenderText {#text} at (6,8) size 288x61
    9999              text run at (6,8) width 64: ":empty {"
    … …  
    111111              RenderBlock {DIV} at (12,12) size 559x0 [bgcolor=#990000]
    112112          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    113             RenderListMarker at (-37,6) size 17x17: "6"
     113            RenderListMarker at (-31,6) size 17x17: "6"
    114114            RenderText {#text} at (6,8) size 384x106
    115115              text run at (6,8) width 64: ":empty {"

  • trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 144x91
    3232              text run at (6,8) width 144: "div :first-child {"
    … …  
    4949            RenderBlock {BLOCKQUOTE} at (0,24) size 583x0
    5050          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    51             RenderListMarker at (-37,6) size 17x17: "2"
     51            RenderListMarker at (-31,6) size 17x17: "2"
    5252            RenderText {#text} at (6,8) size 224x106
    5353              text run at (6,8) width 144: "div :first-child {"
    … …  
    7171            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    7272          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    73             RenderListMarker at (-37,6) size 17x17: "3"
     73            RenderListMarker at (-31,6) size 17x17: "3"
    7474            RenderText {#text} at (6,8) size 208x106
    7575              text run at (6,8) width 144: "div :first-child {"
    … …  
    123123            RenderBlock {DIV} at (0,0) size 583x24
    124124          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    125             RenderListMarker at (-37,6) size 17x17: "5"
     125            RenderListMarker at (-31,6) size 17x17: "5"
    126126            RenderText {#text} at (6,8) size 224x106
    127127              text run at (6,8) width 144: "div :first-child {"
    … …  
    146146            RenderBlock {DIV} at (0,24) size 583x0
    147147          RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
    148             RenderListMarker at (-37,6) size 17x17: "6"
     148            RenderListMarker at (-31,6) size 17x17: "6"
    149149            RenderText {#text} at (6,8) size 520x136
    150150              text run at (6,8) width 144: "div :first-child {"
    … …  
    172172            RenderBlock {DIV} at (0,0) size 583x24
    173173          RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
    174             RenderListMarker at (-37,6) size 17x17: "7"
     174            RenderListMarker at (-31,6) size 17x17: "7"
    175175            RenderText {#text} at (6,8) size 520x136
    176176              text run at (6,8) width 144: "div :first-child {"

  • trunk/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 280x61
    3232              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    4545            RenderBlock {DIV} at (0,24) size 583x0
    4646          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    47             RenderListMarker at (-37,6) size 17x17: "2"
     47            RenderListMarker at (-31,6) size 17x17: "2"
    4848            RenderText {#text} at (6,8) size 280x76
    4949              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    6464            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    6565          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    66             RenderListMarker at (-37,6) size 17x17: "3"
     66            RenderListMarker at (-31,6) size 17x17: "3"
    6767            RenderText {#text} at (6,8) size 280x76
    6868              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    8484              RenderBlock {DIV} at (0,0) size 583x24
    8585          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    86             RenderListMarker at (-37,6) size 17x17: "4"
     86            RenderListMarker at (-31,6) size 17x17: "4"
    8787            RenderText {#text} at (6,8) size 304x106
    8888              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    107107              RenderBlock {DIV} at (0,0) size 583x24
    108108          RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
    109             RenderListMarker at (-37,6) size 17x17: "5"
     109            RenderListMarker at (-31,6) size 17x17: "5"
    110110            RenderText {#text} at (6,8) size 304x91
    111111              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    129129            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    130130          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    131             RenderListMarker at (-37,6) size 17x17: "6"
     131            RenderListMarker at (-31,6) size 17x17: "6"
    132132            RenderText {#text} at (6,8) size 280x106
    133133              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    152152            RenderBlock {DIV} at (0,0) size 583x24
    153153          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    154             RenderListMarker at (-37,6) size 17x17: "7"
     154            RenderListMarker at (-31,6) size 17x17: "7"
    155155            RenderText {#text} at (6,8) size 280x76
    156156              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    171171            RenderBlock {DIV} at (0,0) size 583x24
    172172          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    173             RenderListMarker at (-37,6) size 17x17: "8"
     173            RenderListMarker at (-31,6) size 17x17: "8"
    174174            RenderText {#text} at (6,8) size 280x76
    175175              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    190190            RenderBlock {DIV} at (0,24) size 583x0
    191191          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    192             RenderListMarker at (-37,6) size 17x17: "9"
     192            RenderListMarker at (-31,6) size 17x17: "9"
    193193            RenderText {#text} at (6,8) size 520x106
    194194              text run at (6,8) width 152: "div:first-of-type {"
    … …  
    212212            RenderBlock {DIV} at (0,0) size 583x24
    213213          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    214             RenderListMarker at (-46,6) size 26x17: "10"
     214            RenderListMarker at (-40,6) size 26x17: "10"
    215215            RenderText {#text} at (6,8) size 520x106
    216216              text run at (6,8) width 152: "div:first-of-type {"

  • trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 136x91
    3232              text run at (6,8) width 136: "div :last-child {"
    … …  
    4949            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    5050          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    51             RenderListMarker at (-37,6) size 17x17: "2"
     51            RenderListMarker at (-31,6) size 17x17: "2"
    5252            RenderText {#text} at (6,8) size 224x106
    5353              text run at (6,8) width 136: "div :last-child {"
    … …  
    7171            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    7272          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    73             RenderListMarker at (-37,6) size 17x17: "3"
     73            RenderListMarker at (-31,6) size 17x17: "3"
    7474            RenderText {#text} at (6,8) size 208x106
    7575              text run at (6,8) width 136: "div :last-child {"
    … …  
    123123            RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#990000]
    124124          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    125             RenderListMarker at (-37,6) size 17x17: "5"
     125            RenderListMarker at (-31,6) size 17x17: "5"
    126126            RenderText {#text} at (6,8) size 224x106
    127127              text run at (6,8) width 136: "div :last-child {"
    … …  
    146146            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    147147          RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
    148             RenderListMarker at (-37,6) size 17x17: "6"
     148            RenderListMarker at (-31,6) size 17x17: "6"
    149149            RenderText {#text} at (6,8) size 480x136
    150150              text run at (6,8) width 136: "div :last-child {"
    … …  
    172172            RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
    173173          RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
    174             RenderListMarker at (-37,6) size 17x17: "7"
     174            RenderListMarker at (-31,6) size 17x17: "7"
    175175            RenderText {#text} at (6,8) size 480x136
    176176              text run at (6,8) width 136: "div :last-child {"

  • trunk/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 280x61
    3232              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    4545            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    4646          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    47             RenderListMarker at (-37,6) size 17x17: "2"
     47            RenderListMarker at (-31,6) size 17x17: "2"
    4848            RenderText {#text} at (6,8) size 280x76
    4949              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    6464            RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
    6565          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    66             RenderListMarker at (-37,6) size 17x17: "3"
     66            RenderListMarker at (-31,6) size 17x17: "3"
    6767            RenderText {#text} at (6,8) size 280x76
    6868              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    8484            RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#009900]
    8585          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    86             RenderListMarker at (-37,6) size 17x17: "4"
     86            RenderListMarker at (-31,6) size 17x17: "4"
    8787            RenderText {#text} at (6,8) size 304x106
    8888              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    107107              RenderBlock {DIV} at (0,0) size 583x24
    108108          RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
    109             RenderListMarker at (-37,6) size 17x17: "5"
     109            RenderListMarker at (-31,6) size 17x17: "5"
    110110            RenderText {#text} at (6,8) size 304x91
    111111              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    129129              RenderBlock {DIV} at (0,0) size 583x0
    130130          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    131             RenderListMarker at (-37,6) size 17x17: "6"
     131            RenderListMarker at (-31,6) size 17x17: "6"
    132132            RenderText {#text} at (6,8) size 280x106
    133133              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    152152            RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
    153153          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    154             RenderListMarker at (-37,6) size 17x17: "7"
     154            RenderListMarker at (-31,6) size 17x17: "7"
    155155            RenderText {#text} at (6,8) size 280x76
    156156              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    171171            RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
    172172          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    173             RenderListMarker at (-37,6) size 17x17: "8"
     173            RenderListMarker at (-31,6) size 17x17: "8"
    174174            RenderText {#text} at (6,8) size 280x76
    175175              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    190190            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    191191          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    192             RenderListMarker at (-37,6) size 17x17: "9"
     192            RenderListMarker at (-31,6) size 17x17: "9"
    193193            RenderText {#text} at (6,8) size 480x106
    194194              text run at (6,8) width 144: "div:last-of-type {"
    … …  
    212212            RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
    213213          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    214             RenderListMarker at (-46,6) size 26x17: "10"
     214            RenderListMarker at (-40,6) size 26x17: "10"
    215215            RenderText {#text} at (6,8) size 480x106
    216216              text run at (6,8) width 144: "div:last-of-type {"

  • trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 136x91
    3232              text run at (6,8) width 136: "div :only-child {"
    … …  
    4848            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    4949          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    50             RenderListMarker at (-37,6) size 17x17: "2"
     50            RenderListMarker at (-31,6) size 17x17: "2"
    5151            RenderText {#text} at (6,8) size 208x106
    5252              text run at (6,8) width 136: "div :only-child {"
    … …  
    9696            RenderBlock {BLOCKQUOTE} at (40,40) size 503x0
    9797          RenderBlock {PRE} at (16,56) size 583x120 [bgcolor=#FFFFFF]
    98             RenderListMarker at (-37,6) size 17x17: "4"
     98            RenderListMarker at (-31,6) size 17x17: "4"
    9999            RenderText {#text} at (6,8) size 224x106
    100100              text run at (6,8) width 136: "div :only-child {"
    … …  
    119119            RenderBlock {DIV} at (0,24) size 583x0
    120120          RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
    121             RenderListMarker at (-37,6) size 17x17: "5"
     121            RenderListMarker at (-31,6) size 17x17: "5"
    122122            RenderText {#text} at (6,8) size 480x136
    123123              text run at (6,8) width 136: "div :only-child {"

  • trunk/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt

    r30635 r72527  
    2828            RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
    2929          RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
    30             RenderListMarker at (-37,6) size 17x17: "1"
     30            RenderListMarker at (-31,6) size 17x17: "1"
    3131            RenderText {#text} at (6,8) size 280x61
    3232              text run at (6,8) width 144: "div:only-of-type {"
    … …  
    4545            RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
    4646          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    47             RenderListMarker at (-37,6) size 17x17: "2"
     47            RenderListMarker at (-31,6) size 17x17: "2"
    4848            RenderText {#text} at (6,8) size 280x76
    4949              text run at (6,8) width 144: "div:only-of-type {"
    … …  
    6565              RenderBlock {DIV} at (0,0) size 583x0
    6666          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    67             RenderListMarker at (-37,6) size 17x17: "3"
     67            RenderListMarker at (-31,6) size 17x17: "3"
    6868            RenderText {#text} at (6,8) size 280x106
    6969              text run at (6,8) width 144: "div:only-of-type {"
    … …  
    8888            RenderBlock {DIV} at (0,24) size 583x0
    8989          RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
    90             RenderListMarker at (-37,6) size 17x17: "4"
     90            RenderListMarker at (-31,6) size 17x17: "4"
    9191            RenderText {#text} at (6,8) size 280x76
    9292              text run at (6,8) width 144: "div:only-of-type {"
    … …  
    107107            RenderBlock {DIV} at (0,24) size 583x0
    108108          RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
    109             RenderListMarker at (-37,6) size 17x17: "5"
     109            RenderListMarker at (-31,6) size 17x17: "5"
    110110            RenderText {#text} at (6,8) size 480x106
    111111              text run at (6,8) width 144: "div:only-of-type {"

  • trunk/LayoutTests/platform/mac/fast/doctypes/002-expected.txt

    r25970 r72527  
    1313          RenderBlock {UL} at (0,0) size 744x18
    1414            RenderListItem {LI} at (40,0) size 704x18
    15               RenderListMarker at (-57,0) size 7x18: bullet
     15              RenderListMarker at (-41,0) size 7x18: bullet
    1616              RenderListMarker at (-17,0) size 7x18: white bullet
    1717              RenderText {#text} at (0,0) size 251x18

  • trunk/LayoutTests/platform/mac/fast/lists/001-expected.txt

    r42334 r72527  
    99          RenderListItem {DIV} at (11,11) size 740x62 [border: (3px solid #FFA500)]
    1010            RenderListItem {DIV} at (11,11) size 718x40 [border: (3px solid #FFA500)]
    11               RenderListMarker at (104,11) size 7x18: bullet
    12               RenderListMarker at (104,11) size 7x18: bullet
     11              RenderListMarker at (56,11) size 7x18: bullet
     12              RenderListMarker at (80,11) size 7x18: bullet
    1313              RenderListMarker at (104,11) size 7x18: bullet
    1414              RenderText {#text} at (132,11) size 86x18

  • trunk/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum

    r71700 r72527  
    1 f7a10f5053c0cd7b2a915412c74e411e
     1dee58c18958a4d81998bb553aa2b0989

  • trunk/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt

    r71700 r72527  
    1 layer at (0,0) size 785x620
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x620
    4   RenderBlock {HTML} at (0,0) size 785x600
    5     RenderBody {BODY} at (8,8) size 761x584
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 776x584
    66      RenderBlock {DIV} at (0,0) size 106x584 [border: (3px solid #FFA500)]
    77        RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
    … …  
    99          RenderListItem {DIV} at (11,11) size 62x540 [border: (3px solid #FFA500)]
    1010            RenderListItem {DIV} at (11,11) size 40x518 [border: (3px solid #FFA500)]
    11               RenderListMarker at (11,104) size 18x7: bullet
    12               RenderListMarker at (11,104) size 18x7: bullet
    13               RenderListMarker at (11,104) size 18x7: bullet
     11              RenderListMarker at (11,76) size 18x7: bullet
     12              RenderListMarker at (11,94) size 18x7: bullet
     13              RenderListMarker at (11,112) size 18x7: bullet
    1414              RenderText {#text} at (11,132) size 18x86
    1515                text run at (11,132) width 86: "List item text."
    1616      RenderBlock {UL} at (122,0) size 140x584
    1717        RenderListItem {LI} at (0,40) size 140x544 [border: (2px solid #FF0000)]
    18           RenderListMarker at (52,554) size 18x7: bullet
     18          RenderListMarker at (52,516) size 18x7: bullet
    1919          RenderText {#text} at (52,75) size 36x417
    2020            text run at (52,75) width 417: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl"

  • trunk/LayoutTests/platform/mac/fast/lists/002-expected.txt

    r25970 r72527  
    77        RenderBlock {UL} at (0,0) size 784x36
    88          RenderListItem {LI} at (40,0) size 744x18
    9             RenderListMarker at (-17,0) size 7x18: bullet
     9            RenderListMarker at (688,0) size 7x18: bullet
    1010            RenderInline {A} at (0,0) size 39x18 [color=#0000EE]
    1111              RenderText {#text} at (705,0) size 39x18
    1212                text run at (705,0) width 39: "Home"
    1313          RenderListItem {LI} at (40,18) size 744x18
    14             RenderListMarker at (-17,0) size 7x18: bullet
     14            RenderListMarker at (670,0) size 7x18: bullet
    1515            RenderInline {A} at (0,0) size 57x18 [color=#0000EE]
    1616              RenderText {#text} at (687,0) size 57x18

  • trunk/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum

    r71700 r72527  
    1 c8cecd691c7bd29d8bebb3bbff4d4e6c
     1f3dca30448effd493cdae3d2b83812a6

  • trunk/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt

    r71700 r72527  
    77        RenderBlock {UL} at (0,0) size 36x584
    88          RenderListItem {LI} at (0,40) size 18x544
    9             RenderListMarker at (0,-17) size 18x7: bullet
     9            RenderListMarker at (0,488) size 18x7: bullet
    1010            RenderInline {A} at (0,0) size 18x39 [color=#0000EE]
    1111              RenderText {#text} at (0,505) size 18x39
    1212                text run at (0,505) width 39: "Home"
    1313          RenderListItem {LI} at (18,40) size 18x544
    14             RenderListMarker at (0,-17) size 18x7: bullet
     14            RenderListMarker at (0,470) size 18x7: bullet
    1515            RenderInline {A} at (0,0) size 18x57 [color=#0000EE]
    1616              RenderText {#text} at (0,487) size 18x57

  • trunk/LayoutTests/platform/mac/fast/lists/003-expected.txt

    r25970 r72527  
    119119        RenderBlock {UL} at (0,0) size 784x144
    120120          RenderListItem {LI} at (40,0) size 744x18
    121             RenderListMarker at (413,0) size 7x18: bullet
     121            RenderListMarker at (687,0) size 7x18: bullet
    122122            RenderInline {A} at (0,0) size 40x18 [color=#0000EE]
    123123              RenderText {#text} at (704,0) size 40x18
    124124                text run at (704,0) width 40: "About"
    125125          RenderListItem {LI} at (40,18) size 744x18
    126             RenderListMarker at (413,0) size 7x18: bullet
     126            RenderListMarker at (672,0) size 7x18: bullet
    127127            RenderInline {A} at (0,0) size 55x18 [color=#0000EE]
    128128              RenderText {#text} at (689,0) size 55x18
    129129                text run at (689,0) width 55: "Site map"
    130130          RenderListItem {LI} at (40,36) size 744x18
    131             RenderListMarker at (413,0) size 7x18: bullet
     131            RenderListMarker at (670,0) size 7x18: bullet
    132132            RenderInline {A} at (0,0) size 57x18 [color=#0000EE]
    133133              RenderText {#text} at (687,0) size 57x18
    134134                text run at (687,0) width 57: "Archives"
    135135          RenderListItem {LI} at (40,54) size 744x18
    136             RenderListMarker at (413,0) size 7x18: bullet
     136            RenderListMarker at (677,0) size 7x18: bullet
    137137            RenderInline {A} at (0,0) size 50x18 [color=#0000EE]
    138138              RenderText {#text} at (694,0) size 50x18
    139139                text run at (694,0) width 50: "Projects"
    140140          RenderListItem {LI} at (40,72) size 744x18
    141             RenderListMarker at (413,0) size 7x18: bullet
     141            RenderListMarker at (684,0) size 7x18: bullet
    142142            RenderInline {A} at (0,0) size 43x18 [color=#0000EE]
    143143              RenderText {#text} at (701,0) size 43x18
    144144                text run at (701,0) width 43: "Photos"
    145145          RenderListItem {LI} at (40,90) size 744x18
    146             RenderListMarker at (413,0) size 7x18: bullet
     146            RenderListMarker at (672,0) size 7x18: bullet
    147147            RenderInline {A} at (0,0) size 55x18 [color=#0000EE]
    148148              RenderText {#text} at (689,0) size 55x18
    149149                text run at (689,0) width 55: "Statistics"
    150150          RenderListItem {LI} at (40,108) size 744x18
    151             RenderListMarker at (413,0) size 7x18: bullet
     151            RenderListMarker at (583,0) size 7x18: bullet
    152152            RenderInline {A} at (0,0) size 144x18 [color=#0000EE]
    153153              RenderText {#text} at (600,0) size 144x18
    154154                text run at (600,0) width 144: "Accessibility statement"
    155155          RenderListItem {LI} at (40,126) size 744x18
    156             RenderListMarker at (413,0) size 7x18: bullet
     156            RenderListMarker at (615,0) size 7x18: bullet
    157157            RenderInline {A} at (0,0) size 29x18 [color=#0000EE]
    158158              RenderText {#text} at (632,0) size 29x18
    … …  
    167167        RenderBlock {UL} at (0,160) size 784x18
    168168          RenderListItem {LI} at (40,0) size 744x18
    169             RenderListMarker at (413,0) size 7x18: bullet
     169            RenderListMarker at (639,0) size 7x18: bullet
    170170            RenderInline {A} at (0,0) size 88x18 [color=#0000EE]
    171171              RenderText {#text} at (656,0) size 88x18
    … …  
    173173        RenderBlock {UL} at (0,194) size 784x108
    174174          RenderListItem {LI} at (40,0) size 744x18
    175             RenderListMarker at (413,0) size 7x18: bullet
     175            RenderListMarker at (635,0) size 7x18: bullet
    176176            RenderInline {A} at (0,0) size 92x18 [color=#0000EE]
    177177              RenderText {#text} at (652,0) size 92x18
    178178                text run at (652,0) width 92: "RSS Validator"
    179179          RenderListItem {LI} at (40,18) size 744x18
    180             RenderListMarker at (413,0) size 7x18: bullet
     180            RenderListMarker at (582,0) size 7x18: bullet
    181181            RenderInline {A} at (0,0) size 145x18 [color=#0000EE]
    182182              RenderText {#text} at (599,0) size 145x18
    183183                text run at (599,0) width 145: "Dive Into Accessibility"
    184184          RenderListItem {LI} at (40,36) size 744x18
    185             RenderListMarker at (413,0) size 7x18: bullet
     185            RenderListMarker at (626,0) size 7x18: bullet
    186186            RenderInline {A} at (0,0) size 101x18 [color=#0000EE]
    187187              RenderText {#text} at (643,0) size 101x18
    188188                text run at (643,0) width 101: "Dive Into OS X"
    189189          RenderListItem {LI} at (40,54) size 744x18
    190             RenderListMarker at (413,0) size 7x18: bullet
     190            RenderListMarker at (629,0) size 7x18: bullet
    191191            RenderInline {A} at (0,0) size 98x18 [color=#0000EE]
    192192              RenderText {#text} at (646,0) size 98x18
    193193                text run at (646,0) width 98: "Dive Into J2EE"
    194194          RenderListItem {LI} at (40,72) size 744x18
    195             RenderListMarker at (413,0) size 7x18: bullet
     195            RenderListMarker at (618,0) size 7x18: bullet
    196196            RenderInline {A} at (0,0) size 109x18 [color=#0000EE]
    197197              RenderText {#text} at (635,0) size 109x18
    198198                text run at (635,0) width 109: "Dive Into Python"
    199199          RenderListItem {LI} at (40,90) size 744x18
    200             RenderListMarker at (413,0) size 7x18: bullet
     200            RenderListMarker at (682,0) size 7x18: bullet
    201201            RenderInline {A} at (0,0) size 45x18 [color=#0000EE]
    202202              RenderText {#text} at (699,0) size 45x18

  • trunk/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum

    r71700 r72527  
    1 8ea39c2cea378fe2a063ce9a79663813
     14f54cd0054f763234b9c7ecfde6953a6

  • trunk/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt

    r71700 r72527  
    123123        RenderBlock {UL} at (0,0) size 144x584
    124124          RenderListItem {LI} at (0,40) size 18x544
    125             RenderListMarker at (0,293) size 18x7: bullet
     125            RenderListMarker at (0,487) size 18x7: bullet
    126126            RenderInline {A} at (0,0) size 18x40 [color=#0000EE]
    127127              RenderText {#text} at (0,504) size 18x40
    128128                text run at (0,504) width 40: "About"
    129129          RenderListItem {LI} at (18,40) size 18x544
    130             RenderListMarker at (0,293) size 18x7: bullet
     130            RenderListMarker at (0,472) size 18x7: bullet
    131131            RenderInline {A} at (0,0) size 18x55 [color=#0000EE]
    132132              RenderText {#text} at (0,489) size 18x55
    133133                text run at (0,489) width 55: "Site map"
    134134          RenderListItem {LI} at (36,40) size 18x544
    135             RenderListMarker at (0,293) size 18x7: bullet
     135            RenderListMarker at (0,470) size 18x7: bullet
    136136            RenderInline {A} at (0,0) size 18x57 [color=#0000EE]
    137137              RenderText {#text} at (0,487) size 18x57
    138138                text run at (0,487) width 57: "Archives"
    139139          RenderListItem {LI} at (54,40) size 18x544
    140             RenderListMarker at (0,293) size 18x7: bullet
     140            RenderListMarker at (0,477) size 18x7: bullet
    141141            RenderInline {A} at (0,0) size 18x50 [color=#0000EE]
    142142              RenderText {#text} at (0,494) size 18x50
    143143                text run at (0,494) width 50: "Projects"
    144144          RenderListItem {LI} at (72,40) size 18x544
    145             RenderListMarker at (0,293) size 18x7: bullet
     145            RenderListMarker at (0,484) size 18x7: bullet
    146146            RenderInline {A} at (0,0) size 18x43 [color=#0000EE]
    147147              RenderText {#text} at (0,501) size 18x43
    148148                text run at (0,501) width 43: "Photos"
    149149          RenderListItem {LI} at (90,40) size 18x544
    150             RenderListMarker at (0,293) size 18x7: bullet
     150            RenderListMarker at (0,472) size 18x7: bullet
    151151            RenderInline {A} at (0,0) size 18x55 [color=#0000EE]
    152152              RenderText {#text} at (0,489) size 18x55
    153153                text run at (0,489) width 55: "Statistics"
    154154          RenderListItem {LI} at (108,40) size 18x544
    155             RenderListMarker at (0,293) size 18x7: bullet
     155            RenderListMarker at (0,383) size 18x7: bullet
    156156            RenderInline {A} at (0,0) size 18x144 [color=#0000EE]
    157157              RenderText {#text} at (0,400) size 18x144
    158158                text run at (0,400) width 144: "Accessibility statement"
    159159          RenderListItem {LI} at (126,40) size 18x544
    160             RenderListMarker at (0,293) size 18x7: bullet
     160            RenderListMarker at (0,415) size 18x7: bullet
    161161            RenderInline {A} at (0,0) size 18x29 [color=#0000EE]
    162162              RenderText {#text} at (0,432) size 18x29
    … …  
    171171        RenderBlock {UL} at (160,0) size 18x584
    172172          RenderListItem {LI} at (0,40) size 18x544
    173             RenderListMarker at (0,293) size 18x7: bullet
     173            RenderListMarker at (0,439) size 18x7: bullet
    174174            RenderInline {A} at (0,0) size 18x88 [color=#0000EE]
    175175              RenderText {#text} at (0,456) size 18x88
    … …  
    177177        RenderBlock {UL} at (194,0) size 108x584
    178178          RenderListItem {LI} at (0,40) size 18x544
    179             RenderListMarker at (0,293) size 18x7: bullet
     179            RenderListMarker at (0,435) size 18x7: bullet
    180180            RenderInline {A} at (0,0) size 18x92 [color=#0000EE]
    181181              RenderText {#text} at (0,452) size 18x92
    182182                text run at (0,452) width 92: "RSS Validator"
    183183          RenderListItem {LI} at (18,40) size 18x544
    184             RenderListMarker at (0,293) size 18x7: bullet
     184            RenderListMarker at (0,382) size 18x7: bullet
    185185            RenderInline {A} at (0,0) size 18x145 [color=#0000EE]
    186186              RenderText {#text} at (0,399) size 18x145
    187187                text run at (0,399) width 145: "Dive Into Accessibility"
    188188          RenderListItem {LI} at (36,40) size 18x544
    189             RenderListMarker at (0,293) size 18x7: bullet
     189            RenderListMarker at (0,426) size 18x7: bullet
    190190            RenderInline {A} at (0,0) size 18x101 [color=#0000EE]
    191191              RenderText {#text} at (0,443) size 18x101
    192192                text run at (0,443) width 101: "Dive Into OS X"
    193193          RenderListItem {LI} at (54,40) size 18x544
    194             RenderListMarker at (0,293) size 18x7: bullet
     194            RenderListMarker at (0,429) size 18x7: bullet
    195195            RenderInline {A} at (0,0) size 18x98 [color=#0000EE]
    196196              RenderText {#text} at (0,446) size 18x98
    197197                text run at (0,446) width 98: "Dive Into J2EE"
    198198          RenderListItem {LI} at (72,40) size 18x544
    199             RenderListMarker at (0,293) size 18x7: bullet
     199            RenderListMarker at (0,418) size 18x7: bullet
    200200            RenderInline {A} at (0,0) size 18x109 [color=#0000EE]
    201201              RenderText {#text} at (0,435) size 18x109
    202202                text run at (0,435) width 109: "Dive Into Python"
    203203          RenderListItem {LI} at (90,40) size 18x544
    204             RenderListMarker at (0,293) size 18x7: bullet
     204            RenderListMarker at (0,482) size 18x7: bullet
    205205            RenderInline {A} at (0,0) size 18x45 [color=#0000EE]
    206206              RenderText {#text} at (0,499) size 18x45

  • trunk/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum

    r71700 r72527  
    1 60d5795a1a0a87622e3d56d64ce2cd7f
     16878be66a7c25b309bd51d782f725723

  • trunk/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt

    r71700 r72527  
    1111            text run at (18,0) width 191: "some extra test in order to test."
    1212        RenderListItem {LI} at (36,50) size 72x534 [bgcolor=#FFFFFF] [border: (25px solid #008000) none]
    13           RenderListMarker at (0,-17) size 18x7: bullet
     13          RenderListMarker at (0,8) size 18x7: bullet
    1414          RenderText {#text} at (0,50) size 72x473
    1515            text run at (0,50) width 473: "Another list item might not be such a bad idea, either, considering that such"

  • trunk/LayoutTests/platform/mac/fast/lists/008-vertical-expected.checksum

    r71700 r72527  
    1 9c513c74f48355e9a044c04328c2326d
     1ee20a6ee52266f024547f4a288017c0a

  • trunk/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt

    r71700 r72527  
    66      RenderBlock {UL} at (0,0) size 134x195 [border: (1px solid #0000FF)]
    77        RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
    8           RenderListMarker at (10,-17) size 18x7: bullet
     8          RenderListMarker at (10,-12) size 18x7: bullet
    99          RenderText {#text} at (10,10) size 18x59
    1010            text run at (10,10) width 59: "First item"
    1111        RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
    12           RenderListMarker at (10,-17) size 18x7: bullet
     12          RenderListMarker at (10,-12) size 18x7: bullet
    1313          RenderText {#text} at (10,10) size 36x106
    1414            text run at (10,10) width 106: "Second and very"
    1515            text run at (28,10) width 91: "very long item"
    1616        RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
    17           RenderListMarker at (10,-17) size 18x7: bullet
     17          RenderListMarker at (10,-12) size 18x7: bullet
    1818          RenderText {#text} at (10,10) size 18x66
    1919            text run at (10,10) width 66: "Third item"
    2020      RenderBlock {UL} at (150,0) size 134x195 [border: (1px solid #FF0000)]
    2121        RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
    22           RenderListMarker at (10,163) size 18x7: bullet
     22          RenderListMarker at (10,158) size 18x7: bullet
    2323          RenderText {#text} at (10,84) size 18x59
    2424            text run at (10,84) width 59: "First item"
    2525        RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
    26           RenderListMarker at (10,163) size 18x7: bullet
     26          RenderListMarker at (10,158) size 18x7: bullet
    2727          RenderText {#text} at (10,37) size 36x106
    2828            text run at (10,37) width 106: "Second and very"
    2929            text run at (28,52) width 91: "very long item"
    3030        RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
    31           RenderListMarker at (10,163) size 18x7: bullet
     31          RenderListMarker at (10,158) size 18x7: bullet
    3232          RenderText {#text} at (10,77) size 18x66
    3333            text run at (10,77) width 66: "Third item"
    … …  
    6262      RenderBlock {UL} at (600,0) size 134x195 [border: (1px solid #0000FF)]
    6363        RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
    64           RenderListMarker at (14,-17) size 10x10
     64          RenderListMarker at (14,-12) size 10x10
    6565          RenderText {#text} at (10,10) size 18x59
    6666            text run at (10,10) width 59: "First item"
    6767        RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
    68           RenderListMarker at (14,-17) size 10x10
     68          RenderListMarker at (14,-12) size 10x10
    6969          RenderText {#text} at (10,10) size 36x106
    7070            text run at (10,10) width 106: "Second and very"
    7171            text run at (28,10) width 91: "very long item"
    7272        RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
    73           RenderListMarker at (14,-17) size 10x10
     73          RenderListMarker at (14,-12) size 10x10
    7474          RenderText {#text} at (10,10) size 18x66
    7575            text run at (10,10) width 66: "Third item"
    7676      RenderBlock {UL} at (750,0) size 134x195 [border: (1px solid #FF0000)]
    7777        RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
    78           RenderListMarker at (14,160) size 10x10
     78          RenderListMarker at (14,155) size 10x10
    7979          RenderText {#text} at (10,84) size 18x59
    8080            text run at (10,84) width 59: "First item"
    8181        RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
    82           RenderListMarker at (14,160) size 10x10
     82          RenderListMarker at (14,155) size 10x10
    8383          RenderText {#text} at (10,37) size 36x106
    8484            text run at (10,37) width 106: "Second and very"
    8585            text run at (28,52) width 91: "very long item"
    8686        RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
    87           RenderListMarker at (14,160) size 10x10
     87          RenderListMarker at (14,155) size 10x10
    8888          RenderText {#text} at (10,77) size 18x66
    8989            text run at (10,77) width 66: "Third item"
    … …  
    118118      RenderBlock {OL} at (1200,0) size 134x195 [border: (1px solid #0000FF)]
    119119        RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
    120           RenderListMarker at (10,-20) size 18x16: "1"
     120          RenderListMarker at (10,-15) size 18x16: "1"
    121121          RenderText {#text} at (10,10) size 18x59
    122122            text run at (10,10) width 59: "First item"
    123123        RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
    124           RenderListMarker at (10,-20) size 18x16: "2"
     124          RenderListMarker at (10,-15) size 18x16: "2"
    125125          RenderText {#text} at (10,10) size 36x106
    126126            text run at (10,10) width 106: "Second and very"
    127127            text run at (28,10) width 91: "very long item"
    128128        RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
    129           RenderListMarker at (10,-20) size 18x16: "3"
     129          RenderListMarker at (10,-15) size 18x16: "3"
    130130          RenderText {#text} at (10,10) size 18x66
    131131            text run at (10,10) width 66: "Third item"
    132132      RenderBlock {OL} at (1350,0) size 134x195 [border: (1px solid #FF0000)]
    133133        RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
    134           RenderListMarker at (10,157) size 18x16: "1"
     134          RenderListMarker at (10,152) size 18x16: "1"
    135135          RenderText {#text} at (10,84) size 18x59
    136136            text run at (10,84) width 59: "First item"
    137137        RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
    138           RenderListMarker at (10,157) size 18x16: "2"
     138          RenderListMarker at (10,152) size 18x16: "2"
    139139          RenderText {#text} at (10,37) size 36x106
    140140            text run at (10,37) width 106: "Second and very"
    141141            text run at (28,52) width 91: "very long item"
    142142        RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
    143           RenderListMarker at (10,157) size 18x16: "3"
     143          RenderListMarker at (10,152) size 18x16: "3"
    144144          RenderText {#text} at (10,77) size 18x66
    145145            text run at (10,77) width 66: "Third item"

  • trunk/WebCore/ChangeLog

    r72522 r72527  
     12010-11-22  Renata Hodovan  <reni@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        Outside list bullets ignore text-align style.
     6        https://bugs.webkit.org/show-bug.cgi?id=15713
     7
     8        Fix the position of outside markers by setting its logicalLeft member. Embedded markers need special treatment.
     9        First, the total width of markers should be calculated. Subtracting it from logicalLeft we get the outermost bullet's
     10        position. As for the others, this sum should be decremented with the previous marker's width.
     11        In case of vertical markers the padding is unneeded.
     12
     13        Test: fast/lists/outSideListMarkers.html
     14
     15        * rendering/InlineFlowBox.cpp:
     16        (WebCore::InlineFlowBox::placeBoxesInInlineDirection):
     17        * rendering/RenderListItem.cpp:
     18        (WebCore::RenderListItem::positionListMarker):
     19
    1202010-11-22  Yael Aharon  <yael.aharon@nokia.com>, Chang Shu  <chang.shu@nokia.com>
    221

  • trunk/WebCore/rendering/InlineFlowBox.cpp

    r72347 r72527  
    274274    int startLogicalLeft = logicalLeft;
    275275    logicalLeft += borderLogicalLeft() + paddingLogicalLeft();
    276    
     276
     277    int markerWidth = 0;
     278    for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
     279        if (!curr->renderer()->isListMarker())
     280            continue;
     281        RenderListMarker* marker = toRenderListMarker(curr->renderer());
     282        if (!marker->isInside())
     283            markerWidth += marker->width() - marker->marginLeft();
     284    }
     285
    277286    for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
    278287        if (curr->renderer()->isText()) {
    … …  
    351360               
    352361                logicalLeft += curr->logicalWidth() + logicalRightMargin;
     362            } else {
     363                RenderListMarker* marker = toRenderListMarker(curr->renderer());
     364                markerWidth -= marker->width() - marker->marginLeft();
     365                curr->setLogicalLeft(logicalLeft - markerWidth);
    353366            }
    354367        }

  • trunk/WebCore/rendering/RenderListItem.cpp

    r71700 r72527  
    263263        // not being as tight as it could be though.
    264264        if (style()->isLeftToRightDirection()) {
    265             int leftLineOffset = logicalLeftOffsetForLine(blockOffset, logicalLeftOffsetForLine(blockOffset, false), false);
    266             markerLogicalLeft = leftLineOffset - lineOffset - paddingStart() - borderStart() + m_marker->marginStart();
     265            if (style()->isHorizontalWritingMode())
     266                markerLogicalLeft = m_marker->logicalLeft() - paddingStart() - borderStart() + m_marker->marginStart();
     267            else
     268                markerLogicalLeft = m_marker->logicalLeft() - borderStart() + m_marker->marginStart();
    267269            m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
    268270            for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
    … …  
    274276            }
    275277        } else {
    276             int rightLineOffset = logicalRightOffsetForLine(blockOffset, logicalRightOffsetForLine(blockOffset, false), false);
    277             markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() + borderStart() + m_marker->marginEnd();
     278            if (style()->isHorizontalWritingMode())
     279                markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borderStart() + m_marker->marginEnd();
     280            else
     281                markerLogicalLeft = m_marker->logicalLeft() + borderStart() + m_marker->marginEnd();
    278282            m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
    279283            for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
Note: See TracChangeset for help on using the changeset viewer.