Revert "Getting rid of DelegatedFrameData"

content/browser/compositor/mus_browser_compositor_output_surface.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 "content/browser/compositor/mus_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_frame.h"
@@ skipping 54 matching lines @@
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
   const gfx::Rect bounds = ui_window_ ? gfx::Rect(ui_window_->bounds().size())
                                       : gfx::Rect(window_->bounds().size());
   cc::CompositorFrame ui_frame;
   ui_frame.metadata.latency_info = std::move(frame.latency_info);
   // Reset latency_info to known empty state after moving contents.
   frame.latency_info.clear();
+  ui_frame.delegated_frame_data = base::MakeUnique<cc::DelegatedFrameData>();
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   const bool has_transparent_background = true;
   pass->SetAll(render_pass_id, bounds, bounds, gfx::Transform(),
                has_transparent_background);
   // The SharedQuadState is owned by the SharedQuadStateList
   // shared_quad_state_list.
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->SetAll(gfx::Transform(), bounds.size(), bounds, bounds,
               false /* is_clipped */, 1.f /* opacity */, SkXfermode::kSrc_Mode,
@@ skipping 20 matching lines @@
   const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
   gl->ShallowFlushCHROMIUM();
   gpu::SyncToken sync_token;
   gl->GenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 
   resource.mailbox_holder =
       gpu::MailboxHolder(mailbox, sync_token, GL_TEXTURE_2D);
   resource.read_lock_fences_enabled = false;
   resource.is_software = false;
   resource.is_overlay_candidate = false;
-  ui_frame.resource_list.push_back(std::move(resource));
+  ui_frame.delegated_frame_data->resource_list.push_back(std::move(resource));
 
   const bool needs_blending = true;
   const bool premultiplied_alpha = true;
   const gfx::PointF uv_top_left(0.f, 0.f);
   const gfx::PointF uv_bottom_right(1.f, 1.f);
   const uint32_t background_color = 0x00000000;
   const float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f};
   const bool y_flipped = true;
   const bool nearest_neighbor = false;
   const bool secure_output_only = false;
 
   cc::TextureDrawQuad* quad =
       pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
   quad->SetAll(sqs, rect, rect, rect, needs_blending, resource.id, gfx::Size(),
                premultiplied_alpha, uv_top_left, uv_bottom_right,
                background_color, vertex_opacity, y_flipped, nearest_neighbor,
                secure_output_only);
 
-  ui_frame.render_pass_list.push_back(std::move(pass));
+  ui_frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
   // TODO(mfomitchev): Remove ui_compositor_frame_sink_ once we complete the
   // switch to Aura-Mus.
   if (ui_compositor_frame_sink_)
     ui_compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
   else
     compositor_frame_sink_->SubmitCompositorFrame(std::move(ui_frame));
   return;
 }
 
@@ skipping 55 matching lines @@
 
 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
     uint32_t id) {
   DCHECK_LT(id, mailboxes_.size());
   DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
          free_resource_ids_.end());
   return mailboxes_[id];
 }
 
 }  // namespace content