Getting rid of DelegatedFrameData

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index 1617ec3db8084b7b916e4bb099c34c4f3d271d53..9ba2fb4c17f6fbb31c5df43976d9b41d22149017 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -123,8 +123,7 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) {
         std::move(child_frame_->frame);
 
     gfx::Size frame_size =
-        child_compositor_frame->delegated_frame_data->render_pass_list.back()
-            ->output_rect.size();
+        child_compositor_frame->render_pass_list.back()->output_rect.size();
     bool size_changed = frame_size != frame_size_;
     frame_size_ = frame_size;
     if (child_id_.is_null() || size_changed) {
@@ -177,8 +176,6 @@ void HardwareRenderer::DestroySurface() {
 
   // Submit an empty frame to force any existing resources to be returned.
   cc::CompositorFrame empty_frame;

[danakj, 2016/10/27 23:06:56]

no need for this variable, just pass cc::CompositorFrame() directly

[Saman Sami, 2016/10/28 16:47:35]

Done.

-  empty_frame.delegated_frame_data =
-      base::WrapUnique(new cc::DelegatedFrameData);
   surface_factory_->SubmitCompositorFrame(child_id_, std::move(empty_frame),
                                           cc::SurfaceFactory::DrawCallback());
 
@@ -202,8 +199,7 @@ void HardwareRenderer::ReturnResourcesInChildFrame() {
   if (child_frame_.get() && child_frame_->frame.get()) {
     cc::ReturnedResourceArray resources_to_return;
     cc::TransferableResource::ReturnResources(
-        child_frame_->frame->delegated_frame_data->resource_list,
-        &resources_to_return);
+        child_frame_->frame->resource_list, &resources_to_return);
 
     // The child frame's compositor id is not necessarily same as
     // compositor_id_.