| Index: gpu/command_buffer/service/mailbox_manager.cc
|
| diff --git a/gpu/command_buffer/service/mailbox_manager.cc b/gpu/command_buffer/service/mailbox_manager.cc
|
| index e8432ed17c5873532abae09571ee7b61441f3839..629b26945fa4c5deec7be3da197f8749dd319fcd 100644
|
| --- a/gpu/command_buffer/service/mailbox_manager.cc
|
| +++ b/gpu/command_buffer/service/mailbox_manager.cc
|
| @@ -5,7 +5,7 @@
|
| #include "gpu/command_buffer/service/mailbox_manager.h"
|
|
|
| #include "base/command_line.h"
|
| -#include "gpu/command_buffer/service/gpu_switches.h"
|
| +#include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "gpu/command_buffer/service/mailbox_manager_impl.h"
|
| #include "gpu/command_buffer/service/mailbox_manager_sync.h"
|
|
|
| @@ -13,12 +13,11 @@ namespace gpu {
|
| namespace gles2 {
|
|
|
| // static
|
| -scoped_refptr<MailboxManager> MailboxManager::Create() {
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableThreadedTextureMailboxes)) {
|
| - return scoped_refptr<MailboxManager>(new MailboxManagerSync);
|
| - }
|
| - return scoped_refptr<MailboxManager>(new MailboxManagerImpl);
|
| +scoped_refptr<MailboxManager> MailboxManager::Create(
|
| + const GpuPreferences& gpu_preferences) {
|
| + if (gpu_preferences.enable_threaded_texture_mailboxes)
|
| + return scoped_refptr<MailboxManager>(new MailboxManagerSync);
|
| + return scoped_refptr<MailboxManager>(new MailboxManagerImpl);
|
| }
|
|
|
| } // namespage gles2
|
|
|