Title: [195766] trunk/Source/WebCore
- Revision
- 195766
- Author
- [email protected]
- Date
- 2016-01-28 11:21:37 -0800 (Thu, 28 Jan 2016)
Log Message
Roll out r194555, as it introduced some bad regressions and was not
correct.
* rendering/RenderText.cpp:
(WebCore::RenderText::computePreferredLogicalWidths):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195765 => 195766)
--- trunk/Source/WebCore/ChangeLog 2016-01-28 19:20:25 UTC (rev 195765)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 19:21:37 UTC (rev 195766)
@@ -1,3 +1,11 @@
+2016-01-28 Dave Hyatt <[email protected]>
+
+ Roll out r194555, as it introduced some bad regressions and was not
+ correct.
+
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::computePreferredLogicalWidths):
+
2016-01-28 Brady Eidson <[email protected]>
Modern IDB: Index uniqueness broken in the SQLite backend.
Modified: trunk/Source/WebCore/rendering/RenderText.cpp (195765 => 195766)
--- trunk/Source/WebCore/rendering/RenderText.cpp 2016-01-28 19:20:25 UTC (rev 195765)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2016-01-28 19:21:37 UTC (rev 195766)
@@ -737,7 +737,11 @@
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();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
