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

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

Issue 7541061: Fix ARM build bustage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" 5 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 PPB_VideoDecoder_API* PPB_VideoDecoder_Impl::AsPPB_VideoDecoder_API() { 44 PPB_VideoDecoder_API* PPB_VideoDecoder_Impl::AsPPB_VideoDecoder_API() {
45 return this; 45 return this;
46 } 46 }
47 47
48 // static 48 // static
49 PP_Resource PPB_VideoDecoder_Impl::Create(PluginInstance* instance, 49 PP_Resource PPB_VideoDecoder_Impl::Create(PluginInstance* instance,
50 PP_Resource context3d_id, 50 PP_Resource context3d_id,
51 const PP_VideoConfigElement* config) { 51 const PP_VideoConfigElement* config) {
52 if (!context3d_id) 52 if (!context3d_id)
53 return NULL; 53 return 0;
54 54
55 EnterResourceNoLock<PPB_Context3D_API> enter_context(context3d_id, true); 55 EnterResourceNoLock<PPB_Context3D_API> enter_context(context3d_id, true);
56 if (enter_context.failed()) 56 if (enter_context.failed())
57 return NULL; 57 return 0;
58 58
59 scoped_refptr<PPB_VideoDecoder_Impl> decoder( 59 scoped_refptr<PPB_VideoDecoder_Impl> decoder(
60 new PPB_VideoDecoder_Impl(instance)); 60 new PPB_VideoDecoder_Impl(instance));
61 if (decoder->Init(context3d_id, enter_context.object(), config)) 61 if (decoder->Init(context3d_id, enter_context.object(), config))
62 return decoder->GetReference(); 62 return decoder->GetReference();
63 return 0; 63 return 0;
64 } 64 }
65 65
66 bool PPB_VideoDecoder_Impl::Init(PP_Resource context3d_id, 66 bool PPB_VideoDecoder_Impl::Init(PP_Resource context3d_id,
67 PPB_Context3D_API* context3d, 67 PPB_Context3D_API* context3d,
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 void PPB_VideoDecoder_Impl::AddRefResource(PP_Resource resource) { 245 void PPB_VideoDecoder_Impl::AddRefResource(PP_Resource resource) {
246 ResourceTracker::Get()->AddRefResource(resource); 246 ResourceTracker::Get()->AddRefResource(resource);
247 } 247 }
248 248
249 void PPB_VideoDecoder_Impl::UnrefResource(PP_Resource resource) { 249 void PPB_VideoDecoder_Impl::UnrefResource(PP_Resource resource) {
250 ResourceTracker::Get()->UnrefResource(resource); 250 ResourceTracker::Get()->UnrefResource(resource);
251 } 251 }
252 252
253 } // namespace ppapi 253 } // namespace ppapi
254 } // namespace webkit 254 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698