summaryrefslogtreecommitdiffstats
path: root/layout/style/nsStyleStruct.h
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-10-18 10:45:55 -0500
committerathenian200 <athenian200@outlook.com>2020-10-18 10:45:55 -0500
commit95b4e5084b7fbe62609cfe9680eed5db135a57c8 (patch)
treeeb7ca4ae3da96bf3049c3da41fc511ff3154515e /layout/style/nsStyleStruct.h
parent1fc996152b7a1b0f61287c85ddc1698013ea63c0 (diff)
parent87c4c77ad79f346d9104d9586c9928f30a500632 (diff)
downloadUXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.gz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.lz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.tar.xz
UXP-95b4e5084b7fbe62609cfe9680eed5db135a57c8.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into caret_color
Diffstat (limited to 'layout/style/nsStyleStruct.h')
-rw-r--r--layout/style/nsStyleStruct.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index d3fad3093..88000c722 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -2134,8 +2133,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 {