Enqueuing new frames in a Surface should cause Displays to reaggregate it

content/browser/compositor/delegated_frame_host.cc

 // Copyright 2014 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/browser/compositor/delegated_frame_host.h"
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 314 matching lines @@
     if (resource_collection_.get()) {
       resource_collection_->SetClient(NULL);
 
       if (resource_collection_->LoseAllResources())
         SendReturnedDelegatedResources(last_output_surface_id_);
 
       resource_collection_ = NULL;
     }
     last_output_surface_id_ = output_surface_id;
   }
+  bool modified_layers = false;
   if (frame_size.IsEmpty()) {
     DCHECK(frame_data->resource_list.empty());
     EvictDelegatedFrame();
+    modified_layers = true;
   } else {
     if (use_surfaces_) {
       if (!surface_factory_) {
         ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
         cc::SurfaceManager* manager = factory->GetSurfaceManager();
         id_allocator_ = factory->CreateSurfaceIdAllocator();
         surface_factory_ =
             make_scoped_ptr(new cc::SurfaceFactory(manager, this));
       }
       if (surface_id_.is_null() || frame_size != current_surface_size_ ||
           frame_size_in_dip != current_frame_size_in_dip_) {
         if (!surface_id_.is_null())
-          surface_factory_->Destroy(surface_id_);
+          surfaces_to_destroy_after_commit_.push_back(surface_id_);
         surface_id_ = id_allocator_->GenerateId();
         surface_factory_->Create(surface_id_, frame_size);
         client_->GetLayer()->SetShowSurface(surface_id_, frame_size_in_dip);
         current_surface_size_ = frame_size;
+        modified_layers = true;
       }
       scoped_ptr<cc::CompositorFrame> compositor_frame =
           make_scoped_ptr(new cc::CompositorFrame());
       compositor_frame->delegated_frame_data = frame_data.Pass();
       surface_factory_->SubmitFrame(surface_id_, compositor_frame.Pass());
     } else {
       if (!resource_collection_) {
         resource_collection_ = new cc::DelegatedFrameResourceCollection;
         resource_collection_->SetClient(this);
       }
       // If the physical frame size changes, we need a new |frame_provider_|. If
       // the physical frame size is the same, but the size in DIP changed, we
       // need to adjust the scale at which the frames will be drawn, and we do
       // this by making a new |frame_provider_| also to ensure the scale change
       // is presented in sync with the new frame content.
       if (!frame_provider_.get() ||
           frame_size != frame_provider_->frame_size() ||
           frame_size_in_dip != current_frame_size_in_dip_) {
         frame_provider_ = new cc::DelegatedFrameProvider(
             resource_collection_.get(), frame_data.Pass());
         client_->GetLayer()->SetShowDelegatedContent(frame_provider_.get(),
                                                      frame_size_in_dip);
       } else {
         frame_provider_->SetFrameData(frame_data.Pass());
       }
+      modified_layers = true;
     }
   }
   released_front_lock_ = NULL;
   current_frame_size_in_dip_ = frame_size_in_dip;
   CheckResizeLock();
 
-  client_->SchedulePaintInRect(damage_rect_in_dip);
+  if (modified_layers) {
+    // TODO(jbauman): Need to always tell the window observer about the
+    // damage.
+    client_->SchedulePaintInRect(damage_rect_in_dip);
+  }
 
   pending_delegated_ack_count_++;
 
   ui::Compositor* compositor = client_->GetCompositor();
-  if (!compositor) {
+  if (!compositor || !modified_layers) {
     SendDelegatedFrameAck(output_surface_id);
   } else {
     std::vector<ui::LatencyInfo>::const_iterator it;
     for (it = latency_info.begin(); it != latency_info.end(); ++it)
       compositor->SetLatencyInfo(*it);
     // If we've previously skipped any latency infos add them.
     for (it = skipped_latency_info_list_.begin();
         it != skipped_latency_info_list_.end();
         ++it)
       compositor->SetLatencyInfo(*it);
@@ skipping 59 matching lines @@
             resources.end(),
             std::back_inserter(surface_returned_resources_));
   if (!pending_delegated_ack_count_)
     SendReturnedDelegatedResources(last_output_surface_id_);
 }
 
 void DelegatedFrameHost::EvictDelegatedFrame() {
   client_->GetLayer()->SetShowPaintedContent();
   frame_provider_ = NULL;
   if (!surface_id_.is_null()) {
-    surface_factory_->Destroy(surface_id_);
+    surfaces_to_destroy_after_commit_.push_back(surface_id_);
     surface_id_ = cc::SurfaceId();
   }
   delegated_frame_evictor_->DiscardedFrame();
 }
 
 // static
 void DelegatedFrameHost::CopyFromCompositingSurfaceHasResult(
     const gfx::Size& dst_size_in_pixel,
     const SkColorType color_type,
     const base::Callback<void(bool, const SkBitmap&)>& callback,
@@ skipping 267 matching lines @@
                                      texture_mailbox.sync_point(),
                                      video_frame.get(),
                                      finished_callback);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, ui::CompositorObserver implementation:
 
 void DelegatedFrameHost::OnCompositingDidCommit(
     ui::Compositor* compositor) {
+  std::copy(surfaces_to_destroy_after_commit_.begin(),
+            surfaces_to_destroy_after_commit_.end(),
+            std::back_inserter(surfaces_to_destroy_after_swap_));
+  surfaces_to_destroy_after_commit_.clear();
   RenderWidgetHostImpl* host = client_->GetHost();
   if (can_lock_compositor_ == NO_PENDING_COMMIT) {
     can_lock_compositor_ = YES_CAN_LOCK;
     if (resize_lock_.get() && resize_lock_->GrabDeferredLock())
       can_lock_compositor_ = YES_DID_LOCK;
   }
   RunOnCommitCallbacks();
   if (resize_lock_ &&
       resize_lock_->expected_size() == current_frame_size_in_dip_) {
     resize_lock_.reset();
     host->WasResized();
     // We may have had a resize while we had the lock (e.g. if the lock expired,
     // or if the UI still gave us some resizes), so make sure we grab a new lock
     // if necessary.
     MaybeCreateResizeLock();
   }
 }
 
 void DelegatedFrameHost::OnCompositingStarted(
     ui::Compositor* compositor, base::TimeTicks start_time) {
   last_draw_ended_ = start_time;
 }
 
 void DelegatedFrameHost::OnCompositingEnded(
     ui::Compositor* compositor) {
+  for (std::vector<cc::SurfaceId>::iterator it =
+           surfaces_to_destroy_after_swap_.begin();
+       it != surfaces_to_destroy_after_swap_.end();
+       ++it) {
+    surface_factory_->Destroy(*it);
+  }
+  surfaces_to_destroy_after_swap_.clear();
 }
 
 void DelegatedFrameHost::OnCompositingAborted(ui::Compositor* compositor) {
 }
 
 void DelegatedFrameHost::OnCompositingLockStateChanged(
     ui::Compositor* compositor) {
   // A compositor lock that is part of a resize lock timed out. We
   // should display a renderer frame.
   if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) {
@@ skipping 23 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, private:
 
 DelegatedFrameHost::~DelegatedFrameHost() {
   ImageTransportFactory::GetInstance()->RemoveObserver(this);
 
   if (!surface_id_.is_null())
     surface_factory_->Destroy(surface_id_);
+  for (std::vector<cc::SurfaceId>::iterator it =
+           surfaces_to_destroy_after_commit_.begin();
+       it != surfaces_to_destroy_after_commit_.end();
+       ++it) {
+    surface_factory_->Destroy(*it);
+  }
+  surfaces_to_destroy_after_commit_.clear();
+  for (std::vector<cc::SurfaceId>::iterator it =
+           surfaces_to_destroy_after_swap_.begin();
+       it != surfaces_to_destroy_after_swap_.end();
+       ++it) {
+    surface_factory_->Destroy(*it);
+  }
+  surfaces_to_destroy_after_swap_.clear();
   if (resource_collection_.get())
     resource_collection_->SetClient(NULL);
 
   DCHECK(!vsync_manager_);
 }
 
 void DelegatedFrameHost::RunOnCommitCallbacks() {
   for (std::vector<base::Closure>::const_iterator
       it = on_compositing_did_commit_callbacks_.begin();
       it != on_compositing_did_commit_callbacks_.end(); ++it) {
@@ skipping 59 matching lines @@
     new_layer->SetShowDelegatedContent(frame_provider_.get(),
                                        current_frame_size_in_dip_);
   }
   if (!surface_id_.is_null()) {
     new_layer->SetShowSurface(surface_id_, current_frame_size_in_dip_);
   }
 }
 
 }  // namespace content