OLD | NEW |
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 18 matching lines...) Expand all Loading... |
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
30 */ | 30 */ |
31 | 31 |
32 #include "config.h" | 32 #include "config.h" |
33 #include "core/platform/graphics/FontPlatformData.h" | 33 #include "core/platform/graphics/FontPlatformData.h" |
34 | 34 |
35 #include <windows.h> | 35 #include <windows.h> |
36 #include <mlang.h> | 36 #include <mlang.h> |
37 #include <objidl.h> | 37 #include <objidl.h> |
38 #include "HWndDC.h" | 38 #include "HWndDC.h" |
39 #include "SharedBuffer.h" | |
40 #include "SkTypeface_win.h" | 39 #include "SkTypeface_win.h" |
41 #include "SkiaFontWin.h" | 40 #include "SkiaFontWin.h" |
| 41 #include "core/platform/SharedBuffer.h" |
42 #include "core/platform/graphics/FontCache.h" | 42 #include "core/platform/graphics/FontCache.h" |
43 #include <public/Platform.h> | 43 #include <public/Platform.h> |
44 #include <public/win/WebSandboxSupport.h> | 44 #include <public/win/WebSandboxSupport.h> |
45 #include <wtf/StdLibExtras.h> | 45 #include <wtf/StdLibExtras.h> |
46 | 46 |
47 namespace WebCore { | 47 namespace WebCore { |
48 | 48 |
49 SkTypeface* CreateTypefaceFromHFont(HFONT hfont, int* size, int* lfQuality) | 49 SkTypeface* CreateTypefaceFromHFont(HFONT hfont, int* size, int* lfQuality) |
50 { | 50 { |
51 LOGFONT info; | 51 LOGFONT info; |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 | 225 |
226 bool FontPlatformData::ensureFontLoaded(HFONT font) | 226 bool FontPlatformData::ensureFontLoaded(HFONT font) |
227 { | 227 { |
228 WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->san
dboxSupport(); | 228 WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->san
dboxSupport(); |
229 // if there is no sandbox, then we can assume the font | 229 // if there is no sandbox, then we can assume the font |
230 // was able to be loaded successfully already | 230 // was able to be loaded successfully already |
231 return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; | 231 return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; |
232 } | 232 } |
233 | 233 |
234 } | 234 } |
OLD | NEW |