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

Side by Side Diff: Source/platform/fonts/FontCache.cpp

Issue 213223003: Add ability to pass through IDWriteFactory so sandbox can control how it's constructed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | « Source/platform/fonts/FontCache.h ('k') | Source/platform/fonts/win/FontCacheSkiaWin.cpp » ('j') | 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, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 { 59 {
60 } 60 }
61 #endif // !OS(WIN) 61 #endif // !OS(WIN)
62 62
63 typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCa cheKeyTraits> FontPlatformDataCache; 63 typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCa cheKeyTraits> FontPlatformDataCache;
64 64
65 static FontPlatformDataCache* gFontPlatformDataCache = 0; 65 static FontPlatformDataCache* gFontPlatformDataCache = 0;
66 66
67 #if OS(WIN) 67 #if OS(WIN)
68 bool FontCache::s_useDirectWrite = false; 68 bool FontCache::s_useDirectWrite = false;
69 IDWriteFactory* FontCache::s_directWriteFactory = 0;
69 bool FontCache::s_useSubpixelPositioning = false; 70 bool FontCache::s_useSubpixelPositioning = false;
70 #endif // OS(WIN) 71 #endif // OS(WIN)
71 72
72 FontCache* FontCache::fontCache() 73 FontCache* FontCache::fontCache()
73 { 74 {
74 DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ()); 75 DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ());
75 return &globalFontCache; 76 return &globalFontCache;
76 } 77 }
77 78
78 FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDesc ription, 79 FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDesc ription,
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 clients.append(*it); 291 clients.append(*it);
291 292
292 ASSERT(numClients == clients.size()); 293 ASSERT(numClients == clients.size());
293 for (size_t i = 0; i < numClients; ++i) 294 for (size_t i = 0; i < numClients; ++i)
294 clients[i]->fontCacheInvalidated(); 295 clients[i]->fontCacheInvalidated();
295 296
296 purge(ForcePurge); 297 purge(ForcePurge);
297 } 298 }
298 299
299 } // namespace WebCore 300 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontCache.h ('k') | Source/platform/fonts/win/FontCacheSkiaWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698