Adds a CloneAndAnimate function to WindowManagerInternalClient

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 "base/memory/scoped_ptr.h"
+#include "base/timer/timer.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager_internal.mojom.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"
 
 namespace mojo {
 namespace service {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
 class DisplayManager;
+class ServerView;
 class ViewManagerServiceImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
 // ViewManagerServiceImpls) as well as providing the root of the hierarchy.
 class ConnectionManager : public ServerViewDelegate,
                           public WindowManagerInternalClient {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
   // clients are notified correctly.
   class ScopedChange {
@@ skipping 34 matching lines @@
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Invoked when a ViewManagerServiceImpl's connection encounters an error.
   void OnConnectionError(ClientConnection* connection);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_view_id| is valid.
   void EmbedAtView(ConnectionSpecificId creator_id,
-                   const String& url,
-                   Id transport_view_id,
+                   const std::string& url,
+                   const ViewId& view_id,
                    InterfaceRequest<ServiceProvider> service_provider);
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the View identified by |id|.
   ServerView* GetView(const ViewId& id);
 
   ServerView* root() { return root_.get(); }
 
@@ skipping 18 matching lines @@
   const ViewManagerServiceImpl* GetConnectionWithRoot(const ViewId& id) const;
 
   WindowManagerInternal* wm_internal() { return wm_internal_; }
 
   void SetWindowManagerClientConnection(
       scoped_ptr<ClientConnection> connection);
   bool has_window_manager_client_connection() const {
     return window_manager_client_connection_ != nullptr;
   }
 
+  // Implementation of WindowManagerInternalClient functions. See mojom for

[msw, 2014/11/18 23:37:42]

nit: "WindowManagerInternalClient implementation helper(s); see mojom for
details."

[sky, 2014/11/19 00:49:39]

Done.

+  // details.
+  bool CloneAndAnimate(const ViewId& view_id);
+
   // These functions trivially delegate to all ViewManagerServiceImpls, which in
   // term notify their clients.
   void ProcessViewDestroyed(ServerView* view);
   void ProcessViewBoundsChanged(const ServerView* view,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessWillChangeViewHierarchy(const ServerView* view,
                                       const ServerView* new_parent,
                                       const ServerView* old_parent);
   void ProcessViewHierarchyChanged(const ServerView* view,
@@ skipping 19 matching lines @@
   void FinishChange();
 
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
   // Adds |connection| to internal maps.
   void AddConnection(ClientConnection* connection);
 
+  // Callback from animation timer.
+  // TODO(sky): make this real (move to a different class).
+  void DoAnimation();
+
   // Overridden from ServerViewDelegate:
+  void OnWillDestroyView(ServerView* view) override;
   void OnViewDestroyed(const ServerView* view) override;
-  void OnWillChangeViewHierarchy(const ServerView* view,
-                                 const ServerView* new_parent,
-                                 const ServerView* old_parent) override;
+  void OnWillChangeViewHierarchy(ServerView* view,
+                                 ServerView* new_parent,
+                                 ServerView* old_parent) override;
   void OnViewHierarchyChanged(const ServerView* view,
                               const ServerView* new_parent,
                               const ServerView* old_parent) override;
   void OnViewBoundsChanged(const ServerView* view,
                            const gfx::Rect& old_bounds,
                            const gfx::Rect& new_bounds) override;
   void OnViewSurfaceIdChanged(const ServerView* view) override;
   void OnViewReordered(const ServerView* view,
                        const ServerView* relative,
                        OrderDirection direction) override;
-  void OnWillChangeViewVisibility(const ServerView* view) override;
+  void OnWillChangeViewVisibility(ServerView* view) override;
   void OnViewSharedPropertyChanged(
       const ServerView* view,
       const std::string& name,
       const std::vector<uint8_t>* new_data) override;
+  void OnScheduleViewPaint(const ServerView* view) override;
 
   // WindowManagerInternalClient:
-  void DispatchInputEventToView(Id transport_view_id,
-                                EventPtr event) override;
+  void DispatchInputEventToView(Id transport_view_id, EventPtr event) override;
   void SetViewportSize(SizePtr size) override;
+  void CloneAndAnimate(Id transport_view_id,
+                       const Callback<void(bool)>& callback) override;
 
   ConnectionManagerDelegate* delegate_;
 
   // The ClientConnection containing the ViewManagerService implementation
   // provided to the initial connection (the WindowManager).
   // NOTE: |window_manager_client_connection_| is also in |connection_map_|.
   ClientConnection* window_manager_client_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   scoped_ptr<DisplayManager> display_manager_;
 
   scoped_ptr<ServerView> root_;
 
   WindowManagerInternal* wm_internal_;
 
   // 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_;
 
   bool in_destructor_;
 
+  // TODO(sky): nuke! Just a proof of concept until get real animation api.
+  base::RepeatingTimer<ConnectionManager> animation_timer_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_