Roll out r194555, as it introduced some bad regressions and was not
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jan 2016 19:21:37 +0000 (19:21 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Jan 2016 19:21:37 +0000 (19:21 +0000)
correct.

* rendering/RenderText.cpp:
(WebCore::RenderText::computePreferredLogicalWidths):

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderText.cpp

index a16106b..5d3f68d 100644 (file)
@@ -1,3 +1,11 @@
+2016-01-28  Dave Hyatt  <hyatt@apple.com>
+
+        Roll out r194555, as it introduced some bad regressions and was not
+        correct.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computePreferredLogicalWidths):
+
 2016-01-28  Brady Eidson  <beidson@apple.com>
 
         Modern IDB: Index uniqueness broken in the SQLite backend.
index 7f1824a..5731c0b 100644 (file)
@@ -737,7 +737,11 @@ void RenderText::computePreferredLogicalWidths(float leadWidth, HashSet<const Fo
     Optional<int> firstGlyphLeftOverflow;
 
     bool breakNBSP = style.autoWrap() && style.nbspMode() == SPACE;
-    bool breakAll = (style.wordBreak() == BreakAllWordBreak || style.breakWords()) && style.autoWrap();
+    
+    // Note the deliberate omission of word-wrap and overflow-wrap from this breakAll check. Those
+    // 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() == BreakAllWordBreak || style.wordBreak() == BreakWordBreak) && style.autoWrap();
     bool keepAllWords = style.wordBreak() == KeepAllWordBreak;
     bool isLooseCJKMode = breakIterator.isLooseCJKMode();