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

mojo/examples/sample_app/gles2_client_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/examples/sample_app/gles2_client_impl.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <math.h>
 
 #include "mojo/public/gles2/gles2.h"
 #include "ui/events/event_constants.h"
 
 namespace mojo {
 namespace examples {
 namespace {
 
 float CalculateDragDistance(const gfx::PointF& start, const Point& end) {
   return hypot(start.x() - end.x(), start.y() - end.y());
 }
 
 }
 
 GLES2ClientImpl::GLES2ClientImpl(ScopedMessagePipeHandle pipe)
-    : getting_animation_frames_(false) {
+    : getting_animation_frames_(false),
+      context_created_(false) {
   context_ = MojoGLES2CreateContext(
       pipe.release().value(),
       &DidCreateContextThunk,
       &ContextLostThunk,
       &DrawAnimationFrameThunk,
       this);
 }
 
 GLES2ClientImpl::~GLES2ClientImpl() {
   MojoGLES2DestroyContext(context_);
 }
 
+void GLES2ClientImpl::SetSize(const Size& size) {
+  size_ = gfx::Size(size.width(), size.height());
+  InitializeCubeIfNeeded();
+}
+
 void GLES2ClientImpl::HandleInputEvent(const Event& event) {
   switch (event.action()) {
   case ui::ET_MOUSE_PRESSED:
   case ui::ET_TOUCH_PRESSED:
     CancelAnimationFrames();
     capture_point_.SetPoint(event.location().x(), event.location().y());
     last_drag_point_ = capture_point_;
     drag_start_time_ = GetTimeTicksNow();
     break;
   case ui::ET_MOUSE_DRAGGED:
@@ skipping 20 matching lines @@
 
       capture_point_ = last_drag_point_ = gfx::PointF();
       RequestAnimationFrames();
     }
     break;
   default:
     break;
   }
 }
 
-void GLES2ClientImpl::DidCreateContext(uint32_t width,
-                                       uint32_t height) {
+void GLES2ClientImpl::DidCreateContext() {
   MojoGLES2MakeCurrent(context_);
+  context_created_ = true;
+  InitializeCubeIfNeeded();
+}
 
-  cube_.Init(width, height);
+void GLES2ClientImpl::InitializeCubeIfNeeded() {
+  if (size_.IsEmpty() || !context_created_)
+    return;
+  cube_.Init(size_.width(), size_.height());
   RequestAnimationFrames();
 }
 
-void GLES2ClientImpl::DidCreateContextThunk(
-    void* closure,
-    uint32_t width,
-    uint32_t height) {
-  static_cast<GLES2ClientImpl*>(closure)->DidCreateContext(width, height);
+void GLES2ClientImpl::DidCreateContextThunk(void* closure) {
+  static_cast<GLES2ClientImpl*>(closure)->DidCreateContext();
 }
 
 void GLES2ClientImpl::ContextLost() {
   CancelAnimationFrames();
 }
 
 void GLES2ClientImpl::ContextLostThunk(void* closure) {
   static_cast<GLES2ClientImpl*>(closure)->ContextLost();
 }
 
@@ skipping 18 matching lines @@
   last_time_ = GetTimeTicksNow();
 }
 
 void GLES2ClientImpl::CancelAnimationFrames() {
   getting_animation_frames_ = false;
   MojoGLES2CancelAnimationFrames(context_);
 }
 
 }  // namespace examples
 }  // namespace mojo