Index: Source/core/rendering/style/StyleRareInheritedData.cpp |
diff --git a/Source/core/rendering/style/StyleRareInheritedData.cpp b/Source/core/rendering/style/StyleRareInheritedData.cpp |
index cb1066b370953b363314b04b38189d78d63e7eb2..f643d709db110a5c5a364f5c586345cc15392fd5 100644 |
--- a/Source/core/rendering/style/StyleRareInheritedData.cpp |
+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp |
@@ -48,7 +48,9 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI |
unsigned unsigneds[1]; |
short hyphenationShorts[3]; |
+#if ENABLE(TOUCH_EVENTS) |
Color touchColors; |
+#endif |
void* variableDataRefs[1]; |
}; |
@@ -101,7 +103,9 @@ StyleRareInheritedData::StyleRareInheritedData() |
, hyphenationLimitLines(-1) |
, m_lineGrid(RenderStyle::initialLineGrid()) |
, m_tabSize(RenderStyle::initialTabSize()) |
+#if ENABLE(TOUCH_EVENTS) |
, tapHighlightColor(RenderStyle::initialTapHighlightColor()) |
+#endif |
{ |
m_variables.init(); |
} |
@@ -165,7 +169,9 @@ 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) |
{ |
} |
@@ -192,7 +198,9 @@ 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()) |