[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/core/frame/PinchViewport.cpp

 /*
  * Copyright (C) 2013 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 46 matching lines @@
 using blink::WebScrollbar;
 using blink::WebScrollbarLayer;
 using WebCore::FrameHost;
 using WebCore::GraphicsLayer;
 using WebCore::GraphicsLayerFactory;
 
 namespace WebCore {
 
 PinchViewport::PinchViewport(FrameHost& owner)
     : m_frameHost(owner)
+    , m_scale(1)
 {
 }
 
 PinchViewport::~PinchViewport() { }
 
-void PinchViewport::setSize(const IntSize& newSize)
+void PinchViewport::mainFrameDidChangeSize()
 {
-    // TODO: This is currently called from WebViewImpl with the main frame size which
-    // is (or will be) incorrect, address in future patches.
+    ASSERT(mainFrame() && mainFrame()->view());
 
     if (!m_innerViewportContainerLayer || !m_innerViewportScrollLayer)
         return;
 
+    IntSize newSize = mainFrame()->view()->frameRect().size();
+
     m_innerViewportContainerLayer->setSize(newSize);
     // The innerviewport scroll layer always has the same size as its clip layer, but
     // the page scale layer lives between them, allowing for non-zero max scroll
     // offset when page scale > 1.
     m_innerViewportScrollLayer->setSize(newSize);
 
+    m_offset = clampOffsetToBoundaries(m_offset);
+
     // Need to re-compute sizes for the overlay scrollbars.
     setupScrollbar(WebScrollbar::Horizontal);
     setupScrollbar(WebScrollbar::Vertical);
 }
 
-void PinchViewport::setLocation(const IntPoint& newLocation)
+FloatRect PinchViewport::visibleRect() const
 {
-    // TODO: The update from the LayerTree will occur here before the scale delta is applied.
-    // this means that the clamping below may be incorrect. Once scaling is done in PinchViewport
-    // change it so they happen at the same time.
+    FloatSize viewportSize(mainFrame()->view()->frameRect().size());
+    viewportSize.scale(1 / m_scale);
+    return FloatRect(m_offset, viewportSize);
+}
 
-    // Clamp the location within our extents.
-    IntPoint location(newLocation);
-    location.shrunkTo(maximumScrollPosition());
-    location.expandedTo(minimumScrollPosition());
+void PinchViewport::setLocation(const FloatPoint& newLocation)
+{
+    FloatPoint clampedOffset(clampOffsetToBoundaries(newLocation));
 
-    m_visibleRect.setLocation(newLocation);
+    if (clampedOffset == m_offset)
+        return;
+
+    m_offset = clampedOffset;
 
     ScrollingCoordinator* coordinator = m_frameHost.page().scrollingCoordinator();
     ASSERT(coordinator);
 
     coordinator->scrollableAreaScrollLayerDidChange(this);
 }
 
+void PinchViewport::setScale(float scale)
+{
+    m_scale = scale;
+
+    // Old-style pinch sets scale here but we shouldn't call into the
+    // clamping code below.
+    if (!m_innerViewportScrollLayer)
+        return;
+
+    // Ensure we clamp so we remain within the bounds.
+    setLocation(visibleRect().location());
+}
+
 // Modifies the top of the graphics layer tree to add layers needed to support
 // the inner/outer viewport fixed-position model for pinch zoom. When finished,
 // the tree will look like this (with * denoting added layers):
 //
 // *innerViewportContainerLayer (fixed pos container)
 //  +- *pageScaleLayer
 //  |   +- *innerViewportScrollLayer
 //  |       +-- overflowControlsHostLayer (root layer)
 //  |           +-- rootTransformLayer (optional)
 //  |               +-- outerViewportContainerLayer (fixed pos container) [frame container layer in RenderLayerCompositor]
@@ skipping 44 matching lines @@
         m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get());
         m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal.get());
         m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.get());
 
         // Ensure this class is set as the scroll layer's ScrollableArea
         coordinator->scrollableAreaScrollLayerDidChange(this);
 
         // Setup the inner viewport overlay scrollbars.
         setupScrollbar(WebScrollbar::Horizontal);
         setupScrollbar(WebScrollbar::Vertical);
+
+        mainFrameDidChangeSize();
     }
 
     m_innerViewportScrollLayer->removeAllChildren();
     m_innerViewportScrollLayer->addChild(currentLayerTreeRoot);
 
     // We only need to disable the existing (outer viewport) scrollbars
     // if the existing ones are already overlay.
     // FIXME: If we knew in advance before the overflowControlsHostLayer goes
     // away, we would re-enable the drawing of these scrollbars.
     // FIXME: This doesn't seem to work (at least on Android). Commenting out for now until
@@ skipping 69 matching lines @@
     return (orientation == HorizontalScrollbar) ? scrollDimensions.width() : scrollDimensions.height();
 }
 
 IntPoint PinchViewport::minimumScrollPosition() const
 {
     return IntPoint();
 }
 
 IntPoint PinchViewport::maximumScrollPosition() const
 {
-    // TODO: Doesn't take scale into account yet.
-    IntPoint maxScrollPosition(contentsSize() - visibleRect().size());
-    maxScrollPosition.clampNegativeToZero();
-    return maxScrollPosition;
+    return flooredIntPoint(FloatSize(contentsSize()) - visibleRect().size());
 }
 
 IntRect PinchViewport::scrollableAreaBoundingBox() const
 {
     // This method should return the bounding box in the parent view's coordinate
     // space; however, PinchViewport technically isn't a child of any Frames.
     // Nonetheless, the PinchViewport always occupies the entire main frame so just
     // return that.
-    LocalFrame* frame = m_frameHost.page().mainFrame();
+    LocalFrame* frame = mainFrame();
 
     if (!frame || !frame->view())
         return IntRect();
 
     return frame->view()->frameRect();
 }
 
 IntSize PinchViewport::contentsSize() const
 {
-    LocalFrame* frame = m_frameHost.page().mainFrame();
+    LocalFrame* frame = mainFrame();
 
     if (!frame || !frame->view())
         return IntSize();
 
-    // TODO: This will be visibleContentSize once page scale is removed from FrameView
-    return frame->view()->unscaledVisibleContentSize(IncludeScrollbars);
+    ASSERT(frame->view()->visibleContentScaleFactor() == 1);
+    return frame->view()->visibleContentRect(IncludeScrollbars).size();
 }
 
 void PinchViewport::invalidateScrollbarRect(Scrollbar*, const IntRect&)
 {
     // Do nothing. Pinch scrollbars live on the compositor thread and will
     // be updated when the viewport is synced to the CC.
 }
 
 void PinchViewport::setScrollOffset(const IntPoint& offset)
 {
@@ skipping 21 matching lines @@
 }
 
 void PinchViewport::notifyAnimationStarted(const GraphicsLayer*, double monotonicTime)
 {
 }
 
 void PinchViewport::paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip)
 {
 }
 
+LocalFrame* PinchViewport::mainFrame() const
+{
+    return m_frameHost.page().mainFrame();
+}
+
+FloatPoint PinchViewport::clampOffsetToBoundaries(const FloatPoint& offset)
+{
+    FloatPoint clampedOffset(offset);
+    clampedOffset = clampedOffset.shrunkTo(FloatPoint(maximumScrollPosition()));
+    clampedOffset = clampedOffset.expandedTo(FloatPoint(minimumScrollPosition()));
+    return clampedOffset;
+}
+
 String PinchViewport::debugName(const GraphicsLayer* graphicsLayer)
 {
     String name;
     if (graphicsLayer == m_innerViewportContainerLayer.get()) {
         name = "Inner Viewport Container Layer";
     } else if (graphicsLayer == m_pageScaleLayer.get()) {
         name =  "Page Scale Layer";
     } else if (graphicsLayer == m_innerViewportScrollLayer.get()) {
         name =  "Inner Viewport Scroll Layer";
     } else if (graphicsLayer == m_overlayScrollbarHorizontal.get()) {
         name =  "Overlay Scrollbar Horizontal Layer";
     } else if (graphicsLayer == m_overlayScrollbarVertical.get()) {
         name =  "Overlay Scrollbar Vertical Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore