| 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 while (FontResourceClient* client = walker.next()) | 166 while (FontResourceClient* client = walker.next()) |
| 167 client->fontLoadLongLimitExceeded(this); | 167 client->fontLoadLongLimitExceeded(this); |
| 168 } | 168 } |
| 169 | 169 |
| 170 void FontResource::allClientsAndObserversRemoved() | 170 void FontResource::allClientsAndObserversRemoved() |
| 171 { | 171 { |
| 172 m_fontData.reset(); | 172 m_fontData.reset(); |
| 173 Resource::allClientsAndObserversRemoved(); | 173 Resource::allClientsAndObserversRemoved(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 void FontResource::checkNotify() | 176 void FontResource::checkNotify(MarkFinishedOption markFinishedOption) |
| 177 { | 177 { |
| 178 m_fontLoadShortLimitTimer.stop(); | 178 m_fontLoadShortLimitTimer.stop(); |
| 179 m_fontLoadLongLimitTimer.stop(); | 179 m_fontLoadLongLimitTimer.stop(); |
| 180 | 180 |
| 181 Resource::checkNotify(); | 181 Resource::checkNotify(markFinishedOption); |
| 182 } | 182 } |
| 183 | 183 |
| 184 } // namespace blink | 184 } // namespace blink |
| OLD | NEW |