Changeset 41257 in webkit

Timestamp:

Feb 26, 2009 10:45:25 AM (15 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

2009-02-26 David Hyatt <​hyatt@apple.com>

Reviewed by Dan Bernstein & Darin Adler

Make sure the border/padding are properly omitted at the start of an inline that is a continuation.

Added fast/inline/inline-continuation-borders.html

• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::determineSpacingForFlowBoxes):

LayoutTests:

2009-02-26 David Hyatt <​hyatt@apple.com>

Reviewed by Dan Bernstein & Darin Adler

Make sure the border/padding are properly omitted at the start of an inline that is a continuation.

• fast/inline/inline-continuation-borders.html: Added.
• platform/mac/fast/inline/inline-continuation-borders-expected.checksum: Added.
• platform/mac/fast/inline/inline-continuation-borders-expected.png: Added.
• platform/mac/fast/inline/inline-continuation-borders-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/inline-continuation-borders.html (added)
• LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.checksum (added)
• LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.png (added)
• LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/InlineFlowBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-02-26  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein & Darin Adler
+
+        Make sure the border/padding are properly omitted at the start of an inline that is a continuation.
+
+        * fast/inline/inline-continuation-borders.html: Added.
+        * platform/mac/fast/inline/inline-continuation-borders-expected.checksum: Added.
+        * platform/mac/fast/inline/inline-continuation-borders-expected.png: Added.
+        * platform/mac/fast/inline/inline-continuation-borders-expected.txt: Added.
+
 2009-02-26  Pamela Greene  <pam@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-26  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein & Darin Adler
+
+        Make sure the border/padding are properly omitted at the start of an inline that is a continuation.
+        
+        Added fast/inline/inline-continuation-borders.html
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::determineSpacingForFlowBoxes):
+
 2009-02-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -217 +217 @@
     bool includeLeftEdge = false;
     bool includeRightEdge = false;
-    
-    if (!renderer()->firstChild())
-        includeLeftEdge = includeRightEdge = true; // Empty inlines never split across lines.
-    else if (parent()) { // The root inline box never has borders/margins/padding.
+
+    // The root inline box never has borders/margins/padding.
+    if (parent()) {
         bool ltr = renderer()->style()->direction() == LTR;
-        
+
         // Check to see if all initial lines are unconstructed.  If so, then
-        // we know the inline began on this line.
+        // we know the inline began on this line (unless we are a continuation).
         RenderLineBoxList* lineBoxList = rendererLineBoxes();
-        if (!lineBoxList->firstLineBox()->isConstructed()) {
+        if (!lineBoxList->firstLineBox()->isConstructed() && !renderer()->isInlineContinuation()) {
             if (ltr && lineBoxList->firstLineBox() == this)
                 includeLeftEdge = true;