| 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/html/HTMLIFrameElement.h" | 6 #include "sky/engine/core/html/HTMLIFrameElement.h" |
| 7 | 7 |
| 8 #include "gen/sky/core/HTMLNames.h" | 8 #include "gen/sky/core/HTMLNames.h" |
| 9 #include "mojo/edk/js/handle.h" | |
| 10 #include "sky/engine/core/frame/LocalFrame.h" | 9 #include "sky/engine/core/frame/LocalFrame.h" |
| 11 #include "sky/engine/core/html/parser/HTMLParserIdioms.h" | 10 #include "sky/engine/core/html/parser/HTMLParserIdioms.h" |
| 12 #include "sky/engine/core/loader/FrameLoaderClient.h" | 11 #include "sky/engine/core/loader/FrameLoaderClient.h" |
| 13 #include "sky/engine/core/rendering/RenderIFrame.h" | 12 #include "sky/engine/core/rendering/RenderIFrame.h" |
| 14 | 13 |
| 15 namespace blink { | 14 namespace blink { |
| 16 | 15 |
| 17 PassRefPtr<HTMLIFrameElement> HTMLIFrameElement::create(Document& document) | 16 PassRefPtr<HTMLIFrameElement> HTMLIFrameElement::create(Document& document) |
| 18 { | 17 { |
| 19 return adoptRef(new HTMLIFrameElement(document)); | 18 return adoptRef(new HTMLIFrameElement(document)); |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 102 |
| 104 mojo::MessagePipe exposedServicesPipe; | 103 mojo::MessagePipe exposedServicesPipe; |
| 105 m_exposedServices = exposedServicesPipe.handle0.Pass(); | 104 m_exposedServices = exposedServicesPipe.handle0.Pass(); |
| 106 | 105 |
| 107 m_contentView->Embed(mojo::String::From(url.string().utf8().data()), | 106 m_contentView->Embed(mojo::String::From(url.string().utf8().data()), |
| 108 mojo::GetProxy(&m_services), | 107 mojo::GetProxy(&m_services), |
| 109 mojo::MakeProxy<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass(
))); | 108 mojo::MakeProxy<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass(
))); |
| 110 } | 109 } |
| 111 | 110 |
| 112 } | 111 } |
| OLD | NEW |