[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 16:24:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3a8d2aea4b17e2b8cf2bebaa25f977bedf58781b
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 23 05:41:24 2010 +0000
Back out r72527 since it caused multiple rendering regressions. Details in bug.
WebCore:
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::placeBoxesInInlineDirection):
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::positionListMarker):
LayoutTests:
* fast/lists/outSideListMarkers-expected.txt: Removed.
* fast/lists/outSideListMarkers.html: Removed.
* 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: Removed.
* platform/mac/fast/lists/outSideListMarkers-expected.png: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 79820a3..b0a8d11 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,75 @@
+2010-11-22 David Hyatt <hyatt at apple.com>
+
+ Back out r72527 since it caused multiple rendering regressions. Details in bug.
+
+ * fast/lists/outSideListMarkers-expected.txt: Removed.
+ * fast/lists/outSideListMarkers.html: Removed.
+ * 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: Removed.
+ * platform/mac/fast/lists/outSideListMarkers-expected.png: Removed.
+
2010-11-22 Andreas Kling <kling at webkit.org>
Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/fast/lists/outSideListMarkers-expected.txt b/LayoutTests/fast/lists/outSideListMarkers-expected.txt
deleted file mode 100644
index 4191f30..0000000
--- a/LayoutTests/fast/lists/outSideListMarkers-expected.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {H2} at (0,0) size 784x28
- RenderText {#text} at (0,0) size 509x28
- text run at (0,0) width 509: "The following lists have list-style-position: outside"
- RenderBlock {P} at (0,47) size 784x18
- RenderInline {U} at (0,0) size 105x18
- RenderText {#text} at (0,0) size 105x18
- text run at (0,0) width 105: "text-align: center"
- RenderBlock {UL} at (0,81) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (253,0) size 7x18: bullet
- RenderText {#text} at (270,0) size 203x18
- text run at (270,0) width 203: "Earl Grey Tea - A fine black tea"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (220,0) size 7x18: bullet
- RenderText {#text} at (237,0) size 270x18
- text run at (237,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (219,0) size 7x18: bullet
- RenderText {#text} at (236,0) size 271x18
- text run at (236,0) width 271: "Honeybush Tea - A super fruity delight tea"
- RenderBlock (anonymous) at (0,151) size 784x18
- RenderBR {BR} at (0,0) size 0x18
- RenderBlock {P} at (0,185) size 784x18
- RenderInline {U} at (0,0) size 96x18
- RenderText {#text} at (0,0) size 96x18
- text run at (0,0) width 96: "text-align: right"
- RenderBlock {UL} at (0,219) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (524,0) size 7x18: bullet
- RenderText {#text} at (541,0) size 203x18
- text run at (541,0) width 203: "Earl Grey Tea - A fine black tea"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (457,0) size 7x18: bullet
- RenderText {#text} at (474,0) size 270x18
- text run at (474,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (456,0) size 7x18: bullet
- RenderText {#text} at (473,0) size 271x18
- text run at (473,0) width 271: "Honeybush Tea - A super fruity delight tea"
- RenderBlock {H2} at (0,292) size 784x28
- RenderText {#text} at (0,0) size 509x28
- text run at (0,0) width 509: "The following lists have list-style-position: outside"
- RenderBlock {P} at (0,339) size 784x18
- RenderInline {U} at (0,0) size 105x18
- RenderText {#text} at (0,0) size 105x18
- text run at (0,0) width 105: "text-align: center"
- RenderBlock {UL} at (0,373) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (253,0) size 7x18: bullet
- RenderText {#text} at (270,0) size 203x18
- text run at (270,0) width 203: "Earl Grey Tea - A fine black tea"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (220,0) size 7x18: bullet
- RenderText {#text} at (237,0) size 270x18
- text run at (237,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (219,0) size 7x18: bullet
- RenderText {#text} at (236,0) size 271x18
- text run at (236,0) width 271: "Honeybush Tea - A super fruity delight tea"
- RenderBlock (anonymous) at (0,443) size 784x18
- RenderBR {BR} at (0,0) size 0x18
- RenderBlock {P} at (0,477) size 784x18
- RenderInline {U} at (0,0) size 96x18
- RenderText {#text} at (0,0) size 96x18
- text run at (0,0) width 96: "text-align: right"
- RenderBlock {UL} at (0,511) size 784x54
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (524,0) size 7x18: bullet
- RenderText {#text} at (541,0) size 203x18
- text run at (541,0) width 203: "Earl Grey Tea - A fine black tea"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (457,0) size 7x18: bullet
- RenderText {#text} at (474,0) size 270x18
- text run at (474,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (456,0) size 7x18: bullet
- RenderText {#text} at (473,0) size 271x18
- text run at (473,0) width 271: "Honeybush Tea - A super fruity delight tea"
diff --git a/LayoutTests/fast/lists/outSideListMarkers.html b/LayoutTests/fast/lists/outSideListMarkers.html
deleted file mode 100644
index d0ebb18..0000000
--- a/LayoutTests/fast/lists/outSideListMarkers.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-ul.a {list-style-position:outside; text-align: center;}
-ul.b {list-style-position:outside; text-align: right;}
-</style>
-</head>
-
-<body>
-
-<h2>The following lists have list-style-position: outside </h2>
-
-<p><u>text-align: center</u></p>
-<ul class="a">
-<li>Earl Grey Tea - A fine black tea</li>
-<li>Jasmine Tea - A fabulous "all purpose" tea</li>
-<li>Honeybush Tea - A super fruity delight tea</li>
-</ul> <br>
-
-<p><u>text-align: right</u></p>
-<ul class="b">
-<li>Earl Grey Tea - A fine black tea</li>
-<li>Jasmine Tea - A fabulous "all purpose" tea</li>
-<li>Honeybush Tea - A super fruity delight tea</li>
-</ul>
-
-</body>
-</html>
-<html>
-<head>
-<style type="text/css">
-ul.a {list-style-position:outside; text-align: center;}
-ul.b {list-style-position:outside; text-align: right;}
-</style>
-</head>
-
-<body>
-
-<h2>The following lists have list-style-position: outside </h2>
-
-<p><u>text-align: center</u></p>
-<ul class="a">
-<li>Earl Grey Tea - A fine black tea</li>
-<li>Jasmine Tea - A fabulous "all purpose" tea</li>
-<li>Honeybush Tea - A super fruity delight tea</li>
-</ul> <br>
-
-<p><u>text-align: right</u></p>
-<ul class="b">
-<li>Earl Grey Tea - A fine black tea</li>
-<li>Jasmine Tea - A fabulous "all purpose" tea</li>
-<li>Honeybush Tea - A super fruity delight tea</li>
-</ul>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum b/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum
index 856fa9a..f762e7b 100644
--- a/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.checksum
@@ -1 +1 @@
-55d672967e8ddbf87246a11f92c9c729
\ No newline at end of file
+535d07180f66e0a374faafc4b54b8962
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.png b/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.png
index b19e561..a87e9e5 100644
Binary files a/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.png and b/LayoutTests/platform/mac-leopard/css1/box_properties/margin_right-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum b/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum
index ad3f46e..2f68e71 100644
--- a/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.checksum
@@ -1 +1 @@
-fdd2eaba37bae8295f9aec88acefcb78
\ No newline at end of file
+8fb1e154e79643ac7bbe9205dea3d03b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.png b/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.png
index d2d5df9..71f7041 100644
Binary files a/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.png and b/LayoutTests/platform/mac-leopard/css1/box_properties/padding_right-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum b/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum
index ffa3c02..4da409b 100644
--- a/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.checksum
@@ -1 +1 @@
-60d707dab81ad84c1f511fdfc375a655
\ No newline at end of file
+d012e6bdb5ad2f5b2e533bedcbbc6789
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png b/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png
index e5bd7dc..cb6ff02 100644
Binary files a/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png and b/LayoutTests/platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum
index cf676b7..38ad30d 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.checksum
@@ -1 +1 @@
-bb6c3f97d3127b0e75e47ce1f426302a
\ No newline at end of file
+870fc7a4b6d7194a482d5d782ed12201
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png b/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png
index dd3b08b..a202335 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/background-shorthand-invalid-url-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum
index 82379a9..01fd4a3 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.checksum
@@ -1 +1 @@
-74690022d6e9696f8a57d7fac76ef9f5
\ No newline at end of file
+26b8e5f280430642b910f5238dc1c23f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.png
index 748f6b8..1e826a3 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/empty-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum
index 4589be9..8fbdcf6 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.checksum
@@ -1 +1 @@
-cecb5833db1b0399f740243dfa067554
\ No newline at end of file
+5ccd68b5eda1a8a6fdc3a2c3ad642323
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png
index 270adb2..bf812a4 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/first-child-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum
index c7ce5b4..3d6cdd3 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.checksum
@@ -1 +1 @@
-d1ac2a47cf24b1fa807281fd778ec6e2
\ No newline at end of file
+c3536f4b6e48b311bff7d09886204332
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png
index e8a9111..3efa8e1 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/first-of-type-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum
index 97174c7..3cb4281 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.checksum
@@ -1 +1 @@
-e45354862040a03e31b2190fb43f6979
\ No newline at end of file
+d2b02cccba673c34576738f4fc873ad0
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png
index d008148..9ae3591 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/last-child-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum
index 715137b..d9e0fdb 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.checksum
@@ -1 +1 @@
-f36f002bef42315364af485a1f0d8113
\ No newline at end of file
+3f7d246c4306b7b150771e8bbc17b769
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png
index 18e04c4..536433c 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/last-of-type-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum
index fca3513..2e8a76f 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.checksum
@@ -1 +1 @@
-cc2f8143bac591ec5cd34b08554c22f0
\ No newline at end of file
+085a3864adb1ffffc229133ac8519785
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png
index 629c201..a448ade 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/only-child-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum b/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum
index cbb1b98..d083872 100644
--- a/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.checksum
@@ -1 +1 @@
-cc72d41312ddd9889eb9887f5c3f1266
\ No newline at end of file
+34a12633ff0f6d7d22e42deeeb2b01ce
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png b/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png
index c19e96e..5df842c 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png and b/LayoutTests/platform/mac-leopard/fast/css/only-of-type-pseudo-class-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum b/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum
index 52c5304..6bf8c4f 100644
--- a/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.checksum
@@ -1 +1 @@
-48e1e5d5fb2689ebd477a505cae7252c
\ No newline at end of file
+1a8adaeca723f7629201cdbfeb9b12be
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.png b/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.png
index 9be0a20..a3aea6e 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.png and b/LayoutTests/platform/mac-leopard/fast/doctypes/002-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum b/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum
index 2e45685..6aaa37a 100644
--- a/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/lists/001-expected.checksum
@@ -1 +1 @@
-a5c9bfd57b632e5d90ef2256fc137b06
\ No newline at end of file
+fa6148a3e615abad86aea15059ac7bd5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/001-expected.png b/LayoutTests/platform/mac-leopard/fast/lists/001-expected.png
index b3101b6..0c90bcd 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/lists/001-expected.png and b/LayoutTests/platform/mac-leopard/fast/lists/001-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum b/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum
index d82601a..7efc1c2 100644
--- a/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/lists/002-expected.checksum
@@ -1 +1 @@
-b3bf0281f9f2f3b3718defa2a510996f
\ No newline at end of file
+fdb1d40544f0c806f99f0bb14517df6b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/002-expected.png b/LayoutTests/platform/mac-leopard/fast/lists/002-expected.png
index 7c624c1..01ed4d5 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/lists/002-expected.png and b/LayoutTests/platform/mac-leopard/fast/lists/002-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum b/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum
index cf82015..d0cac02 100644
--- a/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/fast/lists/003-expected.checksum
@@ -1 +1 @@
-645fe17dbe15c1dc22b2e49efcf60584
\ No newline at end of file
+c3e0d7953236beb9ebb61441399383e4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/lists/003-expected.png b/LayoutTests/platform/mac-leopard/fast/lists/003-expected.png
index 82baa42..16ecec8 100644
Binary files a/LayoutTests/platform/mac-leopard/fast/lists/003-expected.png and b/LayoutTests/platform/mac-leopard/fast/lists/003-expected.png differ
diff --git a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
index b3473ce..0fcb7db 100644
--- a/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
+++ b/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.txt
@@ -39,18 +39,18 @@ layer at (0,0) size 787x1005
text run at (401,18) width 176: "width of the parent element."
RenderBlock {UL} at (0,343) size 744x90 [bgcolor=#808080]
RenderListItem {LI} at (40,0) size 704x18
- RenderListMarker at (-13,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (4,0) size 700x18
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."
RenderListItem {LI} at (40,18) size 679x54 [bgcolor=#FFFFFF]
- RenderListMarker at (6,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (23,0) size 677x54
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-"
text run at (2,18) width 60: "checked. "
text run at (62,18) width 617: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin"
text run at (199,36) width 480: "to make 50 pixels of margin, and its background-color has been set to white."
RenderListItem {LI} at (40,72) size 704x18
- RenderListMarker at (508,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (525,0) size 179x18
text run at (525,0) width 179: "This is an unclassed list item"
RenderBlock {P} at (0,449) size 769x18 [bgcolor=#C0C0C0]
@@ -93,19 +93,19 @@ layer at (0,0) size 787x1005
text run at (385,18) width 176: "width of the parent element."
RenderBlock {UL} at (4,192) size 722x108 [bgcolor=#808080]
RenderListItem {LI} at (40,0) size 682x36
- RenderListMarker at (1,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (18,0) size 664x36
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"
text run at (650,18) width 32: "gray."
RenderListItem {LI} at (40,36) size 657x54 [bgcolor=#FFFFFF]
- RenderListMarker at (-16,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (1,0) size 656x54
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-"
text run at (28,18) width 60: "checked. "
text run at (88,18) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's"
text run at (129,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white."
RenderListItem {LI} at (40,90) size 682x18
- RenderListMarker at (486,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (503,0) size 179x18
text run at (503,0) width 179: "This is an unclassed list item"
RenderBlock {P} at (4,316) size 747x18 [bgcolor=#C0C0C0]
diff --git a/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt b/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt
index a936de7..10817d4 100644
--- a/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt
+++ b/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.txt
@@ -54,12 +54,12 @@ layer at (0,0) size 785x1153
text run at (80,36) width 497: "The text has been right-aligned in order to make the right padding easier to see."
RenderBlock {UL} at (0,469) size 769x72 [bgcolor=#808080]
RenderListItem {LI} at (40,0) size 704x36
- RenderListMarker at (-10,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (7,0) size 697x36
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"
text run at (679,18) width 25: "test."
RenderListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF]
- RenderListMarker at (2,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (19,0) size 660x36
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"
text run at (626,18) width 53: "element."
@@ -116,12 +116,12 @@ layer at (0,0) size 785x1153
text run at (481,54) width 80: "easier to see."
RenderBlock {UL} at (4,336) size 747x72 [bgcolor=#808080]
RenderListItem {LI} at (40,0) size 682x36
- RenderListMarker at (-16,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (1,0) size 681x36
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"
text run at (641,18) width 41: "to test."
RenderListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF]
- RenderListMarker at (6,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (23,0) size 634x36
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"
text run at (578,18) width 79: "UL element."
diff --git a/LayoutTests/platform/mac/editing/pasteboard/merge-end-list-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/merge-end-list-expected.txt
index c54d11b..d43b9f6 100644
--- a/LayoutTests/platform/mac/editing/pasteboard/merge-end-list-expected.txt
+++ b/LayoutTests/platform/mac/editing/pasteboard/merge-end-list-expected.txt
@@ -45,7 +45,7 @@ layer at (0,0) size 800x600
RenderBlock {UL} at (0,0) size 784x36
RenderListItem {LI} at (40,0) size 744x36
RenderBlock {DIV} at (0,0) size 744x18
- RenderListMarker at (-85,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderText {#text} at (0,0) size 28x18
text run at (0,0) width 28: "Item"
RenderText {#text} at (28,0) size 21x18
diff --git a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum
index 2030b67..6686f26 100644
--- a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum
+++ b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.checksum
@@ -1 +1 @@
-ee21a1f286cc3d39f06fa65c430473d4
\ No newline at end of file
+4e7ba809b66454d9631f978228c525d4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.png b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.png
index 2d56368..ec06e04 100644
Binary files a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.png and b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.png differ
diff --git a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt
index fb71c85..55b0174 100644
--- a/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/extend-by-word-002-expected.txt
@@ -15,7 +15,7 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,0) size 148x166 [border: (2px solid #FF0000)]
RenderBlock {UL} at (14,14) size 120x138
RenderListItem {LI} at (0,0) size 120x21
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
@@ -24,7 +24,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (19,6) size 52x12
text run at (19,6) width 52: "Appetizers"
RenderListItem {LI} at (0,21) size 120x21
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
@@ -33,7 +33,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (19,6) size 78x12
text run at (19,6) width 78: "Soups & Salads"
RenderListItem {LI} at (0,42) size 120x33
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
@@ -44,7 +44,7 @@ layer at (0,0) size 800x600
text run at (88,6) width 4: " "
text run at (16,18) width 38: "Burgers"
RenderListItem {LI} at (0,75) size 120x21
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
@@ -53,7 +53,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (19,6) size 65x12
text run at (19,6) width 65: "Steak & Ribs"
RenderListItem {LI} at (0,96) size 120x21
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
@@ -62,7 +62,7 @@ layer at (0,0) size 800x600
RenderText {#text} at (19,6) size 41x12
text run at (19,6) width 41: "Seafood"
RenderListItem {LI} at (0,117) size 120x21
- RenderListMarker at (-25,6) size 5x12: bullet
+ RenderListMarker at (-14,6) size 5x12: bullet
RenderInline (generated) at (0,0) size 14x24
RenderText {#text} at (5,-4) size 14x24
text run at (5,-4) width 14: "\x{B7} "
diff --git a/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt b/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt
index 24eb0b5..5c84712 100644
--- a/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.txt
@@ -10,6 +10,6 @@ layer at (0,0) size 800x186
RenderBlock {UL} at (0,0) size 784x91
RenderListItem {LI} at (40,0) size 744x91 [border: (1px solid #FF0000)]
RenderBlock {SPAN} at (1,1) size 304x89 [border: (2px solid #008000)]
- RenderListMarker at (-16,2) size 7x18: bullet
+ RenderListMarker at (-18,2) size 7x18: bullet
RenderText {#text} at (2,2) size 4x18
text run at (2,2) width 4: " "
diff --git a/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt
index 7d2e722..595fb54 100644
--- a/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/empty-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x1610
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 88x61
text run at (6,8) width 64: ":empty {"
text run at (70,8) width 0: " "
@@ -42,7 +42,7 @@ layer at (0,0) size 785x1610
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 272x61
text run at (6,8) width 64: ":empty {"
text run at (70,8) width 0: " "
@@ -57,7 +57,7 @@ layer at (0,0) size 785x1610
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 96x61
text run at (6,8) width 64: ":empty {"
text run at (70,8) width 0: " "
@@ -71,7 +71,7 @@ layer at (0,0) size 785x1610
RenderListItem {LI} at (40,726) size 615x239 [bgcolor=#AAAAAA]
RenderBlock {DIV} at (16,16) size 583x42 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x42
- RenderListMarker at (-25,12) size 17x17: "4"
+ RenderListMarker at (-37,12) size 17x17: "4"
RenderText {#text} at (12,12) size 4x17
text run at (12,12) width 4: "."
RenderBlock {PRE} at (16,71) size 583x102 [bgcolor=#FFFFFF]
@@ -94,7 +94,7 @@ layer at (0,0) size 785x1610
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {BLOCKQUOTE} at (12,12) size 559x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 288x61
text run at (6,8) width 64: ":empty {"
text run at (70,8) width 0: " "
@@ -110,7 +110,7 @@ layer at (0,0) size 785x1610
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (12,12) size 559x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "6"
+ RenderListMarker at (-37,6) size 17x17: "6"
RenderText {#text} at (6,8) size 384x106
text run at (6,8) width 64: ":empty {"
text run at (70,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt
index c4b27ae..d76d0f2 100644
--- a/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/first-child-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 144x91
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
@@ -48,7 +48,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 224x106
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
@@ -70,7 +70,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 208x106
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
@@ -122,7 +122,7 @@ layer at (0,0) size 785x2263
RenderBlock {BLOCKQUOTE} at (0,0) size 583x0 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 224x106
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
@@ -145,7 +145,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "6"
+ RenderListMarker at (-37,6) size 17x17: "6"
RenderText {#text} at (6,8) size 520x136
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
@@ -171,7 +171,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x0 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "7"
+ RenderListMarker at (-37,6) size 17x17: "7"
RenderText {#text} at (6,8) size 520x136
text run at (6,8) width 144: "div :first-child {"
text run at (150,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt
index 5ce1b35..bf464a4 100644
--- a/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/first-of-type-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 280x61
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -44,7 +44,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -63,7 +63,7 @@ layer at (0,0) size 785x2902
RenderBlock {BLOCKQUOTE} at (0,0) size 583x0 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -83,7 +83,7 @@ layer at (0,0) size 785x2902
RenderBlock {BLOCKQUOTE} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "4"
+ RenderListMarker at (-37,6) size 17x17: "4"
RenderText {#text} at (6,8) size 304x106
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -106,7 +106,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 304x91
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -128,7 +128,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "6"
+ RenderListMarker at (-37,6) size 17x17: "6"
RenderText {#text} at (6,8) size 280x106
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -151,7 +151,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "7"
+ RenderListMarker at (-37,6) size 17x17: "7"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -170,7 +170,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "8"
+ RenderListMarker at (-37,6) size 17x17: "8"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -189,7 +189,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "9"
+ RenderListMarker at (-37,6) size 17x17: "9"
RenderText {#text} at (6,8) size 520x106
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
@@ -211,7 +211,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-40,6) size 26x17: "10"
+ RenderListMarker at (-46,6) size 26x17: "10"
RenderText {#text} at (6,8) size 520x106
text run at (6,8) width 152: "div:first-of-type {"
text run at (158,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt
index 47655d4..df68211 100644
--- a/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 136x91
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
@@ -48,7 +48,7 @@ layer at (0,0) size 785x2263
RenderBlock {BLOCKQUOTE} at (0,0) size 583x0
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 224x106
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
@@ -70,7 +70,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 208x106
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
@@ -122,7 +122,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 224x106
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
@@ -145,7 +145,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "6"
+ RenderListMarker at (-37,6) size 17x17: "6"
RenderText {#text} at (6,8) size 480x136
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
@@ -171,7 +171,7 @@ layer at (0,0) size 785x2263
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "7"
+ RenderListMarker at (-37,6) size 17x17: "7"
RenderText {#text} at (6,8) size 480x136
text run at (6,8) width 136: "div :last-child {"
text run at (142,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt
index e4628b1..d42c37d 100644
--- a/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 280x61
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -44,7 +44,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -63,7 +63,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -83,7 +83,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "4"
+ RenderListMarker at (-37,6) size 17x17: "4"
RenderText {#text} at (6,8) size 304x106
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -106,7 +106,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 304x91
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -128,7 +128,7 @@ layer at (0,0) size 785x2902
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "6"
+ RenderListMarker at (-37,6) size 17x17: "6"
RenderText {#text} at (6,8) size 280x106
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -151,7 +151,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "7"
+ RenderListMarker at (-37,6) size 17x17: "7"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -170,7 +170,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "8"
+ RenderListMarker at (-37,6) size 17x17: "8"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -189,7 +189,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "9"
+ RenderListMarker at (-37,6) size 17x17: "9"
RenderText {#text} at (6,8) size 480x106
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
@@ -211,7 +211,7 @@ layer at (0,0) size 785x2902
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0 [bgcolor=#990000]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-40,6) size 26x17: "10"
+ RenderListMarker at (-46,6) size 26x17: "10"
RenderText {#text} at (6,8) size 480x106
text run at (6,8) width 144: "div:last-of-type {"
text run at (150,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt
index 622fd06..af1eb91 100644
--- a/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/only-child-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x1608
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x105 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 136x91
text run at (6,8) width 136: "div :only-child {"
text run at (142,8) width 0: " "
@@ -47,7 +47,7 @@ layer at (0,0) size 785x1608
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 208x106
text run at (6,8) width 136: "div :only-child {"
text run at (142,8) width 0: " "
@@ -95,7 +95,7 @@ layer at (0,0) size 785x1608
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {BLOCKQUOTE} at (40,40) size 503x0
RenderBlock {PRE} at (16,56) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "4"
+ RenderListMarker at (-37,6) size 17x17: "4"
RenderText {#text} at (6,8) size 224x106
text run at (6,8) width 136: "div :only-child {"
text run at (142,8) width 0: " "
@@ -118,7 +118,7 @@ layer at (0,0) size 785x1608
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x150 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 480x136
text run at (6,8) width 136: "div :only-child {"
text run at (142,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt b/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt
index dad5a2b..b6a2aae 100644
--- a/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/only-of-type-pseudo-class-expected.txt
@@ -27,7 +27,7 @@ layer at (0,0) size 785x1488
RenderBlock {DIV} at (16,16) size 583x24 [bgcolor=#990000]
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x75 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "1"
+ RenderListMarker at (-37,6) size 17x17: "1"
RenderText {#text} at (6,8) size 280x61
text run at (6,8) width 144: "div:only-of-type {"
text run at (150,8) width 0: " "
@@ -44,7 +44,7 @@ layer at (0,0) size 785x1488
RenderBlock {DIV} at (0,0) size 583x24 [bgcolor=#009900]
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "2"
+ RenderListMarker at (-37,6) size 17x17: "2"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:only-of-type {"
text run at (150,8) width 0: " "
@@ -64,7 +64,7 @@ layer at (0,0) size 785x1488
RenderBlock {BLOCKQUOTE} at (0,24) size 583x0 [bgcolor=#009900]
RenderBlock {DIV} at (0,0) size 583x0
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "3"
+ RenderListMarker at (-37,6) size 17x17: "3"
RenderText {#text} at (6,8) size 280x106
text run at (6,8) width 144: "div:only-of-type {"
text run at (150,8) width 0: " "
@@ -87,7 +87,7 @@ layer at (0,0) size 785x1488
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x90 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "4"
+ RenderListMarker at (-37,6) size 17x17: "4"
RenderText {#text} at (6,8) size 280x76
text run at (6,8) width 144: "div:only-of-type {"
text run at (150,8) width 0: " "
@@ -106,7 +106,7 @@ layer at (0,0) size 785x1488
RenderBlock {DIV} at (0,0) size 583x24
RenderBlock {DIV} at (0,24) size 583x0
RenderBlock {PRE} at (16,53) size 583x120 [bgcolor=#FFFFFF]
- RenderListMarker at (-31,6) size 17x17: "5"
+ RenderListMarker at (-37,6) size 17x17: "5"
RenderText {#text} at (6,8) size 480x106
text run at (6,8) width 144: "div:only-of-type {"
text run at (150,8) width 0: " "
diff --git a/LayoutTests/platform/mac/fast/doctypes/002-expected.txt b/LayoutTests/platform/mac/fast/doctypes/002-expected.txt
index 8dbd44d..a225c1c 100644
--- a/LayoutTests/platform/mac/fast/doctypes/002-expected.txt
+++ b/LayoutTests/platform/mac/fast/doctypes/002-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 800x176
RenderListItem {LI} at (40,0) size 744x18
RenderBlock {UL} at (0,0) size 744x18
RenderListItem {LI} at (40,0) size 704x18
- RenderListMarker at (-41,0) size 7x18: bullet
+ RenderListMarker at (-57,0) size 7x18: bullet
RenderListMarker at (-17,0) size 7x18: white bullet
RenderText {#text} at (0,0) size 251x18
text run at (0,0) width 251: "Both bullets should be on the same line."
diff --git a/LayoutTests/platform/mac/fast/lists/001-expected.txt b/LayoutTests/platform/mac/fast/lists/001-expected.txt
index 09124ad..bdd5cb8 100644
--- a/LayoutTests/platform/mac/fast/lists/001-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/001-expected.txt
@@ -8,8 +8,8 @@ layer at (0,0) size 809x585
RenderListItem {DIV} at (11,11) size 762x84 [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 740x62 [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 718x40 [border: (3px solid #FFA500)]
- RenderListMarker at (56,11) size 7x18: bullet
- RenderListMarker at (80,11) size 7x18: bullet
+ RenderListMarker at (104,11) size 7x18: bullet
+ RenderListMarker at (104,11) size 7x18: bullet
RenderListMarker at (104,11) size 7x18: bullet
RenderText {#text} at (132,11) size 86x18
text run at (132,11) width 86: "List item text."
diff --git a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum
index 54ddfd1..2d8b748 100644
--- a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.checksum
@@ -1 +1 @@
-dee58c18958a4d81998bb553aa2b0989
\ No newline at end of file
+f7a10f5053c0cd7b2a915412c74e411e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png
index 90fca19..49e0a5b 100644
Binary files a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png and b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
index b54d035..f0dceb5 100644
--- a/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/001-vertical-expected.txt
@@ -1,21 +1,21 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 776x584
+layer at (0,0) size 785x620
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x620
+ RenderBlock {HTML} at (0,0) size 785x600
+ RenderBody {BODY} at (8,8) size 761x584
RenderBlock {DIV} at (0,0) size 106x584 [border: (3px solid #FFA500)]
RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 84x562 [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 62x540 [border: (3px solid #FFA500)]
RenderListItem {DIV} at (11,11) size 40x518 [border: (3px solid #FFA500)]
- RenderListMarker at (11,76) size 18x7: bullet
- RenderListMarker at (11,94) size 18x7: bullet
- RenderListMarker at (11,112) size 18x7: bullet
+ RenderListMarker at (11,104) size 18x7: bullet
+ RenderListMarker at (11,104) size 18x7: bullet
+ RenderListMarker at (11,104) size 18x7: bullet
RenderText {#text} at (11,132) size 18x86
text run at (11,132) width 86: "List item text."
RenderBlock {UL} at (122,0) size 140x584
RenderListItem {LI} at (0,40) size 140x544 [border: (2px solid #FF0000)]
- RenderListMarker at (52,516) size 18x7: bullet
+ RenderListMarker at (52,554) size 18x7: bullet
RenderText {#text} at (52,75) size 36x417
text run at (52,75) width 417: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl"
text run at (70,422) width 70: "asjdlksajdk"
diff --git a/LayoutTests/platform/mac/fast/lists/002-expected.txt b/LayoutTests/platform/mac/fast/lists/002-expected.txt
index ce31ccb..be9c1d8 100644
--- a/LayoutTests/platform/mac/fast/lists/002-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/002-expected.txt
@@ -6,12 +6,12 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,0) size 784x36
RenderBlock {UL} at (0,0) size 784x36
RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (688,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderInline {A} at (0,0) size 39x18 [color=#0000EE]
RenderText {#text} at (705,0) size 39x18
text run at (705,0) width 39: "Home"
RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (670,0) size 7x18: bullet
+ RenderListMarker at (-17,0) size 7x18: bullet
RenderInline {A} at (0,0) size 57x18 [color=#0000EE]
RenderText {#text} at (687,0) size 57x18
text run at (687,0) width 57: "Archives"
diff --git a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum
index bd8203f..ddbdeb5 100644
--- a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.checksum
@@ -1 +1 @@
-f3dca30448effd493cdae3d2b83812a6
\ No newline at end of file
+c8cecd691c7bd29d8bebb3bbff4d4e6c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png
index 288c3b3..7f4daa4 100644
Binary files a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png and b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt
index aa63f7b..5c69dec 100644
--- a/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/002-vertical-expected.txt
@@ -6,12 +6,12 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,0) size 36x584
RenderBlock {UL} at (0,0) size 36x584
RenderListItem {LI} at (0,40) size 18x544
- RenderListMarker at (0,488) size 18x7: bullet
+ RenderListMarker at (0,-17) size 18x7: bullet
RenderInline {A} at (0,0) size 18x39 [color=#0000EE]
RenderText {#text} at (0,505) size 18x39
text run at (0,505) width 39: "Home"
RenderListItem {LI} at (18,40) size 18x544
- RenderListMarker at (0,470) size 18x7: bullet
+ RenderListMarker at (0,-17) size 18x7: bullet
RenderInline {A} at (0,0) size 18x57 [color=#0000EE]
RenderText {#text} at (0,487) size 18x57
text run at (0,487) width 57: "Archives"
diff --git a/LayoutTests/platform/mac/fast/lists/003-expected.txt b/LayoutTests/platform/mac/fast/lists/003-expected.txt
index 91031a9..24013af 100644
--- a/LayoutTests/platform/mac/fast/lists/003-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/003-expected.txt
@@ -118,42 +118,42 @@ layer at (0,0) size 800x350
RenderBlock {DIV} at (0,0) size 784x302
RenderBlock {UL} at (0,0) size 784x144
RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (687,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 40x18 [color=#0000EE]
RenderText {#text} at (704,0) size 40x18
text run at (704,0) width 40: "About"
RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (672,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 55x18 [color=#0000EE]
RenderText {#text} at (689,0) size 55x18
text run at (689,0) width 55: "Site map"
RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (670,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 57x18 [color=#0000EE]
RenderText {#text} at (687,0) size 57x18
text run at (687,0) width 57: "Archives"
RenderListItem {LI} at (40,54) size 744x18
- RenderListMarker at (677,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 50x18 [color=#0000EE]
RenderText {#text} at (694,0) size 50x18
text run at (694,0) width 50: "Projects"
RenderListItem {LI} at (40,72) size 744x18
- RenderListMarker at (684,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 43x18 [color=#0000EE]
RenderText {#text} at (701,0) size 43x18
text run at (701,0) width 43: "Photos"
RenderListItem {LI} at (40,90) size 744x18
- RenderListMarker at (672,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 55x18 [color=#0000EE]
RenderText {#text} at (689,0) size 55x18
text run at (689,0) width 55: "Statistics"
RenderListItem {LI} at (40,108) size 744x18
- RenderListMarker at (583,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 144x18 [color=#0000EE]
RenderText {#text} at (600,0) size 144x18
text run at (600,0) width 144: "Accessibility statement"
RenderListItem {LI} at (40,126) size 744x18
- RenderListMarker at (615,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 29x18 [color=#0000EE]
RenderText {#text} at (632,0) size 29x18
text run at (632,0) width 29: "RSS"
@@ -166,38 +166,38 @@ layer at (0,0) size 800x350
text run at (739,0) width 5: ")"
RenderBlock {UL} at (0,160) size 784x18
RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (639,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 88x18 [color=#0000EE]
RenderText {#text} at (656,0) size 88x18
text run at (656,0) width 88: "What is RSS?"
RenderBlock {UL} at (0,194) size 784x108
RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (635,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 92x18 [color=#0000EE]
RenderText {#text} at (652,0) size 92x18
text run at (652,0) width 92: "RSS Validator"
RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (582,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 145x18 [color=#0000EE]
RenderText {#text} at (599,0) size 145x18
text run at (599,0) width 145: "Dive Into Accessibility"
RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (626,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 101x18 [color=#0000EE]
RenderText {#text} at (643,0) size 101x18
text run at (643,0) width 101: "Dive Into OS X"
RenderListItem {LI} at (40,54) size 744x18
- RenderListMarker at (629,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 98x18 [color=#0000EE]
RenderText {#text} at (646,0) size 98x18
text run at (646,0) width 98: "Dive Into J2EE"
RenderListItem {LI} at (40,72) size 744x18
- RenderListMarker at (618,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 109x18 [color=#0000EE]
RenderText {#text} at (635,0) size 109x18
text run at (635,0) width 109: "Dive Into Python"
RenderListItem {LI} at (40,90) size 744x18
- RenderListMarker at (682,0) size 7x18: bullet
+ RenderListMarker at (413,0) size 7x18: bullet
RenderInline {A} at (0,0) size 45x18 [color=#0000EE]
RenderText {#text} at (699,0) size 45x18
text run at (699,0) width 45: "r\x{E9}sum\x{E9}"
diff --git a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum
index 7898847..6841096 100644
--- a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.checksum
@@ -1 +1 @@
-4f54cd0054f763234b9c7ecfde6953a6
\ No newline at end of file
+8ea39c2cea378fe2a063ce9a79663813
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png
index 2820760..012853e 100644
Binary files a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png and b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
index ffc2dec..fcecfa5 100644
--- a/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/003-vertical-expected.txt
@@ -122,42 +122,42 @@ layer at (0,0) size 426x600
RenderBlock {DIV} at (0,0) size 302x584
RenderBlock {UL} at (0,0) size 144x584
RenderListItem {LI} at (0,40) size 18x544
- RenderListMarker at (0,487) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x40 [color=#0000EE]
RenderText {#text} at (0,504) size 18x40
text run at (0,504) width 40: "About"
RenderListItem {LI} at (18,40) size 18x544
- RenderListMarker at (0,472) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x55 [color=#0000EE]
RenderText {#text} at (0,489) size 18x55
text run at (0,489) width 55: "Site map"
RenderListItem {LI} at (36,40) size 18x544
- RenderListMarker at (0,470) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x57 [color=#0000EE]
RenderText {#text} at (0,487) size 18x57
text run at (0,487) width 57: "Archives"
RenderListItem {LI} at (54,40) size 18x544
- RenderListMarker at (0,477) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x50 [color=#0000EE]
RenderText {#text} at (0,494) size 18x50
text run at (0,494) width 50: "Projects"
RenderListItem {LI} at (72,40) size 18x544
- RenderListMarker at (0,484) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x43 [color=#0000EE]
RenderText {#text} at (0,501) size 18x43
text run at (0,501) width 43: "Photos"
RenderListItem {LI} at (90,40) size 18x544
- RenderListMarker at (0,472) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x55 [color=#0000EE]
RenderText {#text} at (0,489) size 18x55
text run at (0,489) width 55: "Statistics"
RenderListItem {LI} at (108,40) size 18x544
- RenderListMarker at (0,383) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x144 [color=#0000EE]
RenderText {#text} at (0,400) size 18x144
text run at (0,400) width 144: "Accessibility statement"
RenderListItem {LI} at (126,40) size 18x544
- RenderListMarker at (0,415) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x29 [color=#0000EE]
RenderText {#text} at (0,432) size 18x29
text run at (0,432) width 29: "RSS"
@@ -170,38 +170,38 @@ layer at (0,0) size 426x600
text run at (0,539) width 5: ")"
RenderBlock {UL} at (160,0) size 18x584
RenderListItem {LI} at (0,40) size 18x544
- RenderListMarker at (0,439) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x88 [color=#0000EE]
RenderText {#text} at (0,456) size 18x88
text run at (0,456) width 88: "What is RSS?"
RenderBlock {UL} at (194,0) size 108x584
RenderListItem {LI} at (0,40) size 18x544
- RenderListMarker at (0,435) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x92 [color=#0000EE]
RenderText {#text} at (0,452) size 18x92
text run at (0,452) width 92: "RSS Validator"
RenderListItem {LI} at (18,40) size 18x544
- RenderListMarker at (0,382) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x145 [color=#0000EE]
RenderText {#text} at (0,399) size 18x145
text run at (0,399) width 145: "Dive Into Accessibility"
RenderListItem {LI} at (36,40) size 18x544
- RenderListMarker at (0,426) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x101 [color=#0000EE]
RenderText {#text} at (0,443) size 18x101
text run at (0,443) width 101: "Dive Into OS X"
RenderListItem {LI} at (54,40) size 18x544
- RenderListMarker at (0,429) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x98 [color=#0000EE]
RenderText {#text} at (0,446) size 18x98
text run at (0,446) width 98: "Dive Into J2EE"
RenderListItem {LI} at (72,40) size 18x544
- RenderListMarker at (0,418) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x109 [color=#0000EE]
RenderText {#text} at (0,435) size 18x109
text run at (0,435) width 109: "Dive Into Python"
RenderListItem {LI} at (90,40) size 18x544
- RenderListMarker at (0,482) size 18x7: bullet
+ RenderListMarker at (0,293) size 18x7: bullet
RenderInline {A} at (0,0) size 18x45 [color=#0000EE]
RenderText {#text} at (0,499) size 18x45
text run at (0,499) width 45: "r\x{E9}sum\x{E9}"
diff --git a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum
index 4f726b7..8cc7021 100644
--- a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.checksum
@@ -1 +1 @@
-6878be66a7c25b309bd51d782f725723
\ No newline at end of file
+60d5795a1a0a87622e3d56d64ce2cd7f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png
index 973b023..2ae1a46 100644
Binary files a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png and b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt
index d6fbf9c..eaa6e0a 100644
--- a/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/007-vertical-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
text run at (0,0) width 520: "The top padding on this unordered list has been set to 25 pixels, which will require"
text run at (18,0) width 191: "some extra test in order to test."
RenderListItem {LI} at (36,50) size 72x534 [bgcolor=#FFFFFF] [border: (25px solid #008000) none]
- RenderListMarker at (0,8) size 18x7: bullet
+ RenderListMarker at (0,-17) size 18x7: bullet
RenderText {#text} at (0,50) size 72x473
text run at (0,50) width 473: "Another list item might not be such a bad idea, either, considering that such"
text run at (18,50) width 239: "things do need to be double-checked. "
diff --git a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.checksum b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.checksum
index 881a760..68d525d 100644
--- a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.checksum
@@ -1 +1 @@
-ee20a6ee52266f024547f4a288017c0a
\ No newline at end of file
+9c513c74f48355e9a044c04328c2326d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png
index 6e5442a..d456e5e 100644
Binary files a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png and b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt
index 95ea6d6..fa54865 100644
--- a/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/008-vertical-expected.txt
@@ -5,30 +5,30 @@ layer at (0,0) size 1808x585
RenderBody {BODY} at (8,8) size 1784x569
RenderBlock {UL} at (0,0) size 134x195 [border: (1px solid #0000FF)]
RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-12) size 18x7: bullet
+ RenderListMarker at (10,-17) size 18x7: bullet
RenderText {#text} at (10,10) size 18x59
text run at (10,10) width 59: "First item"
RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-12) size 18x7: bullet
+ RenderListMarker at (10,-17) size 18x7: bullet
RenderText {#text} at (10,10) size 36x106
text run at (10,10) width 106: "Second and very"
text run at (28,10) width 91: "very long item"
RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-12) size 18x7: bullet
+ RenderListMarker at (10,-17) size 18x7: bullet
RenderText {#text} at (10,10) size 18x66
text run at (10,10) width 66: "Third item"
RenderBlock {UL} at (150,0) size 134x195 [border: (1px solid #FF0000)]
RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,158) size 18x7: bullet
+ RenderListMarker at (10,163) size 18x7: bullet
RenderText {#text} at (10,84) size 18x59
text run at (10,84) width 59: "First item"
RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,158) size 18x7: bullet
+ RenderListMarker at (10,163) size 18x7: bullet
RenderText {#text} at (10,37) size 36x106
text run at (10,37) width 106: "Second and very"
text run at (28,52) width 91: "very long item"
RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,158) size 18x7: bullet
+ RenderListMarker at (10,163) size 18x7: bullet
RenderText {#text} at (10,77) size 18x66
text run at (10,77) width 66: "Third item"
RenderBlock {UL} at (300,0) size 134x195 [border: (1px solid #0000FF)]
@@ -61,30 +61,30 @@ layer at (0,0) size 1808x585
text run at (10,63) width 66: "Third item"
RenderBlock {UL} at (600,0) size 134x195 [border: (1px solid #0000FF)]
RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,-12) size 10x10
+ RenderListMarker at (14,-17) size 10x10
RenderText {#text} at (10,10) size 18x59
text run at (10,10) width 59: "First item"
RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,-12) size 10x10
+ RenderListMarker at (14,-17) size 10x10
RenderText {#text} at (10,10) size 36x106
text run at (10,10) width 106: "Second and very"
text run at (28,10) width 91: "very long item"
RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,-12) size 10x10
+ RenderListMarker at (14,-17) size 10x10
RenderText {#text} at (10,10) size 18x66
text run at (10,10) width 66: "Third item"
RenderBlock {UL} at (750,0) size 134x195 [border: (1px solid #FF0000)]
RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,155) size 10x10
+ RenderListMarker at (14,160) size 10x10
RenderText {#text} at (10,84) size 18x59
text run at (10,84) width 59: "First item"
RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,155) size 10x10
+ RenderListMarker at (14,160) size 10x10
RenderText {#text} at (10,37) size 36x106
text run at (10,37) width 106: "Second and very"
text run at (28,52) width 91: "very long item"
RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (14,155) size 10x10
+ RenderListMarker at (14,160) size 10x10
RenderText {#text} at (10,77) size 18x66
text run at (10,77) width 66: "Third item"
RenderBlock {UL} at (900,0) size 134x195 [border: (1px solid #0000FF)]
@@ -117,30 +117,30 @@ layer at (0,0) size 1808x585
text run at (10,60) width 66: "Third item"
RenderBlock {OL} at (1200,0) size 134x195 [border: (1px solid #0000FF)]
RenderListItem {LI} at (1,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-15) size 18x16: "1"
+ RenderListMarker at (10,-20) size 18x16: "1"
RenderText {#text} at (10,10) size 18x59
text run at (10,10) width 59: "First item"
RenderListItem {LI} at (39,41) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-15) size 18x16: "2"
+ RenderListMarker at (10,-20) size 18x16: "2"
RenderText {#text} at (10,10) size 36x106
text run at (10,10) width 106: "Second and very"
text run at (28,10) width 91: "very long item"
RenderListItem {LI} at (95,41) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,-15) size 18x16: "3"
+ RenderListMarker at (10,-20) size 18x16: "3"
RenderText {#text} at (10,10) size 18x66
text run at (10,10) width 66: "Third item"
RenderBlock {OL} at (1350,0) size 134x195 [border: (1px solid #FF0000)]
RenderListItem {LI} at (1,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,152) size 18x16: "1"
+ RenderListMarker at (10,157) size 18x16: "1"
RenderText {#text} at (10,84) size 18x59
text run at (10,84) width 59: "First item"
RenderListItem {LI} at (39,1) size 56x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,152) size 18x16: "2"
+ RenderListMarker at (10,157) size 18x16: "2"
RenderText {#text} at (10,37) size 36x106
text run at (10,37) width 106: "Second and very"
text run at (28,52) width 91: "very long item"
RenderListItem {LI} at (95,1) size 38x153 [border: (5px solid #FFA500)]
- RenderListMarker at (10,152) size 18x16: "3"
+ RenderListMarker at (10,157) size 18x16: "3"
RenderText {#text} at (10,77) size 18x66
text run at (10,77) width 66: "Third item"
RenderBlock {OL} at (1500,0) size 134x195 [border: (1px solid #0000FF)]
diff --git a/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.checksum b/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.checksum
deleted file mode 100644
index 474e18a..0000000
--- a/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5fd6ad96dcc2e04ff5da078a121d5acc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.png b/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.png
deleted file mode 100644
index f1e830e..0000000
Binary files a/LayoutTests/platform/mac/fast/lists/outSideListMarkers-expected.png and /dev/null differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3e2978a..dce9c69 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-22 David Hyatt <hyatt at apple.com>
+
+ Back out r72527 since it caused multiple rendering regressions. Details in bug.
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::placeBoxesInInlineDirection):
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::positionListMarker):
+
2010-11-22 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
diff --git a/WebCore/rendering/InlineFlowBox.cpp b/WebCore/rendering/InlineFlowBox.cpp
index 2578ca2..ee9fe9f 100644
--- a/WebCore/rendering/InlineFlowBox.cpp
+++ b/WebCore/rendering/InlineFlowBox.cpp
@@ -273,16 +273,7 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
int startLogicalLeft = logicalLeft;
logicalLeft += borderLogicalLeft() + paddingLogicalLeft();
-
- int markerWidth = 0;
- for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
- if (!curr->renderer()->isListMarker())
- continue;
- RenderListMarker* marker = toRenderListMarker(curr->renderer());
- if (!marker->isInside())
- markerWidth += marker->width() - marker->marginLeft();
- }
-
+
for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
if (curr->renderer()->isText()) {
InlineTextBox* text = static_cast<InlineTextBox*>(curr);
@@ -359,10 +350,6 @@ int InlineFlowBox::placeBoxesInInlineDirection(int logicalLeft, bool& needsWordS
logicalRightVisualOverflow = max(logicalLeft + (isHorizontal() ? box->rightVisualOverflow() : box->bottomVisualOverflow()), logicalRightVisualOverflow);
logicalLeft += curr->logicalWidth() + logicalRightMargin;
- } else {
- RenderListMarker* marker = toRenderListMarker(curr->renderer());
- markerWidth -= marker->width() - marker->marginLeft();
- curr->setLogicalLeft(logicalLeft - markerWidth);
}
}
}
diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp
index b48db56..ba10706 100644
--- a/WebCore/rendering/RenderListItem.cpp
+++ b/WebCore/rendering/RenderListItem.cpp
@@ -262,10 +262,8 @@ void RenderListItem::positionListMarker()
// and really shouldn't keep propagating overflow up. This won't really break anything other than repainting
// not being as tight as it could be though.
if (style()->isLeftToRightDirection()) {
- if (style()->isHorizontalWritingMode())
- markerLogicalLeft = m_marker->logicalLeft() - paddingStart() - borderStart() + m_marker->marginStart();
- else
- markerLogicalLeft = m_marker->logicalLeft() - borderStart() + m_marker->marginStart();
+ int leftLineOffset = logicalLeftOffsetForLine(blockOffset, logicalLeftOffsetForLine(blockOffset, false), false);
+ markerLogicalLeft = leftLineOffset - lineOffset - paddingStart() - borderStart() + m_marker->marginStart();
m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
if (markerLogicalLeft < box->logicalLeftLayoutOverflow()) {
@@ -275,10 +273,9 @@ void RenderListItem::positionListMarker()
}
}
} else {
- if (style()->isHorizontalWritingMode())
- markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borderStart() + m_marker->marginEnd();
- else
- markerLogicalLeft = m_marker->logicalLeft() + borderStart() + m_marker->marginEnd();
+ markerLogicalLeft = m_marker->logicalLeft() + paddingStart() + borderStart() + m_marker->marginEnd();
+ int rightLineOffset = logicalRightOffsetForLine(blockOffset, logicalRightOffsetForLine(blockOffset, false), false);
+ markerLogicalLeft = rightLineOffset - lineOffset + paddingStart() + borderStart() + m_marker->marginEnd();
m_marker->inlineBoxWrapper()->adjustLineDirectionPosition(markerLogicalLeft - markerOldLogicalLeft);
for (InlineFlowBox* box = m_marker->inlineBoxWrapper()->parent(); box; box = box->parent()) {
if (markerLogicalLeft + m_marker->logicalWidth() > box->logicalRightLayoutOverflow()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list