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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGTextMetrics.h

Issue 2888623008: Remove SVGTextMetrics Width/Height getters (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | third_party/WebKit/Source/core/layout/svg/SVGTextMetrics.cpp » ('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 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #ifndef SVGTextMetrics_h 20 #ifndef SVGTextMetrics_h
21 #define SVGTextMetrics_h 21 #define SVGTextMetrics_h
22 22
23 #include "platform/wtf/Allocator.h" 23 #include "platform/wtf/Allocator.h"
24 24
25 namespace blink { 25 namespace blink {
26 26
27 class FloatSize;
27 enum class FontOrientation; 28 enum class FontOrientation;
28 29
29 class SVGTextMetrics { 30 class SVGTextMetrics {
30 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); 31 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
31 32
32 public: 33 public:
33 enum MetricsType { kSkippedSpaceMetrics }; 34 enum MetricsType { kSkippedSpaceMetrics };
34 35
35 SVGTextMetrics(MetricsType); 36 SVGTextMetrics(MetricsType);
36 SVGTextMetrics(unsigned length, float width, float height); 37 SVGTextMetrics(unsigned length, float width, float height);
37 38
38 bool IsEmpty() const { return !width_ && !height_ && length_ <= 1; } 39 bool IsEmpty() const { return !width_ && !height_ && length_ <= 1; }
39 40
40 float Width() const { return width_; } 41 FloatSize Extents() const;
41 float Height() const { return height_; }
42 42
43 // TODO(kojii): We should store logical width (advance) and height instead 43 // TODO(kojii): We should store logical width (advance) and height instead
44 // of storing physical and calculate logical. crbug.com/544767 44 // of storing physical and calculate logical. crbug.com/544767
45 float Advance(FontOrientation) const; 45 float Advance(FontOrientation) const;
46 float Advance(bool is_vertical) const {
47 return is_vertical ? height_ : width_;
48 }
46 unsigned length() const { return length_; } 49 unsigned length() const { return length_; }
47 50
48 private: 51 private:
49 float width_; 52 float width_;
50 float height_; 53 float height_;
51 unsigned length_; 54 unsigned length_;
52 }; 55 };
53 56
54 } // namespace blink 57 } // namespace blink
55 58
56 #endif 59 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/svg/SVGTextMetrics.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698