Changeset 17724 in webkit

Timestamp:

Nov 11, 2006 4:04:50 AM (18 years ago)

Author:

gdennis

Message:

WebCore:

Reviewed by mitz.

REGRESSION (r16122): min/max widths incorrectly calculated for contentEditable text
​http://bugs.webkit.org/show_bug.cgi?id=11570

• rendering/RenderStyle.h: (WebCore::RenderStyle::isSpace): Added.
• rendering/RenderText.cpp: (WebCore::RenderText::calcMinMaxWidth): For the purposes of calculating the line widths, treat non-breaking spaces the same as normal spaces if -webkit-nbsp-mode is 'space'

LayoutTests:

Reviewed by mitz.

REGRESSION (r16122): min/max widths incorrectly calculated for contentEditable text
​http://bugs.webkit.org/show_bug.cgi?id=11570

• fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum: Added.
• fast/text/whitespace/nbsp-mode-and-linewraps-expected.png: Added.
• fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt: Added.
• fast/text/whitespace/nbsp-mode-and-linewraps.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum (added)
• LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.png (added)
• LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt (added)
• LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderStyle.h (modified) (2 diffs)
• WebCore/rendering/RenderText.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-11-11  Graham Dennis  <graham.dennis@gmail.com>
+
+        Reviewed by mitz.
+
+        REGRESSION (r16122): min/max widths incorrectly calculated for contentEditable text
+        http://bugs.webkit.org/show_bug.cgi?id=11570
+
+        * fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum: Added.
+        * fast/text/whitespace/nbsp-mode-and-linewraps-expected.png: Added.
+        * fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt: Added.
+        * fast/text/whitespace/nbsp-mode-and-linewraps.html: Added.
+
 2006-11-10  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-11  Graham Dennis  <graham.dennis@gmail.com>
+
+        Reviewed by mitz.
+        
+        REGRESSION (r16122): min/max widths incorrectly calculated for contentEditable text
+        http://bugs.webkit.org/show_bug.cgi?id=11570
+
+        * rendering/RenderStyle.h:
+        (WebCore::RenderStyle::isSpace): Added.
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::calcMinMaxWidth): For the purposes of calculating the line widths, 
+        treat non-breaking spaces the same as normal spaces if -webkit-nbsp-mode is 'space'
+
 2006-11-10  Zalan Bujtas <zalan.bujtas@nokia.com>
 

trunk/WebCore/rendering/RenderStyle.h

@@ -6 +6 @@
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
@@ -1328 +1329 @@
         return false;
     }
+    bool isSpace(UChar c) const { return c == ' ' || (c == 0xa0 && nbspMode() == SPACE); }
     bool breakOnlyAfterWhiteSpace() const {
         return whiteSpace() == PRE_WRAP || khtmlLineBreak() == AFTER_WHITE_SPACE;

trunk/WebCore/rendering/RenderText.cpp

@@ -6 +6 @@
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
+ * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
@@ -622 +623 @@
     bool firstLine = true;
     int nextBreakable = -1;
+    bool breakNBSP = style()->autoWrap() && style()->nbspMode() == SPACE;
+    
     for (int i = 0; i < len; i++) {
         UChar c = txt[i];
@@ -661 +664 @@
         }
         
-        bool hasBreak = isBreakable(txt, i, len, nextBreakable);
+        bool hasBreak = isBreakable(txt, i, len, nextBreakable, breakNBSP);
         int j = i;
-        while (c != '\n' && c != ' ' && c != '\t' && c != SOFT_HYPHEN) {
+        while (c != '\n' && !style()->isSpace(c) && c != '\t' && c != SOFT_HYPHEN) {
             j++;
             if (j == len)
                 break;
             c = txt[j];
-            if (isBreakable(txt, j, len, nextBreakable))
+            if (isBreakable(txt, j, len, nextBreakable, breakNBSP))
                 break;
         }
@@ -678 +681 @@
             currMaxWidth += w;
             
-            bool isSpace = (j < len) && c == ' ';
+            bool isSpace = (j < len) && style()->isSpace(c);
             bool isCollapsibleWhiteSpace = (j < len) && style()->isCollapsibleWhiteSpace(c);
             if (j < len && style()->autoWrap())