Getting rid of DelegatedFrameData

cc/surfaces/surface_factory.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 "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 67 matching lines @@
   }
 }
 
 void SurfaceFactory::SubmitCompositorFrame(const LocalFrameId& local_frame_id,
                                            CompositorFrame frame,
                                            const DrawCallback& callback) {
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
   OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
-  const CompositorFrame& previous_frame = it->second->GetEligibleFrame();
   // Tell the SurfaceManager if this is the first frame submitted with this
   // LocalFrameId.
-  if (!previous_frame.delegated_frame_data) {
+  if (!it->second->HasFrame()) {
     float device_scale_factor = frame.metadata.device_scale_factor;
     gfx::Size frame_size;
     // CompositorFrames may not be populated with a RenderPass in unit tests.
-    if (frame.delegated_frame_data &&
-        !frame.delegated_frame_data->render_pass_list.empty()) {
-      frame_size =
-          frame.delegated_frame_data->render_pass_list[0]->output_rect.size();
-    }
+    if (!frame.render_pass_list.empty())
+      frame_size = frame.render_pass_list[0]->output_rect.size();
     manager_->SurfaceCreated(it->second->surface_id(), frame_size,
                              device_scale_factor);
   }
   it->second->QueueFrame(std::move(frame), callback);
   if (!manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_frame_id))) {
     TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD);
     it->second->RunDrawCallbacks();
   }
 }
 
 void SurfaceFactory::RequestCopyOfSurface(
     const LocalFrameId& local_frame_id,
     std::unique_ptr<CopyOutputRequest> copy_request) {
   OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
   if (it == surface_map_.end()) {
     copy_request->SendEmptyResult();
     return;
   }
   DCHECK(it->second->factory().get() == this);
   it->second->RequestCopyOfOutput(std::move(copy_request));
   manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_frame_id));
 }
 
+void SurfaceFactory::ClearSurface(const LocalFrameId& local_frame_id) {
+  OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
+  DCHECK(it != surface_map_.end());
+  DCHECK(it->second->factory().get() == this);
+  it->second->EvictFrame();
+  manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_frame_id));
+}
+
 void SurfaceFactory::WillDrawSurface(const LocalFrameId& id,
                                      const gfx::Rect& damage_rect) {
   client_->WillDrawSurface(id, damage_rect);
 }
 
 void SurfaceFactory::ReceiveFromChild(
     const TransferableResourceArray& resources) {
   holder_.ReceiveFromChild(resources);
 }
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
 }  // namespace cc