Changeset 85535 in webkit

Timestamp:

May 2, 2011 3:46:06 PM (13 years ago)

Author:

enrica@apple.com

Message:

Text does not split on white space when typing to the edge of window.
​https://bugs.webkit.org/show_bug.cgi?id=59968
<rdar://problem/9112683>

Reviewed by Dan Bernstein.

Source/WebCore:

Test: editing/inserting/typing-at-end-of-line.html

This is a regression introduced when we converted the line box tree to
floating point in r78846. In findNextLineBreak, there was still one place where
the character width was treated as int and truncated and we were inconsistent
in the way we treated a character that did not fit entirely in the line.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::findNextLineBreak):

LayoutTests:

• editing/inserting/typing-at-end-of-line.html: Added.
• platform/mac/editing/inserting/typing-at-end-of-line-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/typing-at-end-of-line.html (added)
• LayoutTests/platform/mac/editing/inserting/typing-at-end-of-line-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-02  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Text does not split on white space when typing to the edge of window.
+        https://bugs.webkit.org/show_bug.cgi?id=59968
+        <rdar://problem/9112683>
+
+        * editing/inserting/typing-at-end-of-line.html: Added.
+        * platform/mac/editing/inserting/typing-at-end-of-line-expected.txt: Added.
+
 2011-05-02  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Text does not split on white space when typing to the edge of window.
+        https://bugs.webkit.org/show_bug.cgi?id=59968
+        <rdar://problem/9112683>
+
+        Test: editing/inserting/typing-at-end-of-line.html
+
+        This is a regression introduced when we converted the line box tree to
+        floating point in r78846. In findNextLineBreak, there was still one place where
+        the character width was treated as int and truncated and we were inconsistent
+        in the way we treated a character that did not fit entirely in the line.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2011-04-19  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1978 +1978 @@
                         bool lineWasTooWide = false;
                         if (width.fitsOnLine() && currentCharacterIsWS && o->style()->breakOnlyAfterWhiteSpace() && !midWordBreak) {
-                            int charWidth = textWidth(t, pos, 1, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace) + (applyWordSpacing ? wordSpacing : 0);
+                            float charWidth = textWidth(t, pos, 1, f, width.currentWidth(), isFixedPitch, collapseWhiteSpace) + (applyWordSpacing ? wordSpacing : 0);
                             // Check if line is too big even without the extra space
                             // at the end of the line. If it is not, do nothing.