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

Unified Diff: Source/web/DevToolsEmulator.cpp

Issue 1182663009: [DevTools] Disable plugins when emulating mobile. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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/DevToolsEmulator.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/DevToolsEmulator.cpp
diff --git a/Source/web/DevToolsEmulator.cpp b/Source/web/DevToolsEmulator.cpp
index 875932b17d6c6fe814a68490e8e46a2495c89bf6..b55b7dbb90dbbac947457a37603e69f4aa44f97f 100644
--- a/Source/web/DevToolsEmulator.cpp
+++ b/Source/web/DevToolsEmulator.cpp
@@ -59,6 +59,7 @@ DevToolsEmulator::DevToolsEmulator(WebViewImpl* webViewImpl)
, m_embedderDeviceScaleAdjustment(webViewImpl->page()->settings().deviceScaleAdjustment())
, m_embedderPreferCompositingToLCDTextEnabled(webViewImpl->page()->settings().preferCompositingToLCDTextEnabled())
, m_embedderUseMobileViewport(webViewImpl->page()->settings().useMobileViewportStyle())
+ , m_embedderPluginsEnabled(webViewImpl->page()->settings().pluginsEnabled())
, m_touchEventEmulationEnabled(false)
, m_doubleTapToZoomEnabled(false)
, m_originalTouchEnabled(false)
@@ -117,6 +118,14 @@ void DevToolsEmulator::setUseMobileViewportStyle(bool enabled)
m_webViewImpl->page()->settings().setUseMobileViewportStyle(enabled);
}
+void DevToolsEmulator::setPluginsEnabled(bool enabled)
+{
+ m_embedderPluginsEnabled = enabled;
+ bool emulateMobileEnabled = m_deviceMetricsEnabled && m_emulateMobileEnabled;
+ if (!emulateMobileEnabled)
+ m_webViewImpl->page()->settings().setPluginsEnabled(enabled);
+}
+
void DevToolsEmulator::setScriptEnabled(bool enabled)
{
m_embedderScriptEnabled = enabled;
@@ -189,6 +198,7 @@ void DevToolsEmulator::enableMobileEmulation()
m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true);
m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
+ m_webViewImpl->page()->settings().setPluginsEnabled(false);
m_webViewImpl->setZoomFactorOverride(1);
m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageScaleFactor();
@@ -207,6 +217,7 @@ void DevToolsEmulator::disableMobileEmulation()
m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAutosizingEnabled);
m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_embedderPreferCompositingToLCDTextEnabled);
m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMobileViewport);
+ m_webViewImpl->page()->settings().setPluginsEnabled(m_embedderPluginsEnabled);
m_webViewImpl->setZoomFactorOverride(0);
m_emulateMobileEnabled = false;
m_webViewImpl->setDefaultPageScaleLimits(
« no previous file with comments | « Source/web/DevToolsEmulator.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698