cc: Remove things from OutputSurface and CompositorFrameSink.

cc/output/compositor_frame_sink.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_COMPOSITOR_FRAME_SINK_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_SINK_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/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 {
@@ skipping 12 matching lines @@
 // 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 CompositorFrameSink
     : public base::trace_event::MemoryDumpProvider {
  public:
+  struct Capabilities {
+    Capabilities() = default;
+
+    // TODO(enne): Remove this since everything uses begin frames now, but it
+    // causes some racey unit tests to fail.
+    bool adjust_deadline_for_parent = true;

[danakj, 2016/09/17 01:29:37]

So ok the story with this one is I left it as true everywhere because it was:
- true in DirectCFS (desktop, android)
- false in SynchronousCFS (webview)
- true in TestCFS (unit tests, layout tests)

I left that alone for now.  I was thinking of making it false everywhere except
unit tests but I don't mean to change behaviour in such a large CL.

In LTHI it will guess the parent draw time if this is true now (since
settings_.use_external_begin_frame_source is always false now because we're
using compositor_frame_sink_begin_frame_source instead, which is really the same
thing as far as that code is concerned but ya that's another issue).

+
+    // Whether ForceReclaimResources can be called to reclaim all resources
+    // from the CompositorFrameSink.
+    bool can_force_reclaim_resources = false;
+    // True if sync points for resources are needed when swapping delegated
+    // frames.
+    bool delegated_sync_points_required = true;
+  };
+
   // Constructor for GL-based and/or software compositing.
   explicit CompositorFrameSink(
       scoped_refptr<ContextProvider> context_provider,
-      scoped_refptr<ContextProvider> worker_context_provider,
-      std::unique_ptr<SoftwareOutputDevice> software_device);
+      scoped_refptr<ContextProvider> worker_context_provider);
 
   // Constructor for Vulkan-based compositing.
   explicit CompositorFrameSink(
       scoped_refptr<VulkanContextProvider> vulkan_context_provider);
 
   ~CompositorFrameSink() override;
 
-  struct Capabilities {
-    Capabilities()
-        : delegated_rendering(false),
-          max_frames_pending(1),
-          adjust_deadline_for_parent(true),
-          uses_default_gl_framebuffer(true),
-          flipped_compositor_frame_sink(false),
-          can_force_reclaim_resources(false),
-          delegated_sync_points_required(true) {}
-    bool delegated_rendering;
-    int max_frames_pending;
-    // This doesn't handle the <webview> case, but once BeginFrame is
-    // supported natively, we shouldn't need adjust_deadline_for_parent.
-    bool adjust_deadline_for_parent;
-    // Whether this output surface renders to the default OpenGL zero
-    // framebuffer or to an offscreen framebuffer.
-    bool uses_default_gl_framebuffer;
-    // Whether this CompositorFrameSink is flipped or not.
-    bool flipped_compositor_frame_sink;
-    // Whether ForceReclaimResources can be called to reclaim all resources
-    // from the CompositorFrameSink.
-    bool can_force_reclaim_resources;
-    // True if sync points for resources are needed when swapping delegated
-    // frames.
-    bool delegated_sync_points_required;
-  };
-
-  // ============== DISPLAY COMPOSITOR ONLY =======================
-
-  virtual void EnsureBackbuffer();
-  virtual void DiscardBackbuffer();
-
-  const gfx::ColorSpace& device_color_space() const {
-    return device_color_space_;
-  }
-
-  // Called by subclasses after receiving a response from the gpu process to a
-  // query about whether a given set of textures is still in use by the OS
-  // compositor.
-  void DidReceiveTextureInUseResponses(
-      const gpu::TextureInUseResponses& responses);
-
-  // Get the class capable of informing cc of hardware overlay capability.
-  virtual OverlayCandidateValidator* GetOverlayCandidateValidator() const;
-
-  // Returns true if a main image overlay plane should be scheduled.
-  virtual bool IsDisplayedAsOverlayPlane() const;
-
-  // Get the texture for the main image's overlay.
-  virtual unsigned GetOverlayTextureId() const;
-
-  // If this returns true, then the surface will not attempt to draw.
-  virtual bool SurfaceIsSuspendForRecycle() const;
-
-  virtual void Reshape(const gfx::Size& size,
-                       float scale_factor,
-                       const gfx::ColorSpace& color_space,
-                       bool alpha);
-  gfx::Size SurfaceSize() const { return surface_size_; }
-
-  virtual bool HasExternalStencilTest() const;
-  virtual void ApplyExternalStencil();
-
-  // ============== LAYER TREE COMPOSITOR ONLY ===================
-
-  // If supported, this causes a ReclaimResources for all resources that are
-  // currently in use.
-  virtual void ForceReclaimResources() {}
-
-  virtual void BindFramebuffer();
-  // Gives the GL internal format that should be used for calling CopyTexImage2D
-  // when the framebuffer is bound via BindFramebuffer().
-  virtual uint32_t GetFramebufferCopyTextureFormat() = 0;
-
-  // Support for a pull-model where draws are requested by the output surface.
-  //
-  // CompositorFrameSink::Invalidate is called by the compositor to notify that
-  // there's new content.
-  virtual void Invalidate() {}
-
-  // ============== BOTH TYPES OF COMPOSITOR ======================
-
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be initialized, since from
   // this point to when DetachFromClient() is called the output surface will
   // only be used on the compositor thread.
   // The caller should call DetachFromClient() on the same thread before
   // destroying the CompositorFrameSink, even if this fails. And BindToClient
   // should not be called twice for a given CompositorFrameSink.
   virtual bool BindToClient(CompositorFrameSinkClient* client);
 
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be uninitialized.
   virtual void DetachFromClient();
 
   bool HasClient() { return !!client_; }
 
   const Capabilities& capabilities() const { return capabilities_; }
 
   // Obtain the 3d context or the software device associated with this output
   // surface. Either of these may return a null pointer, but not both.
   // In the event of a lost context, the entire output surface should be
   // recreated.
   ContextProvider* context_provider() const { return context_provider_.get(); }
   ContextProvider* worker_context_provider() const {
     return worker_context_provider_.get();
   }
   VulkanContextProvider* vulkan_context_provider() const {
     return vulkan_context_provider_.get();
   }
-  SoftwareOutputDevice* software_device() const {
-    return software_device_.get();
-  }
 
-  // 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
-  // DidSwapBuffersComplete() (via OnSwapBuffersComplete()) eventually.
+  // If supported, this causes a ReclaimResources for all resources that are
+  // currently in use.
+  virtual void ForceReclaimResources() {}
+
+  // Support for a pull-model where draws are requested by the output surface.
+  //
+  // CompositorFrameSink::Invalidate is called by the compositor to notify that
+  // there's new content.
+  virtual void Invalidate() {}
+
+  // For successful swaps, the implementation must call DidSwapBuffersComplete()
+  // (via OnSwapBuffersComplete()) eventually.
   virtual void SwapBuffers(CompositorFrame frame) = 0;
   virtual void OnSwapBuffersComplete();
 
   // base::trace_event::MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
  protected:
   // This is used by both display and delegating implementations.
   void PostSwapBuffersComplete();
 
-  // This is how LayerTreeHostImpl hears about context loss when the Display
-  // is the one listening for context loss. Also used internally for the
-  // context provider to inform the LayerTreeHostImpl or Display about loss.
-  // It would become display-compositor-only when LayerTreeHostImpl receives
-  // its contexts independently from the "CompositorFrameSink".
-  virtual void DidLoseCompositorFrameSink();
+  // Bound to the ContextProvider to hear about when it is lost and inform the
+  // |client_|.
+  void DidLoseCompositorFrameSink();
 
   CompositorFrameSinkClient* client_ = nullptr;
 
   struct CompositorFrameSink::Capabilities capabilities_;
   scoped_refptr<ContextProvider> context_provider_;
   scoped_refptr<ContextProvider> worker_context_provider_;
   scoped_refptr<VulkanContextProvider> vulkan_context_provider_;
-  std::unique_ptr<SoftwareOutputDevice> software_device_;
-  gfx::Size surface_size_;
-  float device_scale_factor_ = -1;
-  gfx::ColorSpace device_color_space_;
-  bool has_alpha_ = true;
-  gfx::ColorSpace color_space_;
   base::ThreadChecker client_thread_checker_;
 
  private:
   void DetachFromClientInternal();
 
   base::WeakPtrFactory<CompositorFrameSink> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_