| 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 visitor->trace(m_cssFontFace); | 645 visitor->trace(m_cssFontFace); |
| 646 visitor->trace(m_callbacks); | 646 visitor->trace(m_callbacks); |
| 647 SuspendableObject::trace(visitor); | 647 SuspendableObject::trace(visitor); |
| 648 } | 648 } |
| 649 | 649 |
| 650 bool FontFace::hadBlankText() const { | 650 bool FontFace::hadBlankText() const { |
| 651 return m_cssFontFace->hadBlankText(); | 651 return m_cssFontFace->hadBlankText(); |
| 652 } | 652 } |
| 653 | 653 |
| 654 bool FontFace::hasPendingActivity() const { | 654 bool FontFace::hasPendingActivity() const { |
| 655 return m_status == Loading && getExecutionContext() && | 655 return m_status == Loading && getExecutionContext(); |
| 656 !getExecutionContext()->isContextDestroyed(); | |
| 657 } | 656 } |
| 658 | 657 |
| 659 } // namespace blink | 658 } // namespace blink |
| OLD | NEW |