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

Side by Side Diff: content/renderer/renderer_font_platform_win.cc

Issue 668743002: Add Georgia, Verdana, and Trebuchet MS to fallback list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/renderer/renderer_font_platform_win.h" 5 #include "content/renderer/renderer_font_platform_win.h"
6 6
7 #include <dwrite.h> 7 #include <dwrite.h>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include <wrl/implements.h> 10 #include <wrl/implements.h>
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 L"consolaz.ttf", // IDS_FIXED_FONT_FAMILY_ALT_WIN 310 L"consolaz.ttf", // IDS_FIXED_FONT_FAMILY_ALT_WIN
311 L"arial.ttf", // IDS_SANS_SERIF_FONT_FAMILY 311 L"arial.ttf", // IDS_SANS_SERIF_FONT_FAMILY
312 L"arialbd.ttf", // IDS_SANS_SERIF_FONT_FAMILY 312 L"arialbd.ttf", // IDS_SANS_SERIF_FONT_FAMILY
313 L"arialbi.ttf", // IDS_SANS_SERIF_FONT_FAMILY 313 L"arialbi.ttf", // IDS_SANS_SERIF_FONT_FAMILY
314 L"ariali.ttf", // IDS_SANS_SERIF_FONT_FAMILY 314 L"ariali.ttf", // IDS_SANS_SERIF_FONT_FAMILY
315 L"comic.ttf", // IDS_CURSIVE_FONT_FAMILY 315 L"comic.ttf", // IDS_CURSIVE_FONT_FAMILY
316 L"comicbd.ttf", // IDS_CURSIVE_FONT_FAMILY 316 L"comicbd.ttf", // IDS_CURSIVE_FONT_FAMILY
317 L"comici.ttf", // IDS_CURSIVE_FONT_FAMILY 317 L"comici.ttf", // IDS_CURSIVE_FONT_FAMILY
318 L"comicz.ttf", // IDS_CURSIVE_FONT_FAMILY 318 L"comicz.ttf", // IDS_CURSIVE_FONT_FAMILY
319 L"impact.ttf", // IDS_FANTASY_FONT_FAMILY 319 L"impact.ttf", // IDS_FANTASY_FONT_FAMILY
320 L"georgia.ttf",
321 L"georgiab.ttf",
322 L"georgiai.ttf",
323 L"georgiaz.ttf",
324 L"trebuc.ttf",
325 L"trebucbd.ttf",
326 L"trebucbi.ttf",
327 L"trebucit.ttf",
328 L"verdana.ttf",
329 L"verdanab.ttf",
330 L"verdanai.ttf",
331 L"verdanaz.ttf",
320 L"segoeui.ttf", // IDS_PICTOGRAPH_FONT_FAMILY 332 L"segoeui.ttf", // IDS_PICTOGRAPH_FONT_FAMILY
321 L"segoeuib.ttf", // IDS_PICTOGRAPH_FONT_FAMILY 333 L"segoeuib.ttf", // IDS_PICTOGRAPH_FONT_FAMILY
322 L"segoeuii.ttf", // IDS_PICTOGRAPH_FONT_FAMILY 334 L"segoeuii.ttf", // IDS_PICTOGRAPH_FONT_FAMILY
323 L"msgothic.ttc", // IDS_STANDARD_FONT_FAMILY_JAPANESE 335 L"msgothic.ttc", // IDS_STANDARD_FONT_FAMILY_JAPANESE
324 L"msmincho.ttc", // IDS_SERIF_FONT_FAMILY_JAPANESE 336 L"msmincho.ttc", // IDS_SERIF_FONT_FAMILY_JAPANESE
325 L"gulim.ttc", // IDS_FIXED_FONT_FAMILY_KOREAN 337 L"gulim.ttc", // IDS_FIXED_FONT_FAMILY_KOREAN
326 L"batang.ttc", // IDS_SERIF_FONT_FAMILY_KOREAN 338 L"batang.ttc", // IDS_SERIF_FONT_FAMILY_KOREAN
327 L"simsun.ttc", // IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 339 L"simsun.ttc", // IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN
328 L"mingliu.ttc", // IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 340 L"mingliu.ttc", // IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN
329 341
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 CHECK(g_font_collection.Get() != NULL); 414 CHECK(g_font_collection.Get() != NULL);
403 415
404 UMA_HISTOGRAM_TIMES("DirectWrite.Fonts.LoadTime", time_delta); 416 UMA_HISTOGRAM_TIMES("DirectWrite.Fonts.LoadTime", time_delta);
405 417
406 base::debug::ClearCrashKey(kFontKeyName); 418 base::debug::ClearCrashKey(kFontKeyName);
407 419
408 return g_font_collection.Get(); 420 return g_font_collection.Get();
409 } 421 }
410 422
411 } // namespace content 423 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698