Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1867)

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

Issue 19041005: Introduce css3TextEnabled instead of CSS3_TEXT. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 7 years, 5 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
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 527c39423a9ac318dd77339399752a1ae7807720..90043c3b750e78bf567fe120dfbdd7cf129013ed 100644
--- a/Source/core/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp
@@ -76,6 +76,7 @@ StyleRareInheritedData::StyleRareInheritedData()
, textEmphasisFill(TextEmphasisFillFilled)
, textEmphasisMark(TextEmphasisMarkNone)
, textEmphasisPosition(TextEmphasisPositionOver)
+ , m_textAlignLast(RenderStyle::initialTextAlignLast())
, m_textOrientation(TextOrientationVerticalRight)
#if ENABLE(CSS3_TEXT)
, m_textIndentLine(RenderStyle::initialTextIndentLine())
@@ -85,7 +86,6 @@ StyleRareInheritedData::StyleRareInheritedData()
, m_lineSnap(RenderStyle::initialLineSnap())
, m_lineAlign(RenderStyle::initialLineAlign())
#if ENABLE(CSS3_TEXT)
- , m_textAlignLast(RenderStyle::initialTextAlignLast())
, m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
#endif // CSS3_TEXT
, m_rubyPosition(RenderStyle::initialRubyPosition())
@@ -130,6 +130,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, textEmphasisFill(o.textEmphasisFill)
, textEmphasisMark(o.textEmphasisMark)
, textEmphasisPosition(o.textEmphasisPosition)
+ , m_textAlignLast(o.m_textAlignLast)
, m_textOrientation(o.m_textOrientation)
#if ENABLE(CSS3_TEXT)
, m_textIndentLine(o.m_textIndentLine)
@@ -139,7 +140,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, m_lineSnap(o.m_lineSnap)
, m_lineAlign(o.m_lineAlign)
#if ENABLE(CSS3_TEXT)
- , m_textAlignLast(o.m_textAlignLast)
, m_textUnderlinePosition(o.m_textUnderlinePosition)
#endif // CSS3_TEXT
, m_rubyPosition(o.m_rubyPosition)
@@ -203,6 +203,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& textEmphasisFill == o.textEmphasisFill
&& textEmphasisMark == o.textEmphasisMark
&& textEmphasisPosition == o.textEmphasisPosition
+ && m_textAlignLast == o.m_textAlignLast
&& m_textOrientation == o.m_textOrientation
#if ENABLE(CSS3_TEXT)
&& m_textIndentLine == o.m_textIndentLine
@@ -216,7 +217,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& m_lineGrid == o.m_lineGrid
&& m_imageRendering == o.m_imageRendering
#if ENABLE(CSS3_TEXT)
- && m_textAlignLast == o.m_textAlignLast
&& m_textUnderlinePosition == o.m_textUnderlinePosition
#endif // CSS3_TEXT
&& m_rubyPosition == o.m_rubyPosition
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698