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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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()) { | 108 if (!m_externalSVGDocument && !errorOccurred() && !isLoading()) { |
109 if (m_data) { | 109 if (m_data) { |
110 m_externalSVGDocument = SVGDocument::create(); | 110 m_externalSVGDocument = SVGDocument::create(); |
111 | 111 |
112 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("a
pplication/xml"); | 112 OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("a
pplication/xml"); |
113 String svgSource = decoder->decode(m_data->data(), m_data->size()); | 113 String svgSource = decoder->decode(m_data->data(), m_data->size()); |
114 svgSource.append(decoder->flush()); | 114 svgSource = svgSource + decoder->flush(); |
115 | 115 |
116 m_externalSVGDocument->setContent(svgSource); | 116 m_externalSVGDocument->setContent(svgSource); |
117 | 117 |
118 if (decoder->sawError()) | 118 if (decoder->sawError()) |
119 m_externalSVGDocument = 0; | 119 m_externalSVGDocument = 0; |
120 } | 120 } |
121 if (!m_externalSVGDocument) | 121 if (!m_externalSVGDocument) |
122 setStatus(DecodeError); | 122 setStatus(DecodeError); |
123 } | 123 } |
124 | 124 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 } | 162 } |
163 | 163 |
164 void FontResource::checkNotify() | 164 void FontResource::checkNotify() |
165 { | 165 { |
166 ResourceClientWalker<FontResourceClient> w(m_clients); | 166 ResourceClientWalker<FontResourceClient> w(m_clients); |
167 while (FontResourceClient* c = w.next()) | 167 while (FontResourceClient* c = w.next()) |
168 c->fontLoaded(this); | 168 c->fontLoaded(this); |
169 } | 169 } |
170 | 170 |
171 } | 171 } |
OLD | NEW |