Changeset 35354 in webkit

Timestamp:

Jul 25, 2008 1:21:06 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

2008-07-25 Jacob Refstrup <​jacob.refstrup@hp.com>

Reviewed by mitz.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=17906 <rdar://problem/5805741> white-space: pre-wrap or -webkit-line-break: after-white-space text can overlap float at end of line

Test: fast/block/float/editable-text-overlapping-float.html

• rendering/RenderBlock.h:
• rendering/bidi.cpp: (WebCore::RenderBlock::skipTrailingWhitespace):
• renamed to reflect usage and removed call to position floats; they only get added (WebCore::RenderBlock::skipLeadingWhitespace):
• renamed to reflect usage (WebCore::RenderBlock::findNextLineBreak):
• use skipTrailingWhitespace at end of line (as before but with new name)

LayoutTests:

2008-07-25 Jacob Refstrup <​jacob.refstrup@hp.com>

Reviewed by mitz.

• added test case for float being added in trailing whitespace of an already full line (with pre-wrap or after-white-space set). <rdar://problem/5805741> ​https://bugs.webkit.org/show_bug.cgi?id=17906

• fast/block/float/editable-text-overlapping-float.html: Added.
• platform/mac/fast/block/float/editable-text-overlapping-float-expected.checksum: Added.
• platform/mac/fast/block/float/editable-text-overlapping-float-expected.png: Added.
• platform/mac/fast/block/float/editable-text-overlapping-float-expected.txt: Added.
• platform/qt/fast/block/float/editable-text-overlapping-float-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/editable-text-overlapping-float.html (added)
• LayoutTests/platform/mac/fast/block/float/editable-text-overlapping-float-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/editable-text-overlapping-float-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/editable-text-overlapping-float-expected.txt (added)
• LayoutTests/platform/qt/fast/block/float/editable-text-overlapping-float-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-07-25  Jacob Refstrup  <jacob.refstrup@hp.com>
+
+        Reviewed by mitz.
+        
+        - added test case for float being added in trailing whitespace
+          of an already full line (with pre-wrap or after-white-space set).
+          <rdar://problem/5805741> https://bugs.webkit.org/show_bug.cgi?id=17906
+
+        * fast/block/float/editable-text-overlapping-float.html: Added.
+        * platform/mac/fast/block/float/editable-text-overlapping-float-expected.checksum: Added.
+        * platform/mac/fast/block/float/editable-text-overlapping-float-expected.png: Added.
+        * platform/mac/fast/block/float/editable-text-overlapping-float-expected.txt: Added.
+        * platform/qt/fast/block/float/editable-text-overlapping-float-expected.txt: Added.
+
 2008-07-24  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-07-25  Jacob Refstrup  <jacob.refstrup@hp.com>
+
+        Reviewed by mitz.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=17906
+        <rdar://problem/5805741> white-space: pre-wrap or -webkit-line-break: after-white-space text can overlap float at end of line
+        
+        Test: fast/block/float/editable-text-overlapping-float.html
+
+        * rendering/RenderBlock.h:
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::skipTrailingWhitespace):
+        - renamed to reflect usage and removed call to position floats; 
+          they only get added
+        (WebCore::RenderBlock::skipLeadingWhitespace):
+        - renamed to reflect usage
+        (WebCore::RenderBlock::findNextLineBreak):
+        - use skipTrailingWhitespace at end of line (as before but with new
+          name)
+
 2008-07-25  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderBlock.h

@@ -146 +146 @@
                         RootInlineBox*& endLine, int& endYPos, int& repaintBottom, int& repaintTop);
     bool generatesLineBoxesForInlineChild(RenderObject*);
-    int skipWhitespace(InlineIterator&);
-    int skipWhitespace(InlineBidiResolver&);
+    void skipTrailingWhitespace(InlineIterator&);
+    int skipLeadingWhitespace(InlineBidiResolver&);
     void fitBelowFloats(int widthToFit, int& availableWidth);
     InlineIterator findNextLineBreak(InlineBidiResolver&, EClear* clear = 0);

trunk/WebCore/rendering/bidi.cpp

@@ -1437 +1437 @@
 }
 
-// FIXME: The entire concept of the skipWhitespace function is flawed, since we really need to be building
+// FIXME: The entire concept of the skipTrailingWhitespace function is flawed, since we really need to be building
 // line boxes even for containers that may ultimately collapse away.  Otherwise we'll never get positioned
 // elements quite right.  In other words, we need to build this function's work into the normal line
 // object iteration process.
-int RenderBlock::skipWhitespace(InlineIterator& iterator)
-{
-    int availableWidth = lineWidth(m_height);
+// NB. this function will insert any floating elements that would otherwise
+// be skipped but it will not position them.
+void RenderBlock::skipTrailingWhitespace(InlineIterator& iterator)
+{
     while (!iterator.atEnd() && !requiresLineBox(iterator)) {
         RenderObject* object = iterator.obj;
         if (object->isFloating()) {
             insertFloatingObject(object);
-            positionNewFloats();
-            availableWidth = lineWidth(m_height);
         } else if (object->isPositioned()) {
             // FIXME: The math here is actually not really right.  It's a best-guess approximation that
@@ -1474 +1473 @@
         iterator.increment();
     }
-    return availableWidth;
-}
-
-int RenderBlock::skipWhitespace(InlineBidiResolver& resolver)
+}
+
+int RenderBlock::skipLeadingWhitespace(InlineBidiResolver& resolver)
 {
     int availableWidth = lineWidth(m_height);
@@ -1560 +1558 @@
     bool appliedStartWidth = resolver.position().pos > 0;
 
-    int width = skipWhitespace(resolver);
+    int width = skipLeadingWhitespace(resolver);
 
     int w = 0;
@@ -1879 +1877 @@
                                 lBreak.obj = o;
                                 lBreak.pos = pos;
-                                skipWhitespace(lBreak);
+                                skipTrailingWhitespace(lBreak);
                             }
                         }