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

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

Issue 1392213002: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added doctype Created 5 years, 2 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 | « 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 document->mediaQueryAffectingValueChanged(); 230 document->mediaQueryAffectingValueChanged();
231 } 231 }
232 232
233 void DevToolsEmulator::enableMobileEmulation() 233 void DevToolsEmulator::enableMobileEmulation()
234 { 234 {
235 if (m_emulateMobileEnabled) 235 if (m_emulateMobileEnabled)
236 return; 236 return;
237 m_emulateMobileEnabled = true; 237 m_emulateMobileEnabled = true;
238 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led(); 238 m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnab led();
239 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 239 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
240 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
240 m_webViewImpl->enableViewport(); 241 m_webViewImpl->enableViewport();
241 m_webViewImpl->settings()->setViewportMetaEnabled(true); 242 m_webViewImpl->settings()->setViewportMetaEnabled(true);
242 m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars(); 243 m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
243 m_webViewImpl->settings()->setShrinksViewportContentToFit(true); 244 m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
244 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true); 245 m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
245 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ; 246 m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true) ;
246 m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
247 m_webViewImpl->page()->settings().setPluginsEnabled(false); 247 m_webViewImpl->page()->settings().setPluginsEnabled(false);
248 m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse ); 248 m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse );
249 m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse); 249 m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse);
250 m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand); 250 m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand);
251 m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand); 251 m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand);
252 m_webViewImpl->setZoomFactorOverride(1); 252 m_webViewImpl->setZoomFactorOverride(1);
253 253
254 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor(); 254 m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageS caleFactor();
255 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor(); 255 m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageS caleFactor();
256 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5); 256 m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 m_lastPinchAnchorCss.clear(); 336 m_lastPinchAnchorCss.clear();
337 m_lastPinchAnchorDip.clear(); 337 m_lastPinchAnchorDip.clear();
338 } 338 }
339 return true; 339 return true;
340 } 340 }
341 341
342 return false; 342 return false;
343 } 343 }
344 344
345 } // namespace blink 345 } // 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