| 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 ecb2b7bc61dcf1aeb7f368d621c934cff1c82b5d..b9541884a4334ca91399a4411cc6efe9dd72680f 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
|
| @@ -26,7 +26,6 @@
|
| #ifndef Scrollbar_h
|
| #define Scrollbar_h
|
|
|
| -#include "platform/FrameViewBase.h"
|
| #include "platform/Timer.h"
|
| #include "platform/graphics/paint/DisplayItem.h"
|
| #include "platform/heap/Handle.h"
|
| @@ -37,6 +36,7 @@
|
| namespace blink {
|
|
|
| class CullRect;
|
| +class FrameViewBase;
|
| class GraphicsContext;
|
| class IntRect;
|
| class PlatformChromeClient;
|
| @@ -155,8 +155,8 @@ class PLATFORM_EXPORT Scrollbar : public GarbageCollectedFinalized<Scrollbar>,
|
|
|
| ScrollbarTheme& GetTheme() const { return theme_; }
|
|
|
| - IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
|
| - IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const;
|
| + IntRect ConvertToContainingFrameView(const IntRect&) const;
|
| + IntPoint ConvertFromContainingFrameView(const IntPoint&) const;
|
|
|
| void MoveThumb(int pos, bool dragging_document = false);
|
|
|
|
|