content/renderer/pepper/ppb_video_decoder_impl.cc - Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper.

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/renderer/pepper/ppb_video_decoder_impl.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: more more clang fun Created 7 years, 5 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: content/renderer/pepper/ppb_video_decoder_impl.cc

===================================================================

--- content/renderer/pepper/ppb_video_decoder_impl.cc (revision 213482)

+++ content/renderer/pepper/ppb_video_decoder_impl.cc (working copy)

@@ -2,13 +2,18 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"

+#include "content/renderer/pepper/ppb_video_decoder_impl.h"

#include <string>

#include "base/logging.h"

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram.h"

+#include "content/renderer/pepper/common.h"

+#include "content/renderer/pepper/plugin_module.h"

+#include "content/renderer/pepper/ppb_buffer_impl.h"

+#include "content/renderer/pepper/ppb_graphics_3d_impl.h"

+#include "content/renderer/pepper/resource_helper.h"

#include "gpu/command_buffer/client/gles2_implementation.h"

#include "media/video/picture.h"

#include "media/video/video_decode_accelerator.h"

@@ -19,11 +24,6 @@

#include "ppapi/c/pp_errors.h"

#include "ppapi/shared_impl/resource_tracker.h"

#include "ppapi/thunk/enter.h"

-#include "webkit/plugins/ppapi/common.h"

-#include "webkit/plugins/ppapi/plugin_module.h"

-#include "webkit/plugins/ppapi/ppb_buffer_impl.h"

-#include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"

-#include "webkit/plugins/ppapi/resource_helper.h"

using ppapi::TrackedCallback;

using ppapi::thunk::EnterResourceNoLock;