Remove GLFrameData from CompositorFrame.

content/browser/compositor/mus_browser_compositor_output_surface.cc

Index: content/browser/compositor/mus_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.cc b/content/browser/compositor/mus_browser_compositor_output_surface.cc
index 82e9345069e676ddc0583e452aa87c1563fb97fc..35b6778e6049747d6a9b0f109d6bdf9c621571b0 100644
--- a/content/browser/compositor/mus_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/mus_browser_compositor_output_surface.cc
@@ -7,6 +7,7 @@
 #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"
@@ -36,10 +37,11 @@ MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
 
 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();
@@ -57,11 +59,11 @@ void MusBrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
   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.