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

mojo/apps/js/main.js

 // 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.
 
 define([
     'console',
     'monotonic_clock',
     'timer',
     'mojo/apps/js/bindings/connector',
     'mojo/apps/js/bindings/core',
@@ skipping 277 matching lines @@
   // have a 'client' object that contains both the sending and receiving bits of
   // the client side of the interface. Since JS is loosely typed, we do not need
   // a separate base class to inherit from to receive callbacks.
   SampleApp.prototype = Object.create(shell.ShellClientStub.prototype);
 
 
   function NativeViewportClientImpl(remote) {
     this.remote_ = remote;
 
     var pipe = core.createMessagePipe();
-    new GLES2ClientImpl(pipe.handle0);
+    this.gles2_ = new GLES2ClientImpl(pipe.handle0);
 
     this.remote_.open();
     this.remote_.createGLES2Context(pipe.handle1);
   }
   NativeViewportClientImpl.prototype =
       Object.create(nativeViewport.NativeViewportClientStub.prototype);
 
-  NativeViewportClientImpl.prototype.onCreated = function() {
+  NativeViewportClientImpl.prototype.onCreated = function(width, height) {
+    this.gles2_.setDimensions(width, height);
     console.log('NativeViewportClientImpl.prototype.OnCreated');
   };
   NativeViewportClientImpl.prototype.didOpen = function() {
     console.log('NativeViewportClientImpl.prototype.DidOpen');
   };
 
 
   function GLES2ClientImpl(remotePipe) {
     this.gl_ = new gljs.Context(remotePipe, this.didCreateContext.bind(this));
     this.lastTime_ = monotonicClock.seconds();
     this.angle_ = 45;
   }
 
-  GLES2ClientImpl.prototype.didCreateContext = function(width, height) {
-    this.width_ = width;
-    this.height_ = height;
+  GLES2ClientImpl.prototype.didCreateContext = function() {
     this.program_ = loadProgram(this.gl_);
     this.positionLocation_ =
         this.gl_.getAttribLocation(this.program_, 'a_position');
     this.mvpLocation_ =
         this.gl_.getUniformLocation(this.program_, 'u_mvpMatrix');
     this.numIndices_ = generateCube(this.gl_);
     this.mvpMatrix_ = new ESMatrix();
     this.mvpMatrix_.loadIdentity();
 
     this.gl_.clearColor(0, 0, 0, 0);
     this.timer_ = timer.createRepeating(16, this.handleTimer.bind(this));
   };
 
+  GLES2ClientImpl.prototype.setDimensions = function(width, height) {
+    this.width_ = width;
+    this.height_ = height;
+  }
+
   GLES2ClientImpl.prototype.drawCube = function() {
+    if (!this.width_ || !this.height_)
+      return;
     this.gl_.viewport(0, 0, this.width_, this.height_);
     this.gl_.clear(this.gl_.COLOR_BUFFER_BIT);
     this.gl_.useProgram(this.program_);
     this.gl_.bindBuffer(this.gl_.ARRAY_BUFFER, vboVertices);
     this.gl_.bindBuffer(this.gl_.ELEMENT_ARRAY_BUFFER, vboIndices);
     this.gl_.vertexAttribPointer(this.positionLocation_, 3, this.gl_.FLOAT,
                                  false, 12, 0);
     this.gl_.enableVertexAttribArray(this.positionLocation_);
     this.gl_.uniformMatrix4fv(this.mvpLocation_, false, this.mvpMatrix_.m);
     this.gl_.drawElements(this.gl_.TRIANGLES, this.numIndices_,
@@ skipping 31 matching lines @@
 
   GLES2ClientImpl.prototype.contextLost = function() {
     console.log('GLES2ClientImpl.prototype.contextLost');
   };
 
 
   return function(handle) {
     new connector.Connection(handle, SampleApp, shell.ShellProxy);
   };
 });