Remove GLFrameData from CompositorFrame.

cc/output/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_OUTPUT_OUTPUT_SURFACE_H_
 #define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #include <deque>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/context_provider.h"
+#include "cc/output/output_surface_frame.h"

[danakj, 2016/10/04 21:58:40]

forward declare it instead?

[kylechar, 2016/10/05 13:45:54]

Done.

 #include "cc/output/overlay_candidate_validator.h"
 #include "cc/output/software_output_device.h"
 #include "cc/output/vulkan_context_provider.h"
 #include "cc/resources/returned_resource.h"
 #include "gpu/command_buffer/common/texture_in_use_response.h"
 #include "ui/gfx/color_space.h"
 
 namespace ui {
 class LatencyInfo;
 }
 
 namespace gfx {
 class ColorSpace;
 class Rect;
 class Size;
 class Transform;
 }
 
 namespace cc {
 
 class CompositorFrame;

[danakj, 2016/10/04 21:58:40]

remove this

[kylechar, 2016/10/05 13:45:54]

Done.

 struct ManagedMemoryPolicy;
 class OutputSurfaceClient;
 
 // Represents the output surface for a compositor. The compositor owns
 // and manages its destruction. Its lifetime is:
 //   1. Created on the main thread by the LayerTreeHost through its client.
 //   2. Passed to the compositor thread and bound to a client via BindToClient.
 //      From here on, it will only be used on the compositor thread.
 //   3. If the 3D context is lost, then the compositor will delete the output
 //      surface (on the compositor thread) and go back to step 1.
@@ skipping 76 matching lines @@
   virtual void ApplyExternalStencil() = 0;
 
   // Gives the GL internal format that should be used for calling CopyTexImage2D
   // when the framebuffer is bound via BindFramebuffer().
   virtual uint32_t GetFramebufferCopyTextureFormat() = 0;
 
   // The implementation may destroy or steal the contents of the CompositorFrame
   // passed in (though it will not take ownership of the CompositorFrame
   // itself). For successful swaps, the implementation must call
   // OutputSurfaceClient::DidSwapBuffersComplete() eventually.
-  virtual void SwapBuffers(CompositorFrame frame) = 0;
+  virtual void SwapBuffers(OutputSurfaceFrame frame) = 0;
 
   // base::trace_event::MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
  protected:
   void PostSwapBuffersComplete();
 
   // Used internally for the context provider to inform the client about loss,
   // and can be overridden to change behaviour instead of informing the client.
@@ skipping 16 matching lines @@
   void OnSwapBuffersComplete();
 
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OUTPUT_SURFACE_H_