Remove GLFrameData from CompositorFrame.

android_webview/browser/parent_output_surface.cc

Index: android_webview/browser/parent_output_surface.cc
diff --git a/android_webview/browser/parent_output_surface.cc b/android_webview/browser/parent_output_surface.cc
index ee88fa1356abb3fc14d35603aa1fa1e2883f20d8..d245cac3e06b501e87c8f13b1daeb14e63405975 100644
--- a/android_webview/browser/parent_output_surface.cc
+++ b/android_webview/browser/parent_output_surface.cc
@@ -6,8 +6,8 @@
 
 #include "android_webview/browser/aw_render_thread_context_provider.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
 namespace android_webview {
@@ -43,7 +43,7 @@ void ParentOutputSurface::Reshape(const gfx::Size& size,
   surface_size_ = size;
 }
 
-void ParentOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
+void ParentOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
   context_provider_->ContextGL()->ShallowFlushCHROMIUM();
 }