| Index: ui/gl/angle_platform_impl.cc
|
| diff --git a/ui/gl/angle_platform_impl.cc b/ui/gl/angle_platform_impl.cc
|
| index 4f979cac8ecb23f1e3f5b1b9c97a7e0efbe697e8..d87f7610170679b87a2238f60f9a4a20468b3434 100644
|
| --- a/ui/gl/angle_platform_impl.cc
|
| +++ b/ui/gl/angle_platform_impl.cc
|
| @@ -21,7 +21,7 @@ double ANGLEPlatformImpl::currentTime() {
|
| }
|
|
|
| double ANGLEPlatformImpl::monotonicallyIncreasingTime() {
|
| - return (base::TraceTicks::Now() - base::TraceTicks()).InSecondsF();
|
| + return (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
|
| }
|
|
|
| const unsigned char* ANGLEPlatformImpl::getTraceCategoryEnabledFlag(
|
| @@ -48,8 +48,8 @@ angle::Platform::TraceEventHandle ANGLEPlatformImpl::addTraceEvent(
|
| const unsigned char* arg_types,
|
| const unsigned long long* arg_values,
|
| unsigned char flags) {
|
| - base::TraceTicks timestamp_tt =
|
| - base::TraceTicks() + base::TimeDelta::FromSecondsD(timestamp);
|
| + base::TimeTicks timestamp_tt =
|
| + base::TimeTicks() + base::TimeDelta::FromSecondsD(timestamp);
|
| base::trace_event::TraceEventHandle handle =
|
| TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
|
| phase, category_group_enabled, name, id, trace_event_internal::kNoId,
|
|
|