Send size to NativeViewportClient::OnCreated instead of GLES2Client::DidCreateContext

mojo/examples/aura_demo/root_window_host_mojo.cc

 // Copyright (c) 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/examples/aura_demo/root_window_host_mojo.h"
 
 #include "mojo/examples/aura_demo/demo_context_factory.h"
 #include "mojo/examples/compositor_app/gles2_client_impl.h"
 #include "mojo/public/gles2/gles2.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_delegate.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 namespace examples {
 
 // static
 ui::ContextFactory* WindowTreeHostMojo::context_factory_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, public:
 
 WindowTreeHostMojo::WindowTreeHostMojo(
     ScopedMessagePipeHandle viewport_handle,
     const base::Callback<void()>& compositor_created_callback)
-    : native_viewport_(viewport_handle.Pass(), this),
+    : context_created_(false),
+      native_viewport_(viewport_handle.Pass(), this),
       compositor_created_callback_(compositor_created_callback) {
   native_viewport_->Open();
 
   ScopedMessagePipeHandle gles2_handle;
   ScopedMessagePipeHandle gles2_client_handle;
   CreateMessagePipe(&gles2_handle, &gles2_client_handle);
 
   // The ContextFactory must exist before any Compositors are created.
   if (!context_factory_) {
     scoped_ptr<DemoContextFactory> cf(new DemoContextFactory(this));
@@ skipping 31 matching lines @@
 void WindowTreeHostMojo::Hide() {
   NOTIMPLEMENTED();
 }
 
 void WindowTreeHostMojo::ToggleFullScreen() {
   NOTIMPLEMENTED();
 }
 
 gfx::Rect WindowTreeHostMojo::GetBounds() const {
   NOTIMPLEMENTED();
-  return gfx::Rect(500, 500);
+  return gfx::Rect(viewport_size_);
 }
 
 void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 gfx::Insets WindowTreeHostMojo::GetInsets() const {
   NOTIMPLEMENTED();
   return gfx::Insets();
 }
@@ skipping 49 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void WindowTreeHostMojo::PrepareForShutdown() {
   NOTIMPLEMENTED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, NativeViewportClient implementation:
 
-void WindowTreeHostMojo::OnCreated() {
+void WindowTreeHostMojo::OnCreated(uint32_t width, uint32_t height) {
+  viewport_size_ = gfx::Size(width, height);
+  MaybeCreateCompositor();
 }
 
 void WindowTreeHostMojo::OnDestroyed() {
   base::MessageLoop::current()->Quit();
 }
 
 void WindowTreeHostMojo::OnEvent(const Event& event) {
   if (!event.location().is_null())
     native_viewport_->AckEvent(event);
 
   // TODO(beng): fwd to rootwindow.
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, private:
 
-void WindowTreeHostMojo::DidCreateContext(gfx::Size viewport_size) {
+void WindowTreeHostMojo::DidCreateContext() {
+  context_created_ = true;
+  MaybeCreateCompositor();
+}
+
+void WindowTreeHostMojo::MaybeCreateCompositor() {
+  if (viewport_size_.IsEmpty() || !context_created_)
+    return;
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
-  NotifyHostResized(viewport_size);
+  NotifyHostResized(viewport_size_);
 }
 
 }  // namespace examples
 }  // namespace mojo