| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 "base/bind.h" |
| 34 #include "core/app/Module.h" | 35 #include "core/app/Module.h" |
| 35 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 36 #include "core/dom/DocumentParser.h" | 37 #include "core/dom/DocumentParser.h" |
| 37 #include "core/dom/StyleEngine.h" | 38 #include "core/dom/StyleEngine.h" |
| 38 #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h" | 39 #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h" |
| 39 #include "core/html/HTMLDocument.h" | 40 #include "core/html/HTMLDocument.h" |
| 40 #include "core/html/imports/HTMLImportChild.h" | 41 #include "core/html/imports/HTMLImportChild.h" |
| 41 #include "core/html/imports/HTMLImportsController.h" | 42 #include "core/html/imports/HTMLImportsController.h" |
| 42 | 43 |
| 43 namespace blink { | 44 namespace blink { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 HTMLImportLoader::State HTMLImportLoader::startWritingAndParsing(mojo::URLRespon
sePtr response) | 97 HTMLImportLoader::State HTMLImportLoader::startWritingAndParsing(mojo::URLRespon
sePtr response) |
| 97 { | 98 { |
| 98 ASSERT(!m_imports.isEmpty()); | 99 ASSERT(!m_imports.isEmpty()); |
| 99 WeakPtr<Document> contextDocument = m_controller->master()->contextDocument(
); | 100 WeakPtr<Document> contextDocument = m_controller->master()->contextDocument(
); |
| 100 ASSERT(contextDocument.get()); | 101 ASSERT(contextDocument.get()); |
| 101 KURL url(ParsedURLString, String::fromUTF8(response->url)); | 102 KURL url(ParsedURLString, String::fromUTF8(response->url)); |
| 102 DocumentInit init = DocumentInit(url, 0, contextDocument, m_controller) | 103 DocumentInit init = DocumentInit(url, 0, contextDocument, m_controller) |
| 103 .withRegistrationContext(m_controller->master()->registrationContext()); | 104 .withRegistrationContext(m_controller->master()->registrationContext()); |
| 104 m_document = HTMLDocument::create(init); | 105 m_document = HTMLDocument::create(init); |
| 105 m_module = Module::create(contextDocument.get(), nullptr, m_document.get(),
url.string()); | 106 m_module = Module::create(contextDocument.get(), nullptr, m_document.get(),
url.string()); |
| 106 m_document->startParsing()->parse(response->body.Pass()); | 107 m_document->startParsing()->parse(response->body.Pass(), base::Bind(base::Do
Nothing)); |
| 107 return StateLoading; | 108 return StateLoading; |
| 108 } | 109 } |
| 109 | 110 |
| 110 HTMLImportLoader::State HTMLImportLoader::finishWriting() | 111 HTMLImportLoader::State HTMLImportLoader::finishWriting() |
| 111 { | 112 { |
| 112 return StateWritten; | 113 return StateWritten; |
| 113 } | 114 } |
| 114 | 115 |
| 115 HTMLImportLoader::State HTMLImportLoader::finishParsing() | 116 HTMLImportLoader::State HTMLImportLoader::finishParsing() |
| 116 { | 117 { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 { | 200 { |
| 200 visitor->trace(m_controller); | 201 visitor->trace(m_controller); |
| 201 #if ENABLE(OILPAN) | 202 #if ENABLE(OILPAN) |
| 202 visitor->trace(m_imports); | 203 visitor->trace(m_imports); |
| 203 #endif | 204 #endif |
| 204 visitor->trace(m_document); | 205 visitor->trace(m_document); |
| 205 visitor->trace(m_microtaskQueue); | 206 visitor->trace(m_microtaskQueue); |
| 206 } | 207 } |
| 207 | 208 |
| 208 } // namespace blink | 209 } // namespace blink |
| OLD | NEW |