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

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

Issue 1213003004: Fix virtual/override/final usage in Source/platform/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | « Source/platform/scroll/ScrollAnimatorNone.h ('k') | Source/platform/scroll/ScrollbarThemeAura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/Scrollbar.h
diff --git a/Source/platform/scroll/Scrollbar.h b/Source/platform/scroll/Scrollbar.h
index db9870049a2a30aa7260512c4099427978bfbf2c..65c33e279fa7153eaaa5a1a96517dfa544f13f2f 100644
--- a/Source/platform/scroll/Scrollbar.h
+++ b/Source/platform/scroll/Scrollbar.h
@@ -49,49 +49,49 @@ class PLATFORM_EXPORT Scrollbar : public Widget, public ScrollbarThemeClient {
public:
static PassRefPtrWillBeRawPtr<Scrollbar> create(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize);
- virtual ~Scrollbar();
+ ~Scrollbar() override;
// ScrollbarThemeClient implementation.
- virtual int x() const override { return Widget::x(); }
- virtual int y() const override { return Widget::y(); }
- virtual int width() const override { return Widget::width(); }
- virtual int height() const override { return Widget::height(); }
- virtual IntSize size() const override { return Widget::size(); }
- virtual IntPoint location() const override { return Widget::location(); }
+ 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(); }
- virtual Widget* parent() const override { return Widget::parent(); }
- virtual Widget* root() const override { return Widget::root(); }
+ Widget* parent() const override { return Widget::parent(); }
+ Widget* root() const override { return Widget::root(); }
- virtual void setFrameRect(const IntRect&) override;
- virtual IntRect frameRect() const override { return Widget::frameRect(); }
+ void setFrameRect(const IntRect&) override;
+ IntRect frameRect() const override { return Widget::frameRect(); }
- virtual void invalidate() override { Widget::invalidate(); }
- virtual void invalidateRect(const IntRect&) override;
+ void invalidate() override { Widget::invalidate(); }
+ void invalidateRect(const IntRect&) override;
- virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
- virtual void getTickmarks(Vector<IntRect>&) const override;
- virtual bool isScrollableAreaActive() const override;
+ ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
+ void getTickmarks(Vector<IntRect>&) const override;
+ bool isScrollableAreaActive() const override;
- virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) override { return Widget::convertFromContainingWindow(windowPoint); }
+ IntPoint convertFromContainingWindow(const IntPoint& windowPoint) override { return Widget::convertFromContainingWindow(windowPoint); }
- virtual bool isCustomScrollbar() const override { return false; }
- virtual ScrollbarOrientation orientation() const override { return m_orientation; }
- virtual bool isLeftSideVerticalScrollbar() const override;
+ bool isCustomScrollbar() const override { return false; }
+ ScrollbarOrientation orientation() const override { return m_orientation; }
+ bool isLeftSideVerticalScrollbar() const override;
- virtual int value() const override { return lroundf(m_currentPos); }
- virtual float currentPos() const override { return m_currentPos; }
- virtual int visibleSize() const override { return m_visibleSize; }
- virtual int totalSize() const override { return m_totalSize; }
- virtual int maximum() const override { return m_totalSize - m_visibleSize; }
- virtual ScrollbarControlSize controlSize() const override { return m_controlSize; }
+ int value() const override { return lroundf(m_currentPos); }
+ float currentPos() const override { return m_currentPos; }
+ int visibleSize() const override { return m_visibleSize; }
+ int totalSize() const override { return m_totalSize; }
+ int maximum() const override { return m_totalSize - m_visibleSize; }
+ ScrollbarControlSize controlSize() const override { return m_controlSize; }
- virtual ScrollbarPart pressedPart() const override { return m_pressedPart; }
- virtual ScrollbarPart hoveredPart() const override { return m_hoveredPart; }
+ ScrollbarPart pressedPart() const override { return m_pressedPart; }
+ ScrollbarPart hoveredPart() const override { return m_hoveredPart; }
- virtual void styleChanged() override { }
+ void styleChanged() override { }
- virtual bool enabled() const override { return m_enabled; }
- virtual void setEnabled(bool) override;
+ bool enabled() const override { return m_enabled; }
+ void setEnabled(bool) override;
// Called by the ScrollableArea when the scroll offset changes.
void offsetDidChange();
@@ -107,9 +107,9 @@ public:
void setProportion(int visibleSize, int totalSize);
void setPressedPos(int p) { m_pressedPos = p; }
- virtual void paint(GraphicsContext*, const IntRect& damageRect) final;
+ void paint(GraphicsContext*, const IntRect& damageRect) final;
- virtual bool isOverlayScrollbar() const override;
+ bool isOverlayScrollbar() const override;
bool shouldParticipateInHitTesting();
bool isWindowActive() const;
@@ -132,25 +132,25 @@ public:
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;
+ IntRect convertToContainingView(const IntRect&) const override;
+ IntRect convertFromContainingView(const IntRect&) const override;
- virtual IntPoint convertToContainingView(const IntPoint&) const override;
- virtual IntPoint convertFromContainingView(const IntPoint&) const override;
+ IntPoint convertToContainingView(const IntPoint&) const override;
+ IntPoint convertFromContainingView(const IntPoint&) const override;
void moveThumb(int pos, bool draggingDocument = false);
- virtual bool isAlphaLocked() const override { return m_isAlphaLocked; }
- virtual void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
+ bool isAlphaLocked() const override { return m_isAlphaLocked; }
+ void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
- virtual float elasticOverscroll() const override { return m_elasticOverscroll; }
- virtual void setElasticOverscroll(float elasticOverscroll) override { m_elasticOverscroll = elasticOverscroll; }
+ float elasticOverscroll() const override { return m_elasticOverscroll; }
+ void setElasticOverscroll(float elasticOverscroll) override { m_elasticOverscroll = elasticOverscroll; }
bool overlapsResizer() const { return m_overlapsResizer; }
void setOverlapsResizer(bool overlapsResizer) { m_overlapsResizer = overlapsResizer; }
- virtual DisplayItemClient displayItemClient() const override { return toDisplayItemClient(this); }
- virtual String debugName() const override { return m_orientation == HorizontalScrollbar ? "HorizontalScrollbar" : "VerticalScrollbar"; }
+ DisplayItemClient displayItemClient() const override { return toDisplayItemClient(this); }
+ String debugName() const override { return m_orientation == HorizontalScrollbar ? "HorizontalScrollbar" : "VerticalScrollbar"; }
// Promptly unregister from the theme manager + run finalizers of derived Scrollbars.
EAGERLY_FINALIZE();
@@ -202,7 +202,7 @@ protected:
float m_elasticOverscroll;
private:
- virtual bool isScrollbar() const override { return true; }
+ bool isScrollbar() const override { return true; }
float scrollableAreaCurrentPos() const;
};
« no previous file with comments | « Source/platform/scroll/ScrollAnimatorNone.h ('k') | Source/platform/scroll/ScrollbarThemeAura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698