Convert view manager to surfaces with uploading shim in client lib

mojo/services/view_manager/connection_manager.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_CONNECTION_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/view_manager/display_manager.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/server_view.h"
 #include "mojo/services/view_manager/server_view_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace ui {
 class Event;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace service {
 
-class DisplayManagerDelegate;
 class ViewManagerServiceImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
 // ViewManagerServiceImpls) as well as providing the root of the hierarchy.
 class MOJO_VIEW_MANAGER_EXPORT ConnectionManager : public ServerViewDelegate {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
   // clients are notified correctly.
   class ScopedChange {
    public:
@@ skipping 20 matching lines @@
     const ConnectionSpecificId connection_id_;
     const bool is_delete_view_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
     std::set<ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   ConnectionManager(ApplicationConnection* app_connection,
-                    DisplayManagerDelegate* display_manager_delegate,
                     const Callback<void()>& native_viewport_closed_callback);
   virtual ~ConnectionManager();
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   void AddConnection(ViewManagerServiceImpl* connection);
   void RemoveConnection(ViewManagerServiceImpl* connection);
 
   // Establishes the initial client. Similar to Connect(), but the resulting
@@ skipping 50 matching lines @@
                                 const gfx::Rect& new_bounds);
   void ProcessViewHierarchyChanged(const ServerView* view,
                                    const ServerView* new_parent,
                                    const ServerView* old_parent);
   void ProcessViewReorder(const ServerView* view,
                           const ServerView* relative_view,
                           const OrderDirection direction);
   void ProcessViewDeleted(const ViewId& view);
 
  private:
-  // Used to setup any static state needed by ConnectionManager.
-  struct Context {
-    Context();
-    ~Context();
-  };
-
   typedef std::map<ConnectionSpecificId, ViewManagerServiceImpl*> ConnectionMap;
 
   // Invoked when a connection is about to make a change.  Subsequently followed
   // by FinishChange() once the change is done.
   //
   // Changes should never nest, meaning each PrepareForChange() must be
   // balanced with a call to FinishChange() with no PrepareForChange()
   // in between.
   void PrepareForChange(ScopedChange* change);
 
@@ skipping 13 matching lines @@
       InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from ServerViewDelegate:
   virtual void OnViewDestroyed(const ServerView* view) OVERRIDE;
   virtual void OnViewHierarchyChanged(const ServerView* view,
                                       const ServerView* new_parent,
                                       const ServerView* old_parent) OVERRIDE;
   virtual void OnViewBoundsChanged(const ServerView* view,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnViewBitmapChanged(const ServerView* view) OVERRIDE;
-
-  Context context_;
+  virtual void OnViewSurfaceIdChanged(const ServerView* view) OVERRIDE;
 
   ApplicationConnection* app_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   DisplayManager display_manager_;
 
   scoped_ptr<ServerView> root_;
 
   // Set of ViewManagerServiceImpls created by way of Connect(). These have to
   // be explicitly destroyed.
   std::set<ViewManagerServiceImpl*> connections_created_by_connect_;
 
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_