content/common/gpu/media/android_video_decode_accelerator.cc - Issue 1846253003: Revert of Refactor content/common/gpu into gpu/ipc/service

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: content/common/gpu/media/android_video_decode_accelerator.cc

Issue 1846253003: Revert of Refactor content/common/gpu into gpu/ipc/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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 | « content/common/gpu/media/android_deferred_rendering_backing_strategy.cc ('k') | content/common/gpu/media/android_video_encode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/android_video_decode_accelerator.cc

diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc

index c0326531ca91865b8bb755381b2c3a512a121f34..524602f60c57e66e1d6d7739e0d1f4bc043f7101 100644

--- a/content/common/gpu/media/android_video_decode_accelerator.cc

+++ b/content/common/gpu/media/android_video_decode_accelerator.cc

@@ -16,13 +16,13 @@

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram.h"

#include "base/trace_event/trace_event.h"

+#include "content/common/gpu/gpu_channel.h"

#include "content/common/gpu/media/android_copying_backing_strategy.h"

#include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"

#include "content/common/gpu/media/avda_return_on_failure.h"

#include "content/common/gpu/media/shared_memory_region.h"

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

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

-#include "gpu/ipc/service/gpu_channel.h"

#include "media/base/android/media_codec_bridge.h"

#include "media/base/android/media_codec_util.h"

#include "media/base/bind_to_current_loop.h"