Source/core/rendering/style/StyleRareInheritedData.cpp - Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed a typo in css-properties-as-js-properties-expected-expected.txt Created 7 years, 7 months 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

« Source/core/rendering/RootInlineBox.h ('K') | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/style/StyleRareInheritedData.cpp

diff --git a/Source/core/rendering/style/StyleRareInheritedData.cpp b/Source/core/rendering/style/StyleRareInheritedData.cpp

index 0f31382f83f9c054cb3055c209bb5548d943d492..343239cd5b19ade201a444816452324c03b17fb3 100644

--- a/Source/core/rendering/style/StyleRareInheritedData.cpp

+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp

@@ -90,8 +90,8 @@ StyleRareInheritedData::StyleRareInheritedData()

#endif

#if ENABLE(CSS3_TEXT)

, m_textAlignLast(RenderStyle::initialTextAlignLast())

- , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())

#endif // CSS3_TEXT

+ , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())

, m_rubyPosition(RenderStyle::initialRubyPosition())

, hyphenationLimitBefore(-1)

, hyphenationLimitAfter(-1)

@@ -148,8 +148,8 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)

#endif

#if ENABLE(CSS3_TEXT)

, m_textAlignLast(o.m_textAlignLast)

- , m_textUnderlinePosition(o.m_textUnderlinePosition)

#endif // CSS3_TEXT

+ , m_textUnderlinePosition(o.m_textUnderlinePosition)

, m_rubyPosition(o.m_rubyPosition)

, hyphenationString(o.hyphenationString)

, hyphenationLimitBefore(o.hyphenationLimitBefore)

@@ -229,8 +229,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const

&& m_imageRendering == o.m_imageRendering

#if ENABLE(CSS3_TEXT)

&& m_textAlignLast == o.m_textAlignLast

- && m_textUnderlinePosition == o.m_textUnderlinePosition

#endif // CSS3_TEXT

+ && m_textUnderlinePosition == o.m_textUnderlinePosition

&& m_rubyPosition == o.m_rubyPosition

&& m_lineSnap == o.m_lineSnap

&& m_variables == o.m_variables