Index: services/ui/public/cpp/window_tree_client.cc |
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc |
index 87fa4dc00c37b423e30046b6f7b2181269a9d81f..cedfe0a2cf6adf3ba7e4fcc0ee8b8c1942ce477d 100644 |
--- a/services/ui/public/cpp/window_tree_client.cc |
+++ b/services/ui/public/cpp/window_tree_client.cc |
@@ -356,6 +356,13 @@ void WindowTreeClient::AttachSurface( |
tree_->AttachSurface(window_id, type, std::move(surface), std::move(client)); |
} |
+void WindowTreeClient::SatisfySurfaceSequence( |
+ Id window_id, |
+ const cc::SurfaceSequence& sequence) { |
+ DCHECK(tree_); |
+ tree_->SatisfySurfaceSequence(window_id, sequence); |
+} |
+ |
void WindowTreeClient::LocalSetCapture(Window* window) { |
if (capture_window_ == window) |
return; |
@@ -489,10 +496,11 @@ Window* WindowTreeClient::BuildWindowTree( |
Window* WindowTreeClient::NewWindowImpl( |
NewWindowType type, |
- const Window::SharedProperties* properties) { |
+ const Window::SharedProperties* properties, |
+ bool container) { |
DCHECK(tree_); |
- Window* window = |
- new Window(this, MakeTransportId(client_id_, next_window_id_++)); |
+ Window* window = new Window( |
+ this, MakeTransportId(client_id_, next_window_id_++), container); |
if (properties) |
window->properties_ = *properties; |
AddWindow(window); |
@@ -694,9 +702,9 @@ void WindowTreeClient::CancelWindowMove(Window* window) { |
tree_->CancelWindowMove(window->server_id()); |
} |
-Window* WindowTreeClient::NewWindow( |
- const Window::SharedProperties* properties) { |
- return NewWindowImpl(NewWindowType::CHILD, properties); |
+Window* WindowTreeClient::NewWindow(const Window::SharedProperties* properties, |
+ bool container) { |
+ return NewWindowImpl(NewWindowType::CHILD, properties, container); |
} |
Window* WindowTreeClient::NewTopLevelWindow( |
@@ -886,6 +894,21 @@ void WindowTreeClient::OnWindowBoundsChanged(Id window_id, |
WindowPrivate(window).LocalSetBounds(old_bounds, new_bounds); |
} |
+void WindowTreeClient::OnWindowSurfaceCreated( |
+ Id window_id, |
+ const gfx::Size& size, |
+ float device_scale_factor, |
+ const cc::SurfaceId& surface_id, |
+ const cc::SurfaceSequence& surface_sequence) { |
+ Window* window = GetWindowByServerId(window_id); |
+ if (!window) |
+ return; |
+ |
+ // TODO(fsamuel): Figure out lifetime management. |
+ WindowPrivate(window).LocalSetSurfaceId(size, device_scale_factor, surface_id, |
+ surface_sequence); |
+} |
+ |
void WindowTreeClient::OnClientAreaChanged( |
uint32_t window_id, |
const gfx::Insets& new_client_area, |