Index: ui/gl/sync_control_vsync_provider.h |
diff --git a/ui/gl/sync_control_vsync_provider.h b/ui/gl/sync_control_vsync_provider.h |
index 19d4a33bf21e80abaf18681268d9e5eba2938fc0..9e196538e03d3109ab867e44f1fef69040f98895 100644 |
--- a/ui/gl/sync_control_vsync_provider.h |
+++ b/ui/gl/sync_control_vsync_provider.h |
@@ -11,13 +11,12 @@ |
#include "base/macros.h" |
#include "ui/gfx/vsync_provider.h" |
-#include "ui/gl/gl_export.h" |
namespace gl { |
// Base class for providers based on extensions like GLX_OML_sync_control and |
// EGL_CHROMIUM_sync_control. |
-class GL_EXPORT SyncControlVSyncProvider : public gfx::VSyncProvider { |
+class SyncControlVSyncProvider : public gfx::VSyncProvider { |
public: |
SyncControlVSyncProvider(); |
~SyncControlVSyncProvider() override; |
@@ -32,24 +31,17 @@ class GL_EXPORT SyncControlVSyncProvider : public gfx::VSyncProvider { |
virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; |
private: |
-#if defined(OS_LINUX) || defined(OS_WIN) |
- bool AdjustSyncValues(int64_t* system_time, int64_t* media_stream_counter); |
- |
+#if defined(OS_LINUX) |
base::TimeTicks last_timebase_; |
- base::TimeDelta last_timebase_diff_; |
- int64_t last_media_stream_counter_ = 0; |
- int64_t last_counter_diff_ = 0; |
+ uint64_t last_media_stream_counter_ = 0; |
base::TimeDelta last_good_interval_; |
+ bool invalid_msc_ = false; |
// A short history of the last few computed intervals. |
// We use this to filter out the noise in the computation resulting |
// from configuration change (monitor reconfiguration, moving windows |
// between monitors, suspend and resume, etc.). |
std::queue<base::TimeDelta> last_computed_intervals_; |
-#endif // defined(OS_LINUX) || defined(OS_WIN) |
- |
-#if defined(OS_LINUX) |
- bool invalid_msc_ = false; |
#endif // defined(OS_LINUX) |
DISALLOW_COPY_AND_ASSIGN(SyncControlVSyncProvider); |