Remove GLFrameData from CompositorFrame.

services/ui/surfaces/direct_output_surface_ozone.cc

 // 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 "services/ui/surfaces/direct_output_surface_ozone.h"
 
 #include <utility>
 
 #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 "components/display_compositor/buffer_queue.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/surfaces_context_provider.h"
 #include "ui/display/types/display_snapshot.h"
 
 using display_compositor::BufferQueue;
 
 namespace ui {
@@ skipping 52 matching lines @@
 
 void DirectOutputSurfaceOzone::DiscardBackbuffer() {
   context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
 }
 
 void DirectOutputSurfaceOzone::BindFramebuffer() {
   DCHECK(buffer_queue_);
   buffer_queue_->BindFramebuffer();
 }
 
-void DirectOutputSurfaceOzone::SwapBuffers(cc::CompositorFrame frame) {
+void DirectOutputSurfaceOzone::SwapBuffers(cc::OutputSurfaceFrame frame) {
   DCHECK(buffer_queue_);
-  DCHECK(frame.gl_frame_data);
 
   // TODO(rjkroege): What if swap happens again before OnGpuSwapBuffersCompleted
   // then it would see the wrong size?
-  DCHECK(reshape_size_ == frame.gl_frame_data->size);
+  DCHECK(reshape_size_ == frame.size);
   swap_size_ = reshape_size_;
 
-  buffer_queue_->SwapBuffers(frame.gl_frame_data->sub_buffer_rect);
+  buffer_queue_->SwapBuffers(frame.sub_buffer_rect);
 
   // Code combining GpuBrowserCompositorOutputSurface + DirectOutputSurface
-  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();
   const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
   gl->ShallowFlushCHROMIUM();
 
   gpu::SyncToken sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 }
 
@@ skipping 58 matching lines @@
   }
 
   buffer_queue_->PageFlipComplete();
   client_->DidSwapBuffersComplete();
 
   if (force_swap)
     client_->SetNeedsRedrawRect(gfx::Rect(swap_size_));
 }
 
 }  // namespace ui