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

Unified Diff: Source/core/layout/LayoutMenuList.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/LayoutMedia.h ('k') | Source/core/layout/LayoutMeter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMenuList.h
diff --git a/Source/core/layout/LayoutMenuList.h b/Source/core/layout/LayoutMenuList.h
index 290b232d3c46d0c6dfe540a84c1ceaf55003d73e..cea272206bcbeb912528d5f1f3da8deae8806b51 100644
--- a/Source/core/layout/LayoutMenuList.h
+++ b/Source/core/layout/LayoutMenuList.h
@@ -38,7 +38,7 @@ class LayoutText;
class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox, private PopupMenuClient {
public:
explicit LayoutMenuList(Element*);
- virtual ~LayoutMenuList();
+ ~LayoutMenuList() override;
bool popupIsVisible() const { return m_popupIsVisible; }
void showPopup();
@@ -51,67 +51,67 @@ public:
String text() const;
- virtual PopupMenuStyle itemStyle(unsigned listIndex) const override;
+ PopupMenuStyle itemStyle(unsigned listIndex) const override;
- virtual const char* name() const override { return "LayoutMenuList"; }
+ const char* name() const override { return "LayoutMenuList"; }
protected:
- virtual void willBeDestroyed() override;
+ void willBeDestroyed() override;
private:
HTMLSelectElement* selectElement() const;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectMenuList || LayoutFlexibleBox::isOfType(type); }
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectMenuList || LayoutFlexibleBox::isOfType(type); }
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
- virtual void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
- virtual void removeChild(LayoutObject*) override;
- virtual bool createsAnonymousWrapper() const override { return true; }
+ void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
+ void removeChild(LayoutObject*) override;
+ bool createsAnonymousWrapper() const override { return true; }
- virtual void updateFromElement() override;
+ void updateFromElement() override;
- virtual LayoutRect controlClipRect(const LayoutPoint&) const override;
- virtual bool hasControlClip() const override { return true; }
+ LayoutRect controlClipRect(const LayoutPoint&) const override;
+ bool hasControlClip() const override { return true; }
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+ void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
// PopupMenuClient methods
- virtual void valueChanged(unsigned listIndex, bool fireOnChange = true) override;
- virtual void selectionChanged(unsigned, bool) override { }
- virtual void selectionCleared() override { }
- virtual String itemText(unsigned listIndex) const override;
- virtual String itemToolTip(unsigned listIndex) const override;
- virtual String itemAccessibilityText(unsigned listIndex) const override;
- virtual bool itemIsEnabled(unsigned listIndex) const override;
- virtual PopupMenuStyle menuStyle() const override;
- virtual LayoutUnit clientPaddingLeft() const override;
- virtual LayoutUnit clientPaddingRight() const override;
- virtual int listSize() const override;
- virtual int selectedIndex() const override;
- virtual void popupDidHide() override;
- virtual void popupDidCancel() override;
- virtual bool itemIsSeparator(unsigned listIndex) const override;
- virtual bool itemIsLabel(unsigned listIndex) const override;
- virtual bool itemIsSelected(unsigned listIndex) const override;
- virtual void provisionalSelectionChanged(unsigned) override;
- virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) override;
- virtual bool multiple() const override;
- virtual IntRect elementRectRelativeToViewport() const override;
- virtual Element& ownerElement() const override;
- virtual const ComputedStyle* computedStyleForItem(Element&) const override;
-
- virtual bool hasLineIfEmpty() const override { return true; }
+ void valueChanged(unsigned listIndex, bool fireOnChange = true) override;
+ void selectionChanged(unsigned, bool) override { }
+ void selectionCleared() override { }
+ String itemText(unsigned listIndex) const override;
+ String itemToolTip(unsigned listIndex) const override;
+ String itemAccessibilityText(unsigned listIndex) const override;
+ bool itemIsEnabled(unsigned listIndex) const override;
+ PopupMenuStyle menuStyle() const override;
+ LayoutUnit clientPaddingLeft() const override;
+ LayoutUnit clientPaddingRight() const override;
+ int listSize() const override;
+ int selectedIndex() const override;
+ void popupDidHide() override;
+ void popupDidCancel() override;
+ bool itemIsSeparator(unsigned listIndex) const override;
+ bool itemIsLabel(unsigned listIndex) const override;
+ bool itemIsSelected(unsigned listIndex) const override;
+ void provisionalSelectionChanged(unsigned) override;
+ void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) override;
+ bool multiple() const override;
+ IntRect elementRectRelativeToViewport() const override;
+ Element& ownerElement() const override;
+ const ComputedStyle* computedStyleForItem(Element&) const override;
+
+ bool hasLineIfEmpty() const override { return true; }
// Flexbox defines baselines differently than regular blocks.
// For backwards compatibility, menulists need to do the regular block behavior.
- virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode position) const override
+ int baselinePosition(FontBaseline baseline, bool firstLine, LineDirectionMode direction, LinePositionMode position) const override
{
return LayoutBlock::baselinePosition(baseline, firstLine, direction, position);
}
- virtual int firstLineBoxBaseline() const override { return LayoutBlock::firstLineBoxBaseline(); }
- virtual int inlineBlockBaseline(LineDirectionMode direction) const override { return LayoutBlock::inlineBlockBaseline(direction); }
+ int firstLineBoxBaseline() const override { return LayoutBlock::firstLineBoxBaseline(); }
+ int inlineBlockBaseline(LineDirectionMode direction) const override { return LayoutBlock::inlineBlockBaseline(direction); }
void getItemBackgroundColor(unsigned listIndex, Color&, bool& itemHasCustomBackgroundColor) const;
« no previous file with comments | « Source/core/layout/LayoutMedia.h ('k') | Source/core/layout/LayoutMeter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698