Revert "Getting rid of DelegatedFrameData"

android_webview/browser/surfaces_instance.cc

 // Copyright 2016 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/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
@@ skipping 114 matching lines @@
   quad_state->visible_quad_layer_rect = gfx::Rect(frame_size);
   quad_state->clip_rect = clip;
   quad_state->is_clipped = true;
   quad_state->opacity = 1.f;
 
   cc::SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
                        gfx::Rect(quad_state->quad_layer_bounds), child_id);
 
+  std::unique_ptr<cc::DelegatedFrameData> delegated_frame(
+      new cc::DelegatedFrameData);
+  delegated_frame->render_pass_list.push_back(std::move(render_pass));
   cc::CompositorFrame frame;
-  frame.render_pass_list.push_back(std::move(render_pass));
+  frame.delegated_frame_data = std::move(delegated_frame);
   frame.metadata.referenced_surfaces = child_ids_;
 
   if (!root_id_.is_valid()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
     display_->SetLocalFrameId(root_id_, 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
                                           cc::SurfaceFactory::DrawCallback());
 
@@ skipping 12 matching lines @@
 void SurfacesInstance::RemoveChildId(const cc::SurfaceId& child_id) {
   auto itr = std::find(child_ids_.begin(), child_ids_.end(), child_id);
   DCHECK(itr != child_ids_.end());
   child_ids_.erase(itr);
   if (root_id_.is_valid())
     SetEmptyRootFrame();
 }
 
 void SurfacesInstance::SetEmptyRootFrame() {
   cc::CompositorFrame empty_frame;
+  empty_frame.delegated_frame_data =
+      base::WrapUnique(new cc::DelegatedFrameData);
   empty_frame.metadata.referenced_surfaces = child_ids_;
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(empty_frame),
                                           cc::SurfaceFactory::DrawCallback());
 }
 
 void SurfacesInstance::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // Root surface should have no resources to return.
   CHECK(resources.empty());
 }
 
 void SurfacesInstance::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Parent compsitor calls DrawAndSwap directly and doesn't use
   // BeginFrameSource.
 }
 
 }  // namespace android_webview