Merge FrameView and ScrollView.

Source/web/ViewportAnchor.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "web/ViewportAnchor.h"
 
 #include "core/dom/ContainerNode.h"
 #include "core/dom/Node.h"
+#include "core/frame/FrameView.h"
 #include "core/page/EventHandler.h"
 #include "core/rendering/HitTestResult.h"
-#include "platform/scroll/ScrollView.h"
 
 namespace blink {
 
 namespace {
 
 static const float viewportAnchorRelativeEpsilon = 0.1f;
 static const int viewportToNodeMaxRelativeArea = 2;
 
 template <typename RectType>
 int area(const RectType& rect) {
@@ skipping 92 matching lines @@
     Node* node = findNonEmptyAnchorNode(flooredIntPoint(anchorPoint), innerViewRect, m_eventHandler);
     if (!node)
         return;
 
     m_anchorNode = node;
     m_anchorNodeBounds = node->boundingBox();
     m_anchorInNodeCoords = anchorPoint - m_anchorNodeBounds.location();
     m_anchorInNodeCoords.scale(1.f / m_anchorNodeBounds.width(), 1.f / m_anchorNodeBounds.height());
 }
 
-void ViewportAnchor::computeOrigins(const ScrollView& scrollView, const FloatSize& innerSize,
+void ViewportAnchor::computeOrigins(const FrameView& scrollView, const FloatSize& innerSize,
     IntPoint& mainFrameOffset, FloatPoint& pinchViewportOffset) const
 {
     IntSize outerSize = scrollView.visibleContentRect().size();
 
     // Compute the viewport origins in CSS pixels relative to the document.
     FloatSize absPinchViewportOffset = m_normalizedPinchViewportOffset;
     absPinchViewportOffset.scale(outerSize.width(), outerSize.height());
 
     FloatPoint innerOrigin = getInnerOrigin(innerSize);
     FloatPoint outerOrigin = innerOrigin - absPinchViewportOffset;
@@ skipping 25 matching lines @@
     anchorOffsetFromNode.scale(m_anchorInNodeCoords.width(), m_anchorInNodeCoords.height());
     FloatPoint anchorPoint = currentNodeBounds.location() + anchorOffsetFromNode;
 
     // Compute the new origin point relative to the new anchor point
     FloatSize anchorOffsetFromOrigin = innerSize;
     anchorOffsetFromOrigin.scale(m_anchorInInnerViewCoords.width(), m_anchorInInnerViewCoords.height());
     return anchorPoint - anchorOffsetFromOrigin;
 }
 
 } // namespace blink