Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/server_view.h

 // 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.
 
 #ifndef MOJO_SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
 #define MOJO_SERVICES_VIEW_MANAGER_SERVER_VIEW_H_
 
 #include <vector>
 
 #include "base/logging.h"
+#include "cc/surfaces/surface_id.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/view_manager_export.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 namespace service {
 
 class ServerViewDelegate;
 
 // Server side representation of a view. Delegate is informed of interesting
 // events.
 //
@@ skipping 28 matching lines @@
   std::vector<const ServerView*> GetChildren() const;
   std::vector<ServerView*> GetChildren();
 
   bool Contains(const ServerView* view) const;
 
   // Returns true if the window is visible. This does not consider visibility
   // of any ancestors.
   bool visible() const { return visible_; }
   void SetVisible(bool value);
 
-  void SetBitmap(const SkBitmap& contents);
-  const SkBitmap& bitmap() const { return bitmap_; }
+  void SetSurfaceId(cc::SurfaceId surface_id);
+  const cc::SurfaceId surface_id() const { return surface_id_; }
 
  private:
   typedef std::vector<ServerView*> Views;
 
   // Implementation of removing a view. Doesn't send any notification.
   void RemoveImpl(ServerView* view);
 
   ServerViewDelegate* delegate_;
   const ViewId id_;
   ServerView* parent_;
   Views children_;
   bool visible_;
   gfx::Rect bounds_;
-  SkBitmap bitmap_;
+  cc::SurfaceId surface_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerView);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_SERVER_VIEW_H_