Mojo: more idiomatic C++ bindings

mojo/aura/window_tree_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/aura/window_tree_host_mojo.h"
 
 #include "mojo/aura/context_factory_mojo.h"
 #include "mojo/public/c/gles2/gles2.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/native_viewport/geometry_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 
 // static
 mojo::ContextFactoryMojo* WindowTreeHostMojo::context_factory_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, public:
 
 WindowTreeHostMojo::WindowTreeHostMojo(
     NativeViewportPtr viewport,
     const gfx::Rect& bounds,
     const base::Callback<void()>& compositor_created_callback)
     : native_viewport_(viewport.Pass()),
       compositor_created_callback_(compositor_created_callback),
       bounds_(bounds) {
   native_viewport_->SetClient(this);
-
-  AllocationScope scope;
-  native_viewport_->Create(bounds);
+  native_viewport_->Create(Rect::From(bounds));
 
   ScopedMessagePipeHandle gles2_handle, gles2_client_handle;
   CreateMessagePipe(&gles2_handle, &gles2_client_handle);
 
   // The ContextFactory must exist before any Compositors are created.
   if (context_factory_) {
     ui::ContextFactory::SetInstance(NULL);
     delete context_factory_;
     context_factory_ = NULL;
   }
@@ skipping 29 matching lines @@
 void WindowTreeHostMojo::Hide() {
   native_viewport_->Hide();
   window()->Hide();
 }
 
 gfx::Rect WindowTreeHostMojo::GetBounds() const {
   return bounds_;
 }
 
 void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
-  AllocationScope scope;
-  native_viewport_->SetBounds(bounds);
+  native_viewport_->SetBounds(Rect::From(bounds));
 }
 
 gfx::Point WindowTreeHostMojo::GetLocationOnNativeScreen() const {
   return gfx::Point(0, 0);
 }
 
 void WindowTreeHostMojo::SetCapture() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 30 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, NativeViewportClient implementation:
 
 void WindowTreeHostMojo::OnCreated() {
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
 }
 
-void WindowTreeHostMojo::OnBoundsChanged(const Rect& bounds) {
-  bounds_ = gfx::Rect(bounds.position().x(), bounds.position().y(),
-                      bounds.size().width(), bounds.size().height());
+void WindowTreeHostMojo::OnBoundsChanged(RectPtr bounds) {
+  bounds_ = gfx::Rect(bounds->position->x, bounds->position->y,
+                      bounds->size->width, bounds->size->height);
   window()->SetBounds(gfx::Rect(bounds_.size()));
   OnHostResized(bounds_.size());
 }
 
 void WindowTreeHostMojo::OnDestroyed() {
   base::MessageLoop::current()->Quit();
 }
 
-void WindowTreeHostMojo::OnEvent(const Event& event,
+void WindowTreeHostMojo::OnEvent(EventPtr event,
                                  const mojo::Callback<void()>& callback) {
-  switch (event.action()) {
+  switch (event->action) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_MOUSE_DRAGGED:
     case ui::ET_MOUSE_RELEASED:
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_ENTERED:
     case ui::ET_MOUSE_EXITED: {
-      gfx::Point location(event.location().x(), event.location().y());
-      ui::MouseEvent ev(static_cast<ui::EventType>(event.action()), location,
-                        location, event.flags(), 0);
+      gfx::Point location(event->location->x, event->location->y);
+      ui::MouseEvent ev(static_cast<ui::EventType>(event->action), location,
+                        location, event->flags, 0);
       SendEventToProcessor(&ev);
       break;
     }
     case ui::ET_KEY_PRESSED:
     case ui::ET_KEY_RELEASED: {
       ui::KeyEvent ev(
-          static_cast<ui::EventType>(event.action()),
-          static_cast<ui::KeyboardCode>(event.key_data().key_code()),
-          event.flags(), event.key_data().is_char());
+          static_cast<ui::EventType>(event->action),
+          static_cast<ui::KeyboardCode>(event->key_data->key_code),
+          event->flags, event->key_data->is_char);
       SendEventToProcessor(&ev);
       break;
     }
     // TODO(beng): touch, etc.
   }
   callback.Run();
 };
 
 }  // namespace mojo