Insert pinch zoom virtual viewport layers to graphics layer tree.

Source/WebKit/chromium/src/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 39 matching lines @@
 #include "AutofillPopupMenuClient.h"
 #include "CSSValueKeywords.h"
 #include "CompositionUnderlineVectorBuilder.h"
 #include "ContextFeaturesClientImpl.h"
 #include "DeviceOrientationClientProxy.h"
 #include "GeolocationClientProxy.h"
 #include "GraphicsLayerFactoryChromium.h"
 #include "HTMLNames.h"
 #include "LinkHighlight.h"
 #include "PageWidgetDelegate.h"
+#include "PinchViewports.h"
 #include "PopupContainer.h"
 #include "PrerendererClientImpl.h"
 #include "SpeechInputClientImpl.h"
 #include "SpeechRecognitionClientProxy.h"
 #include "TextFieldDecoratorImpl.h"
 #include "ValidationMessageClientImpl.h"
 #include "ViewportAnchor.h"
 #include "WebAccessibilityObject.h"
 #include "WebActiveWheelFlingParameters.h"
 #include "WebAutofillClient.h"
@@ skipping 72 matching lines @@
 #include "core/platform/graphics/Extensions3D.h"
 #include "core/platform/graphics/FontCache.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/Image.h"
 #include "core/platform/graphics/ImageBuffer.h"
 #include "core/platform/graphics/chromium/LayerPainterChromium.h"
 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h"
 #include "core/platform/network/ResourceHandle.h"
-#include "core/rendering/RenderLayerCompositor.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/RenderWidget.h"
 #include "core/rendering/TextAutosizer.h"
 #include "modules/geolocation/GeolocationController.h"
 #include "weborigin/SchemeRegistry.h"
 #include "weborigin/SecurityOrigin.h"
 #include "weborigin/SecurityPolicy.h"
 #include "painting/ContinuousPainter.h"
 
 #if ENABLE(DEFAULT_RENDER_THEME)
@@ skipping 1442 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())
+        if (webFrame->frameView()) {
             webFrame->frameView()->resize(m_size);
+            if (m_pinchViewports)
+                m_pinchViewports->setViewportSize(FloatSize(m_size.width, m_size.height));

[jamesr, 2013/06/17 22:16:34]

this appears to be the only caller to setViewportSize(), so what makes sure the
viewport size is set if compositing mode is entered without a resize?

why is this a FloatSize if the size is always an int?

[wjmaclean, 2013/06/18 14:10:53]

Thus far my observation is that we always seem to get a resize, but I can add
this to setRootGraphicsLayer() as well.
GraphicsLayer::setSize() requires FloatRect, and it seemed easier to convert it
here, but I've moved this conversion into PinchViewport.cpp.

+        }
     }
 
     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;
@@ skipping 2181 matching lines @@
 
 bool WebViewImpl::allowsAcceleratedCompositing()
 {
     return !m_compositorCreationFailed;
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     suppressInvalidations(true);
 
-    m_rootGraphicsLayer = layer;
-    m_rootLayer = layer ? layer->platformLayer() : 0;
+    if (page()->settings()->pinchVirtualViewportEnabled() && !m_pinchViewports)
+        m_pinchViewports = PinchViewports::create(this);
+
+    if (m_pinchViewports) {
+        m_pinchViewports->setOverflowControlsHostLayer(layer);
+        if (layer) {
+            m_rootGraphicsLayer = m_pinchViewports->rootGraphicsLayer();
+            m_rootLayer = m_pinchViewports->rootGraphicsLayer()->platformLayer();
+            m_pinchViewports->registerViewportLayersWithTreeView(m_layerTreeView);
+        } else {
+            m_rootGraphicsLayer = 0;
+            m_rootLayer = 0;
+            m_pinchViewports->clearViewportLayersForTreeView(m_layerTreeView);
+        }
+    } else {
+        m_rootGraphicsLayer = layer;
+        m_rootLayer = layer ? layer->platformLayer() : 0;
+    }
+
 
     setIsAcceleratedCompositingActive(layer);
 
     if (m_layerTreeView) {
         if (m_rootLayer)
             m_layerTreeView->setRootLayer(*m_rootLayer);
         else
             m_layerTreeView->clearRootLayer();
     }
 
@@ skipping 17 matching lines @@
         updateLayerTreeViewport();
     } else if (m_client)
         m_client->didInvalidateRect(rect);
 }
 
 WebCore::GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const
 {
     return m_graphicsLayerFactory.get();
 }
 
+WebCore::RenderLayerCompositor* WebViewImpl::compositor() const
+{
+    if (!page()
+        || !page()->mainFrame()
+        || !page()->mainFrame()->document()
+        || !page()->mainFrame()->document()->renderView())
+        return 0;
+    return page()->mainFrame()->document()->renderView()->compositor();
+}
+
 void WebViewImpl::registerForAnimations(WebLayer* layer)
 {
     if (m_layerTreeView)
         m_layerTreeView->registerForAnimations(layer);
 }
 
 WebCore::GraphicsLayer* WebViewImpl::rootGraphicsLayer()
 {
     return m_rootGraphicsLayer;
 }
@@ skipping 229 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