Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1012)

Unified Diff: third_party/WebKit/Source/platform/scroll/Scrollbar.h

Issue 2721133003: Rename platform/Widget to platform/FrameViewBase in platform. (Closed)
Patch Set: Rename platform/Widget to platform/FrameViewBase in platform. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6549ff20e95b5421f79c1275193c4fea81e6e80e..8a1f8d6f199580a0b66137a734edb44c6fb6c59c 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.h
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
@@ -26,8 +26,8 @@
#ifndef Scrollbar_h
#define Scrollbar_h
+#include "platform/FrameViewBase.h"
#include "platform/Timer.h"
-#include "platform/Widget.h"
#include "platform/graphics/paint/DisplayItem.h"
#include "platform/heap/Handle.h"
#include "platform/scroll/ScrollTypes.h"
@@ -44,7 +44,7 @@ class ScrollbarTheme;
class WebGestureEvent;
class WebMouseEvent;
-class PLATFORM_EXPORT Scrollbar : public Widget,
+class PLATFORM_EXPORT Scrollbar : public FrameViewBase,
public ScrollbarThemeClient,
public DisplayItemClient {
public:
@@ -67,18 +67,18 @@ class PLATFORM_EXPORT Scrollbar : public Widget,
~Scrollbar() override;
// ScrollbarThemeClient implementation.
- int x() const override { return Widget::x(); }
- int y() const override { return Widget::y(); }
- int width() const override { return Widget::width(); }
- int height() const override { return Widget::height(); }
- IntSize size() const override { return Widget::size(); }
- IntPoint location() const override { return Widget::location(); }
+ int x() const override { return FrameViewBase::x(); }
+ int y() const override { return FrameViewBase::y(); }
+ int width() const override { return FrameViewBase::width(); }
+ int height() const override { return FrameViewBase::height(); }
+ IntSize size() const override { return FrameViewBase::size(); }
+ IntPoint location() const override { return FrameViewBase::location(); }
- Widget* parent() const override { return Widget::parent(); }
- Widget* root() const override { return Widget::root(); }
+ FrameViewBase* parent() const override { return FrameViewBase::parent(); }
+ FrameViewBase* root() const override { return FrameViewBase::root(); }
void setFrameRect(const IntRect&) override;
- IntRect frameRect() const override { return Widget::frameRect(); }
+ IntRect frameRect() const override { return FrameViewBase::frameRect(); }
ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const override;
void getTickmarks(Vector<IntRect>&) const override;
@@ -86,7 +86,7 @@ class PLATFORM_EXPORT Scrollbar : public Widget,
IntPoint convertFromRootFrame(
const IntPoint& pointInRootFrame) const override {
- return Widget::convertFromRootFrame(pointInRootFrame);
+ return FrameViewBase::convertFromRootFrame(pointInRootFrame);
}
bool isCustomScrollbar() const override { return false; }
@@ -261,10 +261,10 @@ class PLATFORM_EXPORT Scrollbar : public Widget,
};
DEFINE_TYPE_CASTS(Scrollbar,
- Widget,
- widget,
- widget->isScrollbar(),
- widget.isScrollbar());
+ FrameViewBase,
+ frameViewBase,
+ frameViewBase->isScrollbar(),
+ frameViewBase.isScrollbar());
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollableArea.h ('k') | third_party/WebKit/Source/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698