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

Unified Diff: third_party/WebKit/Source/web/WebSettingsImpl.cpp

Issue 1632983002: [DevTools] Do not reset scroll when emulating device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « third_party/WebKit/Source/web/WebSettingsImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebSettingsImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.cpp b/third_party/WebKit/Source/web/WebSettingsImpl.cpp
index 252512323161f1787e564572f46f58a75ecda802..737f0881ddadfba5e935fa144d9be3773e79c213 100644
--- a/third_party/WebKit/Source/web/WebSettingsImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSettingsImpl.cpp
@@ -52,7 +52,6 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings, DevToolsEmulator* devToolsE
, m_viewportMetaLayoutSizeQuirk(false)
, m_viewportMetaNonUserScalableQuirk(false)
, m_clobberUserAgentInitialScaleQuirk(false)
- , m_mainFrameResizesAreOrientationChanges(false)
{
ASSERT(settings);
}
@@ -695,7 +694,7 @@ bool WebSettingsImpl::mockGestureTapHighlightsEnabled() const
bool WebSettingsImpl::mainFrameResizesAreOrientationChanges() const
{
- return m_mainFrameResizesAreOrientationChanges;
+ return m_devToolsEmulator->mainFrameResizesAreOrientationChanges();
}
bool WebSettingsImpl::shrinksViewportContentToFit() const
@@ -781,7 +780,7 @@ void WebSettingsImpl::setUseSolidColorScrollbars(bool enabled)
void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled)
{
- m_mainFrameResizesAreOrientationChanges = enabled;
+ m_devToolsEmulator->setMainFrameResizesAreOrientationChanges(enabled);
}
void WebSettingsImpl::setV8CacheOptions(V8CacheOptions options)
« no previous file with comments | « third_party/WebKit/Source/web/WebSettingsImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698