Remove GLFrameData from CompositorFrame.

content/browser/compositor/offscreen_browser_compositor_output_surface.cc

Index: content/browser/compositor/offscreen_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/offscreen_browser_compositor_output_surface.cc b/content/browser/compositor/offscreen_browser_compositor_output_surface.cc
index b36ae5f4224074f560ac4ce4567ff2dcb1c6b306..aa2df8f0c4ac85a10161c921470f3c1d84aa053a 100644
--- a/content/browser/compositor/offscreen_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/offscreen_browser_compositor_output_surface.cc
@@ -8,9 +8,8 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "cc/output/compositor_frame.h"
-#include "cc/output/gl_frame_data.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/resources/resource_provider.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
@@ -22,9 +21,6 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
-using cc::CompositorFrame;
-using cc::GLFrameData;
-using cc::ResourceProvider;
 using gpu::gles2::GLES2Interface;
 
 namespace content {
@@ -134,10 +130,10 @@ void OffscreenBrowserCompositorOutputSurface::BindFramebuffer() {
 }
 
 void OffscreenBrowserCompositorOutputSurface::SwapBuffers(
-    cc::CompositorFrame frame) {
-  gfx::Size surface_size = frame.gl_frame_data->size;
+    cc::OutputSurfaceFrame frame) {
+  gfx::Size surface_size = frame.size;
   DCHECK(surface_size == surface_size_);
-  gfx::Rect swap_rect = frame.gl_frame_data->sub_buffer_rect;
+  gfx::Rect swap_rect = frame.sub_buffer_rect;
 
   if (reflector_) {
     if (swap_rect == gfx::Rect(surface_size))