| Index: services/ui/ws/window_server.cc
|
| diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
|
| index c4758a510b24ec0e3536e4e075a8c011f7ce3970..5bb725e6e8647519b04bb358d059c75b949c8121 100644
|
| --- a/services/ui/ws/window_server.cc
|
| +++ b/services/ui/ws/window_server.cc
|
| @@ -83,8 +83,9 @@ WindowServer::~WindowServer() {
|
|
|
| ServerWindow* WindowServer::CreateServerWindow(
|
| const WindowId& id,
|
| - const std::map<std::string, std::vector<uint8_t>>& properties) {
|
| - ServerWindow* window = new ServerWindow(this, id, properties);
|
| + const std::map<std::string, std::vector<uint8_t>>& properties,
|
| + const cc::LocalFrameId& local_frame_id) {
|
| + ServerWindow* window = new ServerWindow(this, id, properties, local_frame_id);
|
| window->AddObserver(this);
|
| return window;
|
| }
|
| @@ -346,12 +347,15 @@ void WindowServer::WindowManagerCreatedTopLevelWindow(
|
| change.client_change_id, window);
|
| }
|
|
|
| -void WindowServer::ProcessWindowBoundsChanged(const ServerWindow* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) {
|
| +void WindowServer::ProcessWindowBoundsChanged(
|
| + const ServerWindow* window,
|
| + const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds,
|
| + const cc::LocalFrameId& local_frame_id) {
|
| for (auto& pair : tree_map_) {
|
| pair.second->ProcessWindowBoundsChanged(window, old_bounds, new_bounds,
|
| - IsOperationSource(pair.first));
|
| + IsOperationSource(pair.first),
|
| + local_frame_id);
|
| }
|
| }
|
|
|
| @@ -646,13 +650,15 @@ void WindowServer::OnWindowHierarchyChanged(ServerWindow* window,
|
| UpdateNativeCursorFromMouseLocation(window);
|
| }
|
|
|
| -void WindowServer::OnWindowBoundsChanged(ServerWindow* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) {
|
| +void WindowServer::OnWindowBoundsChanged(
|
| + ServerWindow* window,
|
| + const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds,
|
| + const cc::LocalFrameId& local_frame_id) {
|
| if (in_destructor_)
|
| return;
|
|
|
| - ProcessWindowBoundsChanged(window, old_bounds, new_bounds);
|
| + ProcessWindowBoundsChanged(window, old_bounds, new_bounds, local_frame_id);
|
| if (!window->parent())
|
| return;
|
|
|
|
|