cc: Remove unneeded methods from OutputSurface.

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 101 matching lines @@
 
   // 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();
-  virtual bool HasExternalStencilTest() const;
 
   // ============== 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().
@@ skipping 39 matching lines @@
     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.
   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 "OutputSurface".
-  // TODO(danakj): Be private. Subclasses should just call the client directly.
   virtual void DidLoseOutputSurface();
 
-  // base::trace_event::MemoryDumpProvider implementation.
-  bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
-                    base::trace_event::ProcessMemoryDump* pmd) override;
-
- protected:
-  // ============== DISPLAY COMPOSITOR ONLY =======================
-
-  // Used by WebView for the display compositor only.
-  // TODO(danakj): This should go away, store the state in the subclass that
-  // uses this.
-  void SetExternalStencilTest(bool enabled);
-
-  // ============== BOTH TYPES OF COMPOSITOR ======================
-
-  // This is used by both display and delegating implementations.
-  void PostSwapBuffersComplete();
-  // TODO(danakj): Delete this. Subclasses should just call the client directly.
-  void SetNeedsRedrawRect(const gfx::Rect& damage_rect);
-  // TODO(danakj): Delete this. Subclasses should just call the client directly.
-  void ReclaimResources(const ReturnedResourceArray& resources);
-
   OutputSurfaceClient* client_ = nullptr;
 
   struct OutputSurface::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();
 
-  bool external_stencil_test_enabled_ = false;
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OUTPUT_SURFACE_H_