WIP: Surface Synchronization System

ui/aura/mus/window_port_mus.cc

 // Copyright 2016 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 "ui/aura/mus/window_port_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/client_surface_embedder.h"
@@ skipping 65 matching lines @@
 std::unique_ptr<ui::WindowCompositorFrameSink>
 WindowPortMus::RequestCompositorFrameSink(
     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
   std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
       compositor_frame_sink_binding;
   std::unique_ptr<ui::WindowCompositorFrameSink> compositor_frame_sink =
       ui::WindowCompositorFrameSink::Create(
           cc::FrameSinkId(server_id(), 0), std::move(context_provider),
           gpu_memory_buffer_manager, &compositor_frame_sink_binding);
+  compositor_frame_sink_ = compositor_frame_sink->GetWeakPtr();
   AttachCompositorFrameSink(std::move(compositor_frame_sink_binding));
+  fprintf(stderr,
+          ">>>WindowPortMus::RequestCompositorFrameSink frame_sink_id: %s "
+          "local_frame_id: %s\n",
+          cc::FrameSinkId(server_id(), 0).ToString().c_str(),
+          current_local_frame_id_.ToString().c_str());
+  if (current_local_frame_id_.is_valid()) {
+    compositor_frame_sink_->SetLocalFrameId(current_local_frame_id_);
+  }
   return compositor_frame_sink;
 }
 
 void WindowPortMus::AttachCompositorFrameSink(
     std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
         compositor_frame_sink_binding) {
   window_tree_client_->AttachCompositorFrameSink(
       server_id(), compositor_frame_sink_binding->TakeFrameSinkRequest(),
       mojo::MakeProxy(compositor_frame_sink_binding->TakeFrameSinkClient()));
 }
@@ skipping 67 matching lines @@
 }
 
 PropertyConverter* WindowPortMus::GetPropertyConverter() {
   return window_tree_client_->delegate_->GetPropertyConverter();
 }
 
 Window* WindowPortMus::GetWindow() {
   return window_;
 }
 
+void WindowPortMus::SetLayerType(ui::LayerType layer_type) {
+  layer_type_ = layer_type;
+}
+
+ui::LayerType WindowPortMus::GetLayerType() const {
+  return layer_type_;
+}
+
 void WindowPortMus::AddChildFromServer(WindowMus* window) {
   ServerChangeData data;
   data.child_id = window->server_id();
   ScopedServerChange change(this, ServerChangeType::ADD, data);
   window_->AddChild(window->GetWindow());
 }
 
 void WindowPortMus::RemoveChildFromServer(WindowMus* child) {
   ServerChangeData data;
   data.child_id = child->server_id();
@@ skipping 10 matching lines @@
   // a time, so this should be ok.
   ServerChangeData data;
   data.child_id = child->server_id();
   ScopedServerChange change(this, ServerChangeType::REORDER, data);
   if (direction == ui::mojom::OrderDirection::BELOW)
     window_->StackChildBelow(child->GetWindow(), relative->GetWindow());
   else
     window_->StackChildAbove(child->GetWindow(), relative->GetWindow());
 }
 
-void WindowPortMus::SetBoundsFromServer(const gfx::Rect& bounds) {
+void WindowPortMus::SetBoundsFromServer(
+    const gfx::Rect& bounds,
+    const cc::LocalFrameId& local_frame_id) {
   ServerChangeData data;
   data.bounds_in_dip = bounds;
   ScopedServerChange change(this, ServerChangeType::BOUNDS, data);
   window_->SetBounds(bounds);
+  current_local_frame_id_ = local_frame_id;
+  fprintf(stderr, ">>>%s %s\n", __PRETTY_FUNCTION__,
+          local_frame_id.ToString().c_str());
+  if (compositor_frame_sink_)
+    compositor_frame_sink_->SetLocalFrameId(local_frame_id);
 }
 
 void WindowPortMus::SetVisibleFromServer(bool visible) {
   ServerChangeData data;
   data.visible = visible;
   ScopedServerChange change(this, ServerChangeType::VISIBLE, data);
   if (visible)
     window_->Show();
   else
     window_->Hide();
@@ skipping 30 matching lines @@
         existing_surface_id != new_surface_id) {
       // TODO(kylechar): Start return reference here?
     }
   }
 
   // The fact that SetSurfaceIdFromServer was called means that this window
   // corresponds to an embedded client.
   if (!client_surface_embedder && surface_info.id().is_valid())
     client_surface_embedder = base::MakeUnique<ClientSurfaceEmbedder>(window_);
 
-  if (surface_info.id().is_valid())
+  if (surface_info.id().is_valid() && window_->IsVisible())
     client_surface_embedder->UpdateSurface(surface_info);
   else
     client_surface_embedder.reset();
 
   surface_info_ = surface_info;
 }
 
+void WindowPortMus::SetLocalFrameIdFromServer(
+    const cc::LocalFrameId& local_frame_id) {
+  if (window_->bounds().size().IsEmpty())
+    return;
+
+  cc::SurfaceInfo surface_info(
+      cc::SurfaceId(cc::FrameSinkId(server_id(), 0), local_frame_id), 1.0f,
+      window_->bounds().size());
+
+  fprintf(stderr, ">>>>%s %s\n", __PRETTY_FUNCTION__,
+          local_frame_id.ToString().c_str());
+  SetSurfaceInfoFromServer(surface_info);
+}
+
 void WindowPortMus::DestroyFromServer() {
   std::unique_ptr<ScopedServerChange> remove_from_parent_change;
   if (window_->parent()) {
     ServerChangeData data;
     data.child_id = server_id();
     WindowPortMus* parent = Get(window_->parent());
     remove_from_parent_change = base::MakeUnique<ScopedServerChange>(
         parent, ServerChangeType::REMOVE, data);
   }
   // NOTE: this can't use ScopedServerChange as |this| is destroyed before the
@@ skipping 80 matching lines @@
   const bool removed = RemoveChangeByTypeAndData(
       ServerChangeType::TRANSIENT_REORDER, change_data);
   DCHECK(removed);
 }
 
 void WindowPortMus::NotifyEmbeddedAppDisconnected() {
   for (WindowObserver& observer : *GetObservers(window_))
     observer.OnEmbeddedAppDisconnected(window_);
 }
 
-void WindowPortMus::OnPreInit(Window* window) {
+void WindowPortMus::OnPreInit(Window* window, ui::LayerType layer_type) {
   window_ = window;
-  window_tree_client_->OnWindowMusCreated(this);
+  window_tree_client_->OnWindowMusCreated(this, layer_type);
+  fprintf(stderr, ">>>%s layer_type: %d\n", __PRETTY_FUNCTION__,
+          (uint32_t)layer_type);
 }
 
 void WindowPortMus::OnDeviceScaleFactorChanged(float device_scale_factor) {
   if (window_->delegate())
     window_->delegate()->OnDeviceScaleFactorChanged(device_scale_factor);
 }
 
 void WindowPortMus::OnWillAddChild(Window* child) {
   ServerChangeData change_data;
   change_data.child_id = Get(child)->server_id();
@@ skipping 18 matching lines @@
                               change_data) == server_changes_.end()) {
     window_tree_client_->OnWindowMusMoveChild(this, current_index, dest_index);
   }
 }
 
 void WindowPortMus::OnVisibilityChanged(bool visible) {
   ServerChangeData change_data;
   change_data.visible = visible;
   if (!RemoveChangeByTypeAndData(ServerChangeType::VISIBLE, change_data))
     window_tree_client_->OnWindowMusSetVisible(this, visible);
+  // Update the ClientSurfaceEmbedder on visibility change.
+  if (surface_info_.id().is_valid())
+    SetSurfaceInfoFromServer(surface_info_);
 }
 
 void WindowPortMus::OnDidChangeBounds(const gfx::Rect& old_bounds,
                                       const gfx::Rect& new_bounds) {
   ServerChangeData change_data;
   change_data.bounds_in_dip = new_bounds;
   if (!RemoveChangeByTypeAndData(ServerChangeType::BOUNDS, change_data))
     window_tree_client_->OnWindowMusBoundsChanged(this, old_bounds, new_bounds);
 }
 
 std::unique_ptr<WindowPortPropertyData> WindowPortMus::OnWillChangeProperty(
     const void* key) {
   return window_tree_client_->OnWindowMusWillChangeProperty(this, key);
 }
 
 void WindowPortMus::OnPropertyChanged(
     const void* key,
     std::unique_ptr<WindowPortPropertyData> data) {
   ServerChangeData change_data;
   change_data.property_name =
       GetPropertyConverter()->GetTransportNameForPropertyKey(key);
   // TODO(sky): investigate to see if we need to compare data. In particular do
   // we ever have a case where changing a property cascades into changing the
   // same property?
   if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data))
     window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data));
 }
 
 }  // namespace aura