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

Unified Diff: mojo/examples/compositor_app/compositor_host.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
Index: mojo/examples/compositor_app/compositor_host.cc
diff --git a/mojo/examples/compositor_app/compositor_host.cc b/mojo/examples/compositor_app/compositor_host.cc
index e9853643a0430eeb0e44397f74b1275678d3d83e..31601456aa4f68fdcdd461aeb83b5ce8f9e48869 100644
--- a/mojo/examples/compositor_app/compositor_host.cc
+++ b/mojo/examples/compositor_app/compositor_host.cc
@@ -14,9 +14,10 @@
namespace mojo {
namespace examples {
-CompositorHost::CompositorHost(ScopedMessagePipeHandle gl_pipe)
- : gl_pipe_(gl_pipe.Pass()), compositor_thread_("compositor") {
- DCHECK(gl_pipe_.is_valid());
+CompositorHost::CompositorHost(ScopedMessagePipeHandle command_buffer_handle)
+ : command_buffer_handle_(command_buffer_handle.Pass()),
+ compositor_thread_("compositor") {
+ DCHECK(command_buffer_handle_.is_valid());
bool started = compositor_thread_.Start();
DCHECK(started);
@@ -72,7 +73,8 @@ void CompositorHost::ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
scoped_ptr<cc::OutputSurface> CompositorHost::CreateOutputSurface(
bool fallback) {
return make_scoped_ptr(
- new cc::OutputSurface(new ContextProviderMojo(gl_pipe_.Pass())));
+ new cc::OutputSurface(
+ new ContextProviderMojo(command_buffer_handle_.Pass())));
}
void CompositorHost::DidInitializeOutputSurface() {
« no previous file with comments | « mojo/examples/compositor_app/compositor_host.h ('k') | mojo/examples/pepper_container_app/pepper_container_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698