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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17724 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d23ccab4a60bce3edcf061641c5044a031a9e1d2..fd598769e9adc01cc0a60cfa2163302c63440e83 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
         Reviewed by harrison

diff --git a/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum
new file mode 100644 (file)
index 0000000..7c3565c
--- /dev/null
+++ b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.checksum
@@ -0,0 +1 @@
+ab6fa35f9017684e764e580c22a79f4b
\ No newline at end of file

diff --git a/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.png b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.png
new file mode 100644 (file)
index 0000000..d8e1a79
Binary files /dev/null and b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.png differ

diff --git a/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt
new file mode 100644 (file)
index 0000000..f04ec5c
--- /dev/null
+++ b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+layer at (100,8) size 700x196
+  RenderBlock (positioned) {DIV} at (100,8) size 700x196 [border: (2px solid #FF0000)]
+    RenderText {#text} at (14,14) size 666x168
+      text run at (14,14) width 666: "This div is absolutely positioned to the left. All the spaces in this div"
+      text run at (14,42) width 643: "are replaced with non-breaking spaces, and the nbsp-mode for this"
+      text run at (14,70) width 615: "div is 'space', so when calculating line breaks, the non-breaking"
+      text run at (14,98) width 657: "spaces should be treated as normal spaces. If this isn't the case, then"
+      text run at (14,126) width 629: "all the text for this paragraph will be rendered in two lines, and a"
+      text run at (14,154) width 488: "horizontal scroll bar will appear along the bottom."

diff --git a/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps.html b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps.html
new file mode 100644 (file)
index 0000000..07dd6db
--- /dev/null
+++ b/LayoutTests/fast/text/whitespace/nbsp-mode-and-linewraps.html
@@ -0,0 +1,20 @@
+<html> 
+<head>
+
+<style>
+.editing {
+    border: 2px solid red;
+    padding: 12px;
+    font-size: 24px;
+}
+</style>
+
+<title>-webkit-nbsp-mode and linewraps</title> 
+</head> 
+<body id="root">
+<div class="editing" style="position:absolute; left: 100px; -webkit-nbsp-mode: space;">
+This div is absolutely positioned to the left. All the spaces in this div are replaced with non-breaking spaces, and the nbsp-mode for this div is 'space', so when calculating line breaks, the non-breaking spaces should be treated as normal spaces. If this isn't the case, then all the text for this paragraph will be rendered in two lines, and a horizontal scroll bar will appear along the bottom.
+</div>
+
+</body>
+</html>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0330eb1bbbfa87e0980aa6c16bfe919206994a11..e94debe5f2f8442e3cf9e2d717f91bf323d7611d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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>
 
         Reviewed by Maciej.

diff --git a/WebCore/rendering/RenderStyle.h b/WebCore/rendering/RenderStyle.h
index cc6567687d582ccd94eb94ea124ce0f43a2a174f..26f8ce6f3bb879d0df2bb79dce8e0915fc497b18 100644 (file)
--- a/WebCore/rendering/RenderStyle.h
+++ b/WebCore/rendering/RenderStyle.h
@@ -5,6 +5,7 @@
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (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
  * modify it under the terms of the GNU Library General Public
@@ -1327,6 +1328,7 @@ public:
         }
         return false;
     }
+    bool isSpace(UChar c) const { return c == ' ' || (c == 0xa0 && nbspMode() == SPACE); }
     bool breakOnlyAfterWhiteSpace() const {
         return whiteSpace() == PRE_WRAP || khtmlLineBreak() == AFTER_WHITE_SPACE;
     }

diff --git a/WebCore/rendering/RenderText.cpp b/WebCore/rendering/RenderText.cpp
index 1eb402816f4808de2d00d326c1c2df5867bcfa4a..94f5a1bd6f8f1c8ff9c00ad8899721890e15804b 100644 (file)
--- a/WebCore/rendering/RenderText.cpp
+++ b/WebCore/rendering/RenderText.cpp
@@ -5,6 +5,7 @@
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * 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
  * modify it under the terms of the GNU Library General Public
@@ -621,6 +622,8 @@ void RenderText::calcMinMaxWidth(int leadWidth)
     bool firstWord = true;
     bool firstLine = true;
     int nextBreakable = -1;
+    bool breakNBSP = style()->autoWrap() && style()->nbspMode() == SPACE;
+    
     for (int i = 0; i < len; i++) {
         UChar c = txt[i];
         
@@ -660,14 +663,14 @@ void RenderText::calcMinMaxWidth(int leadWidth)
             continue;
         }
         
-        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;
         }
             
@@ -677,7 +680,7 @@ void RenderText::calcMinMaxWidth(int leadWidth)
             currMinWidth += w;
             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())
                 m_hasBreakableChar = true;