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

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

Issue 1411103011: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526
Patch Set: Created 5 years, 1 month 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 | « content/test/data/resource_loading/resource_loading_non_mobile.html ('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/FrameHost.h" 8 #include "core/frame/FrameHost.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/Settings.h" 10 #include "core/frame/Settings.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 document->mediaQueryAffectingValueChanged(); 238 document->mediaQueryAffectingValueChanged();
239 } 239 }
240 240
241 void DevToolsEmulator::enableMobileEmulation() 241 void DevToolsEmulator::enableMobileEmulation()
242 { 242 {
243 if (m_emulateMobileEnabled) 243 if (m_emulateMobileEnabled)
244 return; 244 return;
245 m_emulateMobileEnabled = true; 245 m_emulateMobileEnabled = true;
246 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led(); 246 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led();
247 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 247 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
248 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
248 m_webViewImpl->enableViewport(); 249 m_webViewImpl->enableViewport();
249 m_webViewImpl->settings()->setViewportMetaEnabled(true); 250 m_webViewImpl->settings()->setViewportMetaEnabled(true);
250 m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars(); 251 m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
251 m_webViewImpl->settings()->setShrinksViewportContentToFit(true); 252 m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
252 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true); 253 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
253 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ; 254 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ;
254 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
255 m_webViewImpl->page()->settings().setPluginsEnabled(false); 255 m_webViewImpl->page()->settings().setPluginsEnabled(false);
256 m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse ); 256 m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse );
257 m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse); 257 m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse);
258 m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand); 258 m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand);
259 m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand); 259 m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand);
260 m_webViewImpl->setZoomFactorOverride(1); 260 m_webViewImpl->setZoomFactorOverride(1);
261 261
262 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor(); 262 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor();
263 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor(); 263 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor();
264 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5); 264 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 m_lastPinchAnchorCss.clear(); 344 m_lastPinchAnchorCss.clear();
345 m_lastPinchAnchorDip.clear(); 345 m_lastPinchAnchorDip.clear();
346 } 346 }
347 return true; 347 return true;
348 } 348 }
349 349
350 return false; 350 return false;
351 } 351 }
352 352
353 } // namespace blink 353 } // namespace blink
OLDNEW
« no previous file with comments | « content/test/data/resource_loading/resource_loading_non_mobile.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698