Revert "Getting rid of DelegatedFrameData"

services/ui/demo/bitmap_uploader.cc

 // Copyright 2015 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 "services/ui/demo/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 61 matching lines @@
 
 void BitmapUploader::Upload() {
   if (!compositor_frame_sink_ || !compositor_frame_sink_->context_provider())
     return;
 
   const gfx::Rect bounds(window_->bounds().size());
 
   cc::CompositorFrame frame;
   // TODO(rjkroege): Support device scale factors other than 1.
   frame.metadata.device_scale_factor = 1.0f;
-  frame.resource_list.resize(0u);
+  frame.delegated_frame_data.reset(new cc::DelegatedFrameData());
+  frame.delegated_frame_data->resource_list.resize(0u);
 
   const cc::RenderPassId render_pass_id(1, 1);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   pass->SetAll(render_pass_id, bounds, bounds, gfx::Transform(),
                true /* 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,
@@ skipping 23 matching lines @@
     resource.id = next_resource_id_++;
     resource_to_texture_id_map_[resource.id] = texture_id;
     resource.format = cc::ResourceFormat::RGBA_8888;
     resource.filter = GL_LINEAR;
     resource.size = bitmap_size;
     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;
-    frame.resource_list.push_back(std::move(resource));
+    frame.delegated_frame_data->resource_list.push_back(std::move(resource));
 
     cc::TextureDrawQuad* quad =
         pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
 
     gfx::Size rect_size;
     if (width_ <= bounds.width() && height_ <= bounds.height()) {
       rect_size.SetSize(width_, height_);
     } else {
       // The source bitmap is larger than the viewport. Resize it while
       // maintaining the aspect ratio.
@@ skipping 22 matching lines @@
   if (color_ != g_transparent_color) {
     cc::SolidColorDrawQuad* quad =
         pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>();
     const bool force_antialiasing_off = false;
     const gfx::Rect opaque_rect(0, 0, 0, 0);
     const bool needs_blending = true;
     quad->SetAll(sqs, bounds, opaque_rect, bounds, needs_blending, color_,
                  force_antialiasing_off);
   }
 
-  frame.render_pass_list.push_back(std::move(pass));
+  frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
   // TODO(rjkroege, fsamuel): We should throttle frames.
   compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
 }
 
 void BitmapUploader::OnGpuChannelEstablished(
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel) {
   compositor_frame_sink_ = window_->RequestCompositorFrameSink(
       mojom::CompositorFrameSinkType::DEFAULT,
@@ skipping 54 matching lines @@
   // TODO(fsamuel): Implement this.
 }
 
 void BitmapUploader::SetExternalTilePriorityConstraints(
     const gfx::Rect& viewport_rect,
     const gfx::Transform& transform) {
   // TODO(fsamuel): Implement this.
 }
 
 }  // namespace ui