Changeset 31065 in webkit

Timestamp:

Mar 14, 2008 1:34:01 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17834 REGRESSION: floated first-letter does not work when included in table

Test: fast/css/first-letter-float.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::updateFirstLetter): Changed the search for the first text node to stop at a float if that float is an existing first- letter.

LayoutTests:

Reviewed by Darin Adler.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17834 REGRESSION: floated first-letter does not work when included in table

• fast/css/first-letter-float.html: Added.
• platform/mac-leopard/fast/css/first-letter-float-expected.checksum: Added.
• platform/mac-leopard/fast/css/first-letter-float-expected.png: Added.
• platform/mac/fast/css/first-letter-float-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/first-letter-float.html (added)
• LayoutTests/platform/mac-leopard/fast/css/first-letter-float-expected.checksum (added)
• LayoutTests/platform/mac-leopard/fast/css/first-letter-float-expected.png (added)
• LayoutTests/platform/mac/fast/css/first-letter-float-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-14  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17834
+          REGRESSION: floated first-letter does not work when included in table
+
+        * fast/css/first-letter-float.html: Added.
+        * platform/mac-leopard/fast/css/first-letter-float-expected.checksum: Added.
+        * platform/mac-leopard/fast/css/first-letter-float-expected.png: Added.
+        * platform/mac/fast/css/first-letter-float-expected.txt: Added.
+
 2008-03-13  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-14  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17834
+          REGRESSION: floated first-letter does not work when included in table
+
+        Test: fast/css/first-letter-float.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateFirstLetter): Changed the search for the
+        first text node to stop at a float if that float is an existing first-
+        letter.
+
 2008-03-14  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -4086 +4086 @@
     RenderObject* currChild = firstLetterBlock->firstChild();
     while (currChild && currChild->needsLayout() && (!currChild->isReplaced() || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
-        if (currChild->isFloatingOrPositioned())
+        if (currChild->isFloatingOrPositioned()) {
+            if (currChild->style()->styleType() == RenderStyle::FIRST_LETTER)
+                break;
             currChild = currChild->nextSibling();
-        else
+        } else
             currChild = currChild->firstChild();
     }