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

Unified Diff: ui/gl/gl_surface_egl.h

Issue 2801163002: Deletes NativeViewGLSurfaceEGL::Initialize(gfx::VSyncProvider). (Closed)
Patch Set: fixes formatting Created 3 years, 8 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: ui/gl/gl_surface_egl.h
diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
index d9caa8fe55b020fa0cc93a76636fba9d17b2948c..c8e7a9b34822c457253b6b2525d395597b6a9483 100644
--- a/ui/gl/gl_surface_egl.h
+++ b/ui/gl/gl_surface_egl.h
@@ -88,10 +88,10 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
// Encapsulates an EGL surface bound to a view.
class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
public:
- explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window);
+ NativeViewGLSurfaceEGL(EGLNativeWindowType window,
+ std::unique_ptr<gfx::VSyncProvider> vsync_provider);
// Implement GLSurface.
- using GLSurfaceEGL::Initialize;
bool Initialize(GLSurfaceFormat format) override;
void Destroy() override;
bool Resize(const gfx::Size& size,
@@ -115,10 +115,6 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
bool FlipsVertically() const override;
bool BuffersFlipped() const override;
- // Create a NativeViewGLSurfaceEGL with an externally provided
- // gfx::VSyncProvider. Takes ownership of the gfx::VSyncProvider.
- virtual bool Initialize(std::unique_ptr<gfx::VSyncProvider> sync_provider);
-
// Takes care of the platform dependant bits, of any, for creating the window.
virtual bool InitializeNativeWindow();
@@ -143,7 +139,8 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
bool supports_swap_buffer_with_damage_;
bool flips_vertically_;
- std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
+ std::unique_ptr<gfx::VSyncProvider> vsync_provider_external_;
+ std::unique_ptr<gfx::VSyncProvider> vsync_provider_internal_;
int swap_interval_;

Powered by Google App Engine
This is Rietveld 408576698