Allow both Context3D and Graphics3D with the video decoder

ppapi/shared_impl/video_decoder_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/shared_impl/video_decoder_impl.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/thunk/ppb_context_3d_api.h"
 #include "ppapi/thunk/enter.h"
 
 using ppapi::thunk::PPB_Context3D_API;
 
 namespace ppapi {
 
 VideoDecoderImpl::VideoDecoderImpl()
     : flush_callback_(PP_MakeCompletionCallback(NULL, NULL)),
       reset_callback_(PP_MakeCompletionCallback(NULL, NULL)),
-      context3d_id_(0),
+      graphics_context_(0),
       gles2_impl_(NULL) {
 }
 
 VideoDecoderImpl::~VideoDecoderImpl() {
 }
 
-bool VideoDecoderImpl::Init(PP_Resource context3d_id,
-                            PPB_Context3D_API* context3d,
-                            const PP_VideoConfigElement* decoder_config) {
-  if (!context3d || !decoder_config || !context3d_id)
-    return false;
-
-  DCHECK(!gles2_impl_ && !context3d_id_);
-  gles2_impl_ = context3d->GetGLES2Impl();
-  TrackerBase::Get()->GetResourceTracker()->AddRefResource(context3d_id);
-  context3d_id_ = context3d_id;
-  return true;
+void VideoDecoderImpl::InitCommon(
+    PP_Resource graphics_context,
+    gpu::gles2::GLES2Implementation* gles2_impl) {
+  DCHECK(graphics_context);
+  DCHECK(!gles2_impl_ && !graphics_context_);
+  gles2_impl_ = gles2_impl;
+  TrackerBase::Get()->GetResourceTracker()->AddRefResource(graphics_context);
+  graphics_context_ = graphics_context;
 }
 
 void VideoDecoderImpl::Destroy() {
-  context3d_id_ = 0;
+  graphics_context_ = 0;
   gles2_impl_ = NULL;
-  TrackerBase::Get()->GetResourceTracker()->ReleaseResource(context3d_id_);
+  TrackerBase::Get()->GetResourceTracker()->ReleaseResource(graphics_context_);
 }
 
 bool VideoDecoderImpl::SetFlushCallback(PP_CompletionCallback callback) {
   CHECK(callback.func);
   if (flush_callback_.func)
     return false;
   flush_callback_ = callback;
   return true;
 }
 
@@ skipping 45 matching lines @@
   const PP_VideoConfigElement* current = configs_to_copy;
   while (current && *current != PP_VIDEOATTR_DICTIONARY_TERMINATOR) {
     out_configs->push_back(*current);
     out_configs->push_back(*(current + 1));
     current += 2;
   }
   return true;
 }
 
 }  // namespace ppapi