| Index: services/ui/ws/server_window.h
|
| diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
|
| index 6ae3f2173991a4f61d5ed3d133ef79bcc14f0f96..0514177ed1e5f48d9e705e9b116ee2c9c4b781e3 100644
|
| --- a/services/ui/ws/server_window.h
|
| +++ b/services/ui/ws/server_window.h
|
| @@ -51,7 +51,8 @@ class ServerWindow {
|
| ServerWindow(ServerWindowDelegate* delegate, const WindowId& id);
|
| ServerWindow(ServerWindowDelegate* delegate,
|
| const WindowId& id,
|
| - const Properties& properties);
|
| + const Properties& properties,
|
| + const cc::LocalFrameId& local_frame_id);
|
| ~ServerWindow();
|
|
|
| void AddObserver(ServerWindowObserver* observer);
|
| @@ -81,7 +82,8 @@ class ServerWindow {
|
| const gfx::Rect& bounds() const { return bounds_; }
|
| // Sets the bounds. If the size changes this implicitly resets the client
|
| // area to fill the whole bounds.
|
| - void SetBounds(const gfx::Rect& bounds);
|
| + void SetBounds(const gfx::Rect& bounds,
|
| + const cc::LocalFrameId& local_frame_id);
|
|
|
| const std::vector<gfx::Rect>& additional_client_areas() const {
|
| return additional_client_areas_;
|
| @@ -167,6 +169,8 @@ class ServerWindow {
|
| void set_can_accept_events(bool value) { can_accept_events_ = value; }
|
| bool can_accept_events() const { return can_accept_events_; }
|
|
|
| + const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
|
| +
|
| // Returns true if this window is attached to a root and all ancestors are
|
| // visible.
|
| bool IsDrawn() const;
|
| @@ -224,6 +228,7 @@ class ServerWindow {
|
|
|
| ServerWindowDelegate* delegate_;
|
| const WindowId id_;
|
| + cc::LocalFrameId local_frame_id_;
|
| ServerWindow* parent_;
|
| Windows children_;
|
|
|
|
|