gpu/command_buffer/service/vertex_array_manager.cc - Issue 895853003: Update from https://crrev.com/314320

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/vertex_array_manager.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: 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/vertex_array_manager.cc

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

index 1560c043c25e9964db98709cf9a425baf73db600..0809eda2861e1dd26f17ce31646a6ee3732792bb 100644

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

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

@@ -3,8 +3,9 @@

// found in the LICENSE file.

#include "gpu/command_buffer/service/vertex_array_manager.h"

-#include "base/debug/trace_event.h"

#include "base/logging.h"

+#include "base/trace_event/trace_event.h"

#include "gpu/command_buffer/common/gles2_cmd_utils.h"

#include "gpu/command_buffer/service/buffer_manager.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"