commit 7f48021e1d4f383115a718d6c4bfb7578c744733
author James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
committer James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
tree 94fea0c4bd0470b1e68a2802f24ebed892617d42
parent 7c05714462a1f2c668dd3946d953cc36aa685bfc

Update from chromium https://crrev.com/302282

Updates based on chromium https://crrev.com/302282 /
30228db41b946899ce33f284da0adf2b35188d552de47. Contains updates for
https://crrev.com/301916 and https://crrev.com/301795.

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/683113005

ui/gl/gl_surface_glx.cc

diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 7189c5a..dd3eed9 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -77,17 +77,17 @@
         window_(window) {
   }
 
-  virtual ~OMLSyncControlVSyncProvider() { }
+  ~OMLSyncControlVSyncProvider() override {}
 
  protected:
-  virtual bool GetSyncValues(int64* system_time,
-                             int64* media_stream_counter,
-                             int64* swap_buffer_counter) override {
+  bool GetSyncValues(int64* system_time,
+                     int64* media_stream_counter,
+                     int64* swap_buffer_counter) override {
     return glXGetSyncValuesOML(g_display, window_, system_time,
                                media_stream_counter, swap_buffer_counter);
   }
 
-  virtual bool GetMscRate(int32* numerator, int32* denominator) override {
+  bool GetMscRate(int32* numerator, int32* denominator) override {
     if (!g_glx_get_msc_rate_oml_supported)
       return false;
 
@@ -127,7 +127,7 @@
     DCHECK(CalledOnValidThread());
   }
 
-  virtual ~SGIVideoSyncThread() {
+  ~SGIVideoSyncThread() override {
     DCHECK(CalledOnValidThread());
     g_video_sync_thread = NULL;
     Stop();
@@ -256,7 +256,7 @@
                    base::Unretained(shim_.get())));
   }
 
-  virtual ~SGIVideoSyncVSyncProvider() {
+  ~SGIVideoSyncVSyncProvider() override {
     {
       base::AutoLock locked(*vsync_lock_);
       cancel_vsync_flag_->Set();
@@ -268,7 +268,7 @@
         shim_.release());
   }
 
-  virtual void GetVSyncParameters(
+  void GetVSyncParameters(
       const VSyncProvider::UpdateVSyncCallback& callback) override {
     if (kGetVSyncParametersMinPeriod > base::TimeDelta()) {
       base::TimeTicks now = base::TimeTicks::Now();