diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-10-06 09:32:46 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-10-06 09:32:46 +0000 |
| commit | a98d06380fe706e3b1b602411c597b9882516b3e (patch) | |
| tree | 60452c5f39b8dc60a8e97454d4103baf2cd194ae /layout/style/nsStyleStruct.h | |
| parent | 63a0006985036b062eed7e9e83324581d8ab247c (diff) | |
| parent | 1e8d07cac205a5db3d7d416d7f414a213fd892ff (diff) | |
| download | UXP-a98d06380fe706e3b1b602411c597b9882516b3e.tar UXP-a98d06380fe706e3b1b602411c597b9882516b3e.tar.gz UXP-a98d06380fe706e3b1b602411c597b9882516b3e.tar.lz UXP-a98d06380fe706e3b1b602411c597b9882516b3e.tar.xz UXP-a98d06380fe706e3b1b602411c597b9882516b3e.zip | |
Merge branch 'redwood' into release
Diffstat (limited to 'layout/style/nsStyleStruct.h')
| -rw-r--r-- | layout/style/nsStyleStruct.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index f49cdc43e..cca7bb8d4 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -2134,8 +2134,11 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText } bool WordCanWrapStyle() const { - return WhiteSpaceCanWrapStyle() && - mOverflowWrap == NS_STYLE_OVERFLOWWRAP_BREAK_WORD; + if (!WhiteSpaceCanWrapStyle()) { + return false; + } + return (mOverflowWrap == NS_STYLE_OVERFLOWWRAP_BREAK_WORD || + mOverflowWrap == NS_STYLE_OVERFLOWWRAP_ANYWHERE); } bool HasTextEmphasis() const { |