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

Unified Diff: Source/core/layout/line/EllipsisBox.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
Index: Source/core/layout/line/EllipsisBox.h
diff --git a/Source/core/layout/line/EllipsisBox.h b/Source/core/layout/line/EllipsisBox.h
index d1f612f981fe06d847c067f78518b8d49ac1a08f..0b8c253d4a9367f9f99e2779f63f7d88b799b4a5 100644
--- a/Source/core/layout/line/EllipsisBox.h
+++ b/Source/core/layout/line/EllipsisBox.h
@@ -39,16 +39,16 @@ public:
setHasVirtualLogicalHeight();
}
- virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
- virtual LayoutUnit virtualLogicalHeight() const override { return m_height; }
- virtual LayoutObject::SelectionState selectionState() const override { return m_selectionState; }
+ LayoutUnit virtualLogicalHeight() const override { return m_height; }
+ LayoutObject::SelectionState selectionState() const override { return m_selectionState; }
const AtomicString& ellipsisStr() { return m_str; }
- virtual const char* boxName() const override;
+ const char* boxName() const override;
private:
« no previous file with comments | « Source/core/layout/compositing/DeprecatedPaintLayerCompositor.h ('k') | Source/core/layout/line/InlineFlowBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698