diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 08:17:15 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 08:17:15 +0000 |
| commit | 4a2e8d5f38da690160909cdbde30010ae6c1e4ed (patch) | |
| tree | 203c09417ecfa60e3bfe1a15b552aeb08ec205d7 /content/browser/renderer_host/pepper | |
| parent | 828d9905ce54258be2cfb6703ceb6b03af0eb572 (diff) | |
| download | chromium_src-4a2e8d5f38da690160909cdbde30010ae6c1e4ed.zip chromium_src-4a2e8d5f38da690160909cdbde30010ae6c1e4ed.tar.gz chromium_src-4a2e8d5f38da690160909cdbde30010ae6c1e4ed.tar.bz2 | |
Fix mac x64 build error in pepper_truetype_font_list_mac.mm.
Introduced http://crrev.com/195082
BUG=230130
TBR=bbudge@chromium.org, raymes@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14392002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/pepper')
| -rw-r--r-- | content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm index 4c7ec94..7615723 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm @@ -56,7 +56,7 @@ void GetFontsInFamily_SlowBlocking( ppapi::proxy::SerializedTrueTypeFontDesc desc; desc.family = family; NSInteger font_weight = [[font_info objectAtIndex:2] intValue]; - font_weight = std::max(0, font_weight); + font_weight = std::max(static_cast<NSInteger>(0), font_weight); font_weight = std::min(kPepperFontWeightsLength - 1, font_weight); desc.weight = kPepperFontWeights[font_weight]; |