| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 } | 40 } |
| 41 | 41 |
| 42 PendingScript::PendingScript(Element* element, ScriptResource* resource) | 42 PendingScript::PendingScript(Element* element, ScriptResource* resource) |
| 43 : m_watchingForLoad(false) | 43 : m_watchingForLoad(false) |
| 44 , m_element(element) | 44 , m_element(element) |
| 45 , m_integrityFailure(false) | 45 , m_integrityFailure(false) |
| 46 , m_parserBlockingLoadStartTime(0) | 46 , m_parserBlockingLoadStartTime(0) |
| 47 , m_client(nullptr) | 47 , m_client(nullptr) |
| 48 { | 48 { |
| 49 setScriptResource(resource); | 49 setScriptResource(resource); |
| 50 ThreadState::current()->registerPreFinalizer(this); |
| 50 } | 51 } |
| 51 | 52 |
| 52 PendingScript::~PendingScript() | 53 PendingScript::~PendingScript() |
| 53 { | 54 { |
| 54 // Verify explicit dispose(). | |
| 55 CHECK(!m_client && !m_element && !m_streamer); | |
| 56 } | 55 } |
| 57 | 56 |
| 58 void PendingScript::dispose() | 57 void PendingScript::dispose() |
| 59 { | 58 { |
| 60 if (!m_client) | 59 if (!m_client) |
| 61 return; | 60 return; |
| 62 stopWatchingForLoad(); | 61 stopWatchingForLoad(); |
| 63 releaseElementAndClear(); | 62 releaseElementAndClear(); |
| 64 } | 63 } |
| 65 | 64 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 bool PendingScript::errorOccurred() const | 221 bool PendingScript::errorOccurred() const |
| 223 { | 222 { |
| 224 if (resource()) | 223 if (resource()) |
| 225 return resource()->errorOccurred(); | 224 return resource()->errorOccurred(); |
| 226 if (m_streamer && m_streamer->resource()) | 225 if (m_streamer && m_streamer->resource()) |
| 227 return m_streamer->resource()->errorOccurred(); | 226 return m_streamer->resource()->errorOccurred(); |
| 228 return false; | 227 return false; |
| 229 } | 228 } |
| 230 | 229 |
| 231 } // namespace blink | 230 } // namespace blink |
| OLD | NEW |