Select BackingStrategy based on GpuPreferences

content/common/gpu/media/android_video_decode_accelerator.cc

Index: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index 9eccdc65e0440ab49d2bdcb479e2e670382960ea..0f76fc8de90654ae14b8073937526a6be706346c 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -22,7 +22,6 @@
 #include "content/common/gpu/media/avda_return_on_failure.h"
 #include "content/common/gpu/media/shared_memory_region.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_codec_util.h"
@@ -1155,17 +1154,18 @@ void AndroidVideoDecodeAccelerator::ManageTimer(bool did_work) {
     g_avda_timer.Pointer()->StopTimer(this);
 }
 
-// static
 bool AndroidVideoDecodeAccelerator::UseDeferredRenderingStrategy() {
-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   // TODO(liberato, watk): Figure out what we want to do about zero copy for
   // fullscreen external SurfaceView in WebView.  http://crbug.com/582170.
-  return !cmd_line->HasSwitch(switches::kEnableThreadedTextureMailboxes);
+  const gpu::GpuPreferences& gpu_preferences =

[liberato (no reviews please), 2016/03/22 21:22:08]

i was thinking that you might pass in the GpuPreferences here, and call it from
both the constructor and GetCapabilities.  otherwise, there's still two copies
of the check.

[william.xie, 2016/03/22 23:11:07]

Thanks Frank, per https://codereview.chromium.org/1809943002/#msg28,
we should get GpuPreferences from AVDA itself.
DaleCurtis@, how do you think?

[DaleCurtis, 2016/03/22 23:14:32]

I believe Frank just means you should have UseDeferredRendereringStrategy() take
gpu preferences as a const& parameter and then pass in the value via the code
you have here. this allows you to keep the UseDeferred...() function call in the
places its used today instead of having both check this preference.

[william.xie, 2016/03/22 23:37:26]

Done.

+      gl_decoder_->GetContextGroup()->gpu_preferences();
+  return !gpu_preferences.enable_threaded_texture_mailboxes;
 }
 
 // static
 media::VideoDecodeAccelerator::Capabilities
-AndroidVideoDecodeAccelerator::GetCapabilities() {
+AndroidVideoDecodeAccelerator::GetCapabilities(
+    const gpu::GpuPreferences& gpu_preferences) {
   Capabilities capabilities;
   SupportedProfiles& profiles = capabilities.supported_profiles;
 
@@ -1196,7 +1196,7 @@ AndroidVideoDecodeAccelerator::GetCapabilities() {
     profiles.push_back(profile);
   }
 
-  if (UseDeferredRenderingStrategy()) {
+  if (!gpu_preferences.enable_threaded_texture_mailboxes) {
     capabilities.flags = media::VideoDecodeAccelerator::Capabilities::
                              NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE |
                          media::VideoDecodeAccelerator::Capabilities::