[PPAPI] Add target param for CompositorLayer::SetTexture().

ppapi/cpp/compositor_layer.cc

 // Copyright 2014 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/compositor_layer.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/var.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_CompositorLayer_0_1>() {
   return PPB_COMPOSITORLAYER_INTERFACE_0_1;
 }
 
+template <> const char* interface_name<PPB_CompositorLayer_0_2>() {
+  return PPB_COMPOSITORLAYER_INTERFACE_0_2;
+}
+
 }  // namespace
 
 CompositorLayer::CompositorLayer() {
 }
 
 CompositorLayer::CompositorLayer(
     const CompositorLayer& other) : Resource(other) {
 }
 
 CompositorLayer::CompositorLayer(const Resource& resource)
@@ skipping 14 matching lines @@
                                   float alpha,
                                   const Size& size) {
   if (has_interface<PPB_CompositorLayer_0_1>()) {
     return get_interface<PPB_CompositorLayer_0_1>()->SetColor(
         pp_resource(), red, green, blue, alpha, &size.pp_size());
   }
   return PP_ERROR_NOINTERFACE;
 }
 
 int32_t CompositorLayer::SetTexture(const Graphics3D& context,
+                                    uint32_t target,
                                     uint32_t texture,
                                     const Size& size,
                                     const CompletionCallback& cc) {
+  if (has_interface<PPB_CompositorLayer_0_2>()) {
+    return get_interface<PPB_CompositorLayer_0_2>()->SetTexture(
+        pp_resource(), context.pp_resource(), target, texture, &size.pp_size(),
+        cc.pp_completion_callback());
+  }
   if (has_interface<PPB_CompositorLayer_0_1>()) {
+    if (target != 0x0DE1) // 0x0DE1 GL_TEXTURE_2D
+      return cc.MayForce(PP_ERROR_BADARGUMENT);

[bbudge, 2014/08/15 17:10:11]

I think PP_ERROR_NOTSUPPORTED is more appropriate here. See
ppapi/cpp/file_ref.cc for example.

I realize it's quite tedious, but in general, when there's a new version of the
API, we check for version for every method in the class. So you need to do this
'has_interface' and 'get_interface' logic for every method in this file.

[Peng, 2014/08/15 17:58:44]

Done.

     return get_interface<PPB_CompositorLayer_0_1>()->SetTexture(
         pp_resource(), context.pp_resource(), texture, &size.pp_size(),
         cc.pp_completion_callback());
   }
   return cc.MayForce(PP_ERROR_NOINTERFACE);
 }
 
 int32_t CompositorLayer::SetImage(const ImageData& image,
                                   const CompletionCallback& cc) {
   if (has_interface<PPB_CompositorLayer_0_1>()) {
@@ skipping 65 matching lines @@
 
 bool CompositorLayer::IsCompositorLayer(const Resource& resource) {
   if (has_interface<PPB_CompositorLayer_0_1>()) {
     return PP_ToBool(get_interface<PPB_CompositorLayer_0_1>()->
         IsCompositorLayer(resource.pp_resource()));
   }
   return false;
 }
 
 }  // namespace pp