| Index: gpu/command_buffer/common/time.h
|
| diff --git a/gpu/command_buffer/common/time.h b/gpu/command_buffer/common/time.h
|
| index e58145b51f3134e7b96f91b02bc91cd83a21412b..8886966d93b28cc022fef71bc34f0cf2c81c7821 100644
|
| --- a/gpu/command_buffer/common/time.h
|
| +++ b/gpu/command_buffer/common/time.h
|
| @@ -7,11 +7,13 @@
|
|
|
| #if !defined(__native_client__)
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "base/time/time.h"
|
|
|
| namespace gpu {
|
|
|
| -inline uint64 MicrosecondsSinceOriginOfTime() {
|
| +inline uint64_t MicrosecondsSinceOriginOfTime() {
|
| return (base::TimeTicks::Now() - base::TimeTicks()).InMicroseconds();
|
| }
|
|
|
| @@ -21,7 +23,7 @@ inline uint64 MicrosecondsSinceOriginOfTime() {
|
|
|
| namespace gpu {
|
|
|
| -inline uint64 MicrosecondsSinceOriginOfTime() {
|
| +inline uint64_t MicrosecondsSinceOriginOfTime() {
|
| return 0;
|
| }
|
|
|
|
|