Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Side by Side Diff: webkit/plugins/ppapi/ppb_video_decoder_impl.h

Issue 8849003: Rename the shared_impl resource files to give them more regular names. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Deleted: svn:mergeinfo
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_video_decoder_impl.h:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_callback_factory.h" 12 #include "base/memory/scoped_callback_factory.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "ppapi/c/dev/pp_video_dev.h" 14 #include "ppapi/c/dev/pp_video_dev.h"
15 #include "ppapi/c/pp_var.h" 15 #include "ppapi/c/pp_var.h"
16 #include "ppapi/shared_impl/ppb_video_decoder_shared.h"
16 #include "ppapi/shared_impl/resource.h" 17 #include "ppapi/shared_impl/resource.h"
17 #include "ppapi/shared_impl/video_decoder_impl.h"
18 #include "ppapi/thunk/ppb_video_decoder_api.h" 18 #include "ppapi/thunk/ppb_video_decoder_api.h"
19 #include "webkit/plugins/ppapi/plugin_delegate.h" 19 #include "webkit/plugins/ppapi/plugin_delegate.h"
20 20
21 struct PP_PictureBuffer_Dev; 21 struct PP_PictureBuffer_Dev;
22 struct PP_VideoBitstreamBuffer_Dev; 22 struct PP_VideoBitstreamBuffer_Dev;
23 struct PPB_VideoDecoder_Dev; 23 struct PPB_VideoDecoder_Dev;
24 struct PPP_VideoDecoder_Dev; 24 struct PPP_VideoDecoder_Dev;
25 25
26 namespace gpu { 26 namespace gpu {
27 namespace gles2 { 27 namespace gles2 {
28 class GLES2Implementation; 28 class GLES2Implementation;
29 } // namespace gles2 29 } // namespace gles2
30 } // namespace gpu 30 } // namespace gpu
31 31
32 namespace webkit { 32 namespace webkit {
33 namespace ppapi { 33 namespace ppapi {
34 34
35 class PPB_VideoDecoder_Impl : public ::ppapi::Resource, 35 class PPB_VideoDecoder_Impl : public ::ppapi::Resource,
36 public ::ppapi::VideoDecoderImpl, 36 public ::ppapi::PPB_VideoDecoder_Shared,
37 public media::VideoDecodeAccelerator::Client { 37 public media::VideoDecodeAccelerator::Client {
38 public: 38 public:
39 virtual ~PPB_VideoDecoder_Impl(); 39 virtual ~PPB_VideoDecoder_Impl();
40 // See PPB_VideoDecoder_Dev::Create. Returns 0 on failure to create & 40 // See PPB_VideoDecoder_Dev::Create. Returns 0 on failure to create &
41 // initialize. 41 // initialize.
42 static PP_Resource Create(PP_Instance instance, 42 static PP_Resource Create(PP_Instance instance,
43 PP_Resource graphics_context, 43 PP_Resource graphics_context,
44 PP_VideoDecoder_Profile profile); 44 PP_VideoDecoder_Profile profile);
45 45
46 // Resource overrides. 46 // Resource overrides.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // Reference to the plugin requesting this interface. 83 // Reference to the plugin requesting this interface.
84 const PPP_VideoDecoder_Dev* ppp_videodecoder_; 84 const PPP_VideoDecoder_Dev* ppp_videodecoder_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl); 86 DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
87 }; 87 };
88 88
89 } // namespace ppapi 89 } // namespace ppapi
90 } // namespace webkit 90 } // namespace webkit
91 91
92 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_ 92 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppb_url_request_info_impl.cc ('k') | webkit/plugins/ppapi/ppb_video_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698