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

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

The size is not really a concept that belongs to GL. Note, we can still start creating
the context before we get OnCreated.

BUG=333157
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247496

[darin (slow to review), 2014-01-27 06:08:14]

LGTM

https://codereview.chromium.org/131153007/diff/30001/mojo/services/native_vie...
File mojo/services/native_viewport/native_viewport_service.cc (right):

https://codereview.chromium.org/131153007/diff/30001/mojo/services/native_vie...
mojo/services/native_viewport/native_viewport_service.cc:119: void
MaybeSendOnCreated() {
nit: A name like SendOnCreatedIfNeeded is a bit more suggestive of what this
function does.

[piman, 2014-01-27 22:10:24]

https://codereview.chromium.org/131153007/diff/30001/mojo/services/native_vie...
File mojo/services/native_viewport/native_viewport_service.cc (right):

https://codereview.chromium.org/131153007/diff/30001/mojo/services/native_vie...
mojo/services/native_viewport/native_viewport_service.cc:119: void
MaybeSendOnCreated() {
On 2014/01/27 06:08:15, darin wrote:
> nit: A name like SendOnCreatedIfNeeded is a bit more suggestive of what this
> function does.

Done.

[commit-bot: I haz the power, 2014-01-27 22:11:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/131153007/150001

[commit-bot: I haz the power, 2014-01-28 00:02:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/131153007/150001

[commit-bot: I haz the power, 2014-01-28 00:02:34]

Failed to apply patch for mojo/examples/aura_demo/root_window_host_mojo.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file mojo/examples/aura_demo/root_window_host_mojo.cc
  Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).
  Hunk #2 FAILED at 79.
  Hunk #3 succeeded at 154 with fuzz 1 (offset 5 lines).
  Hunk #4 succeeded at 202 (offset 34 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
mojo/examples/aura_demo/root_window_host_mojo.cc.rej

Patch:       mojo/examples/aura_demo/root_window_host_mojo.cc
Index: mojo/examples/aura_demo/root_window_host_mojo.cc
diff --git a/mojo/examples/aura_demo/root_window_host_mojo.cc
b/mojo/examples/aura_demo/root_window_host_mojo.cc
index
98d96f72206e9110d2ddf58e80cee06ab4d54c08..2d50471f941a65f4a0f1d24bd57a25c78e3ee1b2
100644
--- a/mojo/examples/aura_demo/root_window_host_mojo.cc
+++ b/mojo/examples/aura_demo/root_window_host_mojo.cc
@@ -26,7 +26,8 @@ ui::ContextFactory* WindowTreeHostMojo::context_factory_ =
NULL;
 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();
 
@@ -78,7 +79,7 @@ void WindowTreeHostMojo::ToggleFullScreen() {
 
 gfx::Rect WindowTreeHostMojo::GetBounds() const {
   NOTIMPLEMENTED();
-  return gfx::Rect(500, 500);
+  return gfx::Rect(viewport_size_);
 }
 
 void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
@@ -148,7 +149,9 @@ void WindowTreeHostMojo::PrepareForShutdown() {

////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, NativeViewportClient implementation:
 
-void WindowTreeHostMojo::OnCreated() {
+void WindowTreeHostMojo::OnCreated(uint32_t width, uint32_t height) {
+  viewport_size_ = gfx::Size(width, height);
+  CreateCompositorIfNeeded();
 }
 
 void WindowTreeHostMojo::OnDestroyed() {
@@ -165,10 +168,17 @@ void WindowTreeHostMojo::OnEvent(const Event& event) {

////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, private:
 
-void WindowTreeHostMojo::DidCreateContext(gfx::Size viewport_size) {
+void WindowTreeHostMojo::DidCreateContext() {
+  context_created_ = true;
+  CreateCompositorIfNeeded();
+}
+
+void WindowTreeHostMojo::CreateCompositorIfNeeded() {
+  if (viewport_size_.IsEmpty() || !context_created_)
+    return;
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
-  NotifyHostResized(viewport_size);
+  NotifyHostResized(viewport_size_);
 }
 
 }  // namespace examples

[piman, 2014-01-28 03:32:36]

I need to rework this CL. Some recent modifications to native_viewport makes it
redundant to send the size in OnCreated.

[piman, 2014-01-28 05:16:34]

PTAL. This needed a bit of an overhaul to work on top of r247329.

- I no longer mess with NativeViewportClient::DidCreate since we can get the
size from OnBoundsChanged
- properly send OnBoundsChanged at least once on all platforms
- fix missing AllocationScopes
- fix handling out-of-order messages in aura_demo. We get OnBoundsChanged before
the context is created, at which point the WindowTreeHostMojo isn't fully
initialized
- add support for floats in javascript. r247329 broke mojo_js, fix that.

[darin (slow to review), 2014-01-28 05:47:14]

LGTM

[commit-bot: I haz the power, 2014-01-28 05:58:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/131153007/170001

[commit-bot: I haz the power, 2014-01-28 20:39:45]

Change committed as 247496