gpu/command_buffer/service/texture_manager.cc - Issue 885443002: Roll Chrome into Mojo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/texture_manager.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Rebase to ToT mojo Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gpu/command_buffer/service/texture_manager.cc

diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc

index b914f6dded0ff6caa4eba43b68bb035c6abdca12..b066e8d13d9ae977efa4c35ef97d7552744210f9 100644

--- a/gpu/command_buffer/service/texture_manager.cc

+++ b/gpu/command_buffer/service/texture_manager.cc

@@ -1718,13 +1718,13 @@ void TextureManager::DoTexImage2D(

ScopedTextureUploadTimer::ScopedTextureUploadTimer(

DecoderTextureState* texture_state)

: texture_state_(texture_state),

- begin_time_(base::TimeTicks::HighResNow()) {

+ begin_time_(base::TimeTicks::Now()) {

}

ScopedTextureUploadTimer::~ScopedTextureUploadTimer() {

texture_state_->texture_upload_count++;

texture_state_->total_texture_upload_time +=

- base::TimeTicks::HighResNow() - begin_time_;

+ base::TimeTicks::Now() - begin_time_;

}

} // namespace gles2