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

Unified Diff: sky/engine/platform/scroll/Scrollbar.h

Issue 685003003: Remove a lot of dead Scrollbar methods. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « sky/engine/platform/exported/WebScrollbarImpl.cpp ('k') | sky/engine/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/scroll/Scrollbar.h
diff --git a/sky/engine/platform/scroll/Scrollbar.h b/sky/engine/platform/scroll/Scrollbar.h
index a4b0cd6776e2902e9ee7b054903326b6c803174a..188f866b70f8f810eb93b97803292fd2846a1bf2 100644
--- a/sky/engine/platform/scroll/Scrollbar.h
+++ b/sky/engine/platform/scroll/Scrollbar.h
@@ -41,37 +41,18 @@ class PlatformGestureEvent;
class PlatformMouseEvent;
class ScrollableArea;
-class PLATFORM_EXPORT Scrollbar : public Widget {
-
+class PLATFORM_EXPORT Scrollbar final : public Widget {
public:
static PassRefPtr<Scrollbar> create(ScrollableArea*, ScrollbarOrientation);
virtual ~Scrollbar();
- int x() const { return Widget::x(); }
- int y() const { return Widget::y(); }
- int width() const { return Widget::width(); }
- int height() const { return Widget::height(); }
- IntSize size() const { return Widget::size(); }
- IntPoint location() const { return Widget::location(); }
-
- Widget* parent() const { return Widget::parent(); }
- Widget* root() const { return Widget::root(); }
-
- void setFrameRect(const IntRect& r) { Widget::setFrameRect(r); }
- IntRect frameRect() const { return Widget::frameRect(); }
-
- void invalidate() { Widget::invalidate(); }
void invalidateRect(const IntRect&);
ScrollbarOverlayStyle scrollbarOverlayStyle() const;
void getTickmarks(Vector<IntRect>&) const;
bool isScrollableAreaActive() const;
- bool isScrollViewScrollbar() const;
- IntPoint convertFromContainingWindow(const IntPoint& windowPoint) { return Widget::convertFromContainingWindow(windowPoint); }
-
- bool isCustomScrollbar() const { return false; }
ScrollbarOrientation orientation() const { return m_orientation; }
bool isLeftSideVerticalScrollbar() const;
@@ -84,8 +65,6 @@ public:
ScrollbarPart pressedPart() const { return m_pressedPart; }
ScrollbarPart hoveredPart() const { return m_hoveredPart; }
- void styleChanged() { }
-
bool enabled() const { return m_enabled; }
void setEnabled(bool);
@@ -97,8 +76,8 @@ public:
int pressedPos() const { return m_pressedPos; }
- virtual void setHoveredPart(ScrollbarPart);
- virtual void setPressedPart(ScrollbarPart);
+ void setHoveredPart(ScrollbarPart);
+ void setPressedPart(ScrollbarPart);
void setProportion(int visibleSize, int totalSize);
void setPressedPos(int p) { m_pressedPos = p; }
@@ -108,8 +87,6 @@ public:
bool isOverlayScrollbar() const;
bool shouldParticipateInHitTesting();
- bool isWindowActive() const;
-
bool gestureEvent(const PlatformGestureEvent&);
// These methods are used for platform scrollbars to give :hover feedback. They will not get called
@@ -123,12 +100,6 @@ public:
void mouseUp(const PlatformMouseEvent&);
void mouseDown(const PlatformMouseEvent&);
- // FIXME(sky): Remove this.
- Scrollbar* theme() { return this; }
-
- bool suppressInvalidation() const { return m_suppressInvalidation; }
- void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
-
virtual IntRect convertToContainingView(const IntRect&) const override;
virtual IntRect convertFromContainingView(const IntRect&) const override;
@@ -137,9 +108,6 @@ public:
void moveThumb(int pos);
- bool isAlphaLocked() const { return m_isAlphaLocked; }
- void setIsAlphaLocked(bool flag) { m_isAlphaLocked = flag; }
-
static int scrollbarThickness();
void invalidateParts()
@@ -153,8 +121,6 @@ public:
static void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
- static void paintOverhangBackground(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&);
-
bool shouldCenterOnThumb(const PlatformMouseEvent&);
bool shouldSnapBackToDragOrigin(const PlatformMouseEvent&);
@@ -184,8 +150,6 @@ protected:
Scrollbar(ScrollableArea*, ScrollbarOrientation);
void updateThumb();
- virtual void updateThumbPosition();
- virtual void updateThumbProportion();
void autoscrollTimerFired(Timer<Scrollbar>*);
void startTimerIfNeeded(double delay);
@@ -213,10 +177,6 @@ protected:
Timer<Scrollbar> m_scrollTimer;
bool m_overlapsResizer;
- bool m_suppressInvalidation;
-
- bool m_isAlphaLocked;
-
private:
virtual bool isScrollbar() const override { return true; }
« no previous file with comments | « sky/engine/platform/exported/WebScrollbarImpl.cpp ('k') | sky/engine/platform/scroll/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698