diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 10:17:23 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 10:17:23 +0000 |
| commit | ca792efe9e0d324d5847f012e91b03aa02f1e81e (patch) | |
| tree | 8f0a1ca86ebc9b0ac0febf0fac5d352e9dce7597 /ui/gl | |
| parent | bbe1169c32700c8de2e777bededa7b2fe83ee7a1 (diff) | |
| download | chromium_src-ca792efe9e0d324d5847f012e91b03aa02f1e81e.zip chromium_src-ca792efe9e0d324d5847f012e91b03aa02f1e81e.tar.gz chromium_src-ca792efe9e0d324d5847f012e91b03aa02f1e81e.tar.bz2 | |
Linux/ChromeOS Chromium style checker cleanup, ui/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12217031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/gl_surface_egl.cc | 4 | ||||
| -rw-r--r-- | ui/gl/gl_surface_glx.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index ac846c6..63e2fab 100644 --- a/ui/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.cc @@ -47,7 +47,7 @@ class EGLSyncControlVSyncProvider protected: virtual bool GetSyncValues(int64* system_time, int64* media_stream_counter, - int64* swap_buffer_counter) { + int64* swap_buffer_counter) OVERRIDE { uint64 u_system_time, u_media_stream_counter, u_swap_buffer_counter; bool result = eglGetSyncValuesCHROMIUM( g_display, surface_, &u_system_time, @@ -60,7 +60,7 @@ class EGLSyncControlVSyncProvider return result; } - virtual bool GetMscRate(int32* numerator, int32* denominator) { + virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE { return false; } diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 5da0191..0a49791 100644 --- a/ui/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -67,12 +67,12 @@ class OMLSyncControlVSyncProvider protected: virtual bool GetSyncValues(int64* system_time, int64* media_stream_counter, - int64* swap_buffer_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) { + virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE { if (!g_glx_get_msc_rate_oml_supported) return false; @@ -112,7 +112,7 @@ class SGIVideoSyncThread DCHECK(CalledOnValidThread()); } - ~SGIVideoSyncThread() { + virtual ~SGIVideoSyncThread() { DCHECK(CalledOnValidThread()); g_video_sync_thread = NULL; Stop(); |