gpu: Pepper3DImageChromium support on ChromeOS.

content/renderer/pepper/ppb_graphics_3d_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_graphics_3d_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/location.h"
@@ skipping 32 matching lines @@
 
 namespace content {
 
 PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PP_Instance instance)
     : PPB_Graphics3D_Shared(instance),
       bound_to_instance_(false),
       commit_pending_(false),
       has_alpha_(false),
       use_image_chromium_(false),
       weak_ptr_factory_(this) {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)

[Daniele Castagna, 2017/01/14 22:55:49]

Can you we remove the ifdef here now that the feature is disabled by default on
every platform but mac?

[reveman, 2017/01/14 23:23:46]

Done.

   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   bool use_image_chromium =
       !command_line->HasSwitch(switches::kDisablePepper3DImageChromium);
 
   if (use_image_chromium) {
     use_image_chromium =
         base::FeatureList::IsEnabled(features::kPepper3DImageChromium);
   }
   use_image_chromium_ = use_image_chromium;
 #endif
@@ skipping 119 matching lines @@
 
   if (bound_to_instance_) {
     // If we are bound to the instance, we need to ask the compositor
     // to commit our backing texture so that the graphics appears on the page.
     // When the backing texture will be committed we get notified via
     // ViewFlushedPaint().
     //
     // Don't need to check for NULL from GetPluginInstance since when we're
     // bound, we know our instance is valid.
     bool is_overlay_candidate = use_image_chromium_;
-    GLenum target =
-        is_overlay_candidate ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D;
-    cc::TextureMailbox texture_mailbox(taken_front_buffer_, sync_token, target,
-                                       size, is_overlay_candidate, false);
+    cc::TextureMailbox texture_mailbox(
+        taken_front_buffer_, sync_token,
+#if defined(OS_MACOSX)
+        use_image_chromium_ ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
+#else
+        use_image_chromium_ ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D,

[Daniele Castagna, 2017/01/14 22:55:49]

Should this be elif CHROME_OS?
Can we add a todo: get the right texture target like we're doing for content?

[reveman, 2017/01/14 23:23:46]

Done. Avoiding the CHROMEOS ifdef as TEXTURE_EXTERNAL_OES is considered the
standard target for image backed textures and Mac is the outlier with its
RECTANGLE_ARB requirement.

+#endif
+        size, is_overlay_candidate, false);
     taken_front_buffer_.SetZero();
     HostGlobals::Get()
         ->GetInstance(pp_instance())
         ->CommitTextureMailbox(texture_mailbox);
     commit_pending_ = true;
   } else {
     // Wait for the command to complete on the GPU to allow for throttling.
     command_buffer_->SignalSyncToken(
         sync_token, base::Bind(&PPB_Graphics3D_Impl::OnSwapBuffers,
                                weak_ptr_factory_.GetWeakPtr()));
@@ skipping 149 matching lines @@
   if (!mailboxes_to_reuse_.empty()) {
     gpu::Mailbox mailbox = mailboxes_to_reuse_.back();
     mailboxes_to_reuse_.pop_back();
     return mailbox;
   }
 
   return gpu::Mailbox::Generate();
 }
 
 }  // namespace content