Index: Source/WebCore/rendering/style/StyleRareInheritedData.cpp |
diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp |
index b22e9bac44e511168c6fc9974e3290efcb62707d..869aaa775a44d7af73f72d9796ec236b045b9965 100644 |
--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp |
+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp |
@@ -52,9 +52,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI |
float imageResolutionFloats; |
#endif |
-#if ENABLE(TOUCH_EVENTS) |
Color touchColors; |
-#endif |
void* variableDataRefs[1]; |
}; |
@@ -114,9 +112,7 @@ StyleRareInheritedData::StyleRareInheritedData() |
#if ENABLE(CSS_IMAGE_RESOLUTION) |
, m_imageResolution(RenderStyle::initialImageResolution()) |
#endif |
-#if ENABLE(TOUCH_EVENTS) |
, tapHighlightColor(RenderStyle::initialTapHighlightColor()) |
-#endif |
{ |
m_variables.init(); |
} |
@@ -187,9 +183,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) |
#if ENABLE(CSS_IMAGE_RESOLUTION) |
, m_imageResolution(o.m_imageResolution) |
#endif |
-#if ENABLE(TOUCH_EVENTS) |
, tapHighlightColor(o.tapHighlightColor) |
-#endif |
, m_variables(o.m_variables) |
{ |
} |
@@ -216,9 +210,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()) |