| Index: third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.h b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| index 14cc4f7ca713b48b096e7fce0b2102a9a0c73195..12a04266dd5b9ae20d0769ebf04a367e653421c1 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| @@ -86,9 +86,7 @@ class PLATFORM_EXPORT Scrollbar : public FrameViewBase,
|
| bool IsScrollableAreaActive() const override;
|
|
|
| IntPoint ConvertFromRootFrame(
|
| - const IntPoint& point_in_root_frame) const override {
|
| - return FrameViewBase::ConvertFromRootFrame(point_in_root_frame);
|
| - }
|
| + const IntPoint& point_in_root_frame) const override;
|
|
|
| bool IsCustomScrollbar() const override { return false; }
|
| ScrollbarOrientation Orientation() const override { return orientation_; }
|
| @@ -157,10 +155,7 @@ class PLATFORM_EXPORT Scrollbar : public FrameViewBase,
|
|
|
| ScrollbarTheme& GetTheme() const { return theme_; }
|
|
|
| - IntRect ConvertToContainingFrameViewBase(const IntRect&) const override;
|
| - IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override;
|
| -
|
| - IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const override;
|
| + IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
|
| IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const override;
|
|
|
| void MoveThumb(int pos, bool dragging_document = false);
|
|
|