Chromium Code Reviews| 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 f3496595a49b91242f2929265d357eb26dab8317..c559b99d893c40d0861d889f1919891e8c02c8c5 100644 |
| --- a/third_party/WebKit/Source/core/frame/FrameView.h |
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h |
| @@ -31,6 +31,7 @@ |
| #include "core/frame/FrameViewAutoSizeInfo.h" |
| #include "core/frame/LayoutSubtreeRootList.h" |
| #include "core/frame/RootFrameViewport.h" |
| +#include "core/layout/MapCoordinatesFlags.h" |
| #include "core/layout/ScrollAnchor.h" |
| #include "core/paint/FirstMeaningfulPaintDetector.h" |
| #include "core/paint/ObjectPaintProperties.h" |
| @@ -767,6 +768,18 @@ 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&); |
| + IntRect remoteViewportIntersection(); |
| + |
| + void mapQuadToAncestorFrameIncludingScrollOffset( |
|
szager1
2016/12/16 03:42:34
Please put a comment here about why this is necess
kenrb
2016/12/16 16:17:35
Done.
|
| + LayoutRect&, |
| + const LayoutObject* descendant, |
| + const LayoutView* ancestor, |
| + MapCoordinatesFlags mode); |
| + |
| protected: |
| // Scroll the content via the compositor. |
| bool scrollContentsFastPath(const IntSize& scrollDelta); |
| @@ -1121,6 +1134,8 @@ class CORE_EXPORT FrameView final |
| Member<ElementVisibilityObserver> m_visibilityObserver; |
| + IntRect m_remoteViewportIntersection; |
| + |
| // For testing. |
| struct ObjectPaintInvalidation { |
| String name; |