Enabled using viewport on desktop browsers behind experimental flag

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 1579 matching lines @@
     FrameView* view = mainFrameImpl()->frameView();
     if (!view)
         return;
 
     WebSize oldSize = m_size;
     float oldPageScaleFactor = pageScaleFactor();
     int oldContentsWidth = contentsSize().width();
 
     m_size = newSize;
 
-    bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled() && oldSize.width && oldContentsWidth;
+    // On devices where resizes come from screen rotation, we want to anchor the scroll
+    // when we resize
+    bool shouldAnchorAndRescaleViewport = settings()->viewportEnabled()
+        && settings()->anchorScrollPositionOnResize() && oldSize.width && oldContentsWidth;
+
     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.
+    // Set the 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);
             if (m_pinchViewports)
@@ skipping 1297 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 63 matching lines @@
         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);
 
+    // Destroying the frameView turns off forced compositing mode, in the case or a refresh it wont get turned
+    // back on because we don't set a new page scale so we make sure it's on here
+    if (pageScaleFactor() && pageScaleFactor() != 1)
+        enterForceCompositingMode(true);

[aelias_OOO_until_Jul13, 2013/07/31 22:31:21]

This doesn't feel like the right place to put this.  Maybe do it when the new
FrameView is constructed?

+
     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;
 
     m_pageScaleConstraintsSet.updatePageDefinedConstraints(arguments, m_size, page()->settings()->layoutFallbackWidth());
 
     if (settingsImpl()->supportDeprecatedTargetDensityDPI())
         m_pageScaleConstraintsSet.adjustPageDefinedConstraintsForAndroidWebView(arguments, m_size, page()->settings()->layoutFallbackWidth(), deviceScaleFactor(), page()->settings()->useWideViewport(), page()->settings()->loadWithOverviewMode());
 
-    WebSize layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize);
+    if (!m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize.isEmpty()) {
+        WebSize layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize);
 
-    if (page()->settings() && page()->settings()->textAutosizingEnabled() && page()->mainFrame()
-        && layoutSize.width != fixedLayoutSize().width)
-            page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();
+        if (page()->settings() && page()->settings()->textAutosizingEnabled() && page()->mainFrame()
+            && layoutSize.width != fixedLayoutSize().width)
+                page()->mainFrame()->document()->textAutosizer()->recalculateMultipliers();
 
-    setFixedLayoutSize(layoutSize);
+        setFixedLayoutSize(layoutSize);
+    }
 }
 
 IntSize WebViewImpl::contentsSize() const
 {
     RenderView* root = page()->mainFrame()->contentRenderer();
     if (!root)
         return IntSize();
     return root->documentRect().size();
 }
 
@@ skipping 59 matching lines @@
 
 WebSize WebViewImpl::fixedLayoutSize() const
 {
     if (!page())
         return WebSize();
 
     Frame* frame = page()->mainFrame();
     if (!frame || !frame->view())
         return WebSize();
 
-    return frame->view()->fixedLayoutSize();
+    return frame->view()->layoutSize();
 }
 
 void WebViewImpl::setFixedLayoutSize(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 986 matching lines @@
             eventType);
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
     return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
         || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
 }
 
+bool WebViewImpl::useDesktopStyleLayoutResizing()
+{
+    if (!page())
+        return true;
+
+    return !page()->settings()->layoutFallbackWidth();
+}
+
 } // namespace WebKit