Clear page-defined constraints when viewportEnabled setting becomes false.

third_party/WebKit/Source/web/DevToolsEmulator.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/DevToolsEmulator.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/page/Page.h"
@@ skipping 247 matching lines @@
         return;
     m_emulateMobileEnabled = true;
     m_isOverlayScrollbarsEnabled = RuntimeEnabledFeatures::overlayScrollbarsEnabled();
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
     m_isOrientationEventEnabled = RuntimeEnabledFeatures::orientationEventEnabled();
     RuntimeEnabledFeatures::setOrientationEventEnabled(true);
     m_isMobileLayoutThemeEnabled = RuntimeEnabledFeatures::mobileLayoutThemeEnabled();
     RuntimeEnabledFeatures::setMobileLayoutThemeEnabled(true);
     ComputedStyle::invalidateInitialStyle();
     m_webViewImpl->page()->settings().setUseMobileViewportStyle(true);
-    m_webViewImpl->enableViewport();
-    m_webViewImpl->settings()->setViewportMetaEnabled(true);
+    m_webViewImpl->page()->settings().setViewportEnabled(true);
+    m_webViewImpl->page()->settings().setViewportMetaEnabled(true);
     m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
     m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
     m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
     m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true);
     m_webViewImpl->page()->settings().setPluginsEnabled(false);
     m_webViewImpl->page()->settings().setAvailablePointerTypes(PointerTypeCoarse);
     m_webViewImpl->page()->settings().setPrimaryPointerType(PointerTypeCoarse);
     m_webViewImpl->page()->settings().setAvailableHoverTypes(HoverTypeOnDemand);
     m_webViewImpl->page()->settings().setPrimaryHoverType(HoverTypeOnDemand);
     m_webViewImpl->page()->settings().setResizeIsDeviceSizeChange(true);
     m_webViewImpl->setZoomFactorOverride(1);
 
     m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageScaleFactor();
     m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageScaleFactor();
     m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
     // TODO(dgozman): mainFrameImpl() is null when it's remote. Figure out how
     // we end up with enabling emulation in this case.
     if (m_webViewImpl->mainFrameImpl())
         m_webViewImpl->mainFrameImpl()->frameView()->layout();
 }
 
 void DevToolsEmulator::disableMobileEmulation()
 {
     if (!m_emulateMobileEnabled)
         return;
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEnabled);
     RuntimeEnabledFeatures::setOrientationEventEnabled(m_isOrientationEventEnabled);
     RuntimeEnabledFeatures::setMobileLayoutThemeEnabled(m_isMobileLayoutThemeEnabled);
     ComputedStyle::invalidateInitialStyle();
-    m_webViewImpl->disableViewport();
-    m_webViewImpl->settings()->setViewportMetaEnabled(false);
+    m_webViewImpl->page()->settings().setViewportEnabled(false);
+    m_webViewImpl->page()->settings().setViewportMetaEnabled(false);
     m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
     m_webViewImpl->settings()->setShrinksViewportContentToFit(false);
     m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAutosizingEnabled);
     m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_embedderPreferCompositingToLCDTextEnabled);
     m_webViewImpl->page()->settings().setUseMobileViewportStyle(m_embedderUseMobileViewport);
     m_webViewImpl->page()->settings().setPluginsEnabled(m_embedderPluginsEnabled);
     m_webViewImpl->page()->settings().setAvailablePointerTypes(m_embedderAvailablePointerTypes);
     m_webViewImpl->page()->settings().setPrimaryPointerType(m_embedderPrimaryPointerType);
     m_webViewImpl->page()->settings().setAvailableHoverTypes(m_embedderAvailableHoverTypes);
     m_webViewImpl->page()->settings().setPrimaryHoverType(m_embedderPrimaryHoverType);
@@ skipping 71 matching lines @@
             m_lastPinchAnchorCss.clear();
             m_lastPinchAnchorDip.clear();
         }
         return true;
     }
 
     return false;
 }
 
 } // namespace blink