Changeset 20967 in webkit

Timestamp:

Apr 19, 2007 10:02:19 PM (17 years ago)

Author:

hyatt

Message:

Fix for bug 13208, implement word-break. This patch produces a partial
implementation of word-break. word-break: break-all is implemented. In
addition, a custom value, word-break: break-word is added that is a hybrid
of word-wrap: break-word and word-break: break-all (and more useful than
either).

Reviewed by beth

Added fast/text/word-break.html

• css/CSSComputedStyleDeclaration.cpp: (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
• css/CSSPropertyNames.in:
• css/CSSValueKeywords.in:
• css/cssparser.cpp: (WebCore::CSSParser::parseValue):
• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::applyProperty):
• rendering/RenderStyle.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator==): (WebCore::RenderStyle::diff):
• rendering/RenderStyle.h: (WebCore::): (WebCore::RenderStyle::breakWords): (WebCore::RenderStyle::wordBreak): (WebCore::RenderStyle::setWordBreak): (WebCore::RenderStyle::initialWordBreak): (WebCore::RenderStyle::initialWordWrap):
• rendering/RenderText.cpp: (WebCore::RenderText::calcMinMaxWidthInternal):
• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::createInnerTextStyle): (WebCore::RenderTextControl::calcHeight):
• rendering/bidi.cpp: (WebCore::RenderBlock::findNextLineBreak):

Location:

trunk

Files:

• LayoutTests/fast/text/word-break-expected.checksum (added)
• LayoutTests/fast/text/word-break-expected.png (added)
• LayoutTests/fast/text/word-break-expected.txt (added)
• LayoutTests/fast/text/word-break.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• WebCore/css/CSSValueKeywords.in (modified) (1 diff)
• WebCore/css/cssparser.cpp (modified) (1 diff)
• WebCore/css/cssstyleselector.cpp (modified) (1 diff)
• WebCore/rendering/RenderStyle.cpp (modified) (4 diffs)
• WebCore/rendering/RenderStyle.h (modified) (6 diffs)
• WebCore/rendering/RenderText.cpp (modified) (3 diffs)
• WebCore/rendering/RenderTextControl.cpp (modified) (2 diffs)
• WebCore/rendering/bidi.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-19  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 13208, implement word-break.  This patch produces a partial
+        implementation of word-break.  word-break: break-all is implemented.  In
+        addition, a custom value, word-break: break-word is added that is a hybrid
+        of word-wrap: break-word and word-break: break-all (and more useful than
+        either).
+
+        Reviewed by beth
+
+        Added fast/text/word-break.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSPropertyNames.in:
+        * css/CSSValueKeywords.in:
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * rendering/RenderStyle.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+        (WebCore::StyleRareInheritedData::operator==):
+        (WebCore::RenderStyle::diff):
+        * rendering/RenderStyle.h:
+        (WebCore::):
+        (WebCore::RenderStyle::breakWords):
+        (WebCore::RenderStyle::wordBreak):
+        (WebCore::RenderStyle::setWordBreak):
+        (WebCore::RenderStyle::initialWordBreak):
+        (WebCore::RenderStyle::initialWordWrap):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::calcMinMaxWidthInternal):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::createInnerTextStyle):
+        (WebCore::RenderTextControl::calcHeight):
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2007-04-20  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1407 +1407 @@
         case CSS_PROP_WIDTH:
             return new CSSPrimitiveValue(renderer->contentWidth(), CSSPrimitiveValue::CSS_PX);
+        case CSS_PROP_WORD_BREAK:
+            switch (style->wordBreak()) {
+                case NormalWordBreak:
+                    return new CSSPrimitiveValue(CSS_VAL_NORMAL);
+                case BreakAllWordBreak:
+                    return new CSSPrimitiveValue(CSS_VAL_BREAK_ALL);
+                case BreakWordBreak:
+                    return new CSSPrimitiveValue(CSS_VAL_BREAK_WORD);
+            }
         case CSS_PROP_WORD_SPACING:
             return new CSSPrimitiveValue(style->wordSpacing(), CSSPrimitiveValue::CSS_PX);
         case CSS_PROP_WORD_WRAP:
             switch (style->wordWrap()) {
-                case WBNORMAL:
+                case NormalWordWrap:
                     return new CSSPrimitiveValue(CSS_VAL_NORMAL);
-                case BREAK_WORD:
+                case BreakWordWrap:
                     return new CSSPrimitiveValue(CSS_VAL_BREAK_WORD);
             }

trunk/WebCore/css/CSSPropertyNames.in

@@ -137 +137 @@
 widows
 width
+word-break
 word-spacing
 word-wrap

trunk/WebCore/css/CSSValueKeywords.in

@@ -462 +462 @@
 
 #
+# CSS_PROP_WORD_BREAK
+#
+break-all
+
+#
 # CSS_PROP_WORD_WRAP
 #

trunk/WebCore/css/cssparser.cpp

@@ -904 +904 @@
         else
             valid_primitive = validUnit(value, FLength, strict);
+        break;
+
+    case CSS_PROP_WORD_BREAK:          // normal | break-all | break-word (this is a custom extension)
+        if (id == CSS_VAL_NORMAL || id == CSS_VAL_BREAK_ALL || CSS_VAL_BREAK_WORD)
+            valid_primitive = true;
         break;
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -2664 +2664 @@
     }
 
-    case CSS_PROP_WORD_WRAP:
-    {
+    case CSS_PROP_WORD_BREAK: {
+        HANDLE_INHERIT_AND_INITIAL(wordBreak, WordBreak)
+
+        EWordBreak b;
+        switch (primitiveValue->getIdent()) {
+        case CSS_VAL_BREAK_ALL:
+            b = BreakAllWordBreak;
+            break;
+        case CSS_VAL_BREAK_WORD:
+            b = BreakWordBreak;
+            break;
+        case CSS_VAL_NORMAL:
+        default:
+            b = NormalWordBreak;
+            break;
+        }
+        style->setWordBreak(b);
+        return;
+    }
+
+    case CSS_PROP_WORD_WRAP: {
         HANDLE_INHERIT_AND_INITIAL(wordWrap, WordWrap)
-
-        if(!primitiveValue->getIdent()) return;
 
         EWordWrap s;
         switch(primitiveValue->getIdent()) {
         case CSS_VAL_BREAK_WORD:
-            s = BREAK_WORD;
+            s = BreakWordWrap;
             break;
         case CSS_VAL_NORMAL:
         default:
-            s = WBNORMAL;
-            break;
-        }
+            s = NormalWordWrap;
+            break;
+        }
+
         style->setWordWrap(s);
         return;

trunk/WebCore/rendering/RenderStyle.cpp

@@ -525 +525 @@
     , textSecurity(RenderStyle::initialTextSecurity())
     , userModify(READ_ONLY)
-    , wordWrap(WBNORMAL)
+    , wordBreak(RenderStyle::initialWordBreak())
+    , wordWrap(RenderStyle::initialWordWrap())
     , nbspMode(NBNORMAL)
     , khtmlLineBreak(LBNORMAL)
@@ -542 +543 @@
     , textSecurity(o.textSecurity)
     , userModify(o.userModify)
+    , wordBreak(o.wordBreak)
     , wordWrap(o.wordWrap)
     , nbspMode(o.nbspMode)
@@ -564 +566 @@
         && textSecurity == o.textSecurity
         && userModify == o.userModify
+        && wordBreak == o.wordBreak
         && wordWrap == o.wordWrap
         && nbspMode == o.nbspMode
@@ -944 +947 @@
         if (rareInheritedData->highlight != other->rareInheritedData->highlight ||
             rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust ||
+            rareInheritedData->wordBreak != other->rareInheritedData->wordBreak ||
             rareInheritedData->wordWrap != other->rareInheritedData->wordWrap ||
             rareInheritedData->nbspMode != other->rareInheritedData->nbspMode ||

trunk/WebCore/rendering/RenderStyle.h

@@ -719 +719 @@
 // Word Break Values. Matches WinIE, rather than CSS3
 
+enum EWordBreak {
+    NormalWordBreak, BreakAllWordBreak, BreakWordBreak
+};
+
 enum EWordWrap {
-    WBNORMAL, BREAK_WORD
+    NormalWordWrap, BreakWordWrap
 };
 
@@ -881 +885 @@
     unsigned textSecurity : 2; // ETextSecurity
     unsigned userModify : 2; // EUserModify (editing)
+    unsigned wordBreak : 2; // EWordBreak
     unsigned wordWrap : 1; // EWordWrap 
     unsigned nbspMode : 1; // ENBSPMode
@@ -1373 +1378 @@
         return whiteSpace() == PRE_WRAP || khtmlLineBreak() == AFTER_WHITE_SPACE;
     }
+    bool breakWords() const {
+        return wordBreak() == BreakWordBreak || wordWrap() == BreakWordWrap;
+    }
 
     const Color & backgroundColor() const { return background->m_color; }
@@ -1457 +1465 @@
     EMarginCollapse marginTopCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginTopCollapse); }
     EMarginCollapse marginBottomCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginBottomCollapse); }
+    EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedData->wordBreak); }
     EWordWrap wordWrap() const { return static_cast<EWordWrap>(rareInheritedData->wordWrap); }
     ENBSPMode nbspMode() const { return static_cast<ENBSPMode>(rareInheritedData->nbspMode); }
@@ -1698 +1707 @@
     void setMarginTopCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginTopCollapse, c); }
     void setMarginBottomCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginBottomCollapse, c); }
+    void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
     void setWordWrap(EWordWrap b) { SET_VAR(rareInheritedData, wordWrap, b); }
     void setNBSPMode(ENBSPMode b) { SET_VAR(rareInheritedData, nbspMode, b); }
@@ -1845 +1855 @@
     static EMarginCollapse initialMarginTopCollapse() { return MCOLLAPSE; }
     static EMarginCollapse initialMarginBottomCollapse() { return MCOLLAPSE; }
-    static EWordWrap initialWordWrap() { return WBNORMAL; }
+    static EWordBreak initialWordBreak() { return NormalWordBreak; }
+    static EWordWrap initialWordWrap() { return NormalWordWrap; }
     static ENBSPMode initialNBSPMode() { return NBNORMAL; }
     static EKHTMLLineBreak initialKHTMLLineBreak() { return LBNORMAL; }

trunk/WebCore/rendering/RenderText.cpp

@@ -537 +537 @@
     bool breakNBSP = style()->autoWrap() && style()->nbspMode() == SPACE;
 
+    bool breakAll = (style()->wordBreak() == BreakAllWordBreak || style()->wordBreak() == BreakWordBreak) && style()->autoWrap();
+
     for (int i = 0; i < len; i++) {
         UChar c = txt[i];
@@ -574 +576 @@
             continue;
 
-        bool hasBreak = isBreakable(txt, i, len, nextBreakable, breakNBSP);
+        bool hasBreak = breakAll || isBreakable(txt, i, len, nextBreakable, breakNBSP);
         int j = i;
         while (c != '\n' && !isSpaceAccordingToStyle(c, style()) && c != '\t' && c != softHyphen) {
@@ -581 +583 @@
                 break;
             c = txt[j];
-            if (isBreakable(txt, j, len, nextBreakable, breakNBSP))
+            if (breakAll || isBreakable(txt, j, len, nextBreakable, breakNBSP))
                 break;
         }

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -149 +149 @@
         if (static_cast<HTMLTextAreaElement*>(element)->wrap() == HTMLTextAreaElement::ta_NoWrap) {
             textBlockStyle->setWhiteSpace(PRE);
-            textBlockStyle->setWordWrap(WBNORMAL);
+            textBlockStyle->setWordWrap(NormalWordWrap);
         } else {
             textBlockStyle->setWhiteSpace(PRE_WRAP);
-            textBlockStyle->setWordWrap(BREAK_WORD);
+            textBlockStyle->setWordWrap(BreakWordWrap);
         }
     } else {
         textBlockStyle->setWhiteSpace(PRE);
-        textBlockStyle->setWordWrap(WBNORMAL);
+        textBlockStyle->setWordWrap(NormalWordWrap);
         textBlockStyle->setOverflowX(OHIDDEN);
         textBlockStyle->setOverflowY(OHIDDEN);
@@ -598 +598 @@
     int scrollbarSize = 0;
     // We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.
-    if (m_innerText->renderer()->style()->overflowX() == OSCROLL ||  (m_innerText->renderer()->style()->overflowX() == OAUTO && m_innerText->renderer()->style()->wordWrap() == WBNORMAL))
+    if (m_innerText->renderer()->style()->overflowX() == OSCROLL ||  (m_innerText->renderer()->style()->overflowX() == OAUTO && m_innerText->renderer()->style()->wordWrap() == NormalWordWrap))
         scrollbarSize = 15;
 

trunk/WebCore/rendering/bidi.cpp

@@ -2227 +2227 @@
             // Auto-wrapping text should wrap in the middle of a word only if it could not wrap before the word,
             // which is only possible if the word is the first thing on the line, that is, if |w| is zero.
-            bool breakWords = o->style()->wordWrap() == BREAK_WORD && ((autoWrap && !w) || currWS == PRE);
+            bool breakWords = o->style()->breakWords() && ((autoWrap && !w) || currWS == PRE);
             bool midWordBreak = false;
-            
+            bool breakAll = o->style()->wordBreak() == BreakAllWordBreak && autoWrap;
+
             while (len) {
                 bool previousCharacterIsSpace = currentCharacterIsSpace;
@@ -2277 +2278 @@
                 currentCharacterIsWS = currentCharacterIsSpace || (breakNBSP && c == noBreakSpace);
 
-                if (breakWords && !midWordBreak) {
+                if (breakAll || (breakWords && !midWordBreak)) {
                     wrapW += t->width(pos, 1, f, w + wrapW);
                     midWordBreak = w + wrapW > width;
@@ -2283 +2284 @@
 
                 bool betweenWords = c == '\n' || (currWS != PRE && !atStart && isBreakable(str, pos, strlen, nextBreakable, breakNBSP));
-
-                if (betweenWords || midWordBreak) {
+    
+                if (betweenWords || midWordBreak || breakAll) {
                     bool stoppedIgnoringSpaces = false;
                     if (ignoringSpaces) {