Changeset 19601 in webkit

Timestamp:

Feb 13, 2007 5:09:04 AM (17 years ago)

Author:

mjs

Message:

LayoutTests:

Reviewed by Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=12746 REGRESSION (r13853): List item's first line overflows containing div

• fast/lists/item-not-in-list-line-wrapping-expected.checksum: Added.
• fast/lists/item-not-in-list-line-wrapping-expected.png: Added.
• fast/lists/item-not-in-list-line-wrapping-expected.txt: Added.
• fast/lists/item-not-in-list-line-wrapping.html: Added.

WebCore:

Reviewed by Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12746 REGRESSION (r13853): List item's first line overflows containing div

Test: fast/lists/item-not-in-list-line-wrapping.html

• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak): Use the list marker's isInside() instead of looking at its style()->listStylePosition(), since if the list item is not in a list, the marker is inside regardless of the style.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/lists/item-not-in-list-line-wrapping-expected.checksum (added)
• LayoutTests/fast/lists/item-not-in-list-line-wrapping-expected.png (added)
• LayoutTests/fast/lists/item-not-in-list-line-wrapping-expected.txt (added)
• LayoutTests/fast/lists/item-not-in-list-line-wrapping.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-13  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=12746
+        REGRESSION (r13853): List item's first line overflows containing div
+
+        * fast/lists/item-not-in-list-line-wrapping-expected.checksum: Added.
+        * fast/lists/item-not-in-list-line-wrapping-expected.png: Added.
+        * fast/lists/item-not-in-list-line-wrapping-expected.txt: Added.
+        * fast/lists/item-not-in-list-line-wrapping.html: Added.
+
 2007-02-13  Rob Buis  <buis@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-13  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12746
+        REGRESSION (r13853): List item's first line overflows containing div
+
+        Test: fast/lists/item-not-in-list-line-wrapping.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak): Use the list marker's isInside()
+        instead of looking at its style()->listStylePosition(), since if the
+        list item is not in a list, the marker is inside regardless of the style.
+
 2007-02-13  Rob Buis  <buis@kde.org>
 

trunk/WebCore/rendering/bidi.cpp

@@ -32 +32 @@
 #include "RenderArena.h"
 #include "RenderLayer.h"
+#include "RenderListMarker.h"
 #include "RenderView.h"
 #include "break_lines.h"
@@ -2192 +2193 @@
             trailingSpaceObject = 0;
             
-            if (o->isListMarker() && o->style()->listStylePosition() == OUTSIDE) {
+            if (o->isListMarker() && !static_cast<RenderListMarker*>(o)->isInside()) {
                 // The marker must not have an effect on whitespace at the start
                 // of the line.  We start ignoring spaces to make sure that any additional
@@ -2526 +2527 @@
 
         if (!last->isFloatingOrPositioned() && last->isReplaced() && autoWrap && 
-            (!last->isListMarker() || last->style()->listStylePosition()==INSIDE)) {
+            (!last->isListMarker() || static_cast<RenderListMarker*>(last)->isInside())) {
             // Go ahead and add in tmpW.
             w += tmpW;