Mus-WS / Aura-Mus: Propagate LocalSurfaceId on WindowTreeHost creation

content/renderer/mus/renderer_window_tree_client.cc

 // Copyright 2017 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.
 
 #include "content/renderer/mus/renderer_window_tree_client.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 89 matching lines @@
   if (!render_frame && !render_view)
     return nullptr;
   return render_frame ? render_frame->GetRenderWidget()
                       : render_view->GetWidget();
 }
 
 void RendererWindowTreeClient::DestroySelf() {
   delete this;
 }
 
-void RendererWindowTreeClient::OnEmbed(ui::ClientSpecificId client_id,
-                                       ui::mojom::WindowDataPtr root,
-                                       ui::mojom::WindowTreePtr tree,
-                                       int64_t display_id,
-                                       ui::Id focused_window_id,
-                                       bool drawn,
-                                       const cc::FrameSinkId& frame_sink_id) {
+void RendererWindowTreeClient::OnEmbed(
+    ui::ClientSpecificId client_id,
+    ui::mojom::WindowDataPtr root,
+    ui::mojom::WindowTreePtr tree,
+    int64_t display_id,
+    ui::Id focused_window_id,
+    bool drawn,
+    const cc::FrameSinkId& frame_sink_id,
+    const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
   frame_sink_id_ = frame_sink_id;
   root_window_id_ = root->window_id;
   tree_ = std::move(tree);
   if (!pending_compositor_frame_sink_callback_.is_null()) {
     RequestCompositorFrameSinkInternal(std::move(pending_context_provider_),
                                        pending_gpu_memory_buffer_manager_,
                                        pending_compositor_frame_sink_callback_);
     pending_context_provider_ = nullptr;
     pending_gpu_memory_buffer_manager_ = nullptr;
     pending_compositor_frame_sink_callback_.Reset();
   }
+  if (local_surface_id) {
+    // TODO(fsamuel): Update the RenderWidgetCompositor's LocalSurfaceId.
+    current_local_surface_id_ = *local_surface_id;
+  }
 }
 
 void RendererWindowTreeClient::OnEmbeddedAppDisconnected(ui::Id window_id) {
   // TODO(sad): Embedded mus-client (oopif) is gone. Figure out what to do.
 }
 
 void RendererWindowTreeClient::OnUnembed(ui::Id window_id) {
   CHECK_EQ(window_id, root_window_id_);
   DestroySelf();
 }
 
 void RendererWindowTreeClient::OnCaptureChanged(ui::Id new_capture_window_id,
                                                 ui::Id old_capture_window_id) {}
 
 void RendererWindowTreeClient::OnFrameSinkIdAllocated(
     ui::Id window_id,
     const cc::FrameSinkId& frame_sink_id) {
   // TODO(fsamuel): OOPIF's |frame_sink_id| is ready. The OOPIF can now be
   // embedded by the parent.
 }
 
 void RendererWindowTreeClient::OnTopLevelCreated(
     uint32_t change_id,
     ui::mojom::WindowDataPtr data,
     int64_t display_id,
     bool drawn,
-    const cc::FrameSinkId& frame_sink_id) {
+    const cc::FrameSinkId& frame_sink_id,
+    const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
   NOTREACHED();
 }
 
 void RendererWindowTreeClient::OnWindowBoundsChanged(
     ui::Id window_id,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds,
     const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
-  if (!enable_surface_synchronization_)
+  if (!enable_surface_synchronization_ || !local_surface_id)
     return;
   current_local_surface_id_ = *local_surface_id;
   RenderWidget* widget = GetRenderWidgetFromRoutingId(routing_id_);
   if (!widget)
     return;
   // TODO(fsamuel): This isn't quite correct. The resize arrives from the
   // browser and so it might not synchronize with the LocalSurfaceId.
   widget->compositor()->SetLocalSurfaceId(*local_surface_id);
 }
 
@@ skipping 107 matching lines @@
                                                  bool success) {}
 
 void RendererWindowTreeClient::RequestClose(uint32_t window_id) {}
 
 void RendererWindowTreeClient::GetWindowManager(
     mojo::AssociatedInterfaceRequest<ui::mojom::WindowManager> internal) {
   NOTREACHED();
 }
 
 }  // namespace content