| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 FontFace* fontFace() const { return m_fontFace; } | 59 FontFace* fontFace() const { return m_fontFace; } |
| 60 | 60 |
| 61 UnicodeRangeSet& ranges() { return m_ranges; } | 61 UnicodeRangeSet& ranges() { return m_ranges; } |
| 62 | 62 |
| 63 void setSegmentedFontFace(CSSSegmentedFontFace*); | 63 void setSegmentedFontFace(CSSSegmentedFontFace*); |
| 64 void clearSegmentedFontFace() { m_segmentedFontFace = 0; } | 64 void clearSegmentedFontFace() { m_segmentedFontFace = 0; } |
| 65 | 65 |
| 66 bool isValid() const { return !m_sources.isEmpty(); } | 66 bool isValid() const { return !m_sources.isEmpty(); } |
| 67 | 67 |
| 68 // FIXME: Should not be exposed (used by tentative CORS fallback code). |
| 69 CSSFontSelector* fontSelector() const; |
| 70 |
| 68 void addSource(PassOwnPtr<CSSFontFaceSource>); | 71 void addSource(PassOwnPtr<CSSFontFaceSource>); |
| 69 | 72 |
| 70 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0); | 73 void beginLoadIfNeeded(CSSFontFaceSource*, CSSFontSelector* = 0); |
| 71 void fontLoaded(RemoteFontFaceSource*); | 74 void fontLoaded(RemoteFontFaceSource*); |
| 72 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*); | 75 void fontLoadWaitLimitExceeded(RemoteFontFaceSource*); |
| 73 | 76 |
| 74 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); | 77 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); |
| 75 | 78 |
| 76 struct UnicodeRange { | 79 struct UnicodeRange { |
| 77 UnicodeRange(UChar32 from, UChar32 to) | 80 UnicodeRange(UChar32 from, UChar32 to) |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 116 |
| 114 UnicodeRangeSet m_ranges; | 117 UnicodeRangeSet m_ranges; |
| 115 CSSSegmentedFontFace* m_segmentedFontFace; | 118 CSSSegmentedFontFace* m_segmentedFontFace; |
| 116 Deque<OwnPtr<CSSFontFaceSource> > m_sources; | 119 Deque<OwnPtr<CSSFontFaceSource> > m_sources; |
| 117 FontFace* m_fontFace; | 120 FontFace* m_fontFace; |
| 118 }; | 121 }; |
| 119 | 122 |
| 120 } | 123 } |
| 121 | 124 |
| 122 #endif | 125 #endif |
| OLD | NEW |