Remove GLFrameData from CompositorFrame.

android_webview/browser/parent_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 "android_webview/browser/parent_output_surface.h"
 
 #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 {
 
 ParentOutputSurface::ParentOutputSurface(
     scoped_refptr<AwRenderThreadContextProvider> context_provider)
     : cc::OutputSurface(std::move(context_provider)) {
 }
 
 ParentOutputSurface::~ParentOutputSurface() {
@@ skipping 15 matching lines @@
 }
 
 void ParentOutputSurface::Reshape(const gfx::Size& size,
                                   float scale_factor,
                                   const gfx::ColorSpace& color_space,
                                   bool has_alpha) {
   DCHECK_EQ(1.f, scale_factor);
   surface_size_ = size;
 }
 
-void ParentOutputSurface::SwapBuffers(cc::CompositorFrame frame) {
+void ParentOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
   context_provider_->ContextGL()->ShallowFlushCHROMIUM();
 }
 
 bool ParentOutputSurface::HasExternalStencilTest() const {
   return ScopedAppGLStateRestore::Current()
       ->stencil_state()
       .stencil_test_enabled;
 }
 
 void ParentOutputSurface::ApplyExternalStencil() {
@@ skipping 33 matching lines @@
 
 unsigned ParentOutputSurface::GetOverlayTextureId() const {
   return 0;
 }
 
 bool ParentOutputSurface::SurfaceIsSuspendForRecycle() const {
   return false;
 }
 
 }  // namespace android_webview