Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/connection_manager.cc

 // Copyright 2014 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/services/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/view_manager/view_manager_service_impl.h"
-#include "ui/aura/env.h"
 
 namespace mojo {
 namespace service {
 
 ConnectionManager::ScopedChange::ScopedChange(
     ViewManagerServiceImpl* connection,
     ConnectionManager* connection_manager,
     bool is_delete_view)
     : connection_manager_(connection_manager),
       connection_id_(connection->id()),
       is_delete_view_(is_delete_view) {
   connection_manager_->PrepareForChange(this);
 }
 
 ConnectionManager::ScopedChange::~ScopedChange() {
   connection_manager_->FinishChange();
 }
 
-ConnectionManager::Context::Context() {
-  // Pass in false as native viewport creates the PlatformEventSource.
-  aura::Env::CreateInstance(false);
-}
-
-ConnectionManager::Context::~Context() {
-  aura::Env::DeleteInstance();
-}
-
 ConnectionManager::ConnectionManager(
     ApplicationConnection* app_connection,
-    DisplayManagerDelegate* display_manager_delegate,
     const Callback<void()>& native_viewport_closed_callback)
     : app_connection_(app_connection),
       next_connection_id_(1),
       display_manager_(app_connection,
                        this,
-                       display_manager_delegate,
                        native_viewport_closed_callback),
       root_(new ServerView(this, RootViewId())),
       current_change_(NULL) {
+  root_->SetBounds(gfx::Rect(800, 600));

[sky, 2014/09/03 22:45:28]

Can we move this to the native viewport service? The native viewport service
should be the one imposing the initial size. Especially important for devices
where we want fullscreen.

[jamesr, 2014/09/03 23:32:47]

The way NVS works today is the client picks the size that the native viewport is
set to initially, so we have to pick.

Setting the root's bounds here is pretty weird.  I'll see if it can be better

 }
 
 ConnectionManager::~ConnectionManager() {
   while (!connections_created_by_connect_.empty())
     delete *(connections_created_by_connect_.begin());
   // All the connections should have been destroyed.
   DCHECK(connection_map_.empty());
   root_.reset();
 }
 
@@ skipping 200 matching lines @@
                                             const gfx::Rect& new_bounds) {
   ProcessViewBoundsChanged(view, old_bounds, new_bounds);
   if (!view->parent())
     return;
 
   // TODO(sky): optimize this.
   display_manager_.SchedulePaint(view->parent(), old_bounds);
   display_manager_.SchedulePaint(view->parent(), new_bounds);
 }
 
-void ConnectionManager::OnViewBitmapChanged(const ServerView* view) {
+void ConnectionManager::OnViewSurfaceChanged(const ServerView* view) {
   display_manager_.SchedulePaint(view, gfx::Rect(view->bounds().size()));
 }
 
 }  // namespace service
 }  // namespace mojo