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

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

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « ui/gfx/platform_font_ios.h ('k') | ui/gfx/platform_font_linux.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 // 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> 9 #include <cmath>
10 10
11 #include "base/basictypes.h"
12 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
13 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
14 #include "ui/gfx/font.h" 13 #include "ui/gfx/font.h"
15 #include "ui/gfx/font_render_params.h" 14 #include "ui/gfx/font_render_params.h"
16 #include "ui/gfx/ios/NSString+CrStringDrawing.h" 15 #include "ui/gfx/ios/NSString+CrStringDrawing.h"
17 16
18 namespace gfx { 17 namespace gfx {
19 18
20 //////////////////////////////////////////////////////////////////////////////// 19 ////////////////////////////////////////////////////////////////////////////////
21 // PlatformFontIOS, public: 20 // PlatformFontIOS, public:
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 return new PlatformFontIOS(native_font); 128 return new PlatformFontIOS(native_font);
130 } 129 }
131 130
132 // static 131 // static
133 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, 132 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
134 int font_size) { 133 int font_size) {
135 return new PlatformFontIOS(font_name, font_size); 134 return new PlatformFontIOS(font_name, font_size);
136 } 135 }
137 136
138 } // namespace gfx 137 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_ios.h ('k') | ui/gfx/platform_font_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698