Implement CompositorFrame Struct Traits

components/bitmap_uploader/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 "components/bitmap_uploader/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "components/mus/public/cpp/gles2_context.h"
-#include "components/mus/public/cpp/surfaces/surfaces_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_surface.h"
 
 namespace bitmap_uploader {
 namespace {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 }  // namespace
 
@@ skipping 40 matching lines @@
   height_ = height;
   bitmap_ = std::move(data);
   format_ = format;
   if (surface_)
     Upload();
 }
 
 void BitmapUploader::Upload() {
   const gfx::Rect bounds(window_->bounds().size());
 
-  cc::mojom::CompositorFramePtr frame = cc::mojom::CompositorFrame::New();
+  cc::CompositorFrame frame;
   // TODO(rjkroege): Support device scale factors other than 1.
-  frame->metadata.device_scale_factor = 1.0f;
-  frame->resources.resize(0u);
+  frame.metadata.device_scale_factor = 1.0f;
+  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 22 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->resources.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->passes.push_back(std::move(pass));
+  frame.delegated_frame_data->render_pass_list.push_back(std::move(pass));
 
   // TODO(rjkroege, fsamuel): We should throttle frames.
   surface_->SubmitCompositorFrame(std::move(frame), base::Closure());
 }
 
 uint32_t BitmapUploader::BindTextureForSize(const gfx::Size& size) {
   gpu::gles2::GLES2Interface* gl = gles2_context_->interface();
   // TODO(jamesr): Recycle textures.
   GLuint texture = 0u;
   gl->GenTextures(1, &texture);
@@ skipping 20 matching lines @@
     DCHECK_EQ(1, resource.count);
     gl->WaitSyncTokenCHROMIUM(resource.sync_token.GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource.id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource.id);
     gl->DeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace bitmap_uploader