[webkit-changes] cvs commit: WebCore/khtml/rendering bidi.cpp
Beth
bdakin at opensource.apple.com
Mon Oct 24 10:47:27 PDT 2005
bdakin 05/10/24 10:47:26
Modified: . ChangeLog
. ChangeLog
khtml/rendering bidi.cpp
Added: fast/lists li-br-expected.checksum li-br-expected.png
li-br-expected.txt li-br.html
Log:
Revision Changes Path
1.46 +10 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 24 Oct 2005 07:25:10 -0000 1.45
+++ ChangeLog 24 Oct 2005 17:47:21 -0000 1.46
@@ -1,3 +1,13 @@
+2005-10-24 Beth Dakin <bdakin at apple.com>
+
+ Layout test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5318
+ forced line break should not be allowed after a list marker
+
+ * fast/lists/li-br-expected.checksum: Added.
+ * fast/lists/li-br-expected.png: Added.
+ * fast/lists/li-br-expected.txt: Added.
+ * fast/lists/li-br.html: Added.
+
2005-10-24 Darin Adler <darin at apple.com>
Reviewed by hyatt.
1.1 LayoutTests/fast/lists/li-br-expected.checksum
Index: li-br-expected.checksum
===================================================================
572b9f1092ea75739d0ffeabcb1b11df
1.1 LayoutTests/fast/lists/li-br-expected.png
<<Binary file>>
1.1 LayoutTests/fast/lists/li-br-expected.txt
Index: li-br-expected.txt
===================================================================
layer at (0,0) size 1518x600
RenderCanvas at (0,0) size 785x585
layer at (0,0) size 1518x600
RenderBlock {HTML} at (0,0) size 785x600
RenderBody {BODY} at (8,8) size 769x576
RenderBlock {OL} at (0,0) size 769x18
RenderListItem {LI} at (40,0) size 729x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 1470x18
text run at (0,0) width 1470: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
RenderBlock {OL} at (0,34) size 769x36
RenderListItem {LI} at (40,0) size 729x36
RenderListMarker at (0,0) size 16x14
RenderText {TEXT} at (0,18) size 1470x18
text run at (0,18) width 1470: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
1.1 LayoutTests/fast/lists/li-br.html
Index: li-br.html
===================================================================
<html>
<body>
<ol>
<li>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
</ol>
<ol>
<li style="list-style-position:inside">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
</ol>
</body>
</html>
1.269 +10 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- ChangeLog 24 Oct 2005 07:24:33 -0000 1.268
+++ ChangeLog 24 Oct 2005 17:47:22 -0000 1.269
@@ -1,3 +1,13 @@
+2005-10-24 Antti Koivisto <koivisto at iki.fi>
+
+ Reviewed by Hyatt, landed by beth.
+
+ Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5318
+ forced line break should not be allowed after a list marker.
+
+ * khtml/rendering/bidi.cpp:
+ (khtml::RenderBlock::findNextLineBreak):
+
2005-10-24 Darin Adler <darin at apple.com>
Reviewed by hyatt.
1.152 +4 -3 WebCore/khtml/rendering/bidi.cpp
Index: bidi.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- bidi.cpp 19 Oct 2005 00:03:45 -0000 1.151
+++ bidi.cpp 24 Oct 2005 17:47:26 -0000 1.152
@@ -2398,7 +2398,8 @@
last = o;
o = next;
- if (!last->isFloatingOrPositioned() && last->isReplaced() && last->style()->whiteSpace() == NORMAL) {
+ if (!last->isFloatingOrPositioned() && last->isReplaced() && last->style()->whiteSpace() == NORMAL &&
+ (!last->isListMarker() || last->style()->listStylePosition()==INSIDE)) {
// Go ahead and add in tmpW.
w += tmpW;
tmpW = 0;
@@ -2435,8 +2436,8 @@
lBreak.pos = last->isText() ? last->length() : 0;
}
} else if( lBreak.obj ) {
- if( last != o ) {
- // better to break between object boundaries than in the middle of a word
+ if( last != o && !last->isListMarker() ) {
+ // better to break between object boundaries than in the middle of a word (except for list markers)
lBreak.obj = o;
lBreak.pos = 0;
} else {
More information about the webkit-changes
mailing list