Refactor fixed layout mode

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 1700 matching lines @@
 
     m_size = newSize;
 
     bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled() && oldSize.width && oldContentsWidth && newSize.width != oldSize.width;
     ViewportAnchor viewportAnchor(mainFrameImpl()->frame()->eventHandler());
     if (shouldAnchorAndRescaleViewport) {
         viewportAnchor.setAnchor(view->visibleContentRect(),
                                  FloatSize(viewportAnchorXCoord, viewportAnchorYCoord));
     }
 
-    // Set the fixed layout size from the viewport constraints before resizing.
-    updatePageDefinedPageScaleConstraints(mainFrameImpl()->frame()->document()->viewportArguments());
+    updateMainFrameLayoutSize();

[aelias_OOO_until_Jul13, 2013/10/01 05:09:30]

Please call:

updatePageDefinedViewportConstraints();
updateMainFrameLayoutSize();

They are logically distinct in my mind (viewport size is an input to viewport
tag calculation, then layout can happen after that).

[bokan, 2013/10/02 17:44:01]

Done.

 
     WebDevToolsAgentPrivate* agentPrivate = devToolsAgentPrivate();
     if (agentPrivate)
         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() && !m_fixedLayoutSizeLock) {
         // Relayout immediately to recalculate the minimum scale limit.
         if (view->needsLayout())
             view->layout();

[aelias_OOO_until_Jul13, 2013/10/01 05:09:30]

Could you delete this layout call?  It should no longer be necessary.

[bokan, 2013/10/02 17:44:01]

Why is that so? None of the calls I added above will cause a layout. Removing
this here breaks page scale related unit tests.

 
         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) {
                 float newPageScaleFactor = oldPageScaleFactor * scaleMultiplier;
                 viewportSize.scale(pageScaleFactor() / newPageScaleFactor);
@@ skipping 1170 matching lines @@
 {
     if (!page())
         return;
 
     page()->setDeviceScaleFactor(scaleFactor);
 
     if (m_layerTreeView)
         m_layerTreeView->setDeviceScaleFactor(scaleFactor);
 }
 
-bool WebViewImpl::isFixedLayoutModeEnabled() const
-{
-    if (!page())
-        return false;
-
-    Frame* frame = page()->mainFrame();
-    if (!frame || !frame->view())
-        return false;
-
-    return frame->view()->useFixedLayout();
-}
-
-void WebViewImpl::enableFixedLayoutMode(bool enable)
-{
-    if (!page())
-        return;
-
-    Frame* frame = page()->mainFrame();
-    if (!frame || !frame->view())
-        return;
-
-    frame->view()->setUseFixedLayout(enable);
-
-    if (m_isAcceleratedCompositingActive)
-        updateLayerTreeViewport();
-}
-
-
 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& maxSize)
 {
     m_shouldAutoResize = true;
     m_minAutoSize = minSize;
     m_maxAutoSize = maxSize;
     configureAutoResizeMode();
 }
 
 void WebViewImpl::disableAutoResizeMode()
 {
@@ skipping 46 matching lines @@
     }
     setUserAgentPageScaleConstraints(constraints);
 }
 
 void WebViewImpl::refreshPageScaleFactorAfterLayout()
 {
     if (!mainFrame() || !page() || !page()->mainFrame() || !page()->mainFrame()->view())
         return;
     FrameView* view = page()->mainFrame()->view();
 
-    updatePageDefinedPageScaleConstraints(mainFrameImpl()->frame()->document()->viewportArguments());
+    updatePageDefinedViewportConstraints(mainFrameImpl()->frame()->document()->viewportArguments());
     m_pageScaleConstraintsSet.computeFinalConstraints();
 
     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);
     }
     setPageScaleFactorPreservingScrollOffset(newPageScaleFactor);
 
     updateLayerTreeViewport();
 
     // Relayout immediately to avoid violating the rule that needsLayout()
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 }
 
-void WebViewImpl::updatePageDefinedPageScaleConstraints(const ViewportArguments& arguments)
+void WebViewImpl::updatePageDefinedViewportConstraints(const ViewportArguments& arguments)
 {
-    if (!settings()->viewportEnabled() || !isFixedLayoutModeEnabled() || !page() || !m_size.width || !m_size.height)
+    if (!settings()->viewportEnabled() || !page() || !m_size.width || !m_size.height)
         return;
 
     ViewportArguments adjustedArguments = arguments;
     if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedArguments.type == ViewportArguments::ViewportMeta) {
         if (adjustedArguments.maxWidth.type() == ExtendToZoom)
             adjustedArguments.maxWidth = Length(); // auto
         adjustedArguments.minWidth = adjustedArguments.maxWidth;
         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)
+    if (page()->settings().textAutosizingEnabled() && page()->mainFrame() && layoutSize.width != page()->mainFrame()->view()->layoutSize().width())
         page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();

[aelias_OOO_until_Jul13, 2013/10/01 05:09:30]

Please move this line into updateMainFrameLayoutSize.

[bokan, 2013/10/02 17:44:01]

Done.

 
     if (page()->mainFrame() && page()->mainFrame()->view() && !m_fixedLayoutSizeLock)
-        page()->mainFrame()->view()->setFixedLayoutSize(layoutSize);
+        page()->mainFrame()->view()->setLayoutSize(layoutSize);

[aelias_OOO_until_Jul13, 2013/10/01 05:09:30]

Just call updateMainFrameLayoutSize from here instead.

[bokan, 2013/10/02 17:44:01]

Done.

+}
+
+void WebViewImpl::updateMainFrameLayoutSize()
+{
+    FrameView* view = mainFrameImpl()->frameView();
+    if (!view)
+        return;
+
+    if (!settings()->viewportEnabled() && !m_fixedLayoutSizeLock)
+        view->setLayoutSize(m_size);
+    else
+        updatePageDefinedViewportConstraints(mainFrameImpl()->frame()->document()->viewportArguments());

[aelias_OOO_until_Jul13, 2013/10/01 05:09:30]

I don't like going into complex viewport tag processing code from this method. 
It should just apply the value that the viewport code calculated previously
instead.  Please restructure like:

if (m_fixedLayoutSizeLock)
  return;

if (settings()->viewportEnabled())
 
view->setLayoutSize(flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize));
else
  view->setLayoutSize(m_size);

[bokan, 2013/10/02 17:44:01]

Done.

 }
 
 IntSize WebViewImpl::contentsSize() const
 {
     RenderView* root = page()->mainFrame()->contentRenderer();
     if (!root)
         return IntSize();
     return root->documentRect().size();
 }
 
@@ skipping 50 matching lines @@
     page()->mainFrame()->loader()->history()->saveDocumentAndScrollState();
     page()->mainFrame()->loader()->history()->clearScrollPositionAndViewState();
     m_pageScaleConstraintsSet.setNeedsReset(true);
 
     // Clobber saved scales and scroll offsets.
     if (FrameView* view = page()->mainFrame()->document()->view())
         view->cacheCurrentScrollPosition();
     resetSavedScrollAndScaleState();
 }
 
-WebSize WebViewImpl::fixedLayoutSize() const
-{
-    if (!page())
-        return WebSize();
-
-    Frame* frame = page()->mainFrame();
-    if (!frame || !frame->view())
-        return WebSize();
-
-    return frame->view()->fixedLayoutSize();
-}
-
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
     if (!page())
         return;
 
     Frame* frame = page()->mainFrame();
     if (!frame)
         return;
 
     FrameView* view = frame->view();
     if (!view)
         return;
 
     m_fixedLayoutSizeLock = layoutSize.width || layoutSize.height;
 
     if (m_fixedLayoutSizeLock)
-        view->setFixedLayoutSize(layoutSize);
+        view->setLayoutSize(layoutSize);
     else
-        view->setFixedLayoutSize(flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize));
+        updateMainFrameLayoutSize();
 }
 
 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 999 matching lines @@
     const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
 
     if (page())
         page()->pointerLockController().dispatchLockedMouseEvent(
             PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent),
             eventType);
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
-    if (!settings()->viewportEnabled() || !isFixedLayoutModeEnabled())
+    if (!settings()->viewportEnabled())
         return false;
 
     // A document is considered adapted to small screen UAs if one of these holds:
     // 1. The author specified viewport has a constrained width that is equal to
     //    the initial viewport width.
     // 2. The author has disabled viewport zoom.
 
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
-    return fixedLayoutSize().width == m_size.width
+    if (!mainFrameImpl() || !mainFrameImpl()->frameView())
+        return false;
+
+    return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace WebKit