Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window.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 SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 
 class InputEventHandler;
 class ServiceProviderImpl;
+class SurfaceIdHandler;
 class WindowObserver;
 class WindowSurface;
 class WindowSurfaceBinding;
 class WindowDropTarget;
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 
 namespace {
 class OrderChangedNotifier;
 }
@@ skipping 115 matching lines @@
   //
   // These properties are only visible in the current process and are not
   // shared with other mojo services.
   template <typename T>
   void ClearLocalProperty(const WindowProperty<T>* property);
 
   void set_input_event_handler(InputEventHandler* input_event_handler) {
     input_event_handler_ = input_event_handler;
   }
 
+  void set_surface_id_handler(SurfaceIdHandler* surface_id_handler) {
+    surface_id_handler_ = surface_id_handler;
+  }
+
   // Observation.
   void AddObserver(WindowObserver* observer);
   void RemoveObserver(WindowObserver* observer);
 
   // Tree.
   Window* parent() { return parent_; }
   const Window* parent() const { return parent_; }
 
   Window* GetRoot() {
     return const_cast<Window*>(const_cast<const Window*>(this)->GetRoot());
@@ skipping 127 matching lines @@
   void LocalSetClientArea(
       const gfx::Insets& new_client_area,
       const std::vector<gfx::Rect>& additional_client_areas);
   void LocalSetParentDrawn(bool drawn);
   void LocalSetDisplay(int64_t display_id);
   void LocalSetVisible(bool visible);
   void LocalSetOpacity(float opacity);
   void LocalSetPredefinedCursor(mojom::Cursor cursor_id);
   void LocalSetSharedProperty(const std::string& name,
                               const std::vector<uint8_t>* data);
+  void LocalSetSurfaceId(const cc::SurfaceId& surface_id,
+                         const cc::SurfaceSequence& surface_sequence,
+                         const gfx::Size& frame_size,
+                         float device_scale_factor);
 
   // Notifies this winodw that its stacking position has changed.
   void NotifyWindowStackingChanged();
   // Methods implementing visibility change notifications. See WindowObserver
   // for more details.
   void NotifyWindowVisibilityChanged(Window* target, bool visible);
   // Notifies this window's observers. Returns false if |this| was deleted
   // during the call (by an observer), otherwise true.
   bool NotifyWindowVisibilityChangedAtReceiver(Window* target, bool visible);
   // Notifies this window and its child hierarchy. Returns false if |this| was
@@ skipping 27 matching lines @@
   Children children_;
 
   Window* stacking_target_;
   Window* transient_parent_;
   Children transient_children_;
 
   bool is_modal_;
 
   base::ObserverList<WindowObserver> observers_;
   InputEventHandler* input_event_handler_;
+  SurfaceIdHandler* surface_id_handler_;
 
   gfx::Rect bounds_;
   gfx::Insets client_area_;
   std::vector<gfx::Rect> additional_client_areas_;
   std::unique_ptr<gfx::Rect> hit_test_mask_;
 
   bool visible_;
   float opacity_;
   int64_t display_id_;
 
@@ skipping 17 matching lines @@
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
   struct Value {
     const char* name;
     int64_t value;
     PropertyDeallocator deallocator;
   };
 
   std::map<const void*, Value> prop_map_;
 
+  struct SurfaceInfo {

[sky, 2016/10/14 20:55:46]

I think this code would be clearer if you passed around the SurfaceInfo struct
rather than members. Specifically:

SurfaceIdHandler::OnChildWindowSurfaceCreated() would take a
std::unique_ptr<SurfaceInfo>* . If the function takes ownership it uses
std::move. That way no return value and expectations are a bit clearer.

LocalSetSurfaceId in Window becomes
LocalSetSurface(std::unique_ptr<SurfaceInfo>). That way you can call it with
null and it's easier to understand what's going on. Additionally the member
becomes std::unique_ptr<SurfaceInfo> so that you know what null means.

the struct were moved to SurfaceIdHandler and OnChildWindowSurfaceCreated took a
std::unique_ptr<SurfaceIdHandler>*. That way LocalSetSurface

[Fady Samuel, 2016/10/14 21:32:48]

Done.

+    cc::SurfaceId surface_id;
+    cc::SurfaceSequence surface_sequence;
+    gfx::Size frame_size;
+    float device_scale_factor;
+  };
+  SurfaceInfo surface_info_;
+
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_H_