| 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 fb96df8cb45c03d11b98cc8be85c1c0928340211..778f2a3f3df0ff190ffb7aa35031e8fe2cbdfd05 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -442,7 +442,7 @@ class CORE_EXPORT FrameView final
|
| bool isScrollCornerVisible() const override;
|
| bool userInputScrollable(ScrollbarOrientation) const override;
|
| bool shouldPlaceVerticalScrollbarOnLeft() const override;
|
| - FrameViewBase* getWidget() override;
|
| + FrameViewBase* getFrameViewBase() override;
|
| CompositorAnimationHost* compositorAnimationHost() const override;
|
| CompositorAnimationTimeline* compositorAnimationTimeline() const override;
|
| LayoutBox* layoutBox() const override;
|
| @@ -646,14 +646,16 @@ class CORE_EXPORT FrameView final
|
| bool scrollbarCornerPresent() const;
|
| IntRect scrollCornerRect() const override;
|
|
|
| - IntRect convertFromScrollbarToContainingWidget(const Scrollbar&,
|
| - const IntRect&) const override;
|
| - IntRect convertFromContainingWidgetToScrollbar(const Scrollbar&,
|
| - const IntRect&) const override;
|
| - IntPoint convertFromScrollbarToContainingWidget(
|
| + IntRect convertFromScrollbarToContainingFrameViewBase(
|
| + const Scrollbar&,
|
| + const IntRect&) const override;
|
| + IntRect convertFromContainingFrameViewBaseToScrollbar(
|
| + const Scrollbar&,
|
| + const IntRect&) const override;
|
| + IntPoint convertFromScrollbarToContainingFrameViewBase(
|
| const Scrollbar&,
|
| const IntPoint&) const override;
|
| - IntPoint convertFromContainingWidgetToScrollbar(
|
| + IntPoint convertFromContainingFrameViewBaseToScrollbar(
|
| const Scrollbar&,
|
| const IntPoint&) const override;
|
|
|
|
|