Revert of Revert of Revert of Initial draft - modify ViewportAnchor to know about both inner and outer viewports.

Source/web/ViewportAnchor.h

Index: Source/web/ViewportAnchor.h
diff --git a/Source/web/ViewportAnchor.h b/Source/web/ViewportAnchor.h
index 46f86f03a78a23edf6b940a80f3a8d03f0b7e42a..8bd0a7b92b1ef0c77917e4b37fc754c2e69e768d 100644
--- a/Source/web/ViewportAnchor.h
+++ b/Source/web/ViewportAnchor.h
@@ -43,7 +43,6 @@
 class EventHandler;
 class IntSize;
 class Node;
-class ScrollView;
 
 // ViewportAnchor provides a way to anchor a viewport origin to a DOM node.
 // In particular, the user supplies the current viewport (in CSS coordinates)
@@ -57,31 +56,22 @@
 public:
     explicit ViewportAnchor(EventHandler*);
 
-    void setAnchor(const IntRect& outerViewRect, const IntRect& innerViewRect, const FloatSize& anchorInViewCoords);
+    void setAnchor(const IntRect& viewRect, const FloatSize& anchorInViewCoords);
 
-    void computeOrigins(const ScrollView&, const FloatSize& innerSize,
-        IntPoint& mainFrameOffset, FloatPoint& pinchViewportOffset) const;
-
-private:
-    FloatPoint getInnerOrigin(const FloatSize& innerSize) const;
+    IntPoint computeOrigin(const IntSize& currentViewSize) const;
 
 private:
     RawPtrWillBeMember<EventHandler> m_eventHandler;
 
-    // Inner viewport origin in the reference frame of the document in CSS pixels
-    FloatPoint m_pinchViewportInDocument;
-
-    // Inner viewport origin in the reference frame of the outer viewport
-    // normalized to the outer viewport size.
-    FloatSize m_normalizedPinchViewportOffset;
+    IntRect m_viewRect;
 
     RefPtrWillBeMember<Node> m_anchorNode;
     LayoutRect m_anchorNodeBounds;
 
-    FloatSize m_anchorInInnerViewCoords;
+    FloatSize m_anchorInViewCoords;
     FloatSize m_anchorInNodeCoords;
 };
 
 } // namespace blink
 
-#endif
+ #endif