Changeset 30590 in webkit

Timestamp:

Feb 25, 2008, 10:47:43 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Sam Weinig.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17152 Paragraphs indented with :first-letter and text-align CSS render incorrectly

Test: fast/text/apply-start-width-after-skipped-text.html

• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak): Improved the logic for when to figure in the padding, border and margin before a text node when the line begins inside a text node.

LayoutTests:

Reviewed by Sam Weinig.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17152 Paragraphs indented with :first-letter and text-align CSS render incorrectly

• fast/text/apply-start-width-after-skipped-text.html: Added.
• platform/mac/fast/text/apply-start-width-after-skipped-text-expected.checksum: Added.
• platform/mac/fast/text/apply-start-width-after-skipped-text-expected.png: Added.
• platform/mac/fast/text/apply-start-width-after-skipped-text-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/apply-start-width-after-skipped-text.html (added)
• LayoutTests/platform/mac/fast/text/apply-start-width-after-skipped-text-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/apply-start-width-after-skipped-text-expected.png (added)
• LayoutTests/platform/mac/fast/text/apply-start-width-after-skipped-text-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17152
+          Paragraphs indented with :first-letter and text-align CSS render incorrectly
+
+        * fast/text/apply-start-width-after-skipped-text.html: Added.
+        * platform/mac/fast/text/apply-start-width-after-skipped-text-expected.checksum: Added.
+        * platform/mac/fast/text/apply-start-width-after-skipped-text-expected.png: Added.
+        * platform/mac/fast/text/apply-start-width-after-skipped-text-expected.txt: Added.
+
 2008-02-25  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17152
+          Paragraphs indented with :first-letter and text-align CSS render incorrectly
+
+        Test: fast/text/apply-start-width-after-skipped-text.html
+
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak): Improved the logic for when
+        to figure in the padding, border and margin before a text node when the
+        line begins inside a text node.
+
 2008-02-25  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -1354 +1354 @@
 BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi)
 {
+    bool appliedStartWidth = start.pos > 0;
+
     // eliminate spaces at beginning of line
     int width = skipWhitespace(start, bidi);
@@ -1543 +1545 @@
                 tmpW += o->width() + o->marginLeft() + o->marginRight() + inlineWidth(o);
         } else if (o->isText()) {
+            if (!pos)
+                appliedStartWidth = false;
+
             RenderText* t = static_cast<RenderText*>(o);
 
@@ -1555 +1560 @@
             int lastSpaceWordSpacing = 0;
 
-            bool appliedStartWidth = pos > 0; // If the span originated on a previous line,
-                                              // then assume the start width has been applied.
             int wrapW = tmpW + inlineWidth(o, !appliedStartWidth, true);
             int charWidth = 0;