| 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 17 matching lines...) Expand all  Loading... | 
|   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   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 "SkPaint.h" |   35 #include "SkPaint.h" | 
|   36 #include "SkTypeface.h" |   36 #include "SkTypeface.h" | 
|   37 #include "SkTypeface_win.h" |   37 #include "SkTypeface_win.h" | 
|   38 #include "core/platform/LayoutTestSupport.h" |  | 
|   39 #include "core/platform/graphics/FontCache.h" |   38 #include "core/platform/graphics/FontCache.h" | 
|   40 #include "core/platform/graphics/GraphicsContext.h" |   39 #include "core/platform/graphics/GraphicsContext.h" | 
|   41 #include "core/platform/graphics/skia/SkiaFontWin.h" |   40 #include "core/platform/graphics/skia/SkiaFontWin.h" | 
|   42 #include "core/platform/win/HWndDC.h" |   41 #include "core/platform/win/HWndDC.h" | 
 |   42 #include "platform/LayoutTestSupport.h" | 
|   43 #include "platform/SharedBuffer.h" |   43 #include "platform/SharedBuffer.h" | 
|   44 #include "public/platform/Platform.h" |   44 #include "public/platform/Platform.h" | 
|   45 #include "public/platform/win/WebSandboxSupport.h" |   45 #include "public/platform/win/WebSandboxSupport.h" | 
|   46 #include "wtf/PassOwnPtr.h" |   46 #include "wtf/PassOwnPtr.h" | 
|   47 #include "wtf/StdLibExtras.h" |   47 #include "wtf/StdLibExtras.h" | 
|   48 #include <mlang.h> |   48 #include <mlang.h> | 
|   49 #include <objidl.h> |   49 #include <objidl.h> | 
|   50 #include <windows.h> |   50 #include <windows.h> | 
|   51  |   51  | 
|   52 namespace WebCore { |   52 namespace WebCore { | 
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  374  |  374  | 
|  375 bool FontPlatformData::ensureFontLoaded(HFONT font) |  375 bool FontPlatformData::ensureFontLoaded(HFONT font) | 
|  376 { |  376 { | 
|  377     WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->san
     dboxSupport(); |  377     WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->san
     dboxSupport(); | 
|  378     // if there is no sandbox, then we can assume the font |  378     // if there is no sandbox, then we can assume the font | 
|  379     // was able to be loaded successfully already |  379     // was able to be loaded successfully already | 
|  380     return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; |  380     return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; | 
|  381 } |  381 } | 
|  382  |  382  | 
|  383 } |  383 } | 
| OLD | NEW |