Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Unified Diff: mojo/aura/window_tree_host_mojo.cc

Issue 272323003: Mojo: Implement support for |Foo&| mojom syntax (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/aura/context_factory_mojo.cc ('k') | mojo/cc/context_provider_mojo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/window_tree_host_mojo.cc
diff --git a/mojo/aura/window_tree_host_mojo.cc b/mojo/aura/window_tree_host_mojo.cc
index bcebbdfbf5d9b646010b9d28b2012345bd595cfa..f3e42d1931c22294756c756520934f2e15bae0e3 100644
--- a/mojo/aura/window_tree_host_mojo.cc
+++ b/mojo/aura/window_tree_host_mojo.cc
@@ -34,8 +34,9 @@ WindowTreeHostMojo::WindowTreeHostMojo(
native_viewport_.set_client(this);
native_viewport_->Create(Rect::From(bounds));
- ScopedMessagePipeHandle gles2_handle, gles2_client_handle;
- CreateMessagePipe(&gles2_handle, &gles2_client_handle);
+ MessagePipe pipe;
+ native_viewport_->CreateGLES2Context(
+ MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
// The ContextFactory must exist before any Compositors are created.
if (context_factory_) {
@@ -43,12 +44,10 @@ WindowTreeHostMojo::WindowTreeHostMojo(
delete context_factory_;
context_factory_ = NULL;
}
- context_factory_ = new ContextFactoryMojo(gles2_handle.Pass());
+ context_factory_ = new ContextFactoryMojo(pipe.handle1.Pass());
ui::ContextFactory::SetInstance(context_factory_);
aura::Env::GetInstance()->set_context_factory(context_factory_);
CHECK(context_factory_) << "No GL bindings.";
-
- native_viewport_->CreateGLES2Context(gles2_client_handle.Pass());
}
WindowTreeHostMojo::~WindowTreeHostMojo() {
« no previous file with comments | « mojo/aura/context_factory_mojo.cc ('k') | mojo/cc/context_provider_mojo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698