Revert of Mojo multiple command buffer support and sample

mojo/services/view_manager/window_tree_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/window_tree_host_impl.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/context_factory_impl.h"
@@ skipping 49 matching lines @@
 void RootLayoutManager::SetChildBounds(aura::Window* child,
                                        const gfx::Rect& requested_bounds) {
   SetChildBoundsDirect(child, gfx::Rect(requested_bounds.size()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, public:
 
 WindowTreeHostImpl::WindowTreeHostImpl(
     NativeViewportPtr viewport,
-    GpuPtr gpu_service,
     const gfx::Rect& bounds,
     const Callback<void()>& compositor_created_callback,
     const Callback<void()>& native_viewport_closed_callback,
     const Callback<void(EventPtr)>& event_received_callback)
     : native_viewport_(viewport.Pass()),
-      gpu_service_(gpu_service.Pass()),
-      widget_(gfx::kNullAcceleratedWidget),
       compositor_created_callback_(compositor_created_callback),
       native_viewport_closed_callback_(native_viewport_closed_callback),
       event_received_callback_(event_received_callback),
       bounds_(bounds) {
   native_viewport_.set_client(this);
   native_viewport_->Create(Rect::From(bounds));
-  native_viewport_->Show();
+
+  MessagePipe pipe;
+  native_viewport_->CreateGLES2Context(
+      MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
+
+  // The ContextFactory must exist before any Compositors are created.
+  if (context_factory_) {
+    delete context_factory_;
+    context_factory_ = NULL;
+  }
+  context_factory_ = new ContextFactoryImpl(pipe.handle1.Pass());
+  aura::Env::GetInstance()->set_context_factory(context_factory_);
 
   window()->SetLayoutManager(new RootLayoutManager());
 }
 
 WindowTreeHostImpl::~WindowTreeHostImpl() {
   DestroyCompositor();
   DestroyDispatcher();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, aura::WindowTreeHost implementation:
 
 ui::EventSource* WindowTreeHostImpl::GetEventSource() {
   return this;
 }
 
 gfx::AcceleratedWidget WindowTreeHostImpl::GetAcceleratedWidget() {
-  return widget_;
+  NOTIMPLEMENTED() << "GetAcceleratedWidget";
+  return gfx::kNullAcceleratedWidget;
 }
 
 void WindowTreeHostImpl::Show() {
   window()->Show();
+  native_viewport_->Show();
 }
 
 void WindowTreeHostImpl::Hide() {
   native_viewport_->Hide();
   window()->Hide();
 }
 
 gfx::Rect WindowTreeHostImpl::GetBounds() const {
   return bounds_;
 }
@@ skipping 34 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, ui::EventSource implementation:
 
 ui::EventProcessor* WindowTreeHostImpl::GetEventProcessor() {
   return dispatcher();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, NativeViewportClient implementation:
 
-void WindowTreeHostImpl::OnCreated(uint64_t native_viewport_id) {
-  LOG(ERROR) << "OnCreated " << native_viewport_id;
-  CommandBufferPtr cb;
-  gpu_service_->CreateOnscreenGLES2Context(
-      native_viewport_id, Size::From(bounds_.size()), Get(&cb));
-  widget_ = reinterpret_cast<gfx::AcceleratedWidget>(native_viewport_id);
-
-  // The ContextFactory must exist before any Compositors are created.
-  if (context_factory_) {
-    delete context_factory_;
-    context_factory_ = NULL;
-  }
-  context_factory_ = new ContextFactoryImpl(cb.PassMessagePipe());
-  aura::Env::GetInstance()->set_context_factory(context_factory_);
-
-  CreateCompositor(gfx::kNullAcceleratedWidget);
+void WindowTreeHostImpl::OnCreated() {
+  CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
 }
 
 void WindowTreeHostImpl::OnBoundsChanged(RectPtr bounds) {
   bounds_ = bounds.To<gfx::Rect>();
-  if (context_factory_)
-    OnHostResized(bounds_.size());
+  OnHostResized(bounds_.size());
 }
 
-void WindowTreeHostImpl::OnDestroyed() {
+void WindowTreeHostImpl::OnDestroyed(const mojo::Callback<void()>& callback) {
   DestroyCompositor();
   native_viewport_closed_callback_.Run();
   // TODO(beng): quit the message loop once we are on our own thread.
+  callback.Run();
 }
 
 void WindowTreeHostImpl::OnEvent(EventPtr event,
                                  const mojo::Callback<void()>& callback) {
   event_received_callback_.Run(event.Pass());
   callback.Run();
 };
 
 }  // namespace service
 }  // namespace mojo