Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1056)

Unified Diff: cc/output/output_surface.h

Issue 2329623003: cc: Remove unneeded methods from OutputSurface. (Closed)
Patch Set: superandroid Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/client/core/compositor/delegated_output_surface.cc ('k') | cc/output/output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 07daf228caff4e18635c8852ce3028447fcc5f14..bf5357b4b2d86ef02b44e74d3f8ff247a6b02066 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -119,8 +119,8 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
bool alpha);
gfx::Size SurfaceSize() const { return surface_size_; }
- virtual void ApplyExternalStencil();
virtual bool HasExternalStencilTest() const;
+ virtual void ApplyExternalStencil();
// ============== LAYER TREE COMPOSITOR ONLY ===================
@@ -180,34 +180,20 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
virtual void SwapBuffers(CompositorFrame frame) = 0;
virtual void OnSwapBuffersComplete();
- // 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);
+
+ // 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".
+ virtual void DidLoseOutputSurface();
OutputSurfaceClient* client_ = nullptr;
@@ -226,7 +212,6 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
private:
void DetachFromClientInternal();
- bool external_stencil_test_enabled_ = false;
base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(OutputSurface);
« no previous file with comments | « blimp/client/core/compositor/delegated_output_surface.cc ('k') | cc/output/output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698