mirror of
https://github.com/encounter/engine.git
synced 2026-03-30 11:09:55 -07:00
Remove some InterfacePtr<> methods which directly deal with message pipe handles.
Users should use the corresponding methods dealing with InterfacePtrInfo<>. BUG=None TEST=None R=jamesr@chromium.org Review URL: https://codereview.chromium.org/1118843003
This commit is contained in:
@@ -82,11 +82,13 @@ PassRefPtr<DartValue> HTMLIFrameElement::takeExposedServicesHandle(DartState*)
|
||||
|
||||
void HTMLIFrameElement::embedViewManagerClient(RefPtr<DartValue> client)
|
||||
{
|
||||
if (!m_contentView)
|
||||
return;
|
||||
if (!m_contentView)
|
||||
return;
|
||||
|
||||
m_contentView->Embed(mojo::MakeProxy<mojo::ViewManagerClient>(
|
||||
DartConverter<mojo::ScopedMessagePipeHandle>::FromDart(client->dart_value())));
|
||||
mojo::ScopedMessagePipeHandle handle = DartConverter<mojo::ScopedMessagePipeHandle>::FromDart(client->dart_value());
|
||||
mojo::ViewManagerClientPtr client_ptr = mojo::MakeProxy(
|
||||
mojo::InterfacePtrInfo<mojo::ViewManagerClient>(handle.Pass(), 0u));
|
||||
m_contentView->Embed(client_ptr.Pass());
|
||||
}
|
||||
|
||||
void HTMLIFrameElement::navigateView()
|
||||
@@ -105,7 +107,7 @@ void HTMLIFrameElement::navigateView()
|
||||
|
||||
m_contentView->Embed(mojo::String::From(url.string().utf8().data()),
|
||||
mojo::GetProxy(&m_services),
|
||||
mojo::MakeProxy<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass()));
|
||||
mojo::MakeProxy(mojo::InterfacePtrInfo<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass(), 0u)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-1
@@ -58,7 +58,8 @@ mojo::ServiceProviderPtr Engine::CreateServiceProvider() {
|
||||
base::Bind(CreateJavaServiceProvider,
|
||||
base::Passed(mojo::MakeRequest<mojo::ServiceProvider>(
|
||||
pipe.handle1.Pass()))));
|
||||
return mojo::MakeProxy<mojo::ServiceProvider>(pipe.handle0.Pass());
|
||||
return mojo::MakeProxy(
|
||||
mojo::InterfacePtrInfo<mojo::ServiceProvider>(pipe.handle0.Pass(), 0u));
|
||||
}
|
||||
|
||||
void Engine::Init() {
|
||||
|
||||
@@ -77,7 +77,7 @@ Internals::~Internals() {
|
||||
}
|
||||
|
||||
mojo::Handle Internals::TakeServicesProvidedByEmbedder() {
|
||||
return service_provider_.PassMessagePipe().release();
|
||||
return service_provider_.PassInterface().PassHandle().release();
|
||||
}
|
||||
|
||||
} // namespace shell
|
||||
|
||||
@@ -198,11 +198,11 @@ mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedToEmbedder() {
|
||||
}
|
||||
|
||||
mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedByEmbedder() {
|
||||
return services_provided_by_embedder_.PassMessagePipe();
|
||||
return services_provided_by_embedder_.PassInterface().PassHandle();
|
||||
}
|
||||
|
||||
mojo::ScopedMessagePipeHandle DocumentView::TakeServiceRegistry() {
|
||||
return service_registry_.PassMessagePipe();
|
||||
return service_registry_.PassInterface().PassHandle();
|
||||
}
|
||||
|
||||
mojo::Shell* DocumentView::GetShell() {
|
||||
|
||||
+1
-1
@@ -172,7 +172,7 @@ mojo::Handle Internals::TakeShellProxyHandle() {
|
||||
mojo::ShellPtr shell;
|
||||
if (!shell_binding_.is_bound())
|
||||
shell_binding_.Bind(GetProxy(&shell));
|
||||
return shell.PassMessagePipe().release();
|
||||
return shell.PassInterface().PassHandle().release();
|
||||
}
|
||||
|
||||
void Internals::ConnectToApplication(
|
||||
|
||||
Reference in New Issue
Block a user