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

Side by Side Diff: Source/web/DevToolsEmulator.cpp

Issue 1062333002: Don't enable @viewport support in inspector emulation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « Source/web/DevToolsEmulator.h ('k') | no next file » | 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 } // namespace 46 } // namespace
47 47
48 namespace blink { 48 namespace blink {
49 49
50 DevToolsEmulator::DevToolsEmulator(WebViewImpl* webViewImpl) 50 DevToolsEmulator::DevToolsEmulator(WebViewImpl* webViewImpl)
51 : m_webViewImpl(webViewImpl) 51 : m_webViewImpl(webViewImpl)
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_originalViewportEnabled(false)
56 , m_isOverlayScrollbarsEnabled(false) 55 , m_isOverlayScrollbarsEnabled(false)
57 , m_originalDefaultMinimumPageScaleFactor(0) 56 , m_originalDefaultMinimumPageScaleFactor(0)
58 , m_originalDefaultMaximumPageScaleFactor(0) 57 , m_originalDefaultMaximumPageScaleFactor(0)
59 , m_embedderTextAutosizingEnabled(webViewImpl->page()->settings().textAutosi zingEnabled()) 58 , m_embedderTextAutosizingEnabled(webViewImpl->page()->settings().textAutosi zingEnabled())
60 , m_embedderDeviceScaleAdjustment(webViewImpl->page()->settings().deviceScal eAdjustment()) 59 , m_embedderDeviceScaleAdjustment(webViewImpl->page()->settings().deviceScal eAdjustment())
61 , m_embedderPreferCompositingToLCDTextEnabled(webViewImpl->page()->settings( ).preferCompositingToLCDTextEnabled()) 60 , m_embedderPreferCompositingToLCDTextEnabled(webViewImpl->page()->settings( ).preferCompositingToLCDTextEnabled())
62 , m_embedderUseMobileViewport(webViewImpl->page()->settings().useMobileViewp ortStyle()) 61 , m_embedderUseMobileViewport(webViewImpl->page()->settings().useMobileViewp ortStyle())
63 , m_touchEventEmulationEnabled(false) 62 , m_touchEventEmulationEnabled(false)
64 , m_doubleTapToZoomEnabled(false) 63 , m_doubleTapToZoomEnabled(false)
65 , m_originalTouchEnabled(false) 64 , m_originalTouchEnabled(false)
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 174 }
176 } 175 }
177 176
178 void DevToolsEmulator::enableMobileEmulation() 177 void DevToolsEmulator::enableMobileEmulation()
179 { 178 {
180 if (m_emulateMobileEnabled) 179 if (m_emulateMobileEnabled)
181 return; 180 return;
182 m_emulateMobileEnabled = true; 181 m_emulateMobileEnabled = true;
183 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led(); 182 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led();
184 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 183 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
185 m_originalViewportEnabled = RuntimeEnabledFeatures::cssViewportEnabled();
186 RuntimeEnabledFeatures::setCSSViewportEnabled(true);
187 m_webViewImpl->enableViewport(); 184 m_webViewImpl->enableViewport();
188 m_webViewImpl->settings()->setViewportMetaEnabled(true); 185 m_webViewImpl->settings()->setViewportMetaEnabled(true);
189 m_webViewImpl->settings()->setShrinksViewportContentToFit(true); 186 m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
190 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true); 187 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
191 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ; 188 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ;
192 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true); 189 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
193 m_webViewImpl->setZoomFactorOverride(1); 190 m_webViewImpl->setZoomFactorOverride(1);
194 191
195 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor(); 192 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor();
196 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor(); 193 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor();
197 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5); 194 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
198 } 195 }
199 196
200 void DevToolsEmulator::disableMobileEmulation() 197 void DevToolsEmulator::disableMobileEmulation()
201 { 198 {
202 if (!m_emulateMobileEnabled) 199 if (!m_emulateMobileEnabled)
203 return; 200 return;
204 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna bled); 201 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEna bled);
205 RuntimeEnabledFeatures::setCSSViewportEnabled(m_originalViewportEnabled);
206 m_webViewImpl->disableViewport(); 202 m_webViewImpl->disableViewport();
207 m_webViewImpl->settings()->setViewportMetaEnabled(false); 203 m_webViewImpl->settings()->setViewportMetaEnabled(false);
208 m_webViewImpl->settings()->setShrinksViewportContentToFit(false); 204 m_webViewImpl->settings()->setShrinksViewportContentToFit(false);
209 m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAut osizingEnabled); 205 m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAut osizingEnabled);
210 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_emb edderPreferCompositingToLCDTextEnabled); 206 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_emb edderPreferCompositingToLCDTextEnabled);
211 m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMob ileViewport); 207 m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMob ileViewport);
212 m_webViewImpl->setZoomFactorOverride(0); 208 m_webViewImpl->setZoomFactorOverride(0);
213 m_emulateMobileEnabled = false; 209 m_emulateMobileEnabled = false;
214 m_webViewImpl->setDefaultPageScaleLimits( 210 m_webViewImpl->setDefaultPageScaleLimits(
215 m_originalDefaultMinimumPageScaleFactor, 211 m_originalDefaultMinimumPageScaleFactor,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 m_lastPinchAnchorCss.clear(); 268 m_lastPinchAnchorCss.clear();
273 m_lastPinchAnchorDip.clear(); 269 m_lastPinchAnchorDip.clear();
274 } 270 }
275 return true; 271 return true;
276 } 272 }
277 273
278 return false; 274 return false;
279 } 275 }
280 276
281 } // namespace blink 277 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/DevToolsEmulator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698