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

Unified Diff: Source/core/rendering/style/RenderStyle.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/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index e6128a821dfced8e888f2c7f50ead288a439da58..fa0db731ab81e40bfb29f5797718b646238b1e24 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -36,9 +36,7 @@
#include "StyleImage.h"
#include "StyleInheritedData.h"
#include "StyleResolver.h"
-#if ENABLE(TOUCH_EVENTS)
#include "RenderTheme.h"
-#endif
#include "TextAutosizer.h"
#include "WebCoreMemoryInstrumentation.h"
#include <wtf/MathExtras.h>
@@ -1529,12 +1527,10 @@ TextEmphasisMark RenderStyle::textEmphasisMark() const
return TextEmphasisMarkSesame;
}
-#if ENABLE(TOUCH_EVENTS)
Color RenderStyle::initialTapHighlightColor()
{
return RenderTheme::tapHighlightColor();
}
-#endif
LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const
{
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698