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

Unified Diff: Source/core/layout/LayoutScrollbarPart.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (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/core/layout/LayoutScrollbar.h ('k') | Source/core/layout/LayoutScrollbarTheme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutScrollbarPart.h
diff --git a/Source/core/layout/LayoutScrollbarPart.h b/Source/core/layout/LayoutScrollbarPart.h
index 1fd8165e55dfcd098e44ebe0f1f141c9f898eda5..b4e8e7fed21de5999888680e801f6965edc04af3 100644
--- a/Source/core/layout/LayoutScrollbarPart.h
+++ b/Source/core/layout/LayoutScrollbarPart.h
@@ -36,67 +36,66 @@ class LayoutScrollbar;
class LayoutScrollbarPart final : public LayoutBlock {
public:
static LayoutScrollbarPart* createAnonymous(Document*, LayoutScrollbar* = nullptr, ScrollbarPart = NoPart);
+ ~LayoutScrollbarPart() override;
- virtual ~LayoutScrollbarPart();
+ const char* name() const override { return "LayoutScrollbarPart"; }
- virtual const char* name() const override { return "LayoutScrollbarPart"; }
+ DeprecatedPaintLayerType layerTypeRequired() const override { return NoDeprecatedPaintLayer; }
- virtual DeprecatedPaintLayerType layerTypeRequired() const override { return NoDeprecatedPaintLayer; }
-
- virtual void layout() override;
+ void layout() override;
// Scrollbar parts needs to be rendered at device pixel boundaries.
- virtual LayoutRectOutsets marginBoxOutsets() const override
+ LayoutRectOutsets marginBoxOutsets() const override
{
ASSERT(isIntegerValue(LayoutBlock::marginBoxOutsets().top()));
return LayoutBlock::marginBoxOutsets();
}
- virtual LayoutUnit marginTop() const override
+ LayoutUnit marginTop() const override
{
ASSERT(isIntegerValue(LayoutBlock::marginTop()));
return LayoutBlock::marginTop();
}
- virtual LayoutUnit marginBottom() const override
+ LayoutUnit marginBottom() const override
{
ASSERT(isIntegerValue(LayoutBlock::marginBottom()));
return LayoutBlock::marginBottom();
}
- virtual LayoutUnit marginLeft() const override
+ LayoutUnit marginLeft() const override
{
ASSERT(isIntegerValue(LayoutBlock::marginLeft()));
return LayoutBlock::marginLeft();
}
- virtual LayoutUnit marginRight() const override
+ LayoutUnit marginRight() const override
{
ASSERT(isIntegerValue(LayoutBlock::marginRight()));
return LayoutBlock::marginRight();
}
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutScrollbarPart || LayoutBlock::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutScrollbarPart || LayoutBlock::isOfType(type); }
LayoutObject* layoutObjectOwningScrollbar() const;
protected:
- virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
- virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
+ void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
private:
LayoutScrollbarPart(LayoutScrollbar*, ScrollbarPart);
- virtual void computePreferredLogicalWidths() override;
+ void computePreferredLogicalWidths() override;
// Have all padding getters return 0. The important point here is to avoid resolving percents
// against the containing block, since scroll bar corners don't always have one (so it would
// crash). Scroll bar corners are not actually laid out, and they don't have child content, so
// what we return here doesn't really matter.
- virtual LayoutUnit paddingTop() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingBottom() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingLeft() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingRight() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingBefore() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingAfter() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingStart() const override { return LayoutUnit(); }
- virtual LayoutUnit paddingEnd() const override { return LayoutUnit(); }
+ LayoutUnit paddingTop() const override { return LayoutUnit(); }
+ LayoutUnit paddingBottom() const override { return LayoutUnit(); }
+ LayoutUnit paddingLeft() const override { return LayoutUnit(); }
+ LayoutUnit paddingRight() const override { return LayoutUnit(); }
+ LayoutUnit paddingBefore() const override { return LayoutUnit(); }
+ LayoutUnit paddingAfter() const override { return LayoutUnit(); }
+ LayoutUnit paddingStart() const override { return LayoutUnit(); }
+ LayoutUnit paddingEnd() const override { return LayoutUnit(); }
void layoutHorizontalPart();
void layoutVerticalPart();
« no previous file with comments | « Source/core/layout/LayoutScrollbar.h ('k') | Source/core/layout/LayoutScrollbarTheme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698