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

Unified Diff: ui/gl/gl_surface_egl.h

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 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 | « ui/gl/gl_surface.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.h
diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
index 720c7dd9decb49e6ffc7dd6744a00023992f56af..b05f9bfc1ae83cc86ea26026e9eeef64af7fa1fe 100644
--- a/ui/gl/gl_surface_egl.h
+++ b/ui/gl/gl_surface_egl.h
@@ -13,7 +13,7 @@
#include "base/compiler_specific.h"
#include "base/time/time.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/vsync_provider.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_surface.h"
@@ -83,6 +83,8 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
EGLNativeWindowType window_;
+ void OnSetSwapInterval(int interval) override;
+
private:
EGLSurface surface_;
bool supports_post_sub_buffer_;
@@ -91,6 +93,17 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
scoped_ptr<VSyncProvider> vsync_provider_;
+ int swap_interval_;
+
+#if defined(OS_WIN)
+ bool vsync_override_;
+
+ unsigned int swap_generation_;
+ static unsigned int current_swap_generation_;
+ static unsigned int swaps_this_generation_;
+ static unsigned int last_multiswap_generation_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceEGL);
};
« no previous file with comments | « ui/gl/gl_surface.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698