| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/loader/MojoLoader.h" | 6 #include "sky/engine/core/loader/MojoLoader.h" |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "mojo/public/cpp/system/data_pipe.h" | 9 #include "mojo/public/cpp/system/data_pipe.h" |
| 10 #include "sky/engine/core/dom/Document.h" | 10 #include "sky/engine/core/dom/Document.h" |
| 11 #include "sky/engine/core/dom/DocumentInit.h" | 11 #include "sky/engine/core/dom/DocumentInit.h" |
| 12 #include "sky/engine/core/dom/DocumentParser.h" | 12 #include "sky/engine/core/dom/DocumentParser.h" |
| 13 #include "sky/engine/core/frame/LocalDOMWindow.h" | 13 #include "sky/engine/core/frame/LocalDOMWindow.h" |
| 14 #include "sky/engine/core/frame/LocalFrame.h" | 14 #include "sky/engine/core/frame/LocalFrame.h" |
| 15 #include "sky/engine/core/loader/FrameLoaderClient.h" | 15 #include "sky/engine/core/loader/FrameLoaderClient.h" |
| 16 #include "sky/engine/core/page/Page.h" | 16 #include "sky/engine/core/page/Page.h" |
| 17 | 17 |
| 18 namespace blink { | 18 namespace blink { |
| 19 | 19 |
| 20 using namespace mojo; | |
| 21 | |
| 22 MojoLoader::MojoLoader(LocalFrame& frame) | 20 MojoLoader::MojoLoader(LocalFrame& frame) |
| 23 : m_frame(frame) | 21 : m_frame(frame) |
| 24 { | 22 { |
| 25 } | 23 } |
| 26 | 24 |
| 27 void MojoLoader::load(const KURL& url, ScopedDataPipeConsumerHandle responseStre
am) | 25 void MojoLoader::init(const KURL& url) { |
| 28 { | |
| 29 DocumentInit init(url, &m_frame); | 26 DocumentInit init(url, &m_frame); |
| 30 | 27 |
| 31 // FIXME(sky): Poorly named method for creating the FrameView: | 28 // FIXME(sky): Poorly named method for creating the FrameView: |
| 32 m_frame.loaderClient()->transitionToCommittedForNewPage(); | 29 m_frame.loaderClient()->transitionToCommittedForNewPage(); |
| 33 // Only needed for UseCounter, and thus probably can be removed: | 30 // Only needed for UseCounter, and thus probably can be removed: |
| 34 m_frame.page()->didCommitLoad(&m_frame); | 31 m_frame.page()->didCommitLoad(&m_frame); |
| 35 | 32 |
| 36 m_frame.setDOMWindow(LocalDOMWindow::create(m_frame)); | 33 m_frame.setDOMWindow(LocalDOMWindow::create(m_frame)); |
| 37 RefPtr<Document> document = m_frame.domWindow()->installNewDocument(init); | 34 RefPtr<Document> document = m_frame.domWindow()->installNewDocument(init); |
| 38 // Unclear if we care about DocumentLoadTiming in Sky. | 35 // Unclear if we care about DocumentLoadTiming in Sky. |
| 39 document->timing()->markNavigationStart(); | 36 document->timing()->markNavigationStart(); |
| 40 document->setReadyState(Document::Loading); | 37 document->setReadyState(Document::Loading); |
| 41 // FIXME: This should read the Content-Language out of the | 38 // FIXME: This should read the Content-Language out of the |
| 42 // response headers and set them on Document::contentLanguage. | 39 // response headers and set them on Document::contentLanguage. |
| 40 } |
| 43 | 41 |
| 44 document->startParsing()->parse(responseStream.Pass(), base::Bind(base::DoNo
thing)); | 42 void MojoLoader::parse(mojo::ScopedDataPipeConsumerHandle responseStream) { |
| 43 m_frame.document()->startParsing()->parse(responseStream.Pass(), |
| 44 base::Bind(base::DoNothing)); |
| 45 } | 45 } |
| 46 | 46 |
| 47 } | 47 } |
| OLD | NEW |