| OLD | NEW | 
|---|
| 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 #include "ui/gfx/platform_font_ios.h" | 5 #include "ui/gfx/platform_font_ios.h" | 
| 6 | 6 | 
| 7 #import <UIKit/UIKit.h> | 7 #import <UIKit/UIKit.h> | 
| 8 | 8 | 
| 9 #include <cmath> |  | 
| 10 |  | 
| 11 #include "base/basictypes.h" | 9 #include "base/basictypes.h" | 
| 12 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" | 
| 13 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" | 
| 14 #include "ui/gfx/font.h" | 12 #include "ui/gfx/font.h" | 
| 15 #include "ui/gfx/font_render_params.h" | 13 #include "ui/gfx/font_render_params.h" | 
| 16 | 14 | 
| 17 namespace gfx { | 15 namespace gfx { | 
| 18 | 16 | 
| 19 //////////////////////////////////////////////////////////////////////////////// | 17 //////////////////////////////////////////////////////////////////////////////// | 
| 20 // PlatformFontIOS, public: | 18 // PlatformFontIOS, public: | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 105   font_size_ = font_size; | 103   font_size_ = font_size; | 
| 106   style_ = style; | 104   style_ = style; | 
| 107   CalculateMetrics(); | 105   CalculateMetrics(); | 
| 108 } | 106 } | 
| 109 | 107 | 
| 110 void PlatformFontIOS::CalculateMetrics() { | 108 void PlatformFontIOS::CalculateMetrics() { | 
| 111   UIFont* font = GetNativeFont(); | 109   UIFont* font = GetNativeFont(); | 
| 112   height_ = font.lineHeight; | 110   height_ = font.lineHeight; | 
| 113   ascent_ = font.ascender; | 111   ascent_ = font.ascender; | 
| 114   cap_height_ = font.capHeight; | 112   cap_height_ = font.capHeight; | 
| 115   NSDictionary* attributes = @{ NSFontAttributeName : font }; | 113   average_width_ = [@"x" sizeWithFont:font].width; | 
| 116   average_width_ = std::ceil([@"x" sizeWithAttributes:attributes].width); |  | 
| 117 } | 114 } | 
| 118 | 115 | 
| 119 //////////////////////////////////////////////////////////////////////////////// | 116 //////////////////////////////////////////////////////////////////////////////// | 
| 120 // PlatformFont, public: | 117 // PlatformFont, public: | 
| 121 | 118 | 
| 122 // static | 119 // static | 
| 123 PlatformFont* PlatformFont::CreateDefault() { | 120 PlatformFont* PlatformFont::CreateDefault() { | 
| 124   return new PlatformFontIOS; | 121   return new PlatformFontIOS; | 
| 125 } | 122 } | 
| 126 | 123 | 
| 127 // static | 124 // static | 
| 128 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) { | 125 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) { | 
| 129   return new PlatformFontIOS(native_font); | 126   return new PlatformFontIOS(native_font); | 
| 130 } | 127 } | 
| 131 | 128 | 
| 132 // static | 129 // static | 
| 133 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, | 130 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, | 
| 134                                                   int font_size) { | 131                                                   int font_size) { | 
| 135   return new PlatformFontIOS(font_name, font_size); | 132   return new PlatformFontIOS(font_name, font_size); | 
| 136 } | 133 } | 
| 137 | 134 | 
| 138 }  // namespace gfx | 135 }  // namespace gfx | 
| OLD | NEW | 
|---|