| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2007 Apple Computer, Inc. | 2  * Copyright (C) 2007 Apple Computer, Inc. | 
| 3  * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. | 3  * Copyright (c) 2007, 2008, 2009, 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 21 matching lines...) Expand all  Loading... | 
| 32 #ifndef FontCustomPlatformData_h | 32 #ifndef FontCustomPlatformData_h | 
| 33 #define FontCustomPlatformData_h | 33 #define FontCustomPlatformData_h | 
| 34 | 34 | 
| 35 #include "platform/PlatformExport.h" | 35 #include "platform/PlatformExport.h" | 
| 36 #include "platform/fonts/FontOrientation.h" | 36 #include "platform/fonts/FontOrientation.h" | 
| 37 #include "wtf/Forward.h" | 37 #include "wtf/Forward.h" | 
| 38 #include "wtf/Noncopyable.h" | 38 #include "wtf/Noncopyable.h" | 
| 39 #include "wtf/RefPtr.h" | 39 #include "wtf/RefPtr.h" | 
| 40 #include "wtf/text/WTFString.h" | 40 #include "wtf/text/WTFString.h" | 
| 41 | 41 | 
|  | 42 #if OS(MACOSX) | 
|  | 43 #include "wtf/RetainPtr.h" | 
|  | 44 #include <CoreFoundation/CFBase.h> | 
|  | 45 typedef struct CGFont* CGFontRef; | 
|  | 46 #endif | 
|  | 47 | 
| 42 class SkTypeface; | 48 class SkTypeface; | 
| 43 | 49 | 
| 44 namespace blink { | 50 namespace blink { | 
| 45 | 51 | 
| 46 class FontPlatformData; | 52 class FontPlatformData; | 
| 47 class SharedBuffer; | 53 class SharedBuffer; | 
| 48 | 54 | 
| 49 class PLATFORM_EXPORT FontCustomPlatformData { | 55 class PLATFORM_EXPORT FontCustomPlatformData { | 
| 50     WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); | 56     WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); | 
| 51 public: | 57 public: | 
| 52     static PassOwnPtr<FontCustomPlatformData> create(SharedBuffer*); | 58     static PassOwnPtr<FontCustomPlatformData> create(SharedBuffer*); | 
| 53     ~FontCustomPlatformData(); | 59     ~FontCustomPlatformData(); | 
| 54 | 60 | 
| 55     FontPlatformData fontPlatformData(float size, bool bold, bool italic, FontOr
    ientation = Horizontal); | 61     FontPlatformData fontPlatformData(float size, bool bold, bool italic, FontOr
    ientation = Horizontal); | 
| 56 | 62 | 
| 57     static bool supportsFormat(const String&); | 63     static bool supportsFormat(const String&); | 
| 58 | 64 | 
| 59 private: | 65 private: | 
|  | 66 #if OS(MACOSX) | 
|  | 67     explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>); | 
|  | 68     RetainPtr<CGFontRef> m_cgFont; | 
|  | 69 #else | 
| 60     explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); | 70     explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); | 
|  | 71 #endif | 
| 61     RefPtr<SkTypeface> m_typeface; | 72     RefPtr<SkTypeface> m_typeface; | 
| 62 }; | 73 }; | 
| 63 | 74 | 
| 64 } // namespace blink | 75 } // namespace blink | 
| 65 | 76 | 
| 66 #endif // FontCustomPlatformData_h | 77 #endif // FontCustomPlatformData_h | 
| OLD | NEW | 
|---|