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

Side by Side Diff: ui/gfx/platform_font_ios.h

Issue 79263004: Enables font-related unittests again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 7 years 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 | « ui/gfx/platform_font.h ('k') | ui/gfx/platform_font_ios.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_IOS_H_
6 #define UI_GFX_PLATFORM_FONT_IOS_H_ 6 #define UI_GFX_PLATFORM_FONT_IOS_H_
7 7
8 #include "ui/gfx/platform_font.h" 8 #include "ui/gfx/platform_font.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 class PlatformFontIOS : public PlatformFont { 12 class PlatformFontIOS : public PlatformFont {
13 public: 13 public:
14 PlatformFontIOS(); 14 PlatformFontIOS();
15 explicit PlatformFontIOS(NativeFont native_font); 15 explicit PlatformFontIOS(NativeFont native_font);
16 PlatformFontIOS(const std::string& font_name, 16 PlatformFontIOS(const std::string& font_name,
17 int font_size); 17 int font_size);
18 18
19 // Overridden from PlatformFont: 19 // Overridden from PlatformFont:
20 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE; 20 virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
21 virtual int GetHeight() const OVERRIDE; 21 virtual int GetHeight() const OVERRIDE;
22 virtual int GetBaseline() const OVERRIDE; 22 virtual int GetBaseline() const OVERRIDE;
23 virtual int GetCapHeight() const OVERRIDE; 23 virtual int GetCapHeight() const OVERRIDE;
24 virtual int GetAverageCharacterWidth() const OVERRIDE; 24 virtual int GetAverageCharacterWidth() const OVERRIDE;
25 virtual int GetStringWidth(const base::string16& text) const OVERRIDE; 25 virtual int GetStringWidth(const base::string16& text) const OVERRIDE;
26 virtual int GetExpectedTextWidth(int length) const OVERRIDE; 26 virtual int GetExpectedTextWidth(int length) const OVERRIDE;
27 virtual int GetStyle() const OVERRIDE; 27 virtual int GetStyle() const OVERRIDE;
28 virtual std::string GetFontName() const OVERRIDE; 28 virtual std::string GetFontName() const OVERRIDE;
29 virtual std::string GetActualFontNameForTesting() const OVERRIDE;
29 virtual int GetFontSize() const OVERRIDE; 30 virtual int GetFontSize() const OVERRIDE;
30 virtual NativeFont GetNativeFont() const OVERRIDE; 31 virtual NativeFont GetNativeFont() const OVERRIDE;
31 32
32 private: 33 private:
33 PlatformFontIOS(const std::string& font_name, int font_size, int style); 34 PlatformFontIOS(const std::string& font_name, int font_size, int style);
34 virtual ~PlatformFontIOS() {} 35 virtual ~PlatformFontIOS() {}
35 36
36 // Initialize the object with the specified parameters. 37 // Initialize the object with the specified parameters.
37 void InitWithNameSizeAndStyle(const std::string& font_name, 38 void InitWithNameSizeAndStyle(const std::string& font_name,
38 int font_size, 39 int font_size,
(...skipping 11 matching lines...) Expand all
50 int ascent_; 51 int ascent_;
51 int cap_height_; 52 int cap_height_;
52 int average_width_; 53 int average_width_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS); 55 DISALLOW_COPY_AND_ASSIGN(PlatformFontIOS);
55 }; 56 };
56 57
57 } // namespace gfx 58 } // namespace gfx
58 59
59 #endif // UI_GFX_PLATFORM_FONT_IOS_H_ 60 #endif // UI_GFX_PLATFORM_FONT_IOS_H_
OLDNEW
« no previous file with comments | « ui/gfx/platform_font.h ('k') | ui/gfx/platform_font_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698