Clear page-defined constraints when viewportEnabled setting becomes false.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3292 matching lines @@
 
 void WebViewImpl::updatePageDefinedViewportConstraints(const ViewportDescription& description)
 {
     // If we're not reading the viewport meta tag, allow GPU rasterization.
     if (!settingsImpl()->viewportMetaEnabled()) {
         m_matchesHeuristicsForGpuRasterization = true;
         if (m_layerTreeView)
             m_layerTreeView->heuristicsForGpuRasterizationUpdated(m_matchesHeuristicsForGpuRasterization);
     }
 
-    if (!settings()->viewportEnabled() || !page() || (!m_size.width && !m_size.height) || !page()->mainFrame()->isLocalFrame())
+    if (!page() || (!m_size.width && !m_size.height) || !page()->mainFrame()->isLocalFrame())
         return;
 
+    if (!settings()->viewportEnabled()) {
+        pageScaleConstraintsSet().clearPageDefinedConstraints();
+        updateMainFrameLayoutSize();
+        return;
+    }
+
     Document* document = page()->deprecatedLocalMainFrame()->document();
 
     m_matchesHeuristicsForGpuRasterization = description.matchesHeuristicsForGpuRasterization();
     if (m_layerTreeView)
         m_layerTreeView->heuristicsForGpuRasterizationUpdated(m_matchesHeuristicsForGpuRasterization);
 
     Length defaultMinWidth = document->viewportDefaultMinWidth();
     if (defaultMinWidth.isAuto())
         defaultMinWidth = Length(ExtendToZoom);
 
@@ skipping 80 matching lines @@
 
     Document* document = m_page->mainFrame()->isLocalFrame() ? m_page->deprecatedLocalMainFrame()->document() : nullptr;
     if (!document || !document->layoutView() || !document->documentElement() || !document->documentElement()->layoutBox())
         return WebSize();
 
     int widthScaled = document->layoutView()->minPreferredLogicalWidth().round(); // Already accounts for zoom.
     int heightScaled = document->documentElement()->layoutBox()->scrollHeight().round();
     return IntSize(widthScaled, heightScaled);
 }
 
-void WebViewImpl::enableViewport()
-{
-    settings()->setViewportEnabled(true);
-}
-
-void WebViewImpl::disableViewport()
-{
-    settings()->setViewportEnabled(false);
-    pageScaleConstraintsSet().clearPageDefinedConstraints();
-    updateMainFrameLayoutSize();
-}
-
 float WebViewImpl::defaultMinimumPageScaleFactor() const
 {
     return pageScaleConstraintsSet().defaultConstraints().minimumScale;
 }
 
 float WebViewImpl::defaultMaximumPageScaleFactor() const
 {
     return pageScaleConstraintsSet().defaultConstraints().maximumScale;
 }
 
@@ skipping 1137 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink