Remove GLFrameData from CompositorFrame.

cc/test/fake_output_surface.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "cc/output/begin_frame_args.h"
-#include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
+#include "cc/output/output_surface_frame.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_gles2_interface.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
 
 class FakeOutputSurface : public OutputSurface {
  public:
   ~FakeOutputSurface() override;
@@ skipping 30 matching lines @@
     auto surface = base::WrapUnique(
         new FakeOutputSurface(TestContextProvider::Create(std::move(context))));
     surface->capabilities_.uses_default_gl_framebuffer = false;
     return surface;
   }
 
   void set_max_frames_pending(int max) {
     capabilities_.max_frames_pending = max;
   }
 
-  CompositorFrame* last_sent_frame() { return last_sent_frame_.get(); }
+  OutputSurfaceFrame* last_sent_frame() { return last_sent_frame_.get(); }
   size_t num_sent_frames() { return num_sent_frames_; }
 
   OutputSurfaceClient* client() { return client_; }
 
   bool BindToClient(OutputSurfaceClient* client) override;
   void EnsureBackbuffer() override {}
   void DiscardBackbuffer() override {}
   void BindFramebuffer() override;
-  void SwapBuffers(CompositorFrame frame) override;
+  void SwapBuffers(OutputSurfaceFrame frame) override;
   uint32_t GetFramebufferCopyTextureFormat() override;
   bool HasExternalStencilTest() const override;
   void ApplyExternalStencil() override {}
   bool SurfaceIsSuspendForRecycle() const override;
   OverlayCandidateValidator* GetOverlayCandidateValidator() const override;
   bool IsDisplayedAsOverlayPlane() const override;
   unsigned GetOverlayTextureId() const override;
 
   void set_framebuffer(GLint framebuffer, GLenum format) {
     framebuffer_ = framebuffer;
@@ skipping 10 matching lines @@
 
   void set_suspended_for_recycle(bool suspended) {
     suspended_for_recycle_ = suspended;
   }
 
   gfx::Rect last_swap_rect() const {
     DCHECK(last_swap_rect_valid_);
     return last_swap_rect_;
   }
 
-  void ReturnResourcesHeldByParent();
-
-  const TransferableResourceArray& resources_held_by_parent() {
-    return resources_held_by_parent_;
-  }
-
  protected:
   explicit FakeOutputSurface(scoped_refptr<ContextProvider> context_provider);
   explicit FakeOutputSurface(
       std::unique_ptr<SoftwareOutputDevice> software_device);
 
   OutputSurfaceClient* client_ = nullptr;
-  std::unique_ptr<CompositorFrame> last_sent_frame_;
+  std::unique_ptr<OutputSurfaceFrame> last_sent_frame_;
   size_t num_sent_frames_ = 0;
   bool has_external_stencil_test_ = false;
   bool suspended_for_recycle_ = false;
   GLint framebuffer_ = 0;
   GLenum framebuffer_format_ = 0;
-  TransferableResourceArray resources_held_by_parent_;
   OverlayCandidateValidator* overlay_candidate_validator_ = nullptr;
   bool last_swap_rect_valid_ = false;
   gfx::Rect last_swap_rect_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_OUTPUT_SURFACE_H_