| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 m_callbacks.swap(callbacks); | 344 m_callbacks.swap(callbacks); |
| 345 for (size_t i = 0; i < callbacks.size(); ++i) { | 345 for (size_t i = 0; i < callbacks.size(); ++i) { |
| 346 if (m_status == Loaded) | 346 if (m_status == Loaded) |
| 347 callbacks[i]->notifyLoaded(this); | 347 callbacks[i]->notifyLoaded(this); |
| 348 else | 348 else |
| 349 callbacks[i]->notifyError(this); | 349 callbacks[i]->notifyError(this); |
| 350 } | 350 } |
| 351 } | 351 } |
| 352 } | 352 } |
| 353 | 353 |
| 354 void FontFace::setError(PassRefPtrWillBeRawPtr<DOMException> error) | 354 void FontFace::setError(DOMException* error) |
| 355 { | 355 { |
| 356 if (!m_error) | 356 if (!m_error) |
| 357 m_error = error ? error : DOMException::create(NetworkError); | 357 m_error = error ? error : DOMException::create(NetworkError); |
| 358 setLoadStatus(Error); | 358 setLoadStatus(Error); |
| 359 } | 359 } |
| 360 | 360 |
| 361 ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState) | 361 ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState) |
| 362 { | 362 { |
| 363 if (!m_loadedProperty) { | 363 if (!m_loadedProperty) { |
| 364 m_loadedProperty = new LoadedProperty(scriptState->executionContext(), t
his, LoadedProperty::Loaded); | 364 m_loadedProperty = new LoadedProperty(scriptState->executionContext(), t
his, LoadedProperty::Loaded); |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 { | 580 { |
| 581 return m_cssFontFace->hadBlankText(); | 581 return m_cssFontFace->hadBlankText(); |
| 582 } | 582 } |
| 583 | 583 |
| 584 bool FontFace::hasPendingActivity() const | 584 bool FontFace::hasPendingActivity() const |
| 585 { | 585 { |
| 586 return m_status == Loading && executionContext() && !executionContext()->act
iveDOMObjectsAreStopped(); | 586 return m_status == Loading && executionContext() && !executionContext()->act
iveDOMObjectsAreStopped(); |
| 587 } | 587 } |
| 588 | 588 |
| 589 } // namespace blink | 589 } // namespace blink |
| OLD | NEW |