| 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 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/html/imports/HTMLImportLoader.h" | 32 #include "core/html/imports/HTMLImportLoader.h" |
| 33 | 33 |
| 34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
| 35 #include "core/dom/StyleEngine.h" | 35 #include "core/dom/StyleEngine.h" |
| 36 #include "core/dom/custom/CustomElementMicrotaskQueue.h" | 36 #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h" |
| 37 #include "core/html/HTMLDocument.h" | 37 #include "core/html/HTMLDocument.h" |
| 38 #include "core/html/imports/HTMLImportChild.h" | 38 #include "core/html/imports/HTMLImportChild.h" |
| 39 #include "core/html/imports/HTMLImportsController.h" | 39 #include "core/html/imports/HTMLImportsController.h" |
| 40 #include "core/loader/DocumentWriter.h" | 40 #include "core/loader/DocumentWriter.h" |
| 41 #include "platform/network/ContentSecurityPolicyResponseHeaders.h" | 41 #include "platform/network/ContentSecurityPolicyResponseHeaders.h" |
| 42 | 42 |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace WebCore { |
| 45 | 45 |
| 46 HTMLImportLoader::HTMLImportLoader(HTMLImportsController* controller) | 46 HTMLImportLoader::HTMLImportLoader(HTMLImportsController* controller) |
| 47 : m_controller(controller) | 47 : m_controller(controller) |
| 48 , m_state(StateLoading) | 48 , m_state(StateLoading) |
| 49 , m_microtaskQueue(CustomElementMicrotaskQueue::create()) | 49 , m_microtaskQueue(CustomElementSyncMicrotaskQueue::create()) |
| 50 { | 50 { |
| 51 } | 51 } |
| 52 | 52 |
| 53 HTMLImportLoader::~HTMLImportLoader() | 53 HTMLImportLoader::~HTMLImportLoader() |
| 54 { | 54 { |
| 55 #if !ENABLE(OILPAN) | 55 #if !ENABLE(OILPAN) |
| 56 clear(); | 56 clear(); |
| 57 #endif | 57 #endif |
| 58 } | 58 } |
| 59 | 59 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 ASSERT(kNotFound != m_imports.find(client)); | 203 ASSERT(kNotFound != m_imports.find(client)); |
| 204 m_imports.remove(m_imports.find(client)); | 204 m_imports.remove(m_imports.find(client)); |
| 205 } | 205 } |
| 206 #endif | 206 #endif |
| 207 | 207 |
| 208 bool HTMLImportLoader::shouldBlockScriptExecution() const | 208 bool HTMLImportLoader::shouldBlockScriptExecution() const |
| 209 { | 209 { |
| 210 return firstImport()->state().shouldBlockScriptExecution(); | 210 return firstImport()->state().shouldBlockScriptExecution(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 PassRefPtrWillBeRawPtr<CustomElementMicrotaskQueue> HTMLImportLoader::microtaskQ
ueue() const | 213 PassRefPtrWillBeRawPtr<CustomElementSyncMicrotaskQueue> HTMLImportLoader::microt
askQueue() const |
| 214 { | 214 { |
| 215 return m_microtaskQueue; | 215 return m_microtaskQueue; |
| 216 } | 216 } |
| 217 | 217 |
| 218 void HTMLImportLoader::trace(Visitor* visitor) | 218 void HTMLImportLoader::trace(Visitor* visitor) |
| 219 { | 219 { |
| 220 visitor->trace(m_controller); | 220 visitor->trace(m_controller); |
| 221 #if ENABLE(OILPAN) | 221 #if ENABLE(OILPAN) |
| 222 visitor->trace(m_imports); | 222 visitor->trace(m_imports); |
| 223 #endif | 223 #endif |
| 224 visitor->trace(m_document); | 224 visitor->trace(m_document); |
| 225 visitor->trace(m_writer); | 225 visitor->trace(m_writer); |
| 226 visitor->trace(m_microtaskQueue); | 226 visitor->trace(m_microtaskQueue); |
| 227 } | 227 } |
| 228 | 228 |
| 229 } // namespace WebCore | 229 } // namespace WebCore |
| OLD | NEW |