OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/aura/mus/window_tree_client.h" | 5 #include "ui/aura/mus/window_tree_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1375 | 1375 |
1376 window->SetCursorFromServer(cursor); | 1376 window->SetCursorFromServer(cursor); |
1377 } | 1377 } |
1378 | 1378 |
1379 void WindowTreeClient::OnWindowSurfaceChanged( | 1379 void WindowTreeClient::OnWindowSurfaceChanged( |
1380 Id window_id, | 1380 Id window_id, |
1381 const cc::SurfaceInfo& surface_info) { | 1381 const cc::SurfaceInfo& surface_info) { |
1382 WindowMus* window = GetWindowByServerId(window_id); | 1382 WindowMus* window = GetWindowByServerId(window_id); |
1383 if (!window) | 1383 if (!window) |
1384 return; | 1384 return; |
1385 | 1385 window->SetSurfaceInfoFromServer(surface_info); |
Fady Samuel
2017/05/30 18:36:42
Please restore this.
Peng
2017/05/31 20:12:25
As we discussed this offline. The SetPrimarySurfac
| |
1386 // If the parent is informed of a child's surface then that surface ID is | |
1387 // guaranteed to be available in the display compositor so we set it as the | |
1388 // fallback. If surface synchronization is enabled, the primary SurfaceInfo | |
1389 // is created by the embedder, and the LocalSurfaceId is allocated by the | |
1390 // embedder. | |
1391 window->SetFallbackSurfaceInfo(surface_info); | |
1392 } | 1386 } |
1393 | 1387 |
1394 void WindowTreeClient::OnDragDropStart( | 1388 void WindowTreeClient::OnDragDropStart( |
1395 const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data) { | 1389 const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data) { |
1396 drag_drop_controller_->OnDragDropStart(mojo::UnorderedMapToMap(mime_data)); | 1390 drag_drop_controller_->OnDragDropStart(mojo::UnorderedMapToMap(mime_data)); |
1397 } | 1391 } |
1398 | 1392 |
1399 void WindowTreeClient::OnDragEnter(Id window_id, | 1393 void WindowTreeClient::OnDragEnter(Id window_id, |
1400 uint32_t key_state, | 1394 uint32_t key_state, |
1401 const gfx::Point& position, | 1395 const gfx::Point& position, |
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2110 } | 2104 } |
2111 | 2105 |
2112 void WindowTreeClient::OnCompositingLockStateChanged( | 2106 void WindowTreeClient::OnCompositingLockStateChanged( |
2113 ui::Compositor* compositor) {} | 2107 ui::Compositor* compositor) {} |
2114 | 2108 |
2115 void WindowTreeClient::OnCompositingShuttingDown(ui::Compositor* compositor) { | 2109 void WindowTreeClient::OnCompositingShuttingDown(ui::Compositor* compositor) { |
2116 compositor->RemoveObserver(this); | 2110 compositor->RemoveObserver(this); |
2117 } | 2111 } |
2118 | 2112 |
2119 } // namespace aura | 2113 } // namespace aura |
OLD | NEW |