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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/DevToolsEmulator.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/DevToolsEmulator.h" 6 #include "web/DevToolsEmulator.h"
7 7
8 #include "core/frame/FrameView.h" 8 #include "core/frame/FrameView.h"
9 #include "core/frame/Settings.h" 9 #include "core/frame/Settings.h"
10 #include "core/page/Page.h" 10 #include "core/page/Page.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 , m_emulationAgent(nullptr) 52 , m_emulationAgent(nullptr)
53 , m_deviceMetricsEnabled(false) 53 , m_deviceMetricsEnabled(false)
54 , m_emulateMobileEnabled(false) 54 , m_emulateMobileEnabled(false)
55 , m_isOverlayScrollbarsEnabled(false) 55 , m_isOverlayScrollbarsEnabled(false)
56 , m_originalDefaultMinimumPageScaleFactor(0) 56 , m_originalDefaultMinimumPageScaleFactor(0)
57 , m_originalDefaultMaximumPageScaleFactor(0) 57 , m_originalDefaultMaximumPageScaleFactor(0)
58 , m_embedderTextAutosizingEnabled(webViewImpl->page()->settings().textAutosi zingEnabled()) 58 , m_embedderTextAutosizingEnabled(webViewImpl->page()->settings().textAutosi zingEnabled())
59 , m_embedderDeviceScaleAdjustment(webViewImpl->page()->settings().deviceScal eAdjustment()) 59 , m_embedderDeviceScaleAdjustment(webViewImpl->page()->settings().deviceScal eAdjustment())
60 , m_embedderPreferCompositingToLCDTextEnabled(webViewImpl->page()->settings( ).preferCompositingToLCDTextEnabled()) 60 , m_embedderPreferCompositingToLCDTextEnabled(webViewImpl->page()->settings( ).preferCompositingToLCDTextEnabled())
61 , m_embedderUseMobileViewport(webViewImpl->page()->settings().useMobileViewp ortStyle()) 61 , m_embedderUseMobileViewport(webViewImpl->page()->settings().useMobileViewp ortStyle())
62 , m_embedderPluginsEnabled(webViewImpl->page()->settings().pluginsEnabled())
62 , m_touchEventEmulationEnabled(false) 63 , m_touchEventEmulationEnabled(false)
63 , m_doubleTapToZoomEnabled(false) 64 , m_doubleTapToZoomEnabled(false)
64 , m_originalTouchEnabled(false) 65 , m_originalTouchEnabled(false)
65 , m_originalDeviceSupportsMouse(false) 66 , m_originalDeviceSupportsMouse(false)
66 , m_originalDeviceSupportsTouch(false) 67 , m_originalDeviceSupportsTouch(false)
67 , m_originalMaxTouchPoints(0) 68 , m_originalMaxTouchPoints(0)
68 , m_embedderScriptEnabled(webViewImpl->page()->settings().scriptEnabled()) 69 , m_embedderScriptEnabled(webViewImpl->page()->settings().scriptEnabled())
69 , m_scriptExecutionDisabled(false) 70 , m_scriptExecutionDisabled(false)
70 { 71 {
71 } 72 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 111 }
111 112
112 void DevToolsEmulator::setUseMobileViewportStyle(bool enabled) 113 void DevToolsEmulator::setUseMobileViewportStyle(bool enabled)
113 { 114 {
114 m_embedderUseMobileViewport = enabled; 115 m_embedderUseMobileViewport = enabled;
115 bool emulateMobileEnabled = m_deviceMetricsEnabled && m_emulateMobileEnabled ; 116 bool emulateMobileEnabled = m_deviceMetricsEnabled && m_emulateMobileEnabled ;
116 if (!emulateMobileEnabled) 117 if (!emulateMobileEnabled)
117 m_webViewImpl->page()->settings().setUseMobileViewportStyle(enabled); 118 m_webViewImpl->page()->settings().setUseMobileViewportStyle(enabled);
118 } 119 }
119 120
121 void DevToolsEmulator::setPluginsEnabled(bool enabled)
122 {
123 m_embedderPluginsEnabled = enabled;
124 bool emulateMobileEnabled = m_deviceMetricsEnabled && m_emulateMobileEnabled ;
125 if (!emulateMobileEnabled)
126 m_webViewImpl->page()->settings().setPluginsEnabled(enabled);
127 }
128
120 void DevToolsEmulator::setScriptEnabled(bool enabled) 129 void DevToolsEmulator::setScriptEnabled(bool enabled)
121 { 130 {
122 m_embedderScriptEnabled = enabled; 131 m_embedderScriptEnabled = enabled;
123 if (!m_scriptExecutionDisabled) 132 if (!m_scriptExecutionDisabled)
124 m_webViewImpl->page()->settings().setScriptEnabled(enabled); 133 m_webViewImpl->page()->settings().setScriptEnabled(enabled);
125 } 134 }
126 135
127 void DevToolsEmulator::setDoubleTapToZoomEnabled(bool enabled) 136 void DevToolsEmulator::setDoubleTapToZoomEnabled(bool enabled)
128 { 137 {
129 m_doubleTapToZoomEnabled = enabled; 138 m_doubleTapToZoomEnabled = enabled;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return; 191 return;
183 m_emulateMobileEnabled = true; 192 m_emulateMobileEnabled = true;
184 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led(); 193 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led();
185 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 194 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
186 m_webViewImpl->enableViewport(); 195 m_webViewImpl->enableViewport();
187 m_webViewImpl->settings()->setViewportMetaEnabled(true); 196 m_webViewImpl->settings()->setViewportMetaEnabled(true);
188 m_webViewImpl->settings()->setShrinksViewportContentToFit(true); 197 m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
189 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true); 198 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
190 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ; 199 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ;
191 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true); 200 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
201 m_webViewImpl->page()->settings().setPluginsEnabled(false);
192 m_webViewImpl->setZoomFactorOverride(1); 202 m_webViewImpl->setZoomFactorOverride(1);
193 203
194 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor(); 204 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor();
195 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor(); 205 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor();
196 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5); 206 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
197 } 207 }
198 208
199 void DevToolsEmulator::disableMobileEmulation() 209 void DevToolsEmulator::disableMobileEmulation()
200 { 210 {
201 if (!m_emulateMobileEnabled) 211 if (!m_emulateMobileEnabled)
202 return; 212 return;
203 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna bled); 213 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna bled);
204 m_webViewImpl->disableViewport(); 214 m_webViewImpl->disableViewport();
205 m_webViewImpl->settings()->setViewportMetaEnabled(false); 215 m_webViewImpl->settings()->setViewportMetaEnabled(false);
206 m_webViewImpl->settings()->setShrinksViewportContentToFit(false); 216 m_webViewImpl->settings()->setShrinksViewportContentToFit(false);
207 m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAut osizingEnabled); 217 m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAut osizingEnabled);
208 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_emb edderPreferCompositingToLCDTextEnabled); 218 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_emb edderPreferCompositingToLCDTextEnabled);
209 m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMob ileViewport); 219 m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMob ileViewport);
220 m_webViewImpl->page()->settings().setPluginsEnabled(m_embedderPluginsEnabled );
210 m_webViewImpl->setZoomFactorOverride(0); 221 m_webViewImpl->setZoomFactorOverride(0);
211 m_emulateMobileEnabled = false; 222 m_emulateMobileEnabled = false;
212 m_webViewImpl->setDefaultPageScaleLimits( 223 m_webViewImpl->setDefaultPageScaleLimits(
213 m_originalDefaultMinimumPageScaleFactor, 224 m_originalDefaultMinimumPageScaleFactor,
214 m_originalDefaultMaximumPageScaleFactor); 225 m_originalDefaultMaximumPageScaleFactor);
215 } 226 }
216 227
217 void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled) 228 void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled)
218 { 229 {
219 if (m_touchEventEmulationEnabled == enabled) 230 if (m_touchEventEmulationEnabled == enabled)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 m_lastPinchAnchorCss.clear(); 281 m_lastPinchAnchorCss.clear();
271 m_lastPinchAnchorDip.clear(); 282 m_lastPinchAnchorDip.clear();
272 } 283 }
273 return true; 284 return true;
274 } 285 }
275 286
276 return false; 287 return false;
277 } 288 }
278 289
279 } // namespace blink 290 } // namespace blink
OLDNEW
« 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