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

Side by Side Diff: trunk/Source/platform/fonts/win/FontCacheSkiaWin.cpp

Issue 554543002: Revert 181532 "Gardening: Fix tests failing on Win7(dbg) caused ..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
« 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 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 30 matching lines...) Expand all
41 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h" 41 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h"
42 #include "platform/fonts/win/FontFallbackWin.h" 42 #include "platform/fonts/win/FontFallbackWin.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 HashMap<String, RefPtr<SkTypeface> >* FontCache::s_sideloadedFonts = 0; 46 HashMap<String, RefPtr<SkTypeface> >* FontCache::s_sideloadedFonts = 0;
47 47
48 // static 48 // static
49 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface) 49 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface)
50 { 50 {
51 if (!typeface)
52 return;
53 if (!s_sideloadedFonts) 51 if (!s_sideloadedFonts)
54 s_sideloadedFonts = new HashMap<String, RefPtr<SkTypeface> >; 52 s_sideloadedFonts = new HashMap<String, RefPtr<SkTypeface> >;
55 SkString name; 53 SkString name;
56 typeface->getFamilyName(&name); 54 typeface->getFamilyName(&name);
57 s_sideloadedFonts->set(name.c_str(), typeface); 55 s_sideloadedFonts->set(name.c_str(), typeface);
58 } 56 }
59 57
60 FontCache::FontCache() 58 FontCache::FontCache()
61 : m_purgePreventCount(0) 59 : m_purgePreventCount(0)
62 { 60 {
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 if (typefacesMatchesFamily(tf.get(), family)) { 320 if (typefacesMatchesFamily(tf.get(), family)) {
323 result->setMinSizeForSubpixel(minSizeForSubpixelForFont); 321 result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
324 break; 322 break;
325 } 323 }
326 } 324 }
327 325
328 return result; 326 return result;
329 } 327 }
330 328
331 } // namespace blink 329 } // namespace blink
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