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

Unified Diff: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Issue 1328283005: Add support for multiple text decorations with same line positioning (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 3 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
Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
index d12593a9956a1c60757ca018adcd4ad5fc644c92..d73125e4f2245d43fc1f7a239be23183c3fe53fe 100644
--- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
+++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
@@ -90,7 +90,7 @@ StyleRareInheritedData::StyleRareInheritedData()
, m_textIndentLine(ComputedStyle::initialTextIndentLine())
, m_textIndentType(ComputedStyle::initialTextIndentLine())
, m_imageRendering(ComputedStyle::initialImageRendering())
- , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
+ , m_hasSimpleUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
, m_rubyPosition(ComputedStyle::initialRubyPosition())
, m_subtreeWillChangeContents(false)
, m_selfOrAncestorHasDirAutoAttribute(false)
@@ -145,7 +145,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, m_textIndentLine(o.m_textIndentLine)
, m_textIndentType(o.m_textIndentType)
, m_imageRendering(o.m_imageRendering)
- , m_textUnderlinePosition(o.m_textUnderlinePosition)
+ , m_hasSimpleUnderlinePosition(o.m_hasSimpleUnderlinePosition)
, m_rubyPosition(o.m_rubyPosition)
, m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
, m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
@@ -219,7 +219,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& quotesDataEquivalent(o)
&& m_tabSize == o.m_tabSize
&& m_imageRendering == o.m_imageRendering
- && m_textUnderlinePosition == o.m_textUnderlinePosition
+ && m_hasSimpleUnderlinePosition == o.m_hasSimpleUnderlinePosition
&& m_rubyPosition == o.m_rubyPosition
&& dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
&& dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);

Powered by Google App Engine
This is Rietveld 408576698