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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 years, 8 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') | Source/core/testing/InternalSettings.cpp » ('j') | 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 4e8606dffeac444e6121309ddf554ee2f87a21dc..cb1066b370953b363314b04b38189d78d63e7eb2 100644
--- a/Source/core/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp
@@ -48,9 +48,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
unsigned unsigneds[1];
short hyphenationShorts[3];
-#if ENABLE(TOUCH_EVENTS)
Color touchColors;
-#endif
void* variableDataRefs[1];
};
@@ -103,9 +101,7 @@ StyleRareInheritedData::StyleRareInheritedData()
, hyphenationLimitLines(-1)
, m_lineGrid(RenderStyle::initialLineGrid())
, m_tabSize(RenderStyle::initialTabSize())
-#if ENABLE(TOUCH_EVENTS)
, tapHighlightColor(RenderStyle::initialTapHighlightColor())
-#endif
{
m_variables.init();
}
@@ -169,9 +165,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, textEmphasisCustomMark(o.textEmphasisCustomMark)
, m_lineGrid(o.m_lineGrid)
, m_tabSize(o.m_tabSize)
-#if ENABLE(TOUCH_EVENTS)
, tapHighlightColor(o.tapHighlightColor)
-#endif
, m_variables(o.m_variables)
{
}
@@ -198,9 +192,7 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& visitedLinkTextStrokeColor == o.visitedLinkTextStrokeColor
&& visitedLinkTextFillColor == o.visitedLinkTextFillColor
&& visitedLinkTextEmphasisColor == o.visitedLinkTextEmphasisColor
-#if ENABLE(TOUCH_EVENTS)
&& tapHighlightColor == o.tapHighlightColor
-#endif
&& shadowDataEquivalent(o)
&& highlight == o.highlight
&& cursorDataEquivalent(cursorData.get(), o.cursorData.get())
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.h ('k') | Source/core/testing/InternalSettings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698