Revert 87919 - Revert 87905 (broke PPAPITest.Scrollbar on win) - PPAPI: Fix interface functions t...

ppapi/cpp/dev/video_decoder_dev.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/cpp/dev/video_decoder_dev.h"
 
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/common.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_VideoDecoder_Dev>() {
   return PPB_VIDEODECODER_DEV_INTERFACE;
 }
 
 }  // namespace
 
-VideoDecoder::VideoDecoder(const Instance* instance,
-                           const PP_VideoConfigElement* config,
-                           CompletionCallback callback,
-                           Client* client)
+VideoDecoder::VideoDecoder(const Instance* instance, Client* client)
     : client_(client) {
   if (!has_interface<PPB_VideoDecoder_Dev>())
     return;
   PassRefFromConstructor(get_interface<PPB_VideoDecoder_Dev>()->Create(
-      instance->pp_instance(), config, callback.pp_completion_callback()));
+      instance->pp_instance()));
 }
 
 VideoDecoder::~VideoDecoder() {}
 
+int32_t VideoDecoder::Initialize(const PP_VideoConfigElement* config,
+                                 CompletionCallback callback) {
+  if (!has_interface<PPB_VideoDecoder_Dev>())
+    return PP_ERROR_NOINTERFACE;
+  return get_interface<PPB_VideoDecoder_Dev>()->Initialize(
+      pp_resource(), config, callback.pp_completion_callback());
+}
+
 bool VideoDecoder::GetConfigs(Instance* instance,
                               const PP_VideoConfigElement* prototype_config,
                               PP_VideoConfigElement* matching_configs,
                               uint32_t matching_configs_size,
                               uint32_t* num_of_matching_configs) {
   if (!has_interface<PPB_VideoDecoder_Dev>())
     return false;
   return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->GetConfigs(
              instance->pp_instance(), prototype_config, matching_configs,
              matching_configs_size, num_of_matching_configs));
 }
 
 void VideoDecoder::AssignGLESBuffers(
     const std::vector<PP_GLESBuffer_Dev>& buffers) {
   if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
     return;
   get_interface<PPB_VideoDecoder_Dev>()->AssignGLESBuffers(
       pp_resource(), buffers.size(), &buffers[0]);
 }
 
 void VideoDecoder::AssignSysmemBuffers(
     const std::vector<PP_SysmemBuffer_Dev>& buffers) {
   if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
     return;
   get_interface<PPB_VideoDecoder_Dev>()->AssignSysmemBuffers(
       pp_resource(), buffers.size(), &buffers[0]);
 }
 
-bool VideoDecoder::Decode(const PP_VideoBitstreamBuffer_Dev& bitstream_buffer,
-                          CompletionCallback callback) {
-  if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
-    return false;
-  return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Decode(
-      pp_resource(), &bitstream_buffer, callback.pp_completion_callback()));
+int32_t VideoDecoder::Decode(
+    const PP_VideoBitstreamBuffer_Dev& bitstream_buffer,
+    CompletionCallback callback) {
+  if (!has_interface<PPB_VideoDecoder_Dev>())
+    return PP_ERROR_NOINTERFACE;
+  if (!pp_resource())
+    return PP_ERROR_BADRESOURCE;
+  return get_interface<PPB_VideoDecoder_Dev>()->Decode(
+      pp_resource(), &bitstream_buffer, callback.pp_completion_callback());
 }
 
 void VideoDecoder::ReusePictureBuffer(int32_t picture_buffer_id) {
   if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
     return;
   get_interface<PPB_VideoDecoder_Dev>()->ReusePictureBuffer(
       pp_resource(), picture_buffer_id);
 }
 
-bool VideoDecoder::Flush(CompletionCallback callback) {
-  if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
-    return false;
-  return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Flush(
-      pp_resource(), callback.pp_completion_callback()));
+int32_t VideoDecoder::Flush(CompletionCallback callback) {
+  if (!has_interface<PPB_VideoDecoder_Dev>())
+    return PP_ERROR_NOINTERFACE;
+  if (!pp_resource())
+    return PP_ERROR_BADRESOURCE;
+  return get_interface<PPB_VideoDecoder_Dev>()->Flush(
+      pp_resource(), callback.pp_completion_callback());
 }
 
-bool VideoDecoder::Abort(CompletionCallback callback) {
-  if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
-    return false;
-  return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Abort(
-      pp_resource(), callback.pp_completion_callback()));
+int32_t VideoDecoder::Abort(CompletionCallback callback) {
+  if (!has_interface<PPB_VideoDecoder_Dev>())
+    return PP_ERROR_NOINTERFACE;
+  if (!pp_resource())
+    return PP_ERROR_BADRESOURCE;
+  return get_interface<PPB_VideoDecoder_Dev>()->Abort(
+      pp_resource(), callback.pp_completion_callback());
 }
 
 }  // namespace pp