| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 , m_exceedsFontLoadWaitLimit(false) | 80 , m_exceedsFontLoadWaitLimit(false) |
| 81 , m_corsFailed(false) | 81 , m_corsFailed(false) |
| 82 , m_fontLoadWaitLimitTimer(this, &FontResource::fontLoadWaitLimitCallback) | 82 , m_fontLoadWaitLimitTimer(this, &FontResource::fontLoadWaitLimitCallback) |
| 83 { | 83 { |
| 84 } | 84 } |
| 85 | 85 |
| 86 FontResource::~FontResource() | 86 FontResource::~FontResource() |
| 87 { | 87 { |
| 88 } | 88 } |
| 89 | 89 |
| 90 void FontResource::trace(Visitor* visitor) |
| 91 { |
| 92 #if ENABLE(SVG_FONTS) |
| 93 visitor->trace(m_externalSVGDocument); |
| 94 #endif |
| 95 Resource::trace(visitor); |
| 96 } |
| 97 |
| 90 void FontResource::load(ResourceFetcher*, const ResourceLoaderOptions& options) | 98 void FontResource::load(ResourceFetcher*, const ResourceLoaderOptions& options) |
| 91 { | 99 { |
| 92 // Don't load the file yet. Wait for an access before triggering the load. | 100 // Don't load the file yet. Wait for an access before triggering the load. |
| 93 setLoading(true); | 101 setLoading(true); |
| 94 m_options = options; | 102 m_options = options; |
| 95 } | 103 } |
| 96 | 104 |
| 97 void FontResource::didAddClient(ResourceClient* c) | 105 void FontResource::didAddClient(ResourceClient* c) |
| 98 { | 106 { |
| 99 ASSERT(c->resourceClientType() == FontResourceClient::expectedType()); | 107 ASSERT(c->resourceClientType() == FontResourceClient::expectedType()); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 | 229 |
| 222 void FontResource::checkNotify() | 230 void FontResource::checkNotify() |
| 223 { | 231 { |
| 224 m_fontLoadWaitLimitTimer.stop(); | 232 m_fontLoadWaitLimitTimer.stop(); |
| 225 ResourceClientWalker<FontResourceClient> w(m_clients); | 233 ResourceClientWalker<FontResourceClient> w(m_clients); |
| 226 while (FontResourceClient* c = w.next()) | 234 while (FontResourceClient* c = w.next()) |
| 227 c->fontLoaded(this); | 235 c->fontLoaded(this); |
| 228 } | 236 } |
| 229 | 237 |
| 230 } | 238 } |
| OLD | NEW |