| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 bool stillNeedsLoad() const { return !m_loadInitiated; } | 54 bool stillNeedsLoad() const { return !m_loadInitiated; } |
| 55 | 55 |
| 56 bool ensureCustomFontData(); | 56 bool ensureCustomFontData(); |
| 57 FontPlatformData platformDataFromCustomData(float size, bool bold, bool ital
ic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRendering
Mode = NormalRenderingMode); | 57 FontPlatformData platformDataFromCustomData(float size, bool bold, bool ital
ic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRendering
Mode = NormalRenderingMode); |
| 58 | 58 |
| 59 #if ENABLE(SVG_FONTS) | 59 #if ENABLE(SVG_FONTS) |
| 60 bool ensureSVGFontData(); | 60 bool ensureSVGFontData(); |
| 61 SVGFontElement* getSVGFontById(const String&) const; | 61 SVGFontElement* getSVGFontById(const String&) const; |
| 62 #endif | 62 #endif |
| 63 | 63 |
| 64 virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; | |
| 65 | |
| 66 private: | 64 private: |
| 67 virtual void checkNotify(); | 65 virtual void checkNotify(); |
| 68 FontCustomPlatformData* m_fontData; | 66 FontCustomPlatformData* m_fontData; |
| 69 bool m_loadInitiated; | 67 bool m_loadInitiated; |
| 70 | 68 |
| 71 #if ENABLE(SVG_FONTS) | 69 #if ENABLE(SVG_FONTS) |
| 72 RefPtr<SVGDocument> m_externalSVGDocument; | 70 RefPtr<SVGDocument> m_externalSVGDocument; |
| 73 #endif | 71 #endif |
| 74 | 72 |
| 75 friend class MemoryCache; | 73 friend class MemoryCache; |
| 76 }; | 74 }; |
| 77 | 75 |
| 78 class CachedFontClient : public CachedResourceClient { | 76 class CachedFontClient : public CachedResourceClient { |
| 79 public: | 77 public: |
| 80 virtual ~CachedFontClient() { } | 78 virtual ~CachedFontClient() { } |
| 81 static CachedResourceClientType expectedType() { return FontType; } | 79 static CachedResourceClientType expectedType() { return FontType; } |
| 82 virtual CachedResourceClientType resourceClientType() const { return expecte
dType(); } | 80 virtual CachedResourceClientType resourceClientType() const { return expecte
dType(); } |
| 83 virtual void fontLoaded(CachedFont*) { } | 81 virtual void fontLoaded(CachedFont*) { } |
| 84 }; | 82 }; |
| 85 | 83 |
| 86 } | 84 } |
| 87 | 85 |
| 88 #endif | 86 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
