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

Unified Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 243233002: [DevTools] Disable touch emulation on devices with touch input. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Staying inside core Created 6 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/web/WebDevToolsAgentImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index e8a14b55eed44580763101b5868618e182725065..2256ead3080175b246e25c1f4dfc2ca87c327985 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -209,6 +209,7 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl(
, m_touchEventEmulationEnabled(false)
, m_originalTouchEnabled(false)
, m_originalDeviceSupportsMouse(false)
+ , m_originalDeviceSupportsTouch(false)
{
ASSERT(m_hostId > 0);
ClientMessageLoopAdapter::ensureClientMessageLoopCreated(m_client);
@@ -389,12 +390,16 @@ void WebDevToolsAgentImpl::setTouchEventEmulationEnabled(bool enabled)
if (!m_touchEventEmulationEnabled) {
m_originalTouchEnabled = RuntimeEnabledFeatures::touchEnabled();
- if (m_webViewImpl->page())
+ if (m_webViewImpl->page()) {
m_originalDeviceSupportsMouse = m_webViewImpl->page()->settings().deviceSupportsMouse();
+ m_originalDeviceSupportsTouch = m_webViewImpl->page()->settings().deviceSupportsTouch();
pfeldman 2014/04/21 12:34:00 Why is this not a part of Page agent?
dgozman 2014/04/21 13:25:47 Moved most to the PageAgent.
+ }
}
RuntimeEnabledFeatures::setTouchEnabled(enabled ? true : m_originalTouchEnabled);
- if (m_webViewImpl->page())
+ if (m_webViewImpl->page()) {
m_webViewImpl->page()->settings().setDeviceSupportsMouse(enabled ? false : m_originalDeviceSupportsMouse);
+ m_webViewImpl->page()->settings().setDeviceSupportsTouch(enabled ? true : m_originalDeviceSupportsTouch);
+ }
m_client->setTouchEventEmulationEnabled(enabled, m_emulateViewportEnabled);
m_touchEventEmulationEnabled = enabled;
m_webViewImpl->mainFrameImpl()->frame()->view()->layout();
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698