Remove GLFrameData from CompositorFrame.

content/browser/compositor/gpu_output_surface_mac.mm

 // Copyright 2016 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 "content/browser/compositor/gpu_output_surface_mac.h"
 
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/output_surface_frame.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/ipc/client/gpu_process_hosted_ca_layer_tree_params.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/compositor/compositor.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/gfx/mac/io_surface.h"
@@ skipping 47 matching lines @@
           std::move(overlay_candidate_validator),
           GL_TEXTURE_RECTANGLE_ARB,
           GL_RGBA,
           gfx::BufferFormat::RGBA_8888,
           gpu_memory_buffer_manager),
       widget_(widget),
       remote_layers_(new RemoteLayers) {}
 
 GpuOutputSurfaceMac::~GpuOutputSurfaceMac() {}
 
-void GpuOutputSurfaceMac::SwapBuffers(cc::CompositorFrame frame) {
+void GpuOutputSurfaceMac::SwapBuffers(cc::OutputSurfaceFrame frame) {
   GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers(std::move(frame));
 
   if (should_show_frames_state_ ==
       SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED) {
     should_show_frames_state_ = SHOULD_SHOW_FRAMES;
   }
 }
 
 void GpuOutputSurfaceMac::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
@@ skipping 47 matching lines @@
           SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED;
     }
   }
 }
 
 bool GpuOutputSurfaceMac::SurfaceIsSuspendForRecycle() const {
   return should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
 }
 
 }  // namespace content