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

ppapi/proxy/compositor_layer_resource.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/proxy/compositor_layer_resource.h"
 
 #include "base/logging.h"
+#include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "ppapi/proxy/compositor_resource.h"
 #include "ppapi/shared_impl/ppb_graphics_3d_shared.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_graphics_3d_api.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 
 using gpu::gles2::GLES2Implementation;
 using ppapi::thunk::EnterResourceNoLock;
@@ skipping 96 matching lines @@
 
   data_.color->red = clamp(red);
   data_.color->green = clamp(green);
   data_.color->blue = clamp(blue);
   data_.color->alpha = clamp(alpha);
   data_.common.size = *size;
 
   return PP_OK;
 }
 
+int32_t CompositorLayerResource::SetTexture0_1(
+    PP_Resource context,
+    uint32_t texture,
+    const PP_Size* size,
+    const scoped_refptr<TrackedCallback>& release_callback) {
+  return SetTexture(context, GL_TEXTURE_2D, texture, size, release_callback);
+}
+
 int32_t CompositorLayerResource::SetTexture(
     PP_Resource context,
+    uint32_t target,
     uint32_t texture,
     const PP_Size* size,
     const scoped_refptr<TrackedCallback>& release_callback) {
   int32_t rv = CheckForSetTextureAndImage(TYPE_TEXTURE, release_callback);
   if (rv != PP_OK)
     return rv;
   DCHECK(data_.texture);
 
   EnterResourceNoLock<PPB_Graphics3D_API> enter(context, true);
   if (enter.failed())
     return PP_ERROR_BADRESOURCE;
 
+  if (target != GL_TEXTURE_2D &&
+      target != GL_TEXTURE_EXTERNAL_OES &&
+      target != GL_TEXTURE_RECTANGLE_ARB) {
+    return PP_ERROR_BADARGUMENT;
+  }
+
   if (!size || size->width <= 0 || size->height <= 0)
     return PP_ERROR_BADARGUMENT;
 
   PPB_Graphics3D_Shared* graphics =
       static_cast<PPB_Graphics3D_Shared*>(enter.object());
 
   GLES2Implementation* gl = graphics->gles2_impl();
 
   // Generate a Mailbox for the texture.
   gl->GenMailboxCHROMIUM(
       reinterpret_cast<GLbyte*>(data_.texture->mailbox.name));
   gl->ProduceTextureDirectCHROMIUM(
-      texture, GL_TEXTURE_2D,
+      texture, target,
       reinterpret_cast<const GLbyte*>(data_.texture->mailbox.name));
 
   // Set the source size to (1, 1). It will be used to verify the source_rect
   // passed to SetSourceRect().
   source_size_ = PP_MakeFloatSize(1.0f, 1.0f);
 
   data_.common.size = *size;
   data_.common.resource_id = compositor_->GenerateResourceId();
+  data_.texture->target = target;
   data_.texture->sync_point = gl->InsertSyncPointCHROMIUM();
   data_.texture->source_rect.point = PP_MakeFloatPoint(0.0f, 0.0f);
   data_.texture->source_rect.size = source_size_;
 
   // If the PP_Resource of this layer is released by the plugin, the
   // release_callback will be aborted immediately, but the texture or image
   // in this layer may still being used by chromium compositor. So we have to
   // use ScopedPPResource to keep this resource alive until the texture or image
   // is released by the chromium compositor.
   release_callback_ = base::Bind(
@@ skipping 190 matching lines @@
 
   // Do not allow using a block callback as a release callback.
   if (release_callback->is_blocking())
     return PP_ERROR_BADARGUMENT;
 
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace ppapi