Revert "Getting rid of DelegatedFrameData"

android_webview/browser/hardware_renderer.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 "android_webview/browser/hardware_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
@@ skipping 107 matching lines @@
       surface_factory_->Reset();
       compositor_id_ = child_frame_->compositor_id;
       last_submitted_compositor_frame_sink_id_ =
           child_frame_->compositor_frame_sink_id;
     }
 
     std::unique_ptr<cc::CompositorFrame> child_compositor_frame =
         std::move(child_frame_->frame);
 
     gfx::Size frame_size =
-        child_compositor_frame->render_pass_list.back()->output_rect.size();
+        child_compositor_frame->delegated_frame_data->render_pass_list.back()
+            ->output_rect.size();
     bool size_changed = frame_size != frame_size_;
     frame_size_ = frame_size;
     if (!child_id_.is_valid() || size_changed) {
       if (child_id_.is_valid())
         DestroySurface();
       AllocateSurface();
     }
 
     surface_factory_->SubmitCompositorFrame(child_id_,
                                             std::move(*child_compositor_frame),
@@ skipping 29 matching lines @@
   DCHECK(!child_id_.is_valid());
   child_id_ = surface_id_allocator_->GenerateId();
   surface_factory_->Create(child_id_);
   surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_));
 }
 
 void HardwareRenderer::DestroySurface() {
   DCHECK(child_id_.is_valid());
 
   // Submit an empty frame to force any existing resources to be returned.
-  surface_factory_->SubmitCompositorFrame(child_id_, cc::CompositorFrame(),
+  cc::CompositorFrame empty_frame;
+  empty_frame.delegated_frame_data =
+      base::WrapUnique(new cc::DelegatedFrameData);
+  surface_factory_->SubmitCompositorFrame(child_id_, std::move(empty_frame),
                                           cc::SurfaceFactory::DrawCallback());
 
   surfaces_->RemoveChildId(cc::SurfaceId(frame_sink_id_, child_id_));
   surface_factory_->Destroy(child_id_);
   child_id_ = cc::LocalFrameId();
 }
 
 void HardwareRenderer::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   ReturnResourcesToCompositor(resources, compositor_id_,
@@ skipping 41 matching lines @@
   }
   return pruned_frames;
 }
 
 void HardwareRenderer::ReturnChildFrame(
     std::unique_ptr<ChildFrame> child_frame) {
   if (!child_frame || !child_frame->frame)
     return;
 
   cc::ReturnedResourceArray resources_to_return;
-  cc::TransferableResource::ReturnResources(child_frame->frame->resource_list,
-                                            &resources_to_return);
+  cc::TransferableResource::ReturnResources(
+      child_frame->frame->delegated_frame_data->resource_list,
+      &resources_to_return);
 
   // The child frame's compositor id is not necessarily same as
   // compositor_id_.
   ReturnResourcesToCompositor(resources_to_return, child_frame->compositor_id,
                               child_frame->compositor_frame_sink_id);
 }
 
 void HardwareRenderer::ReturnResourcesToCompositor(
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t compositor_frame_sink_id) {
   if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       compositor_frame_sink_id);
 }
 
 }  // namespace android_webview