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 "mojo/services/native_viewport/geometry_conversions.h"
@@ skipping 12 matching lines @@
 // static
 ui::ContextFactory* WindowTreeHostMojo::context_factory_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, public:
 
 WindowTreeHostMojo::WindowTreeHostMojo(
     ScopedMessagePipeHandle viewport_handle,
     const gfx::Rect& bounds,
     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) {
   AllocationScope scope;
   native_viewport_->Create(bounds);
 
   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_) {
@@ skipping 108 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, NativeViewportClient implementation:
 
 void WindowTreeHostMojo::OnCreated() {
 }
 
 void WindowTreeHostMojo::OnBoundsChanged(const Rect& bounds) {
   bounds_ = gfx::Rect(bounds.position().x(), bounds.position().y(),
                       bounds.size().width(), bounds.size().height());
-  window()->SetBounds(gfx::Rect(bounds_.size()));
+  if (delegate_)
+    window()->SetBounds(gfx::Rect(bounds_.size()));
+  CreateCompositorIfNeeded();
 }
 
 void WindowTreeHostMojo::OnDestroyed() {
   base::MessageLoop::current()->Quit();
 }
 
 void WindowTreeHostMojo::OnEvent(const Event& event) {
   if (!event.location().is_null())
     native_viewport_->AckEvent(event);
 
@@ skipping 19 matching lines @@
       delegate_->OnHostKeyEvent(&ev);
       break;
     }
     // TODO(beng): touch, etc.
   }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, private:
 
-void WindowTreeHostMojo::DidCreateContext(gfx::Size viewport_size) {
+void WindowTreeHostMojo::DidCreateContext() {
+  context_created_ = true;
+  CreateCompositorIfNeeded();
+}
+
+void WindowTreeHostMojo::CreateCompositorIfNeeded() {
+  if (bounds_.IsEmpty() || !context_created_)
+    return;
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
-  NotifyHostResized(viewport_size);
+  NotifyHostResized(bounds_.size());
 }
 
 }  // namespace examples
 }  // namespace mojo