Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1505786 - Implement overflow-wrap: anywhere. r=xidorn,jfkthame

Browse Source 
Per https://github.com/w3c/csswg-drafts/issues/2682

Differential Revision: https://phabricator.services.mozilla.com/D11328

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2018-11-08 22:39:34 +00:00
parent 5a6ffe9618
commit 56f2b4fded
22 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/shared/css/generated/properties-db.js
View File

@ -7578,6 +7578,7 @@ exports.CSS_PROPERTIES = {
],
"supports": [],
"values": [
"anywhere",
"break-word",
"inherit",
"initial",
@ -9204,6 +9205,7 @@ exports.CSS_PROPERTIES = {
],
"supports": [],
"values": [
"anywhere",
"break-word",
"inherit",
"initial",

3
layout/generic/nsTextFrame.cpp
View File

@ -8607,8 +8607,7 @@ nsTextFrame::AddInlineMinISizeForFlow(gfxContext *aRenderingContext,
return;
}
// If overflow-wrap is break-word, we can wrap everywhere.
if (StaticPrefs::layout_css_overflow_break_intrinsic_size() &&
if (textStyle->mOverflowWrap == mozilla::StyleOverflowWrap::Anywhere &&
textStyle->WordCanWrap(this)) {
aData->OptionallyBreak();
aData->mCurrentLine +=

1
layout/style/ServoBindings.toml
View File

@ -395,6 +395,7 @@ cbindgen-types = [
{ gecko = "StyleFontLanguageOverride", servo = "values::computed::font::FontLanguageOverride" },
{ gecko = "StylePathCommand", servo = "values::specified::svg_path::PathCommand" },
{ gecko = "StyleUnicodeRange", servo = "cssparser::UnicodeRange" },
{ gecko = "StyleOverflowWrap", servo = "values::computed::OverflowWrap" },
]
mapped-generic-types = [

1
layout/style/ServoCSSPropList.mako.py
View File

@ -102,6 +102,7 @@ SERIALIZED_PREDEFINED_TYPES = [
"ListStyleType",
"OffsetPath",
"Opacity",
"OverflowWrap",
"Quotes",
"Resize",
"Scale",

4
layout/style/nsStyleConsts.h
View File

@ -788,10 +788,6 @@ enum class StyleWhiteSpace : uint8_t {
#define NS_STYLE_WORDBREAK_BREAK_ALL 1
#define NS_STYLE_WORDBREAK_KEEP_ALL 2
// See nsStyleText
#define NS_STYLE_OVERFLOWWRAP_NORMAL 0
#define NS_STYLE_OVERFLOWWRAP_BREAK_WORD 1
// ruby-align, see nsStyleText
#define NS_STYLE_RUBY_ALIGN_START 0
#define NS_STYLE_RUBY_ALIGN_CENTER 1

2
layout/style/nsStyleStruct.cpp
View File

@ -4249,7 +4249,7 @@ nsStyleText::nsStyleText(const nsPresContext* aContext)
, mTextTransform(NS_STYLE_TEXT_TRANSFORM_NONE)
, mWhiteSpace(StyleWhiteSpace::Normal)
, mWordBreak(NS_STYLE_WORDBREAK_NORMAL)
, mOverflowWrap(NS_STYLE_OVERFLOWWRAP_NORMAL)
, mOverflowWrap(StyleOverflowWrap::Normal)
, mHyphens(StyleHyphens::Manual)
, mRubyAlign(NS_STYLE_RUBY_ALIGN_SPACE_AROUND)
, mRubyPosition(NS_STYLE_RUBY_POSITION_OVER)

9
layout/style/nsStyleStruct.h
View File

@ -1578,7 +1578,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText
uint8_t mTextTransform; // NS_STYLE_TEXT_TRANSFORM_*
mozilla::StyleWhiteSpace mWhiteSpace;
uint8_t mWordBreak; // NS_STYLE_WORDBREAK_*
uint8_t mOverflowWrap; // NS_STYLE_OVERFLOWWRAP_*
mozilla::StyleOverflowWrap mOverflowWrap;
mozilla::StyleHyphens mHyphens;
uint8_t mRubyAlign; // NS_STYLE_RUBY_ALIGN_*
uint8_t mRubyPosition; // NS_STYLE_RUBY_POSITION_*
@ -1634,8 +1634,11 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText
}
bool WordCanWrapStyle() const {
return WhiteSpaceCanWrapStyle() &&
mOverflowWrap == NS_STYLE_OVERFLOWWRAP_BREAK_WORD;
if (!WhiteSpaceCanWrapStyle()) {
return false;
}
return mOverflowWrap == mozilla::StyleOverflowWrap::BreakWord ||
mOverflowWrap == mozilla::StyleOverflowWrap::Anywhere;
}
bool HasTextEmphasis() const {

7
modules/libpref/init/StaticPrefList.h
View File

@ -804,13 +804,6 @@ VARCACHE_PREF(
bool, false
)
// Does overflow-break: break-word affect intrinsic size?
VARCACHE_PREF(
"layout.css.overflow-break.intrinsic-size",
layout_css_overflow_break_intrinsic_size,
bool, false
)
// Does arbitrary ::-webkit-* pseudo-element parsed?
VARCACHE_PREF(
"layout.css.unknown-webkit-pseudo-element",

1
servo/components/style/cbindgen.toml
View File

@ -49,6 +49,7 @@ include = [
"FontDisplay",
"FontFaceSourceListComponent",
"FontLanguageOverride",
"OverflowWrap",
"TimingFunction",
"PathCommand",
"UnicodeRange",

1
servo/components/style/properties/data.py
View File

@ -324,6 +324,7 @@ class Longhand(object):
"Opacity",
"OutlineStyle",
"OverflowClipBox",
"OverflowWrap",
"OverscrollBehavior",
"Percentage",
"Resize",

1
servo/components/style/properties/gecko.mako.rs
View File

@ -1419,6 +1419,7 @@ impl Clone for ${style_struct.gecko_struct_name} {
"NonNegativeNumber": impl_simple,
"Number": impl_simple,
"Opacity": impl_simple,
"OverflowWrap": impl_simple,
"Perspective": impl_style_coord,
"Position": impl_position,
"RGBAColor": impl_rgba_color,

11
servo/components/style/properties/longhands/inherited_text.mako.rs
View File

@ -61,15 +61,16 @@ ${helpers.predefined_type(
servo_restyle_damage = "reflow",
)}
// Also known as "word-wrap" (which is more popular because of IE), but this is the preferred
// name per CSS-TEXT 6.2.
${helpers.single_keyword(
// Also known as "word-wrap" (which is more popular because of IE), but this is
// the preferred name per CSS-TEXT 6.2.
${helpers.predefined_type(
"overflow-wrap",
"normal break-word",
gecko_constant_prefix="NS_STYLE_OVERFLOWWRAP",
"OverflowWrap",
"computed::OverflowWrap::Normal",
animation_value_type="discrete",
spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap",
alias="word-wrap",
needs_context=False,
servo_restyle_damage="rebuild_and_reflow",
)}

2
servo/components/style/values/computed/mod.rs
View File

@ -78,7 +78,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::table::XSpan;
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle};
pub use self::text::{TextOverflow, WordSpacing};
pub use self::text::{TextOverflow, WordSpacing, OverflowWrap};
pub use self::time::Time;
pub use self::transform::{Rotate, Scale, Transform, TransformOperation};
pub use self::transform::{TransformOrigin, TransformStyle, Translate};

1
servo/components/style/values/computed/text.rs
View File

@ -19,6 +19,7 @@ use values::{CSSFloat, CSSInteger};
pub use values::specified::TextAlignKeyword as TextAlign;
pub use values::specified::TextEmphasisPosition;
pub use values::specified::OverflowWrap;
/// A computed value for the `initial-letter` property.
pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>;

2
servo/components/style/values/specified/mod.rs
View File

@ -76,7 +76,7 @@ pub use self::svg_path::SVGPathData;
pub use self::table::XSpan;
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
pub use self::text::{TextEmphasisPosition, TextEmphasisStyle};
pub use self::text::{TextEmphasisPosition, TextEmphasisStyle, OverflowWrap};
pub use self::time::Time;
pub use self::transform::{Rotate, Scale, Transform};
pub use self::transform::{TransformOrigin, TransformStyle, Translate};

24
servo/components/style/values/specified/text.rs
View File

@ -659,6 +659,8 @@ impl ToComputedValue for TextEmphasisStyle {
fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
match *self {
TextEmphasisStyle::Keyword(ref keyword) => {
// FIXME(emilio): This should set the rule_cache_conditions
// properly.
let default_shape = if context.style().get_inherited_box().clone_writing_mode() ==
SpecifiedWritingMode::HorizontalTb
{
@ -680,6 +682,7 @@ impl ToComputedValue for TextEmphasisStyle {
},
}
}
#[inline]
fn from_computed_value(computed: &Self::ComputedValue) -> Self {
match *computed {
@ -877,3 +880,24 @@ impl Parse for MozTabSize {
)?))
}
}
/// Values for the `overflow-wrap` property.
#[repr(u8)]
#[derive(
Clone,
Copy,
Debug,
Eq,
MallocSizeOf,
Parse,
PartialEq,
SpecifiedValueInfo,
ToComputedValue,
ToCss,
)]
#[allow(missing_docs)]
pub enum OverflowWrap {
Normal,
BreakWord,
Anywhere,
}

2
testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html.ini
View File

@ -1,2 +0,0 @@
[overflow-wrap-min-content-size-001.html]
prefs: [layout.css.overflow-break.intrinsic-size:true]

2
testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html.ini
View File

@ -1,2 +0,0 @@
[overflow-wrap-min-content-size-002.html]
prefs: [layout.css.overflow-break.intrinsic-size:true]

2
testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html.ini
View File

@ -1,2 +0,0 @@
[overflow-wrap-min-content-size-003.html]
prefs: [layout.css.overflow-break.intrinsic-size:true]

6
testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html
View File

@ -1,14 +1,14 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
<link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
<meta name="flags" content="">
<link rel="match" href="reference/overflow-wrap-min-content-size-001-ref.html">
<meta name="assert" content="Soft wrap opportunities introduced by overflow-wrap:break-word **are** considered when calculating min-content intrinsic sizes.">
<meta name="assert" content="Soft wrap opportunities introduced by overflow-wrap:anywhere **are** considered when calculating min-content intrinsic sizes.">
<style>
table {
overflow-wrap: break-word;
overflow-wrap: anywhere;
max-width: 0;
border: 0;
border-collapse: collapse;

6
testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html
View File

@ -1,16 +1,16 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org/">
<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
<link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
<meta name="flags" content="">
<link rel="match" href="reference/overflow-wrap-min-content-size-002-ref.html">
<meta name="assert" content="overflow-wrap:break-word doesn't break grapheme cluster and min-content intrinsic size should take that into account.">
<meta name="assert" content="overflow-wrap:anywhere doesn't break grapheme cluster and min-content intrinsic size should take that into account.">
<style>
#wrapper {
width: 0px;
overflow-wrap: break-word;
overflow-wrap: anywhere;
}
#test {
float: left;

6
testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html
View File

@ -1,17 +1,17 @@
<!DOCTYPE html>
<meta charset="utf-8">
<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org/">
<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
<link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
<meta name="flags" content="ahem">
<link rel="match" href="reference/overflow-wrap-min-content-size-003-ref.html">
<meta name="assert" content="overflow-wrap:break-word breaks at edge of inline elements.">
<meta name="assert" content="overflow-wrap:anywhere breaks at edge of inline elements.">
<style>
#wrapper {
width: 0px;
font: 16px / 1 Ahem;
overflow-wrap: break-word;
overflow-wrap: anywhere;
color: green;
}
#test {