window-service: minor renaming/docs for ClientRoot

This renames UpdatePrimarySurfaceId() to
UpdateLocalSurfaceIdAndClientSurfaceEmbedder(), which better indicates what
it does.

There should be no functional change here, just docs/renaming.

BUG=none
TEST=none

Change-Id: Icfe5643c0225f2e158fe8843b03f08b7dec30495
Reviewed-on: https://chromium-review.googlesource.com/c/1437576
Commit-Queue: Scott Violet <sky@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Auto-Submit: Scott Violet <sky@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626212}

services/ws/client_root.cc

@@ -74,7 +74,7 @@ void ClientRoot::RegisterVizEmbeddingSupport() {
       frame_sink_id, this, viz::ReportFirstSurfaceActivation::kYes);
   window_->SetEmbedFrameSinkId(frame_sink_id);
 
-  UpdatePrimarySurfaceId();
+  UpdateLocalSurfaceIdAndClientSurfaceEmbedder();
 }
 
 bool ClientRoot::ShouldAssignLocalSurfaceId() {
@@ -106,6 +106,19 @@ void ClientRoot::UpdateLocalSurfaceIdIfNecessary() {
   }
 }
 
+void ClientRoot::UpdateLocalSurfaceIdAndClientSurfaceEmbedder() {
+  UpdateLocalSurfaceIdIfNecessary();
+  ProxyWindow* proxy_window = ProxyWindow::GetMayBeNull(window_);
+  if (proxy_window->local_surface_id().has_value()) {
+    client_surface_embedder_->SetSurfaceId(viz::SurfaceId(
+        window_->GetFrameSinkId(), *proxy_window->local_surface_id()));
+    if (fallback_surface_info_) {
+      client_surface_embedder_->SetFallbackSurfaceInfo(*fallback_surface_info_);
+      fallback_surface_info_.reset();
+    }
+  }
+}
+
 void ClientRoot::OnLocalSurfaceIdChanged() {
   if (ShouldAssignLocalSurfaceId())
     return;
@@ -165,19 +178,6 @@ void ClientRoot::UnattachChildFrameSinkIdRecursive(ProxyWindow* proxy_window) {
   }
 }
 
-void ClientRoot::UpdatePrimarySurfaceId() {
-  UpdateLocalSurfaceIdIfNecessary();
-  ProxyWindow* proxy_window = ProxyWindow::GetMayBeNull(window_);
-  if (proxy_window->local_surface_id().has_value()) {
-    client_surface_embedder_->SetSurfaceId(viz::SurfaceId(
-        window_->GetFrameSinkId(), *proxy_window->local_surface_id()));
-    if (fallback_surface_info_) {
-      client_surface_embedder_->SetFallbackSurfaceInfo(*fallback_surface_info_);
-      fallback_surface_info_.reset();
-    }
-  }
-}
-
 void ClientRoot::CheckForScaleFactorChange() {
   if (!ShouldAssignLocalSurfaceId() ||
       last_device_scale_factor_ == window_->layer()->device_scale_factor()) {
@@ -189,7 +189,7 @@ void ClientRoot::CheckForScaleFactorChange() {
 }
 
 void ClientRoot::HandleBoundsOrScaleFactorChange(const gfx::Rect& old_bounds) {
-  UpdatePrimarySurfaceId();
+  UpdateLocalSurfaceIdAndClientSurfaceEmbedder();
   client_surface_embedder_->UpdateSizeAndGutters();
   // See comments in WindowTree::SetWindowBoundsImpl() for details on
   // why this always notifies the client.
@@ -304,7 +304,7 @@ void ClientRoot::OnFirstSurfaceActivation(
   if (proxy_window->local_surface_id().has_value()) {
     DCHECK(!fallback_surface_info_);
     if (!client_surface_embedder_->HasPrimarySurfaceId())
-      UpdatePrimarySurfaceId();
+      UpdateLocalSurfaceIdAndClientSurfaceEmbedder();
     client_surface_embedder_->SetFallbackSurfaceInfo(surface_info);
   } else {
     fallback_surface_info_ = std::make_unique<viz::SurfaceInfo>(surface_info);

services/ws/client_root.h

@@ -80,15 +80,19 @@ class COMPONENT_EXPORT(WINDOW_SERVICE) ClientRoot
  private:
   friend class ClientRootTestHelper;
 
-  void UpdatePrimarySurfaceId();
-
   // Returns true if the WindowService should assign the LocalSurfaceId. A value
   // of false means the client is expected to providate the LocalSurfaceId.
   bool ShouldAssignLocalSurfaceId();
 
-  // If necessary, this updates the LocalSurfaceId.
+  // If necessary, this updates the LocalSurfaceId. Generally you should call
+  // UpdateLocalSurfaceIdAndClientSurfaceEmbedder(), not this. If you call this,
+  // you need to ensure the ClientSurfaceEmbedder is updated at a later time.
   void UpdateLocalSurfaceIdIfNecessary();
 
+  // Calls UpdateLocalSurfaceIdIfNecessary() and if the current LocalSurfaceId
+  // is valid, updates ClientSurfaceEmbedder.
+  void UpdateLocalSurfaceIdAndClientSurfaceEmbedder();
+
   // Calls HandleBoundsOrScaleFactorChange() it the scale factor has changed.
   void CheckForScaleFactorChange();