Remove pinch viewports.

sky/engine/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 31 matching lines @@
 #include "core/editing/HTMLInterchange.h"
 #include "core/editing/InputMethodController.h"
 #include "core/editing/TextIterator.h"
 #include "core/editing/markup.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
-#include "core/frame/PinchViewport.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/ime/InputMethodContext.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/UniqueIdentifier.h"
 #include "core/page/Chrome.h"
 #include "core/page/EventHandler.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
@@ skipping 873 matching lines @@
 void WebViewImpl::willStartLiveResize()
 {
     // FIXME(sky): Remove
 }
 
 WebSize WebViewImpl::size()
 {
     return m_size;
 }
 
-void WebViewImpl::resizePinchViewport(const WebSize& newSize)
-{
-    if (!pinchVirtualViewportEnabled())
-        return;
-
-    page()->frameHost().pinchViewport().setSize(newSize);
-}
-
 WebLocalFrameImpl* WebViewImpl::localFrameRootTemporary() const
 {
     // FIXME(sky): remove
     return WebLocalFrameImpl::fromFrame(page()->mainFrame());
 }
 
 void WebViewImpl::performResize()
 {
     updatePageDefinedViewportConstraints(localFrameRootTemporary()->frame()->document()->viewportDescription());
     updateMainFrameLayoutSize();
 
     // If the virtual viewport pinch mode is enabled, the main frame will be resized
     // after layout so it can be sized to the contentsSize.
-    if (!pinchVirtualViewportEnabled() && localFrameRootTemporary()->frameView())
+    if (localFrameRootTemporary()->frameView())
         localFrameRootTemporary()->frameView()->resize(m_size);
-
-    if (pinchVirtualViewportEnabled())
-        page()->frameHost().pinchViewport().setSize(m_size);
 }
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
     if (m_size == newSize)
         return;
 
     FrameView* view = localFrameRootTemporary()->frameView();
     if (!view)
         return;
@@ skipping 509 matching lines @@
             selectedRange->endContainer(),
             selectedRange->endOffset(),
             selectedRange->endContainer(),
             selectedRange->endOffset());
         focus = localFrame->editor().firstRectForRange(range.get());
     }
 
     IntRect scaledAnchor(localFrame->view()->contentsToWindow(anchor));
     IntRect scaledFocus(localFrame->view()->contentsToWindow(focus));
 
-    if (pinchVirtualViewportEnabled()) {
-        // FIXME(http://crbug.com/371902) - We shouldn't have to do this
-        // manually, the contentsToWindow methods above should be fixed to do
-        // this.
-        IntPoint pinchViewportOffset =
-            roundedIntPoint(page()->frameHost().pinchViewport().visibleRect().location());
-        scaledAnchor.moveBy(-pinchViewportOffset);
-        scaledFocus.moveBy(-pinchViewportOffset);
-    }
-
     anchor = scaledAnchor;
     focus = scaledFocus;
 
     if (!selection.selection().isBaseFirst())
         std::swap(anchor, focus);
     return true;
 }
 
 InputMethodContext* WebViewImpl::inputMethodContext()
 {
@@ skipping 223 matching lines @@
         localFrame->selection().clear();
 }
 
 void WebViewImpl::scrollFocusedNodeIntoRect(const WebRect& rect)
 {
     LocalFrame* frame = page()->mainFrame();
     Element* element = focusedElement();
     if (!frame || !frame->view() || !element)
         return;
 
-    if (!m_webSettings->autoZoomFocusedNodeToLegibleScale()) {
-        frame->view()->scrollElementToRect(element, IntRect(rect.x, rect.y, rect.width, rect.height));
-        return;
-    }
-
     float scale;
     IntPoint scroll;
     bool needAnimation;
     computeScaleAndScrollForFocusedNode(element, scale, scroll, needAnimation);
 }
 
 void WebViewImpl::computeScaleAndScrollForFocusedNode(Node* focusedNode, float& newScale, IntPoint& newScroll, bool& needAnimation)
 {
     //FIXME(sky)
 }
@@ skipping 57 matching lines @@
 
 IntPoint WebViewImpl::clampOffsetAtScale(const IntPoint& offset, float scale)
 {
     FrameView* view = mainFrameImpl()->frameView();
     if (!view)
         return offset;
 
     return view->clampOffsetAtScale(offset, scale);
 }
 
-bool WebViewImpl::pinchVirtualViewportEnabled() const
-{
-    ASSERT(page());
-    return page()->settings().pinchVirtualViewportEnabled();
-}
-
-void WebViewImpl::setPinchViewportOffset(const WebFloatPoint& offset)
-{
-    ASSERT(page());
-
-    if (!pinchVirtualViewportEnabled())
-        return;
-
-    page()->frameHost().pinchViewport().setLocation(offset);
-}
-
-WebFloatPoint WebViewImpl::pinchViewportOffset() const
-{
-    ASSERT(page());
-
-    if (!pinchVirtualViewportEnabled())
-        return WebFloatPoint();
-
-    return page()->frameHost().pinchViewport().visibleRect().location();
-}
-
 void WebViewImpl::setMainFrameScrollOffset(const WebPoint& origin)
 {
     updateMainFrameScrollPosition(origin, false);
 }
 
 float WebViewImpl::deviceScaleFactor() const
 {
     if (!page())
         return 1;
 
@@ skipping 372 matching lines @@
 {
     if (m_pageOverlays && m_pageOverlays->remove(overlay) && m_pageOverlays->empty())
         m_pageOverlays = nullptr;
 }
 
 void WebViewImpl::setOverlayLayer(GraphicsLayer* layer)
 {
     if (!m_rootGraphicsLayer)
         return;
 
-    if (pinchVirtualViewportEnabled()) {
-        m_page->mainFrame()->view()->renderView()->compositor()->setOverlayLayer(layer);
-        return;
-    }
-
     // FIXME(bokan): This path goes away after virtual viewport pinch is enabled everywhere.
     if (!m_rootTransformLayer)
         m_rootTransformLayer = m_page->mainFrame()->view()->renderView()->compositor()->ensureRootTransformLayer();
 
     if (m_rootTransformLayer) {
         if (layer->parent() != m_rootTransformLayer)
             m_rootTransformLayer->addChild(layer);
     }
 }
 
@@ skipping 29 matching lines @@
 
 void WebViewImpl::suppressInvalidations(bool enable)
 {
     m_client->suppressCompositorScheduling(enable);
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     suppressInvalidations(true);
 
-    if (pinchVirtualViewportEnabled()) {
-        PinchViewport& pinchViewport = page()->frameHost().pinchViewport();
-        pinchViewport.attachToLayerTree(layer, graphicsLayerFactory());
-        if (layer) {
-            m_rootGraphicsLayer = pinchViewport.rootGraphicsLayer();
-            m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
-            m_rootTransformLayer = pinchViewport.rootGraphicsLayer();
-        } else {
-            m_rootGraphicsLayer = 0;
-            m_rootLayer = 0;
-            m_rootTransformLayer = 0;
-        }
-    } else {
-        m_rootGraphicsLayer = layer;
-        m_rootLayer = layer ? layer->platformLayer() : 0;
-        m_rootTransformLayer = 0;
-    }
+    m_rootGraphicsLayer = layer;
+    m_rootLayer = layer ? layer->platformLayer() : 0;
+    m_rootTransformLayer = 0;
 
     setIsAcceleratedCompositingActive(layer != 0);
 
     updateRootLayerTransform();
 
     if (m_layerTreeView) {
         if (m_rootLayer) {
             m_layerTreeView->setRootLayer(*m_rootLayer);
             // We register viewport layers here since there may not be a layer
             // tree view prior to this point.
-            if (pinchVirtualViewportEnabled()) {
-                page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
-            } else {
-                GraphicsLayer* rootScrollLayer = compositor()->scrollLayer();
-                ASSERT(rootScrollLayer);
-                WebLayer* pageScaleLayer = rootScrollLayer->parent() ? rootScrollLayer->parent()->platformLayer() : 0;
-                m_layerTreeView->registerViewportLayers(pageScaleLayer, rootScrollLayer->platformLayer(), 0);
-            }
+            GraphicsLayer* rootScrollLayer = compositor()->scrollLayer();
+            ASSERT(rootScrollLayer);
+            WebLayer* pageScaleLayer = rootScrollLayer->parent() ? rootScrollLayer->parent()->platformLayer() : 0;
+            m_layerTreeView->registerViewportLayers(pageScaleLayer, rootScrollLayer->platformLayer(), 0);
         } else {
             m_layerTreeView->clearRootLayer();
-            if (pinchVirtualViewportEnabled())
-                page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
-            else
-                m_layerTreeView->clearViewportLayers();
+            m_layerTreeView->clearViewportLayers();
         }
     }
 
     suppressInvalidations(false);
 }
 
 void WebViewImpl::scheduleCompositingLayerSync()
 {
     m_layerTreeView->setNeedsAnimate();
 }
@@ skipping 182 matching lines @@
         m_layerTreeView->setVisible(visible);
     }
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     return true;
 }
 
 } // namespace blink