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

Unified Diff: third_party/WebKit/Source/web/DevToolsEmulator.cpp

Issue 2547373002: Rename TouchEventAPI to TouchEventFeatureDetection (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into rename Created 4 years 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/web/DevToolsEmulator.cpp
diff --git a/third_party/WebKit/Source/web/DevToolsEmulator.cpp b/third_party/WebKit/Source/web/DevToolsEmulator.cpp
index e3f8ce90e4eae1afe9e86c579be5acb22e2634b8..eeaf1103dd76930419fd3ebb9a593fe31ddf8643 100644
--- a/third_party/WebKit/Source/web/DevToolsEmulator.cpp
+++ b/third_party/WebKit/Source/web/DevToolsEmulator.cpp
@@ -89,7 +89,7 @@ DevToolsEmulator::DevToolsEmulator(WebViewImpl* webViewImpl)
.mainFrameResizesAreOrientationChanges()),
m_touchEventEmulationEnabled(false),
m_doubleTapToZoomEnabled(false),
- m_originalTouchEventAPIEnabled(false),
+ m_originalTouchEventFeatureDetectionEnabled(false),
m_originalDeviceSupportsMouse(false),
m_originalDeviceSupportsTouch(false),
m_originalMaxTouchPoints(0),
@@ -446,8 +446,8 @@ void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled) {
if (m_touchEventEmulationEnabled == enabled)
return;
if (!m_touchEventEmulationEnabled) {
- m_originalTouchEventAPIEnabled =
- RuntimeEnabledFeatures::touchEventAPIEnabled();
+ m_originalTouchEventFeatureDetectionEnabled =
+ RuntimeEnabledFeatures::touchEventFeatureDetectionEnabled();
m_originalDeviceSupportsMouse =
m_webViewImpl->page()->settings().deviceSupportsMouse();
m_originalDeviceSupportsTouch =
@@ -455,8 +455,8 @@ void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled) {
m_originalMaxTouchPoints =
m_webViewImpl->page()->settings().maxTouchPoints();
}
- RuntimeEnabledFeatures::setTouchEventAPIEnabled(
- enabled ? true : m_originalTouchEventAPIEnabled);
+ RuntimeEnabledFeatures::setTouchEventFeatureDetectionEnabled(
+ enabled ? true : m_originalTouchEventFeatureDetectionEnabled);
if (!m_originalDeviceSupportsTouch) {
m_webViewImpl->page()->settings().setDeviceSupportsMouse(
enabled ? false : m_originalDeviceSupportsMouse);
« no previous file with comments | « third_party/WebKit/Source/web/DevToolsEmulator.h ('k') | third_party/WebKit/Source/web/WebRuntimeFeatures.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698