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 1641 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));
     }
 
+    // If we're on a desktop style platform, we want to keep the page's layout
+    // size fixed to the size of the WebViewImpl. Desktop-style is indicated
+    // by layoutFallbackWidth == 0
+    if (page() && !page()->settings().layoutFallbackWidth())

[kenneth.r.christiansen, 2013/09/05 07:54:24]

With the move to using @viewport rules internally, layoutFallbackWidth will go
away at some point

+        view->setLayoutSize(m_size);
+
     // 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);
@@ skipping 1189 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);
+    page()->settings().setLayoutFallbackWidth(enable ? 980 : 0);

[kenneth.r.christiansen, 2013/09/05 08:03:07]

Hmm... I hope noone are overriding it then. This is pretty much a hack and no
FIXME or explanation.

[bokan, 2013/09/05 20:03:36]

Yes, this is a hack to keep the tests working. I'll add a note about this,
however, on the comment above about layoutFallbackWidth eventually going away,
we need some way to signal to the WebView how we want the FrameView resizing to
behave. On desktop we want to resize the layoutSize on each WebView::resize()
while on mobile we don't. aelias originally suggested tying this to
layoutFallbackWidth == 0 but it seems we need something else. Is there already
something we can use or should we add a new flag/setting (something like
'fixLayoutSizeToWindowSize')

 
     if (m_isAcceleratedCompositingActive)
         updateLayerTreeViewport();
 }
 
 
 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& maxSize)
 {
     m_shouldAutoResize = true;
     m_minAutoSize = minSize;
@@ skipping 79 matching lines @@
     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)
 {
-    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)
         adjustedArguments.type = ViewportArguments::ViewportMetaLayoutSizeQuirk;
     m_pageScaleConstraintsSet.updatePageDefinedConstraints(adjustedArguments, m_size, page()->settings().layoutFallbackWidth());
 
     if (settingsImpl()->supportDeprecatedTargetDensityDPI())
         m_pageScaleConstraintsSet.adjustPageDefinedConstraintsForAndroidWebView(adjustedArguments, m_size, page()->settings().layoutFallbackWidth(), deviceScaleFactor(), 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();
 
-    setFixedLayoutSize(layoutSize);
+    setLayoutSize(layoutSize);
 }
 
 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)
 {
+    setLayoutSize(layoutSize);
+}
+
+void WebViewImpl::setLayoutSize(const WebSize& layoutSize)
+{
     if (!page())
         return;
 
     Frame* frame = page()->mainFrame();
     if (!frame || !frame->view())
         return;
 
-    frame->view()->setFixedLayoutSize(layoutSize);
+    frame->view()->setLayoutSize(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 994 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