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

Unified Diff: ui/gl/gl_surface_glx.cc

Issue 1545113002: Switch to standard integer types in ui/gl/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_glx.h ('k') | ui/gl/gl_surface_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_glx.cc
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 2c060ec8f1c482b2cf6e1607d289fa085aa01fc3..20a117755c33431c184332ab0c54e5503dedad2e 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -8,9 +8,9 @@ extern "C" {
#include "ui/gl/gl_surface_glx.h"
-#include "base/basictypes.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -22,6 +22,7 @@ extern "C" {
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/gfx/x/x11_connection.h"
#include "ui/gfx/x/x11_types.h"
@@ -125,14 +126,14 @@ class OMLSyncControlVSyncProvider
~OMLSyncControlVSyncProvider() override {}
protected:
- bool GetSyncValues(int64* system_time,
- int64* media_stream_counter,
- int64* swap_buffer_counter) override {
+ bool GetSyncValues(int64_t* system_time,
+ int64_t* media_stream_counter,
+ int64_t* swap_buffer_counter) override {
return glXGetSyncValuesOML(g_display, glx_window_, system_time,
media_stream_counter, swap_buffer_counter);
}
- bool GetMscRate(int32* numerator, int32* denominator) override {
+ bool GetMscRate(int32_t* numerator, int32_t* denominator) override {
if (!g_glx_get_msc_rate_oml_supported)
return false;
« no previous file with comments | « ui/gl/gl_surface_glx.h ('k') | ui/gl/gl_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698