| Index: third_party/WebKit/Source/core/frame/FrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
|
| index d8f183533b304cbc72c827789d3e7ae11255013c..7e538e9ecdb4f8dede170aaa0faa07090e8c974a 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -730,6 +730,15 @@ class CORE_EXPORT FrameView final
|
| // Only for SPv2.
|
| std::unique_ptr<JSONObject> compositedLayersAsJSON(LayerTreeFlags);
|
|
|
| + // Called on a view for a LocalFrame with a RemoteFrame parent. This makes
|
| + // viewport intersection available that accounts for remote ancestor frames
|
| + // and their respective scroll positions, clips, etc.
|
| + void setViewportIntersectionFromParent(const IntRect& viewportIntersection,
|
| + const IntPoint& rootOffset);
|
| + IntRect remoteViewportIntersection();
|
| +
|
| + IntRect viewportIntersection();
|
| +
|
| protected:
|
| // Scroll the content via the compositor.
|
| bool scrollContentsFastPath(const IntSize& scrollDelta);
|
| @@ -1063,6 +1072,9 @@ class CORE_EXPORT FrameView final
|
| bool m_suppressAdjustViewSize;
|
| bool m_allowsLayoutInvalidationAfterLayoutClean;
|
|
|
| + IntRect m_remoteViewportIntersection;
|
| + IntPoint m_remoteRootOffset;
|
| +
|
| // For testing.
|
| struct ObjectPaintInvalidation {
|
| String name;
|
|
|