Remove GLFrameData from CompositorFrame.

blimp/client/support/compositor/blimp_embedder_compositor.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 "blimp/client/support/compositor/blimp_embedder_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "blimp/client/support/compositor/blimp_context_provider.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/raster/single_thread_task_graph_runner.h"
 #include "cc/surfaces/direct_compositor_frame_sink.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/layer_tree_host_in_process.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 
@@ skipping 21 matching lines @@
   ~DisplayOutputSurface() override = default;
 
   // cc::OutputSurface implementation
   void EnsureBackbuffer() override {}
   void DiscardBackbuffer() override {
     context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
   }
   void BindFramebuffer() override {
     context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
   }
-  void SwapBuffers(cc::CompositorFrame frame) override {
+  void SwapBuffers(cc::OutputSurfaceFrame frame) override {
     // See cc::OutputSurface::SwapBuffers() comment for details.
     context_provider_->ContextSupport()->Swap();
     cc::OutputSurface::PostSwapBuffersComplete();
   }
   cc::OverlayCandidateValidator* GetOverlayCandidateValidator() const override {
     return nullptr;
   }
   bool IsDisplayedAsOverlayPlane() const override { return false; }
   unsigned GetOverlayTextureId() const override { return 0; }
   bool SurfaceIsSuspendForRecycle() const override { return false; }
@@ skipping 133 matching lines @@
   // The Browser compositor and display share the same context provider.
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
       frame_sink_id_, compositor_dependencies_->GetSurfaceManager(),
       display_.get(), context_provider_, nullptr);
 
   host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 }  // namespace client
 }  // namespace blimp