Remove GLFrameData from CompositorFrame.

services/ui/surfaces/direct_output_surface.cc

Index: services/ui/surfaces/direct_output_surface.cc
diff --git a/services/ui/surfaces/direct_output_surface.cc b/services/ui/surfaces/direct_output_surface.cc
index 81457c1962f37614374d4f339db09cd8cdd91674..bd07cd00c6dd4185951daee6ad5b7d98dc5ab718 100644
--- a/services/ui/surfaces/direct_output_surface.cc
+++ b/services/ui/surfaces/direct_output_surface.cc
@@ -8,9 +8,9 @@
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ -49,15 +49,13 @@ void DirectOutputSurface::BindFramebuffer() {
   context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
-void DirectOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
+void DirectOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
   DCHECK(context_provider_);
-  DCHECK(frame.gl_frame_data);
-  if (frame.gl_frame_data->sub_buffer_rect ==
-      gfx::Rect(frame.gl_frame_data->size)) {
+  if (frame.sub_buffer_rect == gfx::Rect(frame.size)) {
     context_provider_->ContextSupport()->Swap();
   } else {
     context_provider_->ContextSupport()->PartialSwapBuffers(
-        frame.gl_frame_data->sub_buffer_rect);
+        frame.sub_buffer_rect);
   }
 
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();