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 1651 matching lines @@
     // Set the fixed layout size from the viewport constraints before resizing.
     updatePageDefinedPageScaleConstraints(mainFrameImpl()->frame()->document()->viewportArguments());
 
     WebDevToolsAgentPrivate* agentPrivate = devToolsAgentPrivate();
     if (agentPrivate)
         agentPrivate->webViewResized(newSize);
     if (!agentPrivate || !agentPrivate->metricsOverridden()) {
         WebFrameImpl* webFrame = mainFrameImpl();
         if (webFrame->frameView()) {
             webFrame->frameView()->resize(m_size);
+

[aelias_OOO_until_Jul13, 2013/09/06 23:11:18]

nit: unnecessary newline diff

[mkosiba (inactive), 2013/09/10 09:11:31]

Done.

             if (m_pinchViewports)
                 m_pinchViewports->setViewportSize(m_size);
         }
     }
 
     if (settings()->viewportEnabled()) {
         // 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();
-            if (scaleMultiplier != 1) {
+            if (scaleMultiplier != 1 && !fixedLayoutSizeLock()) {

[aelias_OOO_until_Jul13, 2013/09/06 23:11:18]

I don't think you want the else clause of this code either.  You just want the
scroll offset to stay at zero without any fancy business.  I suggest moving this
condition up to:

bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled() &&
!fixedLayoutSizeLock() && ...

[mkosiba (inactive), 2013/09/10 09:11:31]

Done.

                 float newPageScaleFactor = oldPageScaleFactor * scaleMultiplier;
                 viewportSize.scale(pageScaleFactor() / newPageScaleFactor);
                 IntPoint scrollOffsetAtNewScale = viewportAnchor.computeOrigin(viewportSize);
                 setPageScaleFactor(newPageScaleFactor, scrollOffsetAtNewScale);
             } else {
                 IntPoint scrollOffsetAtNewScale = clampOffsetAtScale(viewportAnchor.computeOrigin(viewportSize), pageScaleFactor());
                 updateMainFrameScrollPosition(scrollOffsetAtNewScale, false);
             }
         }
     }
@@ skipping 1259 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() && !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 104 matching lines @@
 
     Frame* frame = page()->mainFrame();
     if (!frame || !frame->view())
         return WebSize();
 
     return frame->view()->fixedLayoutSize();
 }
 
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
+    if (fixedLayoutSizeLock())
+        return;
+
     if (!page())
         return;
 
     Frame* frame = page()->mainFrame();
     if (!frame || !frame->view())
         return;
 
     frame->view()->setFixedLayoutSize(layoutSize);
 }
 
+void WebViewImpl::setFixedLayoutSizeLock(bool enable)
+{
+    Frame* frame = page()->mainFrame();
+    if (!frame || !frame->view())
+        return;
+    frame->view()->setFixedLayoutSizeLock(enable);
+}
+
+bool WebViewImpl::fixedLayoutSizeLock() const
+{
+    Frame* frame = page()->mainFrame();
+    if (!frame || !frame->view())
+        return false;
+    return frame->view()->fixedLayoutSizeLock();
+}
+
 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;
 
     RefPtr<HTMLMediaElement> mediaElement =
         static_pointer_cast<HTMLMediaElement>(node);
@@ skipping 992 matching lines @@
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
     return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
         || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
 }
 
 } // namespace WebKit