Changeset 233916 in webkit

Timestamp:

Jul 18, 2018 11:10:08 AM (6 years ago)

Author:

mmaxfield@apple.com

Message:

Rename WordBreak::Break to WordBreak::BreakWord
​https://bugs.webkit.org/show_bug.cgi?id=187767

Reviewed by Simon Fraser.

These breaking properties are very confusing. There are:

1. word-break: break-all, a standard value that allows breaking after every

character.

2. word-break: break-word, a non-standard value which allows for breaking after

every character, but only if the word is too long for the available width (otherwise
it works the same as word-break: normal). This affects the min-content-size of the
text (and makes it equal to what it would be if word-break: break-all was
specified).

3. word-wrap: break-word, which is the same as word-break: break-word, but doesn't

affect the min-content-size of the text.

4. overflow-wrap: break-word, which is the same as word-wrap: break-word.

Because this is so confusing it's valuable for our internal enums to match the names
of the official CSS properties/values.

No new tests because there is no behavior change.

• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator WordBreak const):

• rendering/RenderText.cpp:

(WebCore::RenderText::computePreferredLogicalWidths):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::breakWords const):

• rendering/style/RenderStyleConstants.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValueMappings.h (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (1 diff)
• rendering/style/RenderStyleConstants.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-18  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Rename WordBreak::Break to WordBreak::BreakWord
+        https://bugs.webkit.org/show_bug.cgi?id=187767
+
+        Reviewed by Simon Fraser.
+
+        These breaking properties are very confusing. There are:
+
+        1. word-break: break-all, a standard value that allows breaking after every
+        character.
+        2. word-break: break-word, a non-standard value which allows for breaking after
+        every character, but only if the word is too long for the available width (otherwise
+        it works the same as word-break: normal). This affects the min-content-size of the
+        text (and makes it equal to what it would be if word-break: break-all was
+        specified).
+        3. word-wrap: break-word, which is the same as word-break: break-word, but doesn't
+        affect the min-content-size of the text.
+        4. overflow-wrap: break-word, which is the same as word-wrap: break-word.
+
+        Because this is so confusing it's valuable for our internal enums to match the names
+        of the official CSS properties/values.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator WordBreak const):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computePreferredLogicalWidths):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::breakWords const):
+        * rendering/style/RenderStyleConstants.h:
+
 2018-07-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

@@ -3088 +3088 @@
         m_value.valueID = CSSValueKeepAll;
         break;
-    case WordBreak::Break:
+    case WordBreak::BreakWord:
         m_value.valueID = CSSValueBreakWord;
         break;
@@ -3104 +3104 @@
         return WordBreak::KeepAll;
     case CSSValueBreakWord:
-        return WordBreak::Break;
+        return WordBreak::BreakWord;
     case CSSValueNormal:
         return WordBreak::Normal;

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -827 +827 @@
     // do not affect minimum preferred sizes. Note that break-word is a non-standard value for
     // word-break, but we support it as though it means break-all.
-    bool breakAll = (style.wordBreak() == WordBreak::BreakAll || style.wordBreak() == WordBreak::Break) && style.autoWrap();
+    bool breakAll = (style.wordBreak() == WordBreak::BreakAll || style.wordBreak() == WordBreak::BreakWord) && style.autoWrap();
     bool keepAllWords = style.wordBreak() == WordBreak::KeepAll;
     bool canUseLineBreakShortcut = iteratorMode == LineBreakIteratorMode::Default;

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -2045 +2045 @@
 inline bool RenderStyle::breakWords() const
 {
-    return wordBreak() == WordBreak::Break || overflowWrap() == OverflowWrap::Break;
+    return wordBreak() == WordBreak::BreakWord || overflowWrap() == OverflowWrap::Break;
 }
 

trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

@@ -517 +517 @@
     BreakAll,
     KeepAll,
-    Break
+    BreakWord
 };