| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Torch Mobile, Inc. | 3 * Copyright (C) 2009 Torch Mobile, Inc. |
| 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 ASSERT(m_fontData); | 101 ASSERT(m_fontData); |
| 102 return m_fontData->fontPlatformData(size, bold, italic, orientation, widthVa
riant); | 102 return m_fontData->fontPlatformData(size, bold, italic, orientation, widthVa
riant); |
| 103 } | 103 } |
| 104 | 104 |
| 105 #if ENABLE(SVG_FONTS) | 105 #if ENABLE(SVG_FONTS) |
| 106 bool FontResource::ensureSVGFontData() | 106 bool FontResource::ensureSVGFontData() |
| 107 { | 107 { |
| 108 if (!m_externalSVGDocument && !errorOccurred() && !isLoading() && m_data) { | 108 if (!m_externalSVGDocument && !errorOccurred() && !isLoading() && m_data) { |
| 109 m_externalSVGDocument = SVGDocument::create(); | 109 m_externalSVGDocument = SVGDocument::create(); |
| 110 | 110 |
| 111 RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("appli
cation/xml"); | 111 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("appli
cation/xml"); |
| 112 String svgSource = decoder->decode(m_data->data(), m_data->size()); | 112 String svgSource = decoder->decode(m_data->data(), m_data->size()); |
| 113 svgSource.append(decoder->flush()); | 113 svgSource.append(decoder->flush()); |
| 114 | 114 |
| 115 m_externalSVGDocument->setContent(svgSource); | 115 m_externalSVGDocument->setContent(svgSource); |
| 116 | 116 |
| 117 if (decoder->sawError()) | 117 if (decoder->sawError()) |
| 118 m_externalSVGDocument = 0; | 118 m_externalSVGDocument = 0; |
| 119 } | 119 } |
| 120 | 120 |
| 121 return m_externalSVGDocument; | 121 return m_externalSVGDocument; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 } | 158 } |
| 159 | 159 |
| 160 void FontResource::checkNotify() | 160 void FontResource::checkNotify() |
| 161 { | 161 { |
| 162 ResourceClientWalker<FontResourceClient> w(m_clients); | 162 ResourceClientWalker<FontResourceClient> w(m_clients); |
| 163 while (FontResourceClient* c = w.next()) | 163 while (FontResourceClient* c = w.next()) |
| 164 c->fontLoaded(this); | 164 c->fontLoaded(this); |
| 165 } | 165 } |
| 166 | 166 |
| 167 } | 167 } |
| OLD | NEW |