gpu/command_buffer/service/async_pixel_transfer_manager_share_group.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/async_pixel_transfer_manager_share_group.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/service/async_pixel_transfer_manager_mac.cc ('k') | gpu/command_buffer/service/async_pixel_transfer_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc

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

index 4f85e333c4508585aec0884eb7db17a0920ba2a9..16089f6d458ea1ad3fb152a34127b19c6eaf85be 100644

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

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

@@ -7,8 +7,6 @@

#include <list>

#include "base/bind.h"

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

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

#include "base/lazy_instance.h"

#include "base/logging.h"

#include "base/memory/ref_counted.h"

@@ -18,6 +16,8 @@

#include "base/synchronization/waitable_event.h"

#include "base/threading/thread.h"

#include "base/threading/thread_checker.h"

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

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

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

#include "ui/gl/gl_bindings.h"

#include "ui/gl/gl_context.h"