Make it possibe to lock the fixedLayoutSize

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 361 matching lines @@
     , m_autofillClient(0)
     , m_permissionClient(0)
     , m_spellCheckClient(0)
     , m_passwordGeneratorClient(0)
     , m_chromeClientImpl(this)
     , m_contextMenuClientImpl(this)
     , m_dragClientImpl(this)
     , m_editorClientImpl(this)
     , m_inspectorClientImpl(this)
     , m_backForwardClientImpl(this)
+    , m_fixedLayoutSizeLock(false)
     , m_shouldAutoResize(false)
     , m_observedNewNavigation(false)
 #ifndef NDEBUG
     , m_newNavigationLoader(0)
 #endif
     , m_zoomLevel(0)
     , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
     , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
     , m_savedPageScaleFactor(0)
     , m_doubleTapZoomPageScaleFactor(0)
@@ skipping 1274 matching lines @@
         agentPrivate->webViewResized(newSize);
     if (!agentPrivate || !agentPrivate->metricsOverridden()) {
         WebFrameImpl* webFrame = mainFrameImpl();
         if (webFrame->frameView()) {
             webFrame->frameView()->resize(m_size);
             if (m_pinchViewports)
                 m_pinchViewports->setViewportSize(m_size);
         }
     }
 
-    if (settings()->viewportEnabled()) {
+    if (settings()->viewportEnabled() && !m_fixedLayoutSizeLock) {
         // Relayout immediately to recalculate the minimum scale limit.
         if (view->needsLayout())
             view->layout();
 
         if (shouldAnchorAndRescaleViewport) {
             float viewportWidthRatio = static_cast<float>(newSize.width) / oldSize.width;
             float contentsWidthRatio = static_cast<float>(contentsSize().width()) / oldContentsWidth;
             float scaleMultiplier = viewportWidthRatio / contentsWidthRatio;
 
             IntSize viewportSize = view->visibleContentRect().size();
@@ skipping 1270 matching lines @@
 
 void WebViewImpl::refreshPageScaleFactorAfterLayout()
 {
     if (!mainFrame() || !page() || !page()->mainFrame() || !page()->mainFrame()->view())
         return;
     FrameView* view = page()->mainFrame()->view();
 
     updatePageDefinedPageScaleConstraints(mainFrameImpl()->frame()->document()->viewportArguments());
     m_pageScaleConstraintsSet.computeFinalConstraints();
 
-    if (settings()->viewportEnabled()) {
+    if (settings()->viewportEnabled() && !m_fixedLayoutSizeLock) {
         int verticalScrollbarWidth = 0;
         if (view->verticalScrollbar() && !view->verticalScrollbar()->isOverlayScrollbar())
             verticalScrollbarWidth = view->verticalScrollbar()->width();
         m_pageScaleConstraintsSet.adjustFinalConstraintsToContentsSize(m_size, contentsSize(), verticalScrollbarWidth);
     }
 
     float newPageScaleFactor = pageScaleFactor();
     if (m_pageScaleConstraintsSet.needsReset() && m_pageScaleConstraintsSet.finalConstraints().initialScale != -1) {
         newPageScaleFactor = m_pageScaleConstraintsSet.finalConstraints().initialScale;
         m_pageScaleConstraintsSet.setNeedsReset(false);
@@ skipping 21 matching lines @@
         adjustedArguments.minHeight = adjustedArguments.maxHeight;
     }
     m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedArguments, m_size);
     m_pageScaleConstraintsSet.adjustForAndroidWebViewQuirks(adjustedArguments, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), settingsImpl()->supportDeprecatedTargetDensityDPI(), page()->settings().wideViewportQuirkEnabled(), page()->settings().useWideViewport(), page()->settings().loadWithOverviewMode());
 
     WebSize layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize);
 
     if (page()->settings().textAutosizingEnabled() && page()->mainFrame() && layoutSize.width != fixedLayoutSize().width)
         page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();
 
-    setFixedLayoutSize(layoutSize);
+    if (page()->mainFrame() && page()->mainFrame()->view() && !m_fixedLayoutSizeLock)
+        page()->mainFrame()->view()->setFixedLayoutSize(layoutSize);
 }
 
 IntSize WebViewImpl::contentsSize() const
 {
     RenderView* root = page()->mainFrame()->contentRenderer();
     if (!root)
         return IntSize();
     return root->documentRect().size();
 }
 
@@ skipping 68 matching lines @@
 
     return frame->view()->fixedLayoutSize();
 }
 
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
     if (!page())
         return;
 
     Frame* frame = page()->mainFrame();
-    if (!frame || !frame->view())
+    if (!frame)
         return;
 
-    frame->view()->setFixedLayoutSize(layoutSize);
+    FrameView* view = frame->view();
+    if (!view)
+        return;
+
+    m_fixedLayoutSizeLock = layoutSize.width || layoutSize.height;
+
+    if (m_fixedLayoutSizeLock)
+        view->setFixedLayoutSize(layoutSize);
+    else
+        view->setFixedLayoutSize(flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize));
 }
 
 void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
                                            const WebPoint& location)
 {
     HitTestResult result = hitTestResultForWindowPos(location);
     RefPtr<Node> node = result.innerNonSharedNode();
     if (!isHTMLVideoElement(node.get()) && !node->hasTagName(HTMLNames::audioTag))
         return;
 
@@ skipping 1001 matching lines @@
     //    the initial viewport width.
     // 2. The author has disabled viewport zoom.
 
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     return fixedLayoutSize().width == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace WebKit