[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Thu Apr 8 00:04:47 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 382642bac77ee587a22f09f032339090d01564d0
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 1 07:37:14 2009 +0000
2009-11-30 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
css2.1/t1205-c566-list-stl-00-e-ag.html is failing
https://bugs.webkit.org/show_bug.cgi?id=23264
css2.1/t1205-c565-list-pos-00-b.html is failing
https://bugs.webkit.org/show_bug.cgi?id=23263
Ignore whitespaces after list markers.
Rendering of this was already done for the case where inside=false.
This fixes the rendering of inside=true case and calcInlinePrefWidths.
Test: fast/lists/calc-width-with-space.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::calcInlinePrefWidths):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::findNextLineBreak):
2009-11-30 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
css2.1/t1205-c566-list-stl-00-e-ag.html is failing
https://bugs.webkit.org/show_bug.cgi?id=23264
* editing/pasteboard/copy-crash-expected.txt:
* fast/lists/calc-width-with-space-expected.txt: Added.
* fast/lists/calc-width-with-space.html: Added.
* platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum:
* platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png:
* platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt:
* platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum:
* platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png:
* platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt:
* platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum:
* platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png:
* platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
* platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum:
* platform/mac/fast/block/positioning/complex-percentage-height-expected.png:
* platform/mac/fast/block/positioning/complex-percentage-height-expected.txt:
* platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum:
* platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png:
* platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt:
* platform/mac/fast/repaint/list-marker-expected.checksum:
* platform/mac/fast/repaint/list-marker-expected.png:
* platform/mac/fast/repaint/list-marker-expected.txt:
* platform/qt/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a784868..21a5fb2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2009-11-30 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ css2.1/t1205-c566-list-stl-00-e-ag.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=23264
+
+ * editing/pasteboard/copy-crash-expected.txt:
+ * fast/lists/calc-width-with-space-expected.txt: Added.
+ * fast/lists/calc-width-with-space.html: Added.
+ * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum:
+ * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png:
+ * platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt:
+ * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum:
+ * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png:
+ * platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt:
+ * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum:
+ * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png:
+ * platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt:
+ * platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum:
+ * platform/mac/fast/block/positioning/complex-percentage-height-expected.png:
+ * platform/mac/fast/block/positioning/complex-percentage-height-expected.txt:
+ * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum:
+ * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png:
+ * platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt:
+ * platform/mac/fast/repaint/list-marker-expected.checksum:
+ * platform/mac/fast/repaint/list-marker-expected.png:
+ * platform/mac/fast/repaint/list-marker-expected.txt:
+ * platform/qt/Skipped:
+
2009-11-30 Enrica Casucci <enrica at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/editing/pasteboard/copy-crash-expected.txt b/LayoutTests/editing/pasteboard/copy-crash-expected.txt
index 5848652..48c467c 100644
--- a/LayoutTests/editing/pasteboard/copy-crash-expected.txt
+++ b/LayoutTests/editing/pasteboard/copy-crash-expected.txt
@@ -1,7 +1,7 @@
Mouse Over
This test checks the fix for https://bugs.webkit.org/show_bug.cgi?id=18506. To test it manually:
- Hover mouse over "Mouse Over" link
- Quickly jump to the yellow box that pops up and select "Select" link
- Move mouse away so that pop up disappears
- Press the "Copy" keyboard accelerator - this should not cause any crash
+Hover mouse over "Mouse Over" link
+Quickly jump to the yellow box that pops up and select "Select" link
+Move mouse away so that pop up disappears
+Press the "Copy" keyboard accelerator - this should not cause any crash
diff --git a/LayoutTests/fast/lists/calc-width-with-space-expected.txt b/LayoutTests/fast/lists/calc-width-with-space-expected.txt
new file mode 100644
index 0000000..0519a72
--- /dev/null
+++ b/LayoutTests/fast/lists/calc-width-with-space-expected.txt
@@ -0,0 +1,6 @@
+These two lines should look same as spaces after a list marker should be ignored. There are 18 characters in each line. As they are 20px width, the total width should be 360px + a few pixels for table. If the space character after the list marker in "test" isn't ignored, the number of characters become 19 and 370px div will be overflowed. Note that this test requires Ahem font.
+XpX XpX
+XpX XpX
+XpX XpX
+XpX XpX
+SUCCESS
diff --git a/LayoutTests/fast/lists/calc-width-with-space.html b/LayoutTests/fast/lists/calc-width-with-space.html
new file mode 100644
index 0000000..607d240
--- /dev/null
+++ b/LayoutTests/fast/lists/calc-width-with-space.html
@@ -0,0 +1,54 @@
+<head>
+<style>
+ ol { margin: 0px; }
+</style>
+<script>
+function run()
+{
+ // Check if the two divs aren't overflowed by checking they have
+ // the same height.
+ var ref = document.getElementById("ref");
+ var test = document.getElementById("test");
+ var result = document.getElementById("result");
+ if (ref.scrollHeight == test.scrollHeight)
+ result.appendChild(document.createTextNode("SUCCESS"));
+ else
+ result.appendChild(document.createTextNode("FAILED"));
+}
+
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</head>
+
+<body onload="run();">
+
+These two lines should look same as spaces after a list marker should
+be ignored. There are 18 characters in each line. As they are 20px
+width, the total width should be 360px + a few pixels for table.
+If the space character after the list marker in "test" isn't ignored,
+the number of characters become 19 and 370px div will be overflowed.
+Note that this test requires Ahem font.
+
+<div style="height: 20px; overflow-y: scroll;" id="ref">
+<table style="width: 370px; font: 20px Ahem;">
+ <tr>
+ <td><ol><li>XpX XpX</ol></td>
+ <td><ol><li>XpX XpX</ol></td>
+ </tr>
+</table>
+</div>
+
+<div style="height: 20px; overflow-y: scroll;" id="test">
+<table style="width: 370px; font: 20px Ahem;">
+ <tr>
+ <td><ol><li> XpX XpX</ol></td>
+ <td><ol><li>XpX XpX</ol></td>
+ </tr>
+</table>
+</div>
+
+<div id="result">
+</div>
+
+</body>
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum
index 7a2ed5f..975f5a8 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum
+++ b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.checksum
@@ -1 +1 @@
-2b34a5c8a7bfdb2404f15ad98193f305
\ No newline at end of file
+c981a1604d0acab41c03a2ade5976056
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png
index ec9117d..8d9e44a 100644
Binary files a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png and b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.png differ
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt
index 33945da..7499864 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1205-c561-list-displ-00-b-expected.txt
@@ -8,8 +8,8 @@ layer at (0,0) size 800x202
text run at (0,0) width 757: "There should be eight numbered lines below, all identical except for the numbering, which should match the description."
RenderListItem {DIV} at (0,34) size 784x18 [color=#000080]
RenderListMarker at (0,0) size 16x18: "1"
- RenderText {#text} at (16,0) size 155x18
- text run at (16,0) width 155: " This should be line one."
+ RenderText {#text} at (16,0) size 151x18
+ text run at (16,0) width 151: "This should be line one."
RenderBlock {DIV} at (0,52) size 784x18 [color=#000080]
RenderText {#text} at (0,0) size 168x18
text run at (0,0) width 168: "2. This should be line two."
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum
index 8671ae6..ccc0b58 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum
+++ b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.checksum
@@ -1 +1 @@
-46d4d532d748c69d57a0a20cdb8571ed
\ No newline at end of file
+372bfeb496e4437cda7029069c957f7b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png
index 6d3ca08..e71e147 100644
Binary files a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png and b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.png differ
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt
index 38cf85e..4979e83 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1205-c565-list-pos-00-b-expected.txt
@@ -17,6 +17,6 @@ layer at (0,0) size 800x95
RenderBlock {OL} at (80,53) size 160x18 [color=#000080] [bgcolor=#000080]
RenderListItem {LI} at (0,0) size 160x18
RenderListMarker at (0,0) size 16x18: "1"
- RenderInline {SPAN} at (0,0) size 31x18 [color=#FFFFFF]
- RenderText {#text} at (16,0) size 31x18
- text run at (16,0) width 31: " Test"
+ RenderInline {SPAN} at (0,0) size 27x18 [color=#FFFFFF]
+ RenderText {#text} at (16,0) size 27x18
+ text run at (16,0) width 27: "Test"
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum
index bc3fdcf..9486068 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum
+++ b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.checksum
@@ -1 +1 @@
-f51f10c52adf75a0e527562909041c1f
\ No newline at end of file
+890c459839c732d1ae63b46aaf1298d9
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png
index 7118b3c..da6d56c 100644
Binary files a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png and b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.png differ
diff --git a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
index 707722e..314eae8 100644
--- a/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt
@@ -10,6 +10,6 @@ layer at (0,0) size 800x116
RenderListItem {LI} at (3,3) size 90x45
RenderListMarker at (0,0) size 45x15: "A"
RenderText {#text} at (45,0) size 90x45
- text run at (45,0) width 30: " x"
- text run at (0,15) width 60: "x xx"
- text run at (0,30) width 90: "xx x x"
+ text run at (45,0) width 45: "x x"
+ text run at (0,15) width 75: "xx xx"
+ text run at (0,30) width 45: "x x"
diff --git a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum
index 37d0186..8cfd470 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum
+++ b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.checksum
@@ -1 +1 @@
-cd3ed5b4147c3257eb22a6a5912aa8d0
\ No newline at end of file
+d3d2c1237d98f6e596100059972e1de8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.png b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.png
index dce7745..cc0f57b 100644
Binary files a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.png and b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.txt b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.txt
index 8509d96..01ba566 100644
--- a/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/positioning/complex-percentage-height-expected.txt
@@ -10,23 +10,20 @@ layer at (0,0) size 785x638
RenderBlock {UL} at (0,27) size 735x147
RenderListItem {LI} at (0,0) size 735x18
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 415x18
- text run at (14,0) width 4: " "
- text run at (18,0) width 411: "Blue div has 400px width, dynamic height, and position: relative."
+ RenderText {#text} at (14,0) size 411x18
+ text run at (14,0) width 411: "Blue div has 400px width, dynamic height, and position: relative."
RenderListItem {LI} at (0,25) size 735x36
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 545x18
- text run at (14,0) width 4: " "
- text run at (18,0) width 541: "Inside blue div there are 3 other div with height: 40px (and has some bottom margin..)"
- RenderBR {BR} at (559,0) size 0x18
+ RenderText {#text} at (14,0) size 541x18
+ text run at (14,0) width 541: "Inside blue div there are 3 other div with height: 40px (and has some bottom margin..)"
+ RenderBR {BR} at (555,0) size 0x18
RenderText {#text} at (0,18) size 386x18
text run at (0,18) width 386: "the height of the blue div expands with the green divs inside.."
RenderListItem {LI} at (0,68) size 735x54
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 542x18
- text run at (14,0) width 4: " "
- text run at (18,0) width 538: "Yellow div has position absolute (and positioned in the top left corner of the blue div)"
- RenderBR {BR} at (556,0) size 0x18
+ RenderText {#text} at (14,0) size 538x18
+ text run at (14,0) width 538: "Yellow div has position absolute (and positioned in the top left corner of the blue div)"
+ RenderBR {BR} at (552,0) size 0x18
RenderText {#text} at (0,18) size 138x18
text run at (0,18) width 138: "it's height set to 100%"
RenderBR {BR} at (138,18) size 0x18
@@ -34,9 +31,8 @@ layer at (0,0) size 785x638
text run at (0,36) width 442: "the height of the yellow div now equals with the height of the blue div"
RenderListItem {LI} at (0,129) size 735x18
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 416x18
- text run at (14,0) width 4: " "
- text run at (18,0) width 412: "Red div is inserted into the yellow div, and it's height set to 100%"
+ RenderText {#text} at (14,0) size 412x18
+ text run at (14,0) width 412: "Red div is inserted into the yellow div, and it's height set to 100%"
RenderBlock {H3} at (0,194) size 735x22
RenderText {#text} at (0,0) size 76x22
text run at (0,0) width 76: "Problem:"
diff --git a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum
index 72ec596..ab2581d 100644
--- a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum
+++ b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.checksum
@@ -1 +1 @@
-fa350d7ab2094c06a0c85de99384ee7e
\ No newline at end of file
+eec87fe7f04c7c6c5a49faec862d93d6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png
index 341e17e..eee5202 100644
Binary files a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png and b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt
index d16c8cc..f9b7026 100644
--- a/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt
+++ b/LayoutTests/platform/mac/fast/lists/item-not-in-list-line-wrapping-expected.txt
@@ -22,7 +22,6 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,86) size 125x36 [bgcolor=#FFFF00]
RenderListItem {LI} at (0,0) size 125x36
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 102x36
- text run at (14,0) width 4: " "
- text run at (18,0) width 84: "Lorem ipsum"
+ RenderText {#text} at (14,0) size 98x36
+ text run at (14,0) width 84: "Lorem ipsum"
text run at (0,18) width 85: "dolor sit amet"
diff --git a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.checksum b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.checksum
index dfa1084..aa4e055 100644
--- a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.checksum
+++ b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.checksum
@@ -1 +1 @@
-448b1ea7ae59733b03f04fe2cc7a7169
\ No newline at end of file
+d4cd04dd0e73614278b8ef3dc41e8c60
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.png b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.png
index 7b37cb3..8f7b9b6 100644
Binary files a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.png and b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.txt b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.txt
index 35655c5..bca2e3d 100644
--- a/LayoutTests/platform/mac/fast/repaint/list-marker-expected.txt
+++ b/LayoutTests/platform/mac/fast/repaint/list-marker-expected.txt
@@ -27,9 +27,8 @@ layer at (0,0) size 800x600
RenderListItem {LI} at (40,0) size 744x18
RenderBlock (anonymous) at (0,0) size 744x18
RenderListMarker at (-1,0) size 7x18: bullet
- RenderText {#text} at (14,0) size 24x18
- text run at (14,0) width 4: " "
- text run at (18,0) width 20: "bar"
+ RenderText {#text} at (14,0) size 20x18
+ text run at (14,0) width 20: "bar"
RenderBlock {DIV} at (10,28) size 724x0
RenderBlock {UL} at (0,120) size 784x18
RenderListItem {LI} at (0,0) size 744x18
@@ -42,7 +41,6 @@ layer at (0,0) size 800x600
RenderListItem {LI} at (0,0) size 744x18
RenderBlock (anonymous) at (0,0) size 744x18
RenderListMarker at (738,0) size 7x18: bullet
- RenderText {#text} at (706,0) size 24x18
- text run at (706,0) width 20: "bar"
- text run at (726,0) width 4 RTL: " "
+ RenderText {#text} at (710,0) size 20x18
+ text run at (710,0) width 20: "bar"
RenderBlock {DIV} at (10,28) size 724x0
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3b5f7b8..4d14bbf 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5260,3 +5260,11 @@ transitions/transition-end-event-rendering.html
# Failure introduced by http://trac.webkit.org/changeset/51429
# hamaji will look into this.
editing/selection/last-empty-inline.html
+
+# Need to update the expectations.
+# See: https://bugs.webkit.org/show_bug.cgi?id=23264
+css2.1/t1205-c561-list-displ-00-b.html
+css2.1/t1205-c565-list-pos-00-b.html
+css2.1/t1205-c566-list-stl-00-e-ag.html
+fast/block/positioning/complex-percentage-height.html
+fast/lists/item-not-in-list-line-wrapping.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eb8feb6..32e1e2d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2009-11-30 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ css2.1/t1205-c566-list-stl-00-e-ag.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=23264
+ css2.1/t1205-c565-list-pos-00-b.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=23263
+
+ Ignore whitespaces after list markers.
+ Rendering of this was already done for the case where inside=false.
+ This fixes the rendering of inside=true case and calcInlinePrefWidths.
+
+ Test: fast/lists/calc-width-with-space.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::calcInlinePrefWidths):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::findNextLineBreak):
+
2009-11-30 Fumitoshi Ukai <ukai at chromium.org>
Unreviewed Chromium build fix introduced by r51212
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 7f70b07..0e69b38 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -4212,6 +4212,10 @@ void RenderBlock::calcInlinePrefWidths()
} else
inlineMax += childMax;
}
+
+ // Ignore spaces after a list marker.
+ if (child->isListMarker())
+ stripFrontSpaces = true;
} else {
m_minPrefWidth = max(inlineMin, m_minPrefWidth);
m_maxPrefWidth = max(inlineMax, m_maxPrefWidth);
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp
index 19923f1..4e76fcb 100644
--- a/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -1769,10 +1769,10 @@ InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, bool
currentCharacterIsSpace = false;
currentCharacterIsWS = false;
trailingSpaceObject = 0;
-
+
// Optimize for a common case. If we can't find whitespace after the list
// item, then this is all moot. -dwh
- if (o->isListMarker() && !toRenderListMarker(o)->isInside()) {
+ if (o->isListMarker()) {
if (style()->collapseWhiteSpace() && shouldSkipWhitespaceAfterStartObject(this, o, lineMidpointState)) {
// Like with inline flows, we start ignoring spaces to make sure that any
// additional spaces we see will be discarded.
@@ -1780,6 +1780,8 @@ InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, bool
currentCharacterIsWS = true;
ignoringSpaces = true;
}
+ if (toRenderListMarker(o)->isInside())
+ tmpW += replacedBox->width() + replacedBox->marginLeft() + replacedBox->marginRight() + inlineWidth(o);
} else
tmpW += replacedBox->width() + replacedBox->marginLeft() + replacedBox->marginRight() + inlineWidth(o);
} else if (o->isText()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list