| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 FontFace::LoadStatus loadStatus() const { return m_fontFace->loadStatus(); } | 105 FontFace::LoadStatus loadStatus() const { return m_fontFace->loadStatus(); } |
| 106 void willUseFontData(const FontDescription&); | 106 void willUseFontData(const FontDescription&); |
| 107 void load(const FontDescription&, CSSFontSelector* = 0); | 107 void load(const FontDescription&, CSSFontSelector* = 0); |
| 108 | 108 |
| 109 bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText();
} | 109 bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText();
} |
| 110 | 110 |
| 111 private: | 111 private: |
| 112 void setLoadStatus(FontFace::LoadStatus); | 112 void setLoadStatus(FontFace::LoadStatus); |
| 113 | 113 |
| 114 UnicodeRangeSet m_ranges; | 114 UnicodeRangeSet m_ranges; |
| 115 // FIXME: Oilpan: Make m_segmentedFontFace a RawPtrWillBeMember when moving |
| 116 // CSSFontFace to the heap. |
| 115 CSSSegmentedFontFace* m_segmentedFontFace; | 117 CSSSegmentedFontFace* m_segmentedFontFace; |
| 116 Deque<OwnPtr<CSSFontFaceSource> > m_sources; | 118 Deque<OwnPtr<CSSFontFaceSource> > m_sources; |
| 117 FontFace* m_fontFace; | 119 FontFace* m_fontFace; |
| 118 }; | 120 }; |
| 119 | 121 |
| 120 } | 122 } |
| 121 | 123 |
| 122 #endif | 124 #endif |
| OLD | NEW |