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

Unified Diff: content/browser/compositor/offscreen_browser_compositor_output_surface.h

Issue 2443003004: cc: Make OutputSurface::BindToClient pure virtual and not return bool (Closed)
Patch Set: bindtoclient-pure-virtual: rebase Created 4 years, 2 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
Index: content/browser/compositor/offscreen_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/offscreen_browser_compositor_output_surface.h b/content/browser/compositor/offscreen_browser_compositor_output_surface.h
index b3fa660839398f40899100734f82826cdf8eeff2..0a947ee848011969850ea172841adc8fe776ad89 100644
--- a/content/browser/compositor/offscreen_browser_compositor_output_surface.h
+++ b/content/browser/compositor/offscreen_browser_compositor_output_surface.h
@@ -35,8 +35,9 @@ class OffscreenBrowserCompositorOutputSurface
~OffscreenBrowserCompositorOutputSurface() override;
- protected:
- // cc::OutputSurface:
+ private:
+ // cc::OutputSurface implementation.
+ void BindToClient(cc::OutputSurfaceClient* client) override;
void EnsureBackbuffer() override;
void DiscardBackbuffer() override;
void Reshape(const gfx::Size& size,
@@ -50,23 +51,22 @@ class OffscreenBrowserCompositorOutputSurface
bool SurfaceIsSuspendForRecycle() const override;
uint32_t GetFramebufferCopyTextureFormat() override;
- // BrowserCompositorOutputSurface
+ // BrowserCompositorOutputSurface implementation.
void OnReflectorChanged() override;
#if defined(OS_MACOSX)
void SetSurfaceSuspendedForRecycle(bool suspended) override {};
#endif
+ void OnSwapBuffersComplete();
+
+ cc::OutputSurfaceClient* client_ = nullptr;
gfx::Size reshape_size_;
uint32_t fbo_ = 0;
bool reflector_changed_ = false;
std::unique_ptr<ReflectorTexture> reflector_texture_;
-
base::WeakPtrFactory<OffscreenBrowserCompositorOutputSurface>
weak_ptr_factory_;
- private:
- void OnSwapBuffersComplete();
-
DISALLOW_COPY_AND_ASSIGN(OffscreenBrowserCompositorOutputSurface);
};

Powered by Google App Engine
This is Rietveld 408576698