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

Unified Diff: Source/core/rendering/EllipsisBox.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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/rendering/EllipsisBox.h
diff --git a/Source/core/rendering/EllipsisBox.h b/Source/core/rendering/EllipsisBox.h
index ad8e61291f5e6c5a6ef39411b695e3fbf0283342..149a8512e641060f9c2f2642e65c529121a38eba 100644
--- a/Source/core/rendering/EllipsisBox.h
+++ b/Source/core/rendering/EllipsisBox.h
@@ -40,7 +40,7 @@ public:
setHasVirtualLogicalHeight();
}
- virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
+ virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
@@ -48,8 +48,8 @@ public:
virtual float virtualLogicalHeight() const OVERRIDE { return m_height; }
private:
void paintMarkupBox(PaintInfo&, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle*);
- virtual int height() const { return m_height; }
- virtual RenderObject::SelectionState selectionState() { return m_selectionState; }
+ int height() const { return m_height; }
eseidel 2014/01/10 20:11:50 Lineboxes no longer have virtual height?
Inactive 2014/01/10 20:29:06 height() is not virtual in LineBox class: floa
+ virtual RenderObject::SelectionState selectionState() OVERRIDE { return m_selectionState; }
void paintSelection(GraphicsContext*, const FloatPoint&, RenderStyle*, const Font&);
InlineBox* markupBox() const;

Powered by Google App Engine
This is Rietveld 408576698