Moved FrameHost::setDefaultPageScaleLimits/UserAgentPageScaleConstraints

third_party/WebKit/Source/core/frame/FrameHost.cpp

 /*
  * Copyright (C) 2013 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/frame/FrameHost.h"
 
 #include "core/frame/BrowserControls.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/PageScaleConstraints.h"
-#include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/VisualViewport.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 
 namespace blink {
 
@@ skipping 101 matching lines @@
 #endif
 
 int FrameHost::subframeCount() const {
 #if DCHECK_IS_ON()
   checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame());
 #endif
   return m_subframeCount;
 }
 
 void FrameHost::setDefaultPageScaleLimits(float minScale, float maxScale) {
-  PageScaleConstraints newDefaults =
-      pageScaleConstraintsSet().defaultConstraints();
-  newDefaults.minimumScale = minScale;
-  newDefaults.maximumScale = maxScale;
-
-  if (newDefaults == pageScaleConstraintsSet().defaultConstraints())
-    return;
-
-  pageScaleConstraintsSet().setDefaultConstraints(newDefaults);
-  pageScaleConstraintsSet().computeFinalConstraints();
-  pageScaleConstraintsSet().setNeedsReset(true);
-
-  if (!page().mainFrame() || !page().mainFrame()->isLocalFrame())
-    return;
-
-  FrameView* rootView = page().deprecatedLocalMainFrame()->view();
-
-  if (!rootView)
-    return;
-
-  rootView->setNeedsLayout();
+  page().setDefaultPageScaleLimits(minScale, maxScale);
 }
 
 void FrameHost::setUserAgentPageScaleConstraints(
     const PageScaleConstraints& newConstraints) {
-  if (newConstraints == pageScaleConstraintsSet().userAgentConstraints())
-    return;
-
-  pageScaleConstraintsSet().setUserAgentConstraints(newConstraints);
-
-  if (!page().mainFrame() || !page().mainFrame()->isLocalFrame())
-    return;
-
-  FrameView* rootView = page().deprecatedLocalMainFrame()->view();
-
-  if (!rootView)
-    return;
-
-  rootView->setNeedsLayout();
+  page().setUserAgentPageScaleConstraints(newConstraints);
 }
 
 }  // namespace blink