Remove GLFrameData from CompositorFrame.

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"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_surface.h"
 
 namespace content {
 
 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
     ui::Window* window,
     scoped_refptr<ContextProviderCommandBuffer> context,
     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
     cc::SyntheticBeginFrameSource* begin_frame_source,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : GpuBrowserCompositorOutputSurface(std::move(context),
                                         std::move(vsync_manager),
                                         begin_frame_source,
                                         std::move(overlay_candidate_validator)),
       ui_window_(window) {
   ui_window_surface_ =
       ui_window_->RequestSurface(ui::mojom::SurfaceType::DEFAULT);
 }
 
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
-void MusBrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
+void MusBrowserCompositorOutputSurface::SwapBuffers(
+    cc::OutputSurfaceFrame frame) {
   const gfx::Rect bounds(ui_window_->bounds().size());
   cc::CompositorFrame ui_frame;
-  ui_frame.metadata = std::move(frame.metadata);
+  ui_frame.metadata.latency_info = frame.latency_info;

[danakj, 2016/10/04 21:58:40]

Keep moving this? Moving a vector is much better than copying it.

[kylechar, 2016/10/05 13:45:54]

That seems super unsafe? We pass |frame| to
GpuBrowserCompositorOutputSurface::SwapBuffers() after this and it uses the
|frame.latency_info| field.

Actually, I'm not totally sure how this worked before. I guess
GpuBrowserCompositorOutputSurface::SwapBuffers() doesn't really need the
latency_info or something?

[danakj, 2016/10/05 23:02:19]

Oh wow. It does use the latency infoes:
https://cs.chromium.org/chromium/src/content/browser/compositor/gpu_browser_c...

However duplicating them doesn't sound right! This class basically renders into
a texture and then passes that texture along instead of the original resources.
So I think we should move the latency infos here (where they will continue on
later), and empty the |frame|'s vector. That's probably what was happening
before but undefined-like.

[kylechar, 2016/10/06 14:16:55]

Done.

   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,
               0 /* sorting_context_id */);
 
   cc::TransferableResource resource;
   resource.id = AllocateResourceId();
   resource.format = cc::ResourceFormat::RGBA_8888;
   resource.filter = GL_LINEAR;
-  resource.size = frame.gl_frame_data->size;
+  resource.size = frame.size;
 
   const gpu::Mailbox& mailbox = GetMailboxFromResourceId(resource.id);
   DCHECK(!mailbox.IsZero());
-  const gfx::Rect rect(frame.gl_frame_data->size);
+  const gfx::Rect rect(frame.size);
 
   // Call parent's SwapBuffers to generate the front buffer, and then send the
   // front buffer to mus.
   // TODO(penghuang): we should avoid extra copies here by sending frames to mus
   // directly from renderer.
   GpuBrowserCompositorOutputSurface::SwapBuffers(std::move(frame));
   GetCommandBufferProxy()->TakeFrontBuffer(mailbox);
 
   auto* gl = context_provider()->ContextGL();
   const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
@@ skipping 81 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