Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1452343002: Ignore break-word when white-space pre/nowrap is specified (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-break-word-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 9952068a8c8bf9357de4cf4d7137aa2641acfc6f..70c57cee1f3863be35905e4298707a4424481ab1 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -664,7 +664,8 @@ public:
bool breakWords() const
{
- return wordBreak() == BreakWordBreak || overflowWrap() == BreakOverflowWrap;
+ return (wordBreak() == BreakWordBreak || overflowWrap() == BreakOverflowWrap)
+ && whiteSpace() != PRE && whiteSpace() != NOWRAP;
}
EFillBox backgroundClip() const { return static_cast<EFillBox>(m_background->background().clip()); }
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-break-word-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698