Changeset 72582 in webkit
- Timestamp:
- Nov 22, 2010 9:41:24 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 67 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r72577 r72582 1 2010-11-22 David Hyatt <hyatt@apple.com> 2 3 Back out r72527 since it caused multiple rendering regressions. Details in bug. 4 5 * fast/lists/outSideListMarkers-expected.txt: Removed. 6 * fast/lists/outSideListMarkers.html: Removed. 7 * platform/mac-leopard/css1/box_properties/margin_right-expected.checksum: 8 * platform/mac-leopard/css1/box_properties/margin_right-expected.png: 9 * platform/mac-leopard/css1/box_properties/padding_right-expected.checksum: 10 * platform/mac-leopard/css1/box_properties/padding_right-expected.png: 11 * platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum: 12 * platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png: 13 * platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum: 14 * platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png: 15 * platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum: 16 * platform/mac-leopard/fast/css/empty-pseudo-class-expected.png: 17 * platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum: 18 * platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png: 19 * platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum: 20 * platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png: 21 * platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum: 22 * platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png: 23 * platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum: 24 * platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png: 25 * platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum: 26 * platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png: 27 * platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum: 28 * platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png: 29 * platform/mac-leopard/fast/doctypes/002-expected.checksum: 30 * platform/mac-leopard/fast/doctypes/002-expected.png: 31 * platform/mac-leopard/fast/lists/001-expected.checksum: 32 * platform/mac-leopard/fast/lists/001-expected.png: 33 * platform/mac-leopard/fast/lists/002-expected.checksum: 34 * platform/mac-leopard/fast/lists/002-expected.png: 35 * platform/mac-leopard/fast/lists/003-expected.checksum: 36 * platform/mac-leopard/fast/lists/003-expected.png: 37 * platform/mac/css1/box_properties/margin_right-expected.txt: 38 * platform/mac/css1/box_properties/padding_right-expected.txt: 39 * platform/mac/editing/pasteboard/merge-end-list-expected.txt: 40 * platform/mac/editing/selection/extend-by-word-002-expected.checksum: 41 * platform/mac/editing/selection/extend-by-word-002-expected.png: 42 * platform/mac/editing/selection/extend-by-word-002-expected.txt: 43 * platform/mac/fast/css/background-shorthand-invalid-url-expected.txt: 44 * platform/mac/fast/css/empty-pseudo-class-expected.txt: 45 * platform/mac/fast/css/first-child-pseudo-class-expected.txt: 46 * platform/mac/fast/css/first-of-type-pseudo-class-expected.txt: 47 * platform/mac/fast/css/last-child-pseudo-class-expected.txt: 48 * platform/mac/fast/css/last-of-type-pseudo-class-expected.txt: 49 * platform/mac/fast/css/only-child-pseudo-class-expected.txt: 50 * platform/mac/fast/css/only-of-type-pseudo-class-expected.txt: 51 * platform/mac/fast/doctypes/002-expected.txt: 52 * platform/mac/fast/lists/001-expected.txt: 53 * platform/mac/fast/lists/001-vertical-expected.checksum: 54 * platform/mac/fast/lists/001-vertical-expected.png: 55 * platform/mac/fast/lists/001-vertical-expected.txt: 56 * platform/mac/fast/lists/002-expected.txt: 57 * platform/mac/fast/lists/002-vertical-expected.checksum: 58 * platform/mac/fast/lists/002-vertical-expected.png: 59 * platform/mac/fast/lists/002-vertical-expected.txt: 60 * platform/mac/fast/lists/003-expected.txt: 61 * platform/mac/fast/lists/003-vertical-expected.checksum: 62 * platform/mac/fast/lists/003-vertical-expected.png: 63 * platform/mac/fast/lists/003-vertical-expected.txt: 64 * platform/mac/fast/lists/007-vertical-expected.checksum: 65 * platform/mac/fast/lists/007-vertical-expected.png: 66 * platform/mac/fast/lists/007-vertical-expected.txt: 67 * platform/mac/fast/lists/008-vertical-expected.checksum: 68 * platform/mac/fast/lists/008-vertical-expected.png: 69 * platform/mac/fast/lists/008-vertical-expected.txt: 70 * platform/mac/fast/lists/outSideListMarkers-expected.checksum: Removed. 71 * platform/mac/fast/lists/outSideListMarkers-expected.png: Removed. 72 1 73 2010-11-22 Andreas Kling <kling@webkit.org> 2 74 -
trunk/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum
r72527 r72582 1 5 5d672967e8ddbf87246a11f92c9c7291 535d07180f66e0a374faafc4b54b8962 -
trunk/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum
r72527 r72582 1 fdd2eaba37bae8295f9aec88acefcb78 1 8fb1e154e79643ac7bbe9205dea3d03b -
trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum
r72527 r72582 1 60d707dab81ad84c1f511fdfc375a655 1 d012e6bdb5ad2f5b2e533bedcbbc6789 -
trunk/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum
r72527 r72582 1 bb6c3f97d3127b0e75e47ce1f426302a 1 870fc7a4b6d7194a482d5d782ed12201 -
trunk/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum
r72527 r72582 1 74690022d6e9696f8a57d7fac76ef9f5 1 26b8e5f280430642b910f5238dc1c23f -
trunk/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum
r72527 r72582 1 cecb5833db1b0399f740243dfa067554 1 5ccd68b5eda1a8a6fdc3a2c3ad642323 -
trunk/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum
r72527 r72582 1 d1ac2a47cf24b1fa807281fd778ec6e21 c3536f4b6e48b311bff7d09886204332 -
trunk/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum
r72527 r72582 1 e45354862040a03e31b2190fb43f6979 1 d2b02cccba673c34576738f4fc873ad0 -
trunk/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum
r72527 r72582 1 f36f002bef42315364af485a1f0d8113 1 3f7d246c4306b7b150771e8bbc17b769 -
trunk/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum
r72527 r72582 1 cc2f8143bac591ec5cd34b08554c22f0 1 085a3864adb1ffffc229133ac8519785 -
trunk/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum
r72527 r72582 1 cc72d41312ddd9889eb9887f5c3f1266 1 34a12633ff0f6d7d22e42deeeb2b01ce -
trunk/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum
r72527 r72582 1 48e1e5d5fb2689ebd477a505cae7252c 1 1a8adaeca723f7629201cdbfeb9b12be -
trunk/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum
r72527 r72582 1 a5c9bfd57b632e5d90ef2256fc137b06 1 fa6148a3e615abad86aea15059ac7bd5 -
trunk/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum
r72527 r72582 1 b3bf0281f9f2f3b3718defa2a510996f 1 fdb1d40544f0c806f99f0bb14517df6b -
trunk/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum
r72527 r72582 1 645fe17dbe15c1dc22b2e49efcf605841 c3e0d7953236beb9ebb61441399383e4 -
trunk/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
r72527 r72582 40 40 RenderBlock {UL} at (0,343) size 744x90 [bgcolor=#808080] 41 41 RenderListItem {LI} at (40,0) size 704x18 42 RenderListMarker at (-1 3,0) size 7x18: bullet42 RenderListMarker at (-17,0) size 7x18: bullet 43 43 RenderText {#text} at (4,0) size 700x18 44 44 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." 45 45 RenderListItem {LI} at (40,18) size 679x54 [bgcolor=#FFFFFF] 46 RenderListMarker at ( 6,0) size 7x18: bullet46 RenderListMarker at (-17,0) size 7x18: bullet 47 47 RenderText {#text} at (23,0) size 677x54 48 48 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-" … … 51 51 text run at (199,36) width 480: "to make 50 pixels of margin, and its background-color has been set to white." 52 52 RenderListItem {LI} at (40,72) size 704x18 53 RenderListMarker at ( 508,0) size 7x18: bullet53 RenderListMarker at (-17,0) size 7x18: bullet 54 54 RenderText {#text} at (525,0) size 179x18 55 55 text run at (525,0) width 179: "This is an unclassed list item" … … 94 94 RenderBlock {UL} at (4,192) size 722x108 [bgcolor=#808080] 95 95 RenderListItem {LI} at (40,0) size 682x36 96 RenderListMarker at ( 1,0) size 7x18: bullet96 RenderListMarker at (-17,0) size 7x18: bullet 97 97 RenderText {#text} at (18,0) size 664x36 98 98 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" 99 99 text run at (650,18) width 32: "gray." 100 100 RenderListItem {LI} at (40,36) size 657x54 [bgcolor=#FFFFFF] 101 RenderListMarker at (-1 6,0) size 7x18: bullet101 RenderListMarker at (-17,0) size 7x18: bullet 102 102 RenderText {#text} at (1,0) size 656x54 103 103 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-" … … 106 106 text run at (129,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white." 107 107 RenderListItem {LI} at (40,90) size 682x18 108 RenderListMarker at ( 486,0) size 7x18: bullet108 RenderListMarker at (-17,0) size 7x18: bullet 109 109 RenderText {#text} at (503,0) size 179x18 110 110 text run at (503,0) width 179: "This is an unclassed list item" -
trunk/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt
r72527 r72582 55 55 RenderBlock {UL} at (0,469) size 769x72 [bgcolor=#808080] 56 56 RenderListItem {LI} at (40,0) size 704x36 57 RenderListMarker at (-1 0,0) size 7x18: bullet57 RenderListMarker at (-17,0) size 7x18: bullet 58 58 RenderText {#text} at (7,0) size 697x36 59 59 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" 60 60 text run at (679,18) width 25: "test." 61 61 RenderListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF] 62 RenderListMarker at ( 2,0) size 7x18: bullet62 RenderListMarker at (-17,0) size 7x18: bullet 63 63 RenderText {#text} at (19,0) size 660x36 64 64 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" … … 117 117 RenderBlock {UL} at (4,336) size 747x72 [bgcolor=#808080] 118 118 RenderListItem {LI} at (40,0) size 682x36 119 RenderListMarker at (-1 6,0) size 7x18: bullet119 RenderListMarker at (-17,0) size 7x18: bullet 120 120 RenderText {#text} at (1,0) size 681x36 121 121 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" 122 122 text run at (641,18) width 41: "to test." 123 123 RenderListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF] 124 RenderListMarker at ( 6,0) size 7x18: bullet124 RenderListMarker at (-17,0) size 7x18: bullet 125 125 RenderText {#text} at (23,0) size 634x36 126 126 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
r72527 r72582 46 46 RenderListItem {LI} at (40,0) size 744x36 47 47 RenderBlock {DIV} at (0,0) size 744x18 48 RenderListMarker at (- 85,0) size 7x18: bullet48 RenderListMarker at (-17,0) size 7x18: bullet 49 49 RenderText {#text} at (0,0) size 28x18 50 50 text run at (0,0) width 28: "Item" -
trunk/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum
r72527 r72582 1 ee21a1f286cc3d39f06fa65c430473d41 4e7ba809b66454d9631f978228c525d4 -
trunk/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt
r72527 r72582 16 16 RenderBlock {UL} at (14,14) size 120x138 17 17 RenderListItem {LI} at (0,0) size 120x21 18 RenderListMarker at (- 25,6) size 5x12: bullet18 RenderListMarker at (-14,6) size 5x12: bullet 19 19 RenderInline (generated) at (0,0) size 14x24 20 20 RenderText {#text} at (5,-4) size 14x24 … … 25 25 text run at (19,6) width 52: "Appetizers" 26 26 RenderListItem {LI} at (0,21) size 120x21 27 RenderListMarker at (- 25,6) size 5x12: bullet27 RenderListMarker at (-14,6) size 5x12: bullet 28 28 RenderInline (generated) at (0,0) size 14x24 29 29 RenderText {#text} at (5,-4) size 14x24 … … 34 34 text run at (19,6) width 78: "Soups & Salads" 35 35 RenderListItem {LI} at (0,42) size 120x33 36 RenderListMarker at (- 25,6) size 5x12: bullet36 RenderListMarker at (-14,6) size 5x12: bullet 37 37 RenderInline (generated) at (0,0) size 14x24 38 38 RenderText {#text} at (5,-4) size 14x24 … … 45 45 text run at (16,18) width 38: "Burgers" 46 46 RenderListItem {LI} at (0,75) size 120x21 47 RenderListMarker at (- 25,6) size 5x12: bullet47 RenderListMarker at (-14,6) size 5x12: bullet 48 48 RenderInline (generated) at (0,0) size 14x24 49 49 RenderText {#text} at (5,-4) size 14x24 … … 54 54 text run at (19,6) width 65: "Steak & Ribs" 55 55 RenderListItem {LI} at (0,96) size 120x21 56 RenderListMarker at (- 25,6) size 5x12: bullet56 RenderListMarker at (-14,6) size 5x12: bullet 57 57 RenderInline (generated) at (0,0) size 14x24 58 58 RenderText {#text} at (5,-4) size 14x24 … … 63 63 text run at (19,6) width 41: "Seafood" 64 64 RenderListItem {LI} at (0,117) size 120x21 65 RenderListMarker at (- 25,6) size 5x12: bullet65 RenderListMarker at (-14,6) size 5x12: bullet 66 66 RenderInline (generated) at (0,0) size 14x24 67 67 RenderText {#text} at (5,-4) size 14x24 -
trunk/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt
r72527 r72582 11 11 RenderListItem {LI} at (40,0) size 744x91 [border: (1px solid #FF0000)] 12 12 RenderBlock {SPAN} at (1,1) size 304x89 [border: (2px solid #008000)] 13 RenderListMarker at (-1 6,2) size 7x18: bullet13 RenderListMarker at (-18,2) size 7x18: bullet 14 14 RenderText {#text} at (2,2) size 4x18 15 15 text run at (2,2) width 4: " " -
trunk/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 88x61 32 32 text run at (6,8) width 64: ":empty {" … … 43 43 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 44 44 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 45 RenderListMarker at (-3 1,6) size 17x17: "2"45 RenderListMarker at (-37,6) size 17x17: "2" 46 46 RenderText {#text} at (6,8) size 272x61 47 47 text run at (6,8) width 64: ":empty {" … … 58 58 RenderBlock {DIV} at (0,0) size 583x24 59 59 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 60 RenderListMarker at (-3 1,6) size 17x17: "3"60 RenderListMarker at (-37,6) size 17x17: "3" 61 61 RenderText {#text} at (6,8) size 96x61 62 62 text run at (6,8) width 64: ":empty {" … … 72 72 RenderBlock {DIV} at (16,16) size 583x42 [bgcolor=#009900] 73 73 RenderBlock {DIV} at (0,0) size 583x42 74 RenderListMarker at (- 25,12) size 17x17: "4"74 RenderListMarker at (-37,12) size 17x17: "4" 75 75 RenderText {#text} at (12,12) size 4x17 76 76 text run at (12,12) width 4: "." … … 95 95 RenderBlock {BLOCKQUOTE} at (12,12) size 559x0 [bgcolor=#990000] 96 96 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 97 RenderListMarker at (-3 1,6) size 17x17: "5"97 RenderListMarker at (-37,6) size 17x17: "5" 98 98 RenderText {#text} at (6,8) size 288x61 99 99 text run at (6,8) width 64: ":empty {" … … 111 111 RenderBlock {DIV} at (12,12) size 559x0 [bgcolor=#990000] 112 112 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 113 RenderListMarker at (-3 1,6) size 17x17: "6"113 RenderListMarker at (-37,6) size 17x17: "6" 114 114 RenderText {#text} at (6,8) size 384x106 115 115 text run at (6,8) width 64: ":empty {" -
trunk/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 144x91 32 32 text run at (6,8) width 144: "div :first-child {" … … 49 49 RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 50 50 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 51 RenderListMarker at (-3 1,6) size 17x17: "2"51 RenderListMarker at (-37,6) size 17x17: "2" 52 52 RenderText {#text} at (6,8) size 224x106 53 53 text run at (6,8) width 144: "div :first-child {" … … 71 71 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 72 72 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 73 RenderListMarker at (-3 1,6) size 17x17: "3"73 RenderListMarker at (-37,6) size 17x17: "3" 74 74 RenderText {#text} at (6,8) size 208x106 75 75 text run at (6,8) width 144: "div :first-child {" … … 123 123 RenderBlock {DIV} at (0,0) size 583x24 124 124 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 125 RenderListMarker at (-3 1,6) size 17x17: "5"125 RenderListMarker at (-37,6) size 17x17: "5" 126 126 RenderText {#text} at (6,8) size 224x106 127 127 text run at (6,8) width 144: "div :first-child {" … … 146 146 RenderBlock {DIV} at (0,24) size 583x0 147 147 RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF] 148 RenderListMarker at (-3 1,6) size 17x17: "6"148 RenderListMarker at (-37,6) size 17x17: "6" 149 149 RenderText {#text} at (6,8) size 520x136 150 150 text run at (6,8) width 144: "div :first-child {" … … 172 172 RenderBlock {DIV} at (0,0) size 583x24 173 173 RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF] 174 RenderListMarker at (-3 1,6) size 17x17: "7"174 RenderListMarker at (-37,6) size 17x17: "7" 175 175 RenderText {#text} at (6,8) size 520x136 176 176 text run at (6,8) width 144: "div :first-child {" -
trunk/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 280x61 32 32 text run at (6,8) width 152: "div:first-of-type {" … … 45 45 RenderBlock {DIV} at (0,24) size 583x0 46 46 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 47 RenderListMarker at (-3 1,6) size 17x17: "2"47 RenderListMarker at (-37,6) size 17x17: "2" 48 48 RenderText {#text} at (6,8) size 280x76 49 49 text run at (6,8) width 152: "div:first-of-type {" … … 64 64 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 65 65 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 66 RenderListMarker at (-3 1,6) size 17x17: "3"66 RenderListMarker at (-37,6) size 17x17: "3" 67 67 RenderText {#text} at (6,8) size 280x76 68 68 text run at (6,8) width 152: "div:first-of-type {" … … 84 84 RenderBlock {DIV} at (0,0) size 583x24 85 85 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 86 RenderListMarker at (-3 1,6) size 17x17: "4"86 RenderListMarker at (-37,6) size 17x17: "4" 87 87 RenderText {#text} at (6,8) size 304x106 88 88 text run at (6,8) width 152: "div:first-of-type {" … … 107 107 RenderBlock {DIV} at (0,0) size 583x24 108 108 RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF] 109 RenderListMarker at (-3 1,6) size 17x17: "5"109 RenderListMarker at (-37,6) size 17x17: "5" 110 110 RenderText {#text} at (6,8) size 304x91 111 111 text run at (6,8) width 152: "div:first-of-type {" … … 129 129 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 130 130 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 131 RenderListMarker at (-3 1,6) size 17x17: "6"131 RenderListMarker at (-37,6) size 17x17: "6" 132 132 RenderText {#text} at (6,8) size 280x106 133 133 text run at (6,8) width 152: "div:first-of-type {" … … 152 152 RenderBlock {DIV} at (0,0) size 583x24 153 153 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 154 RenderListMarker at (-3 1,6) size 17x17: "7"154 RenderListMarker at (-37,6) size 17x17: "7" 155 155 RenderText {#text} at (6,8) size 280x76 156 156 text run at (6,8) width 152: "div:first-of-type {" … … 171 171 RenderBlock {DIV} at (0,0) size 583x24 172 172 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 173 RenderListMarker at (-3 1,6) size 17x17: "8"173 RenderListMarker at (-37,6) size 17x17: "8" 174 174 RenderText {#text} at (6,8) size 280x76 175 175 text run at (6,8) width 152: "div:first-of-type {" … … 190 190 RenderBlock {DIV} at (0,24) size 583x0 191 191 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 192 RenderListMarker at (-3 1,6) size 17x17: "9"192 RenderListMarker at (-37,6) size 17x17: "9" 193 193 RenderText {#text} at (6,8) size 520x106 194 194 text run at (6,8) width 152: "div:first-of-type {" … … 212 212 RenderBlock {DIV} at (0,0) size 583x24 213 213 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 214 RenderListMarker at (-4 0,6) size 26x17: "10"214 RenderListMarker at (-46,6) size 26x17: "10" 215 215 RenderText {#text} at (6,8) size 520x106 216 216 text run at (6,8) width 152: "div:first-of-type {" -
trunk/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 136x91 32 32 text run at (6,8) width 136: "div :last-child {" … … 49 49 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 50 50 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 51 RenderListMarker at (-3 1,6) size 17x17: "2"51 RenderListMarker at (-37,6) size 17x17: "2" 52 52 RenderText {#text} at (6,8) size 224x106 53 53 text run at (6,8) width 136: "div :last-child {" … … 71 71 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 72 72 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 73 RenderListMarker at (-3 1,6) size 17x17: "3"73 RenderListMarker at (-37,6) size 17x17: "3" 74 74 RenderText {#text} at (6,8) size 208x106 75 75 text run at (6,8) width 136: "div :last-child {" … … 123 123 RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#990000] 124 124 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 125 RenderListMarker at (-3 1,6) size 17x17: "5"125 RenderListMarker at (-37,6) size 17x17: "5" 126 126 RenderText {#text} at (6,8) size 224x106 127 127 text run at (6,8) width 136: "div :last-child {" … … 146 146 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 147 147 RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF] 148 RenderListMarker at (-3 1,6) size 17x17: "6"148 RenderListMarker at (-37,6) size 17x17: "6" 149 149 RenderText {#text} at (6,8) size 480x136 150 150 text run at (6,8) width 136: "div :last-child {" … … 172 172 RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000] 173 173 RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF] 174 RenderListMarker at (-3 1,6) size 17x17: "7"174 RenderListMarker at (-37,6) size 17x17: "7" 175 175 RenderText {#text} at (6,8) size 480x136 176 176 text run at (6,8) width 136: "div :last-child {" -
trunk/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 280x61 32 32 text run at (6,8) width 144: "div:last-of-type {" … … 45 45 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 46 46 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 47 RenderListMarker at (-3 1,6) size 17x17: "2"47 RenderListMarker at (-37,6) size 17x17: "2" 48 48 RenderText {#text} at (6,8) size 280x76 49 49 text run at (6,8) width 144: "div:last-of-type {" … … 64 64 RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900] 65 65 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 66 RenderListMarker at (-3 1,6) size 17x17: "3"66 RenderListMarker at (-37,6) size 17x17: "3" 67 67 RenderText {#text} at (6,8) size 280x76 68 68 text run at (6,8) width 144: "div:last-of-type {" … … 84 84 RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#009900] 85 85 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 86 RenderListMarker at (-3 1,6) size 17x17: "4"86 RenderListMarker at (-37,6) size 17x17: "4" 87 87 RenderText {#text} at (6,8) size 304x106 88 88 text run at (6,8) width 144: "div:last-of-type {" … … 107 107 RenderBlock {DIV} at (0,0) size 583x24 108 108 RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF] 109 RenderListMarker at (-3 1,6) size 17x17: "5"109 RenderListMarker at (-37,6) size 17x17: "5" 110 110 RenderText {#text} at (6,8) size 304x91 111 111 text run at (6,8) width 144: "div:last-of-type {" … … 129 129 RenderBlock {DIV} at (0,0) size 583x0 130 130 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 131 RenderListMarker at (-3 1,6) size 17x17: "6"131 RenderListMarker at (-37,6) size 17x17: "6" 132 132 RenderText {#text} at (6,8) size 280x106 133 133 text run at (6,8) width 144: "div:last-of-type {" … … 152 152 RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000] 153 153 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 154 RenderListMarker at (-3 1,6) size 17x17: "7"154 RenderListMarker at (-37,6) size 17x17: "7" 155 155 RenderText {#text} at (6,8) size 280x76 156 156 text run at (6,8) width 144: "div:last-of-type {" … … 171 171 RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000] 172 172 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 173 RenderListMarker at (-3 1,6) size 17x17: "8"173 RenderListMarker at (-37,6) size 17x17: "8" 174 174 RenderText {#text} at (6,8) size 280x76 175 175 text run at (6,8) width 144: "div:last-of-type {" … … 190 190 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 191 191 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 192 RenderListMarker at (-3 1,6) size 17x17: "9"192 RenderListMarker at (-37,6) size 17x17: "9" 193 193 RenderText {#text} at (6,8) size 480x106 194 194 text run at (6,8) width 144: "div:last-of-type {" … … 212 212 RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000] 213 213 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 214 RenderListMarker at (-4 0,6) size 26x17: "10"214 RenderListMarker at (-46,6) size 26x17: "10" 215 215 RenderText {#text} at (6,8) size 480x106 216 216 text run at (6,8) width 144: "div:last-of-type {" -
trunk/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 136x91 32 32 text run at (6,8) width 136: "div :only-child {" … … 48 48 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 49 49 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 50 RenderListMarker at (-3 1,6) size 17x17: "2"50 RenderListMarker at (-37,6) size 17x17: "2" 51 51 RenderText {#text} at (6,8) size 208x106 52 52 text run at (6,8) width 136: "div :only-child {" … … 96 96 RenderBlock {BLOCKQUOTE} at (40,40) size 503x0 97 97 RenderBlock {PRE} at (16,56) size 583x120 [bgcolor=#FFFFFF] 98 RenderListMarker at (-3 1,6) size 17x17: "4"98 RenderListMarker at (-37,6) size 17x17: "4" 99 99 RenderText {#text} at (6,8) size 224x106 100 100 text run at (6,8) width 136: "div :only-child {" … … 119 119 RenderBlock {DIV} at (0,24) size 583x0 120 120 RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF] 121 RenderListMarker at (-3 1,6) size 17x17: "5"121 RenderListMarker at (-37,6) size 17x17: "5" 122 122 RenderText {#text} at (6,8) size 480x136 123 123 text run at (6,8) width 136: "div :only-child {" -
trunk/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt
r72527 r72582 28 28 RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900] 29 29 RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF] 30 RenderListMarker at (-3 1,6) size 17x17: "1"30 RenderListMarker at (-37,6) size 17x17: "1" 31 31 RenderText {#text} at (6,8) size 280x61 32 32 text run at (6,8) width 144: "div:only-of-type {" … … 45 45 RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900] 46 46 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 47 RenderListMarker at (-3 1,6) size 17x17: "2"47 RenderListMarker at (-37,6) size 17x17: "2" 48 48 RenderText {#text} at (6,8) size 280x76 49 49 text run at (6,8) width 144: "div:only-of-type {" … … 65 65 RenderBlock {DIV} at (0,0) size 583x0 66 66 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 67 RenderListMarker at (-3 1,6) size 17x17: "3"67 RenderListMarker at (-37,6) size 17x17: "3" 68 68 RenderText {#text} at (6,8) size 280x106 69 69 text run at (6,8) width 144: "div:only-of-type {" … … 88 88 RenderBlock {DIV} at (0,24) size 583x0 89 89 RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF] 90 RenderListMarker at (-3 1,6) size 17x17: "4"90 RenderListMarker at (-37,6) size 17x17: "4" 91 91 RenderText {#text} at (6,8) size 280x76 92 92 text run at (6,8) width 144: "div:only-of-type {" … … 107 107 RenderBlock {DIV} at (0,24) size 583x0 108 108 RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF] 109 RenderListMarker at (-3 1,6) size 17x17: "5"109 RenderListMarker at (-37,6) size 17x17: "5" 110 110 RenderText {#text} at (6,8) size 480x106 111 111 text run at (6,8) width 144: "div:only-of-type {" -
trunk/LayoutTests/platform/mac/fast/doctypes/002-expected.txt
r72527 r72582 13 13 RenderBlock {UL} at (0,0) size 744x18 14 14 RenderListItem {LI} at (40,0) size 704x18 15 RenderListMarker at (- 41,0) size 7x18: bullet15 RenderListMarker at (-57,0) size 7x18: bullet 16 16 RenderListMarker at (-17,0) size 7x18: white bullet 17 17 RenderText {#text} at (0,0) size 251x18 -
trunk/LayoutTests/platform/mac/fast/lists/001-expected.txt
r72527 r72582 9 9 RenderListItem {DIV} at (11,11) size 740x62 [border: (3px solid #FFA500)] 10 10 RenderListItem {DIV} at (11,11) size 718x40 [border: (3px solid #FFA500)] 11 RenderListMarker at ( 56,11) size 7x18: bullet12 RenderListMarker at ( 80,11) size 7x18: bullet11 RenderListMarker at (104,11) size 7x18: bullet 12 RenderListMarker at (104,11) size 7x18: bullet 13 13 RenderListMarker at (104,11) size 7x18: bullet 14 14 RenderText {#text} at (132,11) size 86x18 -
trunk/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum
r72527 r72582 1 dee58c18958a4d81998bb553aa2b0989 1 f7a10f5053c0cd7b2a915412c74e411e -
trunk/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
r72527 r72582 1 layer at (0,0) size 800x6002 RenderView at (0,0) size 800x6003 layer at (0,0) size 800x6004 RenderBlock {HTML} at (0,0) size 800x6005 RenderBody {BODY} at (8,8) size 7 76x5841 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 6 6 RenderBlock {DIV} at (0,0) size 106x584 [border: (3px solid #FFA500)] 7 7 RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)] … … 9 9 RenderListItem {DIV} at (11,11) size 62x540 [border: (3px solid #FFA500)] 10 10 RenderListItem {DIV} at (11,11) size 40x518 [border: (3px solid #FFA500)] 11 RenderListMarker at (11, 76) size 18x7: bullet12 RenderListMarker at (11, 94) size 18x7: bullet13 RenderListMarker at (11,1 12) size 18x7: bullet11 RenderListMarker at (11,104) size 18x7: bullet 12 RenderListMarker at (11,104) size 18x7: bullet 13 RenderListMarker at (11,104) size 18x7: bullet 14 14 RenderText {#text} at (11,132) size 18x86 15 15 text run at (11,132) width 86: "List item text." 16 16 RenderBlock {UL} at (122,0) size 140x584 17 17 RenderListItem {LI} at (0,40) size 140x544 [border: (2px solid #FF0000)] 18 RenderListMarker at (52,5 16) size 18x7: bullet18 RenderListMarker at (52,554) size 18x7: bullet 19 19 RenderText {#text} at (52,75) size 36x417 20 20 text run at (52,75) width 417: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl" -
trunk/LayoutTests/platform/mac/fast/lists/002-expected.txt
r72527 r72582 7 7 RenderBlock {UL} at (0,0) size 784x36 8 8 RenderListItem {LI} at (40,0) size 744x18 9 RenderListMarker at ( 688,0) size 7x18: bullet9 RenderListMarker at (-17,0) size 7x18: bullet 10 10 RenderInline {A} at (0,0) size 39x18 [color=#0000EE] 11 11 RenderText {#text} at (705,0) size 39x18 12 12 text run at (705,0) width 39: "Home" 13 13 RenderListItem {LI} at (40,18) size 744x18 14 RenderListMarker at ( 670,0) size 7x18: bullet14 RenderListMarker at (-17,0) size 7x18: bullet 15 15 RenderInline {A} at (0,0) size 57x18 [color=#0000EE] 16 16 RenderText {#text} at (687,0) size 57x18 -
trunk/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum
r72527 r72582 1 f3dca30448effd493cdae3d2b83812a6 1 c8cecd691c7bd29d8bebb3bbff4d4e6c -
trunk/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt
r72527 r72582 7 7 RenderBlock {UL} at (0,0) size 36x584 8 8 RenderListItem {LI} at (0,40) size 18x544 9 RenderListMarker at (0, 488) size 18x7: bullet9 RenderListMarker at (0,-17) size 18x7: bullet 10 10 RenderInline {A} at (0,0) size 18x39 [color=#0000EE] 11 11 RenderText {#text} at (0,505) size 18x39 12 12 text run at (0,505) width 39: "Home" 13 13 RenderListItem {LI} at (18,40) size 18x544 14 RenderListMarker at (0, 470) size 18x7: bullet14 RenderListMarker at (0,-17) size 18x7: bullet 15 15 RenderInline {A} at (0,0) size 18x57 [color=#0000EE] 16 16 RenderText {#text} at (0,487) size 18x57 -
trunk/LayoutTests/platform/mac/fast/lists/003-expected.txt
r72527 r72582 119 119 RenderBlock {UL} at (0,0) size 784x144 120 120 RenderListItem {LI} at (40,0) size 744x18 121 RenderListMarker at ( 687,0) size 7x18: bullet121 RenderListMarker at (413,0) size 7x18: bullet 122 122 RenderInline {A} at (0,0) size 40x18 [color=#0000EE] 123 123 RenderText {#text} at (704,0) size 40x18 124 124 text run at (704,0) width 40: "About" 125 125 RenderListItem {LI} at (40,18) size 744x18 126 RenderListMarker at ( 672,0) size 7x18: bullet126 RenderListMarker at (413,0) size 7x18: bullet 127 127 RenderInline {A} at (0,0) size 55x18 [color=#0000EE] 128 128 RenderText {#text} at (689,0) size 55x18 129 129 text run at (689,0) width 55: "Site map" 130 130 RenderListItem {LI} at (40,36) size 744x18 131 RenderListMarker at ( 670,0) size 7x18: bullet131 RenderListMarker at (413,0) size 7x18: bullet 132 132 RenderInline {A} at (0,0) size 57x18 [color=#0000EE] 133 133 RenderText {#text} at (687,0) size 57x18 134 134 text run at (687,0) width 57: "Archives" 135 135 RenderListItem {LI} at (40,54) size 744x18 136 RenderListMarker at ( 677,0) size 7x18: bullet136 RenderListMarker at (413,0) size 7x18: bullet 137 137 RenderInline {A} at (0,0) size 50x18 [color=#0000EE] 138 138 RenderText {#text} at (694,0) size 50x18 139 139 text run at (694,0) width 50: "Projects" 140 140 RenderListItem {LI} at (40,72) size 744x18 141 RenderListMarker at ( 684,0) size 7x18: bullet141 RenderListMarker at (413,0) size 7x18: bullet 142 142 RenderInline {A} at (0,0) size 43x18 [color=#0000EE] 143 143 RenderText {#text} at (701,0) size 43x18 144 144 text run at (701,0) width 43: "Photos" 145 145 RenderListItem {LI} at (40,90) size 744x18 146 RenderListMarker at ( 672,0) size 7x18: bullet146 RenderListMarker at (413,0) size 7x18: bullet 147 147 RenderInline {A} at (0,0) size 55x18 [color=#0000EE] 148 148 RenderText {#text} at (689,0) size 55x18 149 149 text run at (689,0) width 55: "Statistics" 150 150 RenderListItem {LI} at (40,108) size 744x18 151 RenderListMarker at ( 583,0) size 7x18: bullet151 RenderListMarker at (413,0) size 7x18: bullet 152 152 RenderInline {A} at (0,0) size 144x18 [color=#0000EE] 153 153 RenderText {#text} at (600,0) size 144x18 154 154 text run at (600,0) width 144: "Accessibility statement" 155 155 RenderListItem {LI} at (40,126) size 744x18 156 RenderListMarker at ( 615,0) size 7x18: bullet156 RenderListMarker at (413,0) size 7x18: bullet 157 157 RenderInline {A} at (0,0) size 29x18 [color=#0000EE] 158 158 RenderText {#text} at (632,0) size 29x18 … … 167 167 RenderBlock {UL} at (0,160) size 784x18 168 168 RenderListItem {LI} at (40,0) size 744x18 169 RenderListMarker at ( 639,0) size 7x18: bullet169 RenderListMarker at (413,0) size 7x18: bullet 170 170 RenderInline {A} at (0,0) size 88x18 [color=#0000EE] 171 171 RenderText {#text} at (656,0) size 88x18 … … 173 173 RenderBlock {UL} at (0,194) size 784x108 174 174 RenderListItem {LI} at (40,0) size 744x18 175 RenderListMarker at ( 635,0) size 7x18: bullet175 RenderListMarker at (413,0) size 7x18: bullet 176 176 RenderInline {A} at (0,0) size 92x18 [color=#0000EE] 177 177 RenderText {#text} at (652,0) size 92x18 178 178 text run at (652,0) width 92: "RSS Validator" 179 179 RenderListItem {LI} at (40,18) size 744x18 180 RenderListMarker at ( 582,0) size 7x18: bullet180 RenderListMarker at (413,0) size 7x18: bullet 181 181 RenderInline {A} at (0,0) size 145x18 [color=#0000EE] 182 182 RenderText {#text} at (599,0) size 145x18 183 183 text run at (599,0) width 145: "Dive Into Accessibility" 184 184 RenderListItem {LI} at (40,36) size 744x18 185 RenderListMarker at ( 626,0) size 7x18: bullet185 RenderListMarker at (413,0) size 7x18: bullet 186 186 RenderInline {A} at (0,0) size 101x18 [color=#0000EE] 187 187 RenderText {#text} at (643,0) size 101x18 188 188 text run at (643,0) width 101: "Dive Into OS X" 189 189 RenderListItem {LI} at (40,54) size 744x18 190 RenderListMarker at ( 629,0) size 7x18: bullet190 RenderListMarker at (413,0) size 7x18: bullet 191 191 RenderInline {A} at (0,0) size 98x18 [color=#0000EE] 192 192 RenderText {#text} at (646,0) size 98x18 193 193 text run at (646,0) width 98: "Dive Into J2EE" 194 194 RenderListItem {LI} at (40,72) size 744x18 195 RenderListMarker at ( 618,0) size 7x18: bullet195 RenderListMarker at (413,0) size 7x18: bullet 196 196 RenderInline {A} at (0,0) size 109x18 [color=#0000EE] 197 197 RenderText {#text} at (635,0) size 109x18 198 198 text run at (635,0) width 109: "Dive Into Python" 199 199 RenderListItem {LI} at (40,90) size 744x18 200 RenderListMarker at ( 682,0) size 7x18: bullet200 RenderListMarker at (413,0) size 7x18: bullet 201 201 RenderInline {A} at (0,0) size 45x18 [color=#0000EE] 202 202 RenderText {#text} at (699,0) size 45x18 -
trunk/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum
r72527 r72582 1 4f54cd0054f763234b9c7ecfde6953a6 1 8ea39c2cea378fe2a063ce9a79663813 -
trunk/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
r72527 r72582 123 123 RenderBlock {UL} at (0,0) size 144x584 124 124 RenderListItem {LI} at (0,40) size 18x544 125 RenderListMarker at (0, 487) size 18x7: bullet125 RenderListMarker at (0,293) size 18x7: bullet 126 126 RenderInline {A} at (0,0) size 18x40 [color=#0000EE] 127 127 RenderText {#text} at (0,504) size 18x40 128 128 text run at (0,504) width 40: "About" 129 129 RenderListItem {LI} at (18,40) size 18x544 130 RenderListMarker at (0, 472) size 18x7: bullet130 RenderListMarker at (0,293) size 18x7: bullet 131 131 RenderInline {A} at (0,0) size 18x55 [color=#0000EE] 132 132 RenderText {#text} at (0,489) size 18x55 133 133 text run at (0,489) width 55: "Site map" 134 134 RenderListItem {LI} at (36,40) size 18x544 135 RenderListMarker at (0, 470) size 18x7: bullet135 RenderListMarker at (0,293) size 18x7: bullet 136 136 RenderInline {A} at (0,0) size 18x57 [color=#0000EE] 137 137 RenderText {#text} at (0,487) size 18x57 138 138 text run at (0,487) width 57: "Archives" 139 139 RenderListItem {LI} at (54,40) size 18x544 140 RenderListMarker at (0, 477) size 18x7: bullet140 RenderListMarker at (0,293) size 18x7: bullet 141 141 RenderInline {A} at (0,0) size 18x50 [color=#0000EE] 142 142 RenderText {#text} at (0,494) size 18x50 143 143 text run at (0,494) width 50: "Projects" 144 144 RenderListItem {LI} at (72,40) size 18x544 145 RenderListMarker at (0, 484) size 18x7: bullet145 RenderListMarker at (0,293) size 18x7: bullet 146 146 RenderInline {A} at (0,0) size 18x43 [color=#0000EE] 147 147 RenderText {#text} at (0,501) size 18x43 148 148 text run at (0,501) width 43: "Photos" 149 149 RenderListItem {LI} at (90,40) size 18x544 150 RenderListMarker at (0, 472) size 18x7: bullet150 RenderListMarker at (0,293) size 18x7: bullet 151 151 RenderInline {A} at (0,0) size 18x55 [color=#0000EE] 152 152 RenderText {#text} at (0,489) size 18x55 153 153 text run at (0,489) width 55: "Statistics" 154 154 RenderListItem {LI} at (108,40) size 18x544 155 RenderListMarker at (0, 383) size 18x7: bullet155 RenderListMarker at (0,293) size 18x7: bullet 156 156 RenderInline {A} at (0,0) size 18x144 [color=#0000EE] 157 157 RenderText {#text} at (0,400) size 18x144 158 158 text run at (0,400) width 144: "Accessibility statement" 159 159 RenderListItem {LI} at (126,40) size 18x544 160 RenderListMarker at (0, 415) size 18x7: bullet160 RenderListMarker at (0,293) size 18x7: bullet 161 161 RenderInline {A} at (0,0) size 18x29 [color=#0000EE] 162 162 RenderText {#text} at (0,432) size 18x29 … … 171 171 RenderBlock {UL} at (160,0) size 18x584 172 172 RenderListItem {LI} at (0,40) size 18x544 173 RenderListMarker at (0, 439) size 18x7: bullet173 RenderListMarker at (0,293) size 18x7: bullet 174 174 RenderInline {A} at (0,0) size 18x88 [color=#0000EE] 175 175 RenderText {#text} at (0,456) size 18x88 … … 177 177 RenderBlock {UL} at (194,0) size 108x584 178 178 RenderListItem {LI} at (0,40) size 18x544 179 RenderListMarker at (0, 435) size 18x7: bullet179 RenderListMarker at (0,293) size 18x7: bullet 180 180 RenderInline {A} at (0,0) size 18x92 [color=#0000EE] 181 181 RenderText {#text} at (0,452) size 18x92 182 182 text run at (0,452) width 92: "RSS Validator" 183 183 RenderListItem {LI} at (18,40) size 18x544 184 RenderListMarker at (0, 382) size 18x7: bullet184 RenderListMarker at (0,293) size 18x7: bullet 185 185 RenderInline {A} at (0,0) size 18x145 [color=#0000EE] 186 186 RenderText {#text} at (0,399) size 18x145 187 187 text run at (0,399) width 145: "Dive Into Accessibility" 188 188 RenderListItem {LI} at (36,40) size 18x544 189 RenderListMarker at (0, 426) size 18x7: bullet189 RenderListMarker at (0,293) size 18x7: bullet 190 190 RenderInline {A} at (0,0) size 18x101 [color=#0000EE] 191 191 RenderText {#text} at (0,443) size 18x101 192 192 text run at (0,443) width 101: "Dive Into OS X" 193 193 RenderListItem {LI} at (54,40) size 18x544 194 RenderListMarker at (0, 429) size 18x7: bullet194 RenderListMarker at (0,293) size 18x7: bullet 195 195 RenderInline {A} at (0,0) size 18x98 [color=#0000EE] 196 196 RenderText {#text} at (0,446) size 18x98 197 197 text run at (0,446) width 98: "Dive Into J2EE" 198 198 RenderListItem {LI} at (72,40) size 18x544 199 RenderListMarker at (0, 418) size 18x7: bullet199 RenderListMarker at (0,293) size 18x7: bullet 200 200 RenderInline {A} at (0,0) size 18x109 [color=#0000EE] 201 201 RenderText {#text} at (0,435) size 18x109 202 202 text run at (0,435) width 109: "Dive Into Python" 203 203 RenderListItem {LI} at (90,40) size 18x544 204 RenderListMarker at (0, 482) size 18x7: bullet204 RenderListMarker at (0,293) size 18x7: bullet 205 205 RenderInline {A} at (0,0) size 18x45 [color=#0000EE] 206 206 RenderText {#text} at (0,499) size 18x45 -
trunk/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum
r72527 r72582 1 6 878be66a7c25b309bd51d782f7257231 60d5795a1a0a87622e3d56d64ce2cd7f -
trunk/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt
r72527 r72582 11 11 text run at (18,0) width 191: "some extra test in order to test." 12 12 RenderListItem {LI} at (36,50) size 72x534 [bgcolor=#FFFFFF] [border: (25px solid #008000) none] 13 RenderListMarker at (0, 8) size 18x7: bullet13 RenderListMarker at (0,-17) size 18x7: bullet 14 14 RenderText {#text} at (0,50) size 72x473 15 15 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
r72527 r72582 1 ee20a6ee52266f024547f4a288017c0a 1 9c513c74f48355e9a044c04328c2326d -
trunk/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt
r72527 r72582 6 6 RenderBlock {UL} at (0,0) size 134x195 [border: (1px solid #0000FF)] 7 7 RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)] 8 RenderListMarker at (10,-1 2) size 18x7: bullet8 RenderListMarker at (10,-17) size 18x7: bullet 9 9 RenderText {#text} at (10,10) size 18x59 10 10 text run at (10,10) width 59: "First item" 11 11 RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)] 12 RenderListMarker at (10,-1 2) size 18x7: bullet12 RenderListMarker at (10,-17) size 18x7: bullet 13 13 RenderText {#text} at (10,10) size 36x106 14 14 text run at (10,10) width 106: "Second and very" 15 15 text run at (28,10) width 91: "very long item" 16 16 RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)] 17 RenderListMarker at (10,-1 2) size 18x7: bullet17 RenderListMarker at (10,-17) size 18x7: bullet 18 18 RenderText {#text} at (10,10) size 18x66 19 19 text run at (10,10) width 66: "Third item" 20 20 RenderBlock {UL} at (150,0) size 134x195 [border: (1px solid #FF0000)] 21 21 RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)] 22 RenderListMarker at (10,1 58) size 18x7: bullet22 RenderListMarker at (10,163) size 18x7: bullet 23 23 RenderText {#text} at (10,84) size 18x59 24 24 text run at (10,84) width 59: "First item" 25 25 RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)] 26 RenderListMarker at (10,1 58) size 18x7: bullet26 RenderListMarker at (10,163) size 18x7: bullet 27 27 RenderText {#text} at (10,37) size 36x106 28 28 text run at (10,37) width 106: "Second and very" 29 29 text run at (28,52) width 91: "very long item" 30 30 RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)] 31 RenderListMarker at (10,1 58) size 18x7: bullet31 RenderListMarker at (10,163) size 18x7: bullet 32 32 RenderText {#text} at (10,77) size 18x66 33 33 text run at (10,77) width 66: "Third item" … … 62 62 RenderBlock {UL} at (600,0) size 134x195 [border: (1px solid #0000FF)] 63 63 RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)] 64 RenderListMarker at (14,-1 2) size 10x1064 RenderListMarker at (14,-17) size 10x10 65 65 RenderText {#text} at (10,10) size 18x59 66 66 text run at (10,10) width 59: "First item" 67 67 RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)] 68 RenderListMarker at (14,-1 2) size 10x1068 RenderListMarker at (14,-17) size 10x10 69 69 RenderText {#text} at (10,10) size 36x106 70 70 text run at (10,10) width 106: "Second and very" 71 71 text run at (28,10) width 91: "very long item" 72 72 RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)] 73 RenderListMarker at (14,-1 2) size 10x1073 RenderListMarker at (14,-17) size 10x10 74 74 RenderText {#text} at (10,10) size 18x66 75 75 text run at (10,10) width 66: "Third item" 76 76 RenderBlock {UL} at (750,0) size 134x195 [border: (1px solid #FF0000)] 77 77 RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)] 78 RenderListMarker at (14,1 55) size 10x1078 RenderListMarker at (14,160) size 10x10 79 79 RenderText {#text} at (10,84) size 18x59 80 80 text run at (10,84) width 59: "First item" 81 81 RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)] 82 RenderListMarker at (14,1 55) size 10x1082 RenderListMarker at (14,160) size 10x10 83 83 RenderText {#text} at (10,37) size 36x106 84 84 text run at (10,37) width 106: "Second and very" 85 85 text run at (28,52) width 91: "very long item" 86 86 RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)] 87 RenderListMarker at (14,1 55) size 10x1087 RenderListMarker at (14,160) size 10x10 88 88 RenderText {#text} at (10,77) size 18x66 89 89 text run at (10,77) width 66: "Third item" … … 118 118 RenderBlock {OL} at (1200,0) size 134x195 [border: (1px solid #0000FF)] 119 119 RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)] 120 RenderListMarker at (10,- 15) size 18x16: "1"120 RenderListMarker at (10,-20) size 18x16: "1" 121 121 RenderText {#text} at (10,10) size 18x59 122 122 text run at (10,10) width 59: "First item" 123 123 RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)] 124 RenderListMarker at (10,- 15) size 18x16: "2"124 RenderListMarker at (10,-20) size 18x16: "2" 125 125 RenderText {#text} at (10,10) size 36x106 126 126 text run at (10,10) width 106: "Second and very" 127 127 text run at (28,10) width 91: "very long item" 128 128 RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)] 129 RenderListMarker at (10,- 15) size 18x16: "3"129 RenderListMarker at (10,-20) size 18x16: "3" 130 130 RenderText {#text} at (10,10) size 18x66 131 131 text run at (10,10) width 66: "Third item" 132 132 RenderBlock {OL} at (1350,0) size 134x195 [border: (1px solid #FF0000)] 133 133 RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)] 134 RenderListMarker at (10,15 2) size 18x16: "1"134 RenderListMarker at (10,157) size 18x16: "1" 135 135 RenderText {#text} at (10,84) size 18x59 136 136 text run at (10,84) width 59: "First item" 137 137 RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)] 138 RenderListMarker at (10,15 2) size 18x16: "2"138 RenderListMarker at (10,157) size 18x16: "2" 139 139 RenderText {#text} at (10,37) size 36x106 140 140 text run at (10,37) width 106: "Second and very" 141 141 text run at (28,52) width 91: "very long item" 142 142 RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)] 143 RenderListMarker at (10,15 2) size 18x16: "3"143 RenderListMarker at (10,157) size 18x16: "3" 144 144 RenderText {#text} at (10,77) size 18x66 145 145 text run at (10,77) width 66: "Third item" -
trunk/WebCore/ChangeLog
r72581 r72582 1 2010-11-22 David Hyatt <hyatt@apple.com> 2 3 Back out r72527 since it caused multiple rendering regressions. Details in bug. 4 5 * rendering/InlineFlowBox.cpp: 6 (WebCore::InlineFlowBox::placeBoxesInInlineDirection): 7 * rendering/RenderListItem.cpp: 8 (WebCore::RenderListItem::positionListMarker): 9 1 10 2010-11-22 John Knottenbelt <jknotten@chromium.org> 2 11 -
trunk/WebCore/rendering/InlineFlowBox.cpp
r72527 r72582 274 274 int startLogicalLeft = logicalLeft; 275 275 logicalLeft += borderLogicalLeft() + paddingLogicalLeft(); 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 276 286 277 for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) { 287 278 if (curr->renderer()->isText()) { … … 360 351 361 352 logicalLeft += curr->logicalWidth() + logicalRightMargin; 362 } else {363 RenderListMarker* marker = toRenderListMarker(curr->renderer());364 markerWidth -= marker->width() - marker->marginLeft();365 curr->setLogicalLeft(logicalLeft - markerWidth);366 353 } 367 354 } -
trunk/WebCore/rendering/RenderListItem.cpp
r72527 r72582 263 263 // not being as tight as it could be though. 264 264 if (style()->isLeftToRightDirection()) { 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(); 265 int leftLineOffset = logicalLeftOffsetForLine(blockOffset, logicalLeftOffsetForLine(blockOffset, false), false); 266 markerLogicalLeft = leftLineOffset - lineOffset - paddingStart() - borderStart() + m_marker->marginStart(); 269 267 m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft); 270 268 for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) { … … 276 274 } 277 275 } else { 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(); 276 markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borderStart() + m_marker->marginEnd(); 277 int rightLineOffset = logicalRightOffsetForLine(blockOffset, logicalRightOffsetForLine(blockOffset, false), false); 278 markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() + borderStart() + m_marker->marginEnd(); 282 279 m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft); 283 280 for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
Note: See TracChangeset
for help on using the changeset viewer.