Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/gpu/compositor_output_surface.h

 // Copyright (c) 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 CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 11 matching lines @@
 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
 #include "ipc/ipc_sync_message_filter.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace cc {
 class CompositorFrame;
 class CompositorFrameAck;
-class ContextProvider;
+class GLFrameData;
 }
 
 namespace content {
+class ContextProviderCommandBuffer;
 class FrameSwapMessageQueue;
 
 // This class can be created only on the main thread, but then becomes pinned
-// to a fixed thread when BindToClient is called.
+// to a fixed thread when bindToClient is called.
 class CompositorOutputSurface
     : NON_EXPORTED_BASE(public cc::OutputSurface),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   CompositorOutputSurface(
       int32_t routing_id,
       uint32_t output_surface_id,
-      scoped_refptr<cc::ContextProvider> context_provider,
-      scoped_refptr<cc::ContextProvider> worker_context_provider,
-      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
-  CompositorOutputSurface(
-      int32_t routing_id,
-      uint32_t output_surface_id,
-      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
-      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
+      const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
+      const scoped_refptr<ContextProviderCommandBuffer>&
+          worker_context_provider,
+      const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
+      std::unique_ptr<cc::SoftwareOutputDevice> software,
+      scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
+      bool use_swap_compositor_frame_message);
   ~CompositorOutputSurface() override;
 
   // cc::OutputSurface implementation.
   bool BindToClient(cc::OutputSurfaceClient* client) override;
   void DetachFromClient() override;
   void SwapBuffers(cc::CompositorFrame* frame) override;
 
  protected:
+  void ShortcutSwapAck(uint32_t output_surface_id,
+                       std::unique_ptr<cc::GLFrameData> gl_frame_data);
+  virtual void OnSwapAck(uint32_t output_surface_id,
+                         const cc::CompositorFrameAck& ack);
+  virtual void OnReclaimResources(uint32_t output_surface_id,
+                                  const cc::CompositorFrameAck& ack);
   uint32_t output_surface_id_;
 
  private:
   class CompositorOutputSurfaceProxy :
       public base::RefCountedThreadSafe<CompositorOutputSurfaceProxy> {
    public:
     explicit CompositorOutputSurfaceProxy(
         CompositorOutputSurface* output_surface)
         : output_surface_(output_surface) {}
     void ClearOutputSurface() { output_surface_ = NULL; }
     void OnMessageReceived(const IPC::Message& message) {
       if (output_surface_)
         output_surface_->OnMessageReceived(message);
     }
 
    private:
     friend class base::RefCountedThreadSafe<CompositorOutputSurfaceProxy>;
     ~CompositorOutputSurfaceProxy() {}
     CompositorOutputSurface* output_surface_;
 
     DISALLOW_COPY_AND_ASSIGN(CompositorOutputSurfaceProxy);
   };
 
   void OnMessageReceived(const IPC::Message& message);
   void OnUpdateVSyncParametersFromBrowser(base::TimeTicks timebase,
                                           base::TimeDelta interval);
-  void OnSwapAck(uint32_t output_surface_id, const cc::CompositorFrameAck& ack);
-  void OnReclaimResources(uint32_t output_surface_id,
-                          const cc::CompositorFrameAck& ack);
   bool Send(IPC::Message* message);
 
+  bool use_swap_compositor_frame_message_;
+
   scoped_refptr<CompositorForwardingMessageFilter> output_surface_filter_;
   CompositorForwardingMessageFilter::Handler output_surface_filter_handler_;
   scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
   int routing_id_;
+
+  // TODO(danakj): Remove this when crbug.com/311404
+  bool layout_test_mode_;
+  std::unique_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
+  base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_