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

Side by Side Diff: Source/core/rendering/InlineTextBox.h

Issue 137943002: Update more core classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/RenderBlock.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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const; 87 bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const;
88 88
89 LayoutRect logicalOverflowRect() const; 89 LayoutRect logicalOverflowRect() const;
90 void setLogicalOverflowRect(const LayoutRect&); 90 void setLogicalOverflowRect(const LayoutRect&);
91 LayoutUnit logicalTopVisualOverflow() const { return logicalOverflowRect().y (); } 91 LayoutUnit logicalTopVisualOverflow() const { return logicalOverflowRect().y (); }
92 LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect( ).maxY(); } 92 LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect( ).maxY(); }
93 LayoutUnit logicalLeftVisualOverflow() const { return logicalOverflowRect(). x(); } 93 LayoutUnit logicalLeftVisualOverflow() const { return logicalOverflowRect(). x(); }
94 LayoutUnit logicalRightVisualOverflow() const { return logicalOverflowRect() .maxX(); } 94 LayoutUnit logicalRightVisualOverflow() const { return logicalOverflowRect() .maxX(); }
95 95
96 #ifndef NDEBUG 96 #ifndef NDEBUG
97 virtual void showBox(int = 0) const; 97 virtual void showBox(int = 0) const OVERRIDE;
98 virtual const char* boxName() const; 98 virtual const char* boxName() const OVERRIDE;
99 #endif 99 #endif
100 100
101 enum RotationDirection { Counterclockwise, Clockwise }; 101 enum RotationDirection { Counterclockwise, Clockwise };
102 static AffineTransform rotation(const FloatRect& boxRect, RotationDirection) ; 102 static AffineTransform rotation(const FloatRect& boxRect, RotationDirection) ;
103 private: 103 private:
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.
(...skipping 95 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/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698