RELAND Surface synchronization: Don't evict surface on DelegatedFrameHost::WasResized

If we evict a surface before the previous CompositorFrame activates with it
as a fallback, then we will attempt to add an invalid reference and we may
end up with missing surfaces in surface aggregator. This CL combats the issue
by avoiding evicting frames during resize.

We will still only update the primary surface ID if the tab is not hidden,
and we will clear the fallback surface ID if the tab is hidden.

[email protected]

(cherry picked from commit eb8dd47)

Bug: 813157, 672962
TBR: [email protected]
Change-Id: I9f35ef24597f0bc88e139b23a2994e8b32abbc70
Reviewed-on: https://chromium-review.googlesource.com/938678
Reviewed-by: Saman Sami <[email protected]>
Commit-Queue: Fady Samuel <[email protected]>
Cr-Original-Original-Commit-Position: refs/heads/master@{#539639}
Reviewed-on: https://chromium-review.googlesource.com/943725
Reviewed-by: Fady Samuel <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#540333}
Reviewed-on: https://chromium-review.googlesource.com/953126
Cr-Commit-Position: refs/branch-heads/3359@{#61}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}

Author: Fady Samuel

content/browser/renderer_host/delegated_frame_host.cc

@@ -272,20 +272,29 @@ void DelegatedFrameHost::WasResized(
   pending_local_surface_id_ = new_pending_local_surface_id;
   pending_surface_dip_size_ = new_pending_dip_size;
 
-  if (enable_surface_synchronization_ &&
-      client_->DelegatedFrameHostIsVisible() &&
-      (!primary_surface_id ||
-       primary_surface_id->local_surface_id() != pending_local_surface_id_)) {
-    current_frame_size_in_dip_ = pending_surface_dip_size_;
+  if (enable_surface_synchronization_) {
+    if (!client_->DelegatedFrameHostIsVisible()) {
+      if (HasFallbackSurface()) {
+        client_->DelegatedFrameHostGetLayer()->SetFallbackSurfaceId(
+            viz::SurfaceId());
+      }
+      return;
+    }
 
-    viz::SurfaceId surface_id(frame_sink_id_, pending_local_surface_id_);
-    client_->DelegatedFrameHostGetLayer()->SetShowPrimarySurface(
-        surface_id, current_frame_size_in_dip_, GetGutterColor(),
-        deadline_policy);
-    if (compositor_ && !base::CommandLine::ForCurrentProcess()->HasSwitch(
-                           switches::kDisableResizeLock)) {
-      compositor_->OnChildResizing();
+    if (!primary_surface_id ||
+        primary_surface_id->local_surface_id() != pending_local_surface_id_) {
+      current_frame_size_in_dip_ = pending_surface_dip_size_;
+
+      viz::SurfaceId surface_id(frame_sink_id_, pending_local_surface_id_);
+      client_->DelegatedFrameHostGetLayer()->SetShowPrimarySurface(
+          surface_id, current_frame_size_in_dip_, GetGutterColor(),
+          deadline_policy);
+      if (compositor_ && !base::CommandLine::ForCurrentProcess()->HasSwitch(
+                             switches::kDisableResizeLock)) {
+        compositor_->OnChildResizing();
+      }
     }
+
     // Input throttling and guttering are handled differently when surface
     // synchronization is enabled so exit early here.
     return;
@@ -547,17 +556,18 @@ void DelegatedFrameHost::OnBeginFrame(const viz::BeginFrameArgs& args) {
 }
 
 void DelegatedFrameHost::EvictDelegatedFrame() {
-  if (!HasFallbackSurface())
+  if (!HasSavedFrame())
     return;
 
-  std::vector<viz::SurfaceId> surface_ids = {
-      *client_->DelegatedFrameHostGetLayer()->GetFallbackSurfaceId()};
+  std::vector<viz::SurfaceId> surface_ids = {GetCurrentSurfaceId()};
 
   GetHostFrameSinkManager()->EvictSurfaces(surface_ids);
 
   if (enable_surface_synchronization_) {
-    client_->DelegatedFrameHostGetLayer()->SetFallbackSurfaceId(
-        viz::SurfaceId());
+    if (HasFallbackSurface()) {
+      client_->DelegatedFrameHostGetLayer()->SetFallbackSurfaceId(
+          viz::SurfaceId());
+    }
   } else {
     client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
     resize_lock_.reset();