Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / ViewportAnchor.cpp

diff --git a/src/third_party/WebKit/Source/web/ViewportAnchor.cpp b/src/third_party/WebKit/Source/web/ViewportAnchor.cpp
index d4ec656..e70f295 100644 (file)
--- a/src/third_party/WebKit/Source/web/ViewportAnchor.cpp
+++ b/src/third_party/WebKit/Source/web/ViewportAnchor.cpp
@@ -33,9 +33,9 @@
 
 #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 {
 
@@ -148,10 +148,10 @@ void ViewportAnchor::setAnchor(const IntRect& outerViewRect, const IntRect& inne
     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& frameView, const FloatSize& innerSize,
     IntPoint& mainFrameOffset, FloatPoint& pinchViewportOffset) const
 {
-    IntSize outerSize = scrollView.visibleContentRect().size();
+    IntSize outerSize = frameView.visibleContentRect().size();
 
     // Compute the viewport origins in CSS pixels relative to the document.
     FloatSize absPinchViewportOffset = m_normalizedPinchViewportOffset;
@@ -165,7 +165,7 @@ void ViewportAnchor::computeOrigins(const ScrollView& scrollView, const FloatSiz
 
     moveToEncloseRect(outerRect, innerRect);
 
-    outerRect.setLocation(scrollView.adjustScrollPositionWithinRange(outerRect.location()));
+    outerRect.setLocation(frameView.adjustScrollPositionWithinRange(outerRect.location()));
 
     moveIntoRect(innerRect, outerRect);