diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-10-03 14:52:47 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-10-06 09:31:51 +0000 |
| commit | 17b4d049f487c412ed319e81de6d49a7d07d0f44 (patch) | |
| tree | 7320ebee8b132eecc73644021aa8e6b09c6ab5ef /layout | |
| parent | abf1d5a099ea8c3fbd6912ff7b199791994cb932 (diff) | |
| download | UXP-17b4d049f487c412ed319e81de6d49a7d07d0f44.tar UXP-17b4d049f487c412ed319e81de6d49a7d07d0f44.tar.gz UXP-17b4d049f487c412ed319e81de6d49a7d07d0f44.tar.lz UXP-17b4d049f487c412ed319e81de6d49a7d07d0f44.tar.xz UXP-17b4d049f487c412ed319e81de6d49a7d07d0f44.zip | |
Issue #1666 - Implement overflow-wrap: anywhere
This aligns with the current spec regarding overflow-wrap: break-word and
overflow-wrap: anywhere in if it affects intrinsic sized due to considering
soft-wrap opportunities or not.
See CSS Text Module Level 3, Editor’s Draft, 1 October 2020, Section 5.5
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/generic/nsTextFrame.cpp | 5 | ||||
| -rw-r--r-- | layout/style/nsCSSKeywordList.h | 1 | ||||
| -rw-r--r-- | layout/style/nsCSSProps.cpp | 1 | ||||
| -rw-r--r-- | layout/style/nsStyleConsts.h | 1 | ||||
| -rw-r--r-- | layout/style/nsStyleStruct.h | 7 |
5 files changed, 11 insertions, 4 deletions
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index a9ed168fb..a47b87e38 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -8245,8 +8245,9 @@ nsTextFrame::AddInlineMinISizeForFlow(nsRenderingContext *aRenderingContext, return; } - // If overflow-wrap is break-word, we can wrap everywhere. - if (textStyle->WordCanWrap(this)) { + // If overflow-wrap is 'anywhere', we can wrap everywhere. + if (textStyle->mOverflowWrap == NS_STYLE_OVERFLOWWRAP_ANYWHERE && + textStyle->WordCanWrap(this)) { aData->OptionallyBreak(); aData->mCurrentLine += textRun->GetMinAdvanceWidth(Range(start, flowEndInTextRun)); diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h index 9045da9ff..86ba59142 100644 --- a/layout/style/nsCSSKeywordList.h +++ b/layout/style/nsCSSKeywordList.h @@ -144,6 +144,7 @@ CSS_KEY(alternate, alternate) CSS_KEY(alternate-reverse, alternate_reverse) CSS_KEY(always, always) CSS_KEY(annotation, annotation) +CSS_KEY(anywhere, anywhere) CSS_KEY(appworkspace, appworkspace) CSS_KEY(auto, auto) CSS_KEY(auto-fill, auto_fill) diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 24c97cf33..e0cda2488 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -2284,6 +2284,7 @@ const KTableEntry nsCSSProps::kWordBreakKTable[] = { const KTableEntry nsCSSProps::kOverflowWrapKTable[] = { { eCSSKeyword_normal, NS_STYLE_OVERFLOWWRAP_NORMAL }, { eCSSKeyword_break_word, NS_STYLE_OVERFLOWWRAP_BREAK_WORD }, + { eCSSKeyword_anywhere, NS_STYLE_OVERFLOWWRAP_ANYWHERE }, { eCSSKeyword_UNKNOWN, -1 } }; diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h index f54387aa8..e6a0cc65a 100644 --- a/layout/style/nsStyleConsts.h +++ b/layout/style/nsStyleConsts.h @@ -997,6 +997,7 @@ enum class StyleDisplay : uint8_t { // See nsStyleText #define NS_STYLE_OVERFLOWWRAP_NORMAL 0 #define NS_STYLE_OVERFLOWWRAP_BREAK_WORD 1 +#define NS_STYLE_OVERFLOWWRAP_ANYWHERE 2 // See nsStyleText #define NS_STYLE_HYPHENS_NONE 0 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 { |