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

Unified Diff: Source/core/inspector/InspectorPageAgent.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: Even more 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/core/inspector/InspectorPageAgent.h ('k') | Source/devtools/front_end/OverridesSupport.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorPageAgent.cpp
diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
index e01e26537b1821f181ab687d64dc7f8311da7fb1..cc4c4eb8911ed4cc5bba12ec4b76ee5f4310e404 100644
--- a/Source/core/inspector/InspectorPageAgent.cpp
+++ b/Source/core/inspector/InspectorPageAgent.cpp
@@ -342,6 +342,10 @@ InspectorPageAgent::InspectorPageAgent(Page* page, InjectedScriptManager* inject
, m_ignoreScriptsEnabledNotification(false)
, m_deviceMetricsOverridden(false)
, m_emulateViewportEnabled(false)
+ , m_touchEmulationEnabled(false)
+ , m_originalTouchEnabled(false)
+ , m_originalDeviceSupportsMouse(false)
+ , m_originalDeviceSupportsTouch(false)
, m_embedderTextAutosizingEnabled(m_page->settings().textAutosizingEnabled())
, m_embedderFontScaleFactor(m_page->settings().deviceScaleAdjustment())
{
@@ -370,7 +374,6 @@ void InspectorPageAgent::clearFrontend()
{
ErrorString error;
disable(&error);
- updateTouchEventEmulationInPage(false);
m_frontend = 0;
}
@@ -436,6 +439,11 @@ void InspectorPageAgent::disable(ErrorString*)
setShowScrollBottleneckRects(0, false);
setShowViewportSizeOnResize(0, false, 0);
+ if (m_state->getBoolean(PageAgentState::touchEventEmulationEnabled)) {
+ updateTouchEventEmulationInPage(false);
+ m_state->setBoolean(PageAgentState::touchEventEmulationEnabled, false);
+ }
+
if (!deviceMetricsChanged(0, 0, 0, false, false, 1, false))
return;
@@ -1160,14 +1168,38 @@ void InspectorPageAgent::updateViewMetrics(int width, int height, double deviceS
void InspectorPageAgent::updateTouchEventEmulationInPage(bool enabled)
{
- m_state->setBoolean(PageAgentState::touchEventEmulationEnabled, enabled);
+ if (!m_touchEmulationEnabled) {
+ m_originalTouchEnabled = RuntimeEnabledFeatures::touchEnabled();
+ m_originalDeviceSupportsMouse = m_page->settings().deviceSupportsMouse();
+ m_originalDeviceSupportsTouch = m_page->settings().deviceSupportsTouch();
+ }
+ RuntimeEnabledFeatures::setTouchEnabled(enabled ? true : m_originalTouchEnabled);
+ m_page->settings().setDeviceSupportsMouse(enabled ? false : m_originalDeviceSupportsMouse);
+ m_page->settings().setDeviceSupportsTouch(enabled ? true : m_originalDeviceSupportsTouch);
+ m_touchEmulationEnabled = enabled;
m_client->setTouchEventEmulationEnabled(enabled);
+ m_page->mainFrame()->view()->layout();
+}
+
+void InspectorPageAgent::hasTouchInputs(ErrorString*, bool* result)
+{
+ *result = m_touchEmulationEnabled ? m_originalDeviceSupportsTouch : m_page->settings().deviceSupportsTouch();
}
-void InspectorPageAgent::setTouchEmulationEnabled(ErrorString*, bool enabled)
+void InspectorPageAgent::setTouchEmulationEnabled(ErrorString* error, bool enabled)
{
if (m_state->getBoolean(PageAgentState::touchEventEmulationEnabled) == enabled)
return;
+
+ bool hasTouch = false;
+ hasTouchInputs(error, &hasTouch);
+ if (enabled && hasTouch) {
+ if (error)
+ *error = "Device already supports touch input";
+ return;
+ }
+
+ m_state->setBoolean(PageAgentState::touchEventEmulationEnabled, enabled);
updateTouchEventEmulationInPage(enabled);
}
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.h ('k') | Source/devtools/front_end/OverridesSupport.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698