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/svg/line/SVGInlineTextBox.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/svg/line/SVGInlineFlowBox.h ('k') | Source/core/layout/svg/line/SVGRootInlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/line/SVGInlineTextBox.h
diff --git a/Source/core/layout/svg/line/SVGInlineTextBox.h b/Source/core/layout/svg/line/SVGInlineTextBox.h
index e649e69df6f12ee766b2bd376b024dcc8bebfe2f..708ce2330d808496fbfde89b3fa5339ba29b4633 100644
--- a/Source/core/layout/svg/line/SVGInlineTextBox.h
+++ b/Source/core/layout/svg/line/SVGInlineTextBox.h
@@ -31,26 +31,26 @@ class SVGInlineTextBox final : public InlineTextBox {
public:
SVGInlineTextBox(LayoutObject&, int start, unsigned short length);
- virtual bool isSVGInlineTextBox() const override { return true; }
+ bool isSVGInlineTextBox() const override { return true; }
- virtual LayoutUnit virtualLogicalHeight() const override { return m_logicalHeight; }
+ LayoutUnit virtualLogicalHeight() const override { return m_logicalHeight; }
void setLogicalHeight(LayoutUnit height) { m_logicalHeight = height; }
- virtual int offsetForPosition(LayoutUnit x, bool includePartialGlyphs = true) const override;
- virtual LayoutUnit positionForOffset(int offset) const override;
+ int offsetForPosition(LayoutUnit x, bool includePartialGlyphs = true) const override;
+ LayoutUnit positionForOffset(int offset) const override;
- virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
- virtual LayoutRect localSelectionRect(int startPosition, int endPosition) override;
+ void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ LayoutRect localSelectionRect(int startPosition, int endPosition) override;
bool mapStartEndPositionsIntoFragmentCoordinates(const SVGTextFragment&, int& startPosition, int& endPosition) const;
- virtual LayoutRect calculateBoundaries() const override;
+ LayoutRect calculateBoundaries() const override;
void clearTextFragments() { m_textFragments.clear(); }
Vector<SVGTextFragment>& textFragments() { return m_textFragments; }
const Vector<SVGTextFragment>& textFragments() const { return m_textFragments; }
- virtual void dirtyLineBoxes() override;
+ void dirtyLineBoxes() override;
bool startsNewTextChunk() const { return m_startsNewTextChunk; }
void setStartsNewTextChunk(bool newTextChunk) { m_startsNewTextChunk = newTextChunk; }
@@ -60,10 +60,10 @@ public:
TextRun constructTextRun(const ComputedStyle&, const SVGTextFragment&) const;
private:
- virtual void paintDocumentMarker(GraphicsContext*, const LayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&, bool) override final;
- virtual void paintTextMatchMarker(GraphicsContext*, const LayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&) override final;
+ void paintDocumentMarker(GraphicsContext*, const LayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&, bool) final;
+ void paintTextMatchMarker(GraphicsContext*, const LayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&) final;
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
LayoutUnit m_logicalHeight;
bool m_startsNewTextChunk : 1;
« no previous file with comments | « Source/core/layout/svg/line/SVGInlineFlowBox.h ('k') | Source/core/layout/svg/line/SVGRootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698