| Index: third_party/WebKit/Source/core/layout/LayoutView.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutView.h b/third_party/WebKit/Source/core/layout/LayoutView.h
|
| index af4a7dd9b99b4f8dfaab14be0bd7e3ee81759754..bf98f7c554fc6d92c8d27fd0ca721d77dc102385 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutView.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutView.h
|
| @@ -104,15 +104,9 @@ public:
|
|
|
| FrameView* frameView() const { return m_frameView; }
|
|
|
| - enum ViewportConstrainedPosition {
|
| - IsNotFixedPosition,
|
| - IsFixedPosition,
|
| - };
|
| -
|
| - static ViewportConstrainedPosition toViewportConstrainedPosition(EPosition position) { return position == FixedPosition ? IsFixedPosition : IsNotFixedPosition; }
|
| - void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, ViewportConstrainedPosition, const PaintInvalidationState*) const;
|
| - void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, const PaintInvalidationState*) const override;
|
| - void adjustViewportConstrainedOffset(LayoutRect&, ViewportConstrainedPosition) const;
|
| + void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, MapCoordinatesFlags) const;
|
| + void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&) const override;
|
| + void adjustOffsetForFixedPosition(LayoutRect&) const;
|
|
|
| void invalidatePaintForViewAndCompositedLayers();
|
|
|
| @@ -215,7 +209,7 @@ public:
|
| ScrollResult scroll(ScrollGranularity, const FloatSize&) override;
|
|
|
| private:
|
| - void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const override;
|
| + void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const override;
|
|
|
| const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override;
|
| void mapAncestorToLocal(const LayoutBoxModelObject*, TransformState&, MapCoordinatesFlags) const override;
|
|
|