Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/view_manager_service_impl.cc

Index: mojo/services/view_manager/view_manager_service_impl.cc
diff --git a/mojo/services/view_manager/view_manager_service_impl.cc b/mojo/services/view_manager/view_manager_service_impl.cc
index 69495c5f50fe5e7a522768f8852319b71e131469..bfb38e683fda9d4cc36053dde2cbf0cfa18d59c8 100644
--- a/mojo/services/view_manager/view_manager_service_impl.cc
+++ b/mojo/services/view_manager/view_manager_service_impl.cc
@@ -7,12 +7,12 @@
 #include "base/bind.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
+#include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h"
 #include "mojo/services/view_manager/connection_manager.h"
 #include "mojo/services/view_manager/default_access_policy.h"
 #include "mojo/services/view_manager/server_view.h"
 #include "mojo/services/view_manager/window_manager_access_policy.h"
 #include "third_party/skia/include/core/SkBitmap.h"

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

nit: remove

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

Done.

-#include "ui/aura/window.h"
 #include "ui/gfx/codec/png_codec.h"

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

nit: remove.

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

Done.

 
 namespace mojo {
@@ -397,28 +397,17 @@ void ViewManagerServiceImpl::GetViewTree(
   callback.Run(ViewsToViewDatas(views));
 }
 
-void ViewManagerServiceImpl::SetViewContents(
+void ViewManagerServiceImpl::SetViewSurfaceId(
     Id view_id,
-    ScopedSharedBufferHandle buffer,
-    uint32_t buffer_size,
+    SurfaceIdPtr surface_id,
     const Callback<void(bool)>& callback) {
-  // TODO(sky): add coverage of not being able to set for random view.
+  // TODO(sky): add coverage of not being able to set for random node.
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
   if (!view || !access_policy_->CanSetViewContents(view)) {

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

CanSetViewContents->CanSetViewSurfaceId

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

Done.

     callback.Run(false);
     return;
   }
-  void* handle_data;
-  if (MapBuffer(buffer.get(), 0, buffer_size, &handle_data,
-                MOJO_MAP_BUFFER_FLAG_NONE) != MOJO_RESULT_OK) {
-    callback.Run(false);
-    return;
-  }
-  SkBitmap bitmap;
-  gfx::PNGCodec::Decode(static_cast<const unsigned char*>(handle_data),
-                        buffer_size, &bitmap);
-  view->SetBitmap(bitmap);
-  UnmapBuffer(handle_data);
+  view->SetSurfaceId(surface_id.To<cc::SurfaceId>());
   callback.Run(true);
 }