Remove GLFrameData from CompositorFrame.

content/browser/compositor/gpu_browser_compositor_output_surface.cc

 // Copyright 2014 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/gpu_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "build/build_config.h"
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/reflector_texture.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 
 namespace content {
@@ skipping 56 matching lines @@
 void GpuBrowserCompositorOutputSurface::EnsureBackbuffer() {}
 
 void GpuBrowserCompositorOutputSurface::DiscardBackbuffer() {
   context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
 }
 
 void GpuBrowserCompositorOutputSurface::BindFramebuffer() {
   context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
-void GpuBrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
-  DCHECK(frame.gl_frame_data);
+void GpuBrowserCompositorOutputSurface::SwapBuffers(
+    cc::OutputSurfaceFrame frame) {
+  GetCommandBufferProxy()->SetLatencyInfo(frame.latency_info);
 
-  GetCommandBufferProxy()->SetLatencyInfo(frame.metadata.latency_info);
-
-  gfx::Rect swap_rect = frame.gl_frame_data->sub_buffer_rect;
-  gfx::Size surface_size = frame.gl_frame_data->size;
+  gfx::Rect swap_rect = frame.sub_buffer_rect;
+  gfx::Size surface_size = frame.size;
   if (reflector_) {
     if (swap_rect == gfx::Rect(surface_size)) {
       reflector_texture_->CopyTextureFullImage(surface_size);
       reflector_->OnSourceSwapBuffers(surface_size);
     } else {
       reflector_texture_->CopyTextureSubImage(swap_rect);
       reflector_->OnSourcePostSubBuffer(swap_rect, surface_size);
     }
   }
 
-  if (swap_rect == gfx::Rect(frame.gl_frame_data->size))
+  if (swap_rect == gfx::Rect(frame.size))
     context_provider_->ContextSupport()->Swap();
   else
     context_provider_->ContextSupport()->PartialSwapBuffers(swap_rect);
 }
 
 uint32_t GpuBrowserCompositorOutputSurface::GetFramebufferCopyTextureFormat() {
   auto* gl = static_cast<ContextProviderCommandBuffer*>(context_provider());
   return gl->GetCopyTextureInternalFormat();
 }
 
@@ skipping 16 matching lines @@
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
   client_->DidSwapBuffersComplete();
 }
 
 #if defined(OS_MACOSX)
 void GpuBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle(
     bool suspended) {}
 #endif
 
 }  // namespace content