Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/server_view.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/server_view.h"
 
 #include "mojo/services/view_manager/server_view_delegate.h"
 
 namespace mojo {
 namespace service {
@@ skipping 111 matching lines @@
 
 bool ServerView::IsDrawn(const ServerView* root) const {
   if (!root->visible_)
     return false;
   const ServerView* view = this;
   while (view && view != root && view->visible_)
     view = view->parent_;
   return view == root;
 }
 
-void ServerView::SetBitmap(const SkBitmap& bitmap) {
-  bitmap_ = bitmap;
-  delegate_->OnViewBitmapChanged(this);
+void ServerView::SetSurfaceId(cc::SurfaceId surface_id) {
+  surface_id_ = surface_id;
+  delegate_->OnViewSurfaceIdChanged(this);
 }
 
 void ServerView::RemoveImpl(ServerView* view) {
   view->parent_ = NULL;
   children_.erase(std::find(children_.begin(), children_.end(), view));
 }
 
 }  // namespace service
 }  // namespace mojo