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>
 
@@ skipping 17 matching lines @@
 
 namespace gfx {
 class ColorSpace;
 class Rect;
 class Size;
 class Transform;
 }
 
 namespace cc {
 
-class CompositorFrame;
 struct ManagedMemoryPolicy;
 class OutputSurfaceClient;
+class OutputSurfaceFrame;
 
 // 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.
 class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
  public:
@@ skipping 74 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_