Remove GLFrameData from CompositorFrame.

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 27e59139936bb17d307ff00adb6239989d4d78f1..2ba3f9f46de5623b76e3ba2e3e4fd22b8343b5c7 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -15,6 +15,7 @@
 #include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/context_provider.h"
+#include "cc/output/output_surface_frame.h"

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

forward declare it instead?

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

Done.

 #include "cc/output/overlay_candidate_validator.h"
 #include "cc/output/software_output_device.h"
 #include "cc/output/vulkan_context_provider.h"
@@ -132,7 +133,7 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
   // passed in (though it will not take ownership of the CompositorFrame
   // itself). For successful swaps, the implementation must call
   // OutputSurfaceClient::DidSwapBuffersComplete() eventually.
-  virtual void SwapBuffers(CompositorFrame frame) = 0;
+  virtual void SwapBuffers(OutputSurfaceFrame frame) = 0;
 
   // base::trace_event::MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,