| Index: ui/gl/gpu_timing.h
|
| diff --git a/ui/gl/gpu_timing.h b/ui/gl/gpu_timing.h
|
| index 4082b91e1cd8242caffc0726b89b5669c8a7d4a1..d17dd5dbe76cfe1d53355584426a25d02ce4e7d6 100644
|
| --- a/ui/gl/gpu_timing.h
|
| +++ b/ui/gl/gpu_timing.h
|
| @@ -5,10 +5,13 @@
|
| #ifndef UI_GL_GPU_TIMING_H_
|
| #define UI_GL_GPU_TIMING_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <memory>
|
| #include <queue>
|
|
|
| #include "base/callback.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/gl/gl_export.h"
|
|
|
| @@ -96,8 +99,8 @@ class GL_EXPORT GPUTimer {
|
|
|
| bool IsAvailable();
|
|
|
| - void GetStartEndTimestamps(int64* start, int64* end);
|
| - int64 GetDeltaElapsed();
|
| + void GetStartEndTimestamps(int64_t* start, int64_t* end);
|
| + int64_t GetDeltaElapsed();
|
|
|
| private:
|
| friend class GPUTimingClient;
|
| @@ -138,8 +141,8 @@ class GL_EXPORT GPUTimingClient
|
| // discarded.
|
| bool CheckAndResetTimerErrors();
|
|
|
| - int64 GetCurrentCPUTime();
|
| - void SetCpuTimeForTesting(const base::Callback<int64(void)>& cpu_time);
|
| + int64_t GetCurrentCPUTime();
|
| + void SetCpuTimeForTesting(const base::Callback<int64_t(void)>& cpu_time);
|
|
|
| bool IsForceTimeElapsedQuery();
|
| void ForceTimeElapsedQuery();
|
|
|