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

Side by Side Diff: Source/core/rendering/InlineTextBox.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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/RenderApplet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 LayoutUnit selectionTop(); 104 LayoutUnit selectionTop();
105 LayoutUnit selectionBottom(); 105 LayoutUnit selectionBottom();
106 LayoutUnit selectionHeight(); 106 LayoutUnit selectionHeight();
107 107
108 // charactersWithHyphen, if provided, must not be destroyed before the TextR un. 108 // charactersWithHyphen, if provided, must not be destroyed before the TextR un.
109 TextRun constructTextRun(RenderStyle*, const Font&, StringBuilder* character sWithHyphen = 0) const; 109 TextRun constructTextRun(RenderStyle*, const Font&, StringBuilder* character sWithHyphen = 0) const;
110 TextRun constructTextRun(RenderStyle*, const Font&, StringView, int maximumL ength, StringBuilder* charactersWithHyphen = 0) const; 110 TextRun constructTextRun(RenderStyle*, const Font&, StringView, int maximumL ength, StringBuilder* charactersWithHyphen = 0) const;
111 111
112 public: 112 public:
113 TextRun constructTextRunForInspector(RenderStyle*, const Font&) const; 113 TextRun constructTextRunForInspector(RenderStyle*, const Font&) const;
114 virtual FloatRect calculateBoundaries() const { return FloatRect(x(), y(), w idth(), height()); } 114 virtual FloatRect calculateBoundaries() const OVERRIDE { return FloatRect(x( ), y(), width(), height()); }
115 115
116 virtual LayoutRect localSelectionRect(int startPos, int endPos); 116 virtual LayoutRect localSelectionRect(int startPos, int endPos);
117 bool isSelected(int startPos, int endPos) const; 117 bool isSelected(int startPos, int endPos) const;
118 void selectionStartEnd(int& sPos, int& ePos); 118 void selectionStartEnd(int& sPos, int& ePos);
119 119
120 protected: 120 protected:
121 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom); 121 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) OVERRIDE;
122 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; 122 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
123 123
124 public: 124 public:
125 RenderText* textRenderer() const; 125 RenderText* textRenderer() const;
126 126
127 private: 127 private:
128 virtual void deleteLine() OVERRIDE FINAL; 128 virtual void deleteLine() OVERRIDE FINAL;
129 virtual void extractLine() OVERRIDE FINAL; 129 virtual void extractLine() OVERRIDE FINAL;
130 virtual void attachLine() OVERRIDE FINAL; 130 virtual void attachLine() OVERRIDE FINAL;
131 131
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 inline AffineTransform InlineTextBox::rotation(const FloatRect& boxRect, Rotatio nDirection rotationDirection) 205 inline AffineTransform InlineTextBox::rotation(const FloatRect& boxRect, Rotatio nDirection rotationDirection)
206 { 206 {
207 return rotationDirection == Clockwise ? AffineTransform(0, 1, -1, 0, boxRect .x() + boxRect.maxY(), boxRect.maxY() - boxRect.x()) 207 return rotationDirection == Clockwise ? AffineTransform(0, 1, -1, 0, boxRect .x() + boxRect.maxY(), boxRect.maxY() - boxRect.x())
208 : AffineTransform(0, -1, 1, 0, boxRect.x() - boxRect.maxY(), boxRect.x() + boxRect.maxY()); 208 : AffineTransform(0, -1, 1, 0, boxRect.x() - boxRect.maxY(), boxRect.x() + boxRect.maxY());
209 } 209 }
210 210
211 } // namespace WebCore 211 } // namespace WebCore
212 212
213 #endif // InlineTextBox_h 213 #endif // InlineTextBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/RenderApplet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698