| Index: android_webview/lib/main/aw_main_delegate.cc
|
| diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
|
| index 7bf9e7f117fa30cb99da0c70f7dc364d223f7bf3..55a96a613199f5976d3871e62cdeba2cb28e82b3 100644
|
| --- a/android_webview/lib/main/aw_main_delegate.cc
|
| +++ b/android_webview/lib/main/aw_main_delegate.cc
|
| @@ -26,6 +26,7 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "gpu/command_buffer/client/gl_in_process_context.h"
|
| #include "gpu/command_buffer/service/in_process_command_buffer.h"
|
| +#include "gpu/command_buffer/service/mailbox_synchronizer.h"
|
| #include "media/base/media_switches.h"
|
| #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
|
|
|
| @@ -67,9 +68,7 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
|
| cl->AppendSwitch(switches::kDisableExperimentalWebGL);
|
| cl->AppendSwitch(switches::kDisableSharedWorkers);
|
|
|
| - // Ganesh backed 2D-Canvas integration is being implemented but not ready to
|
| - // be turned on by default yet.
|
| - if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas))
|
| + if (!gpu::gles2::MailboxSynchronizer::Initialize())
|
| cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
|
|
|
| // File system API not supported (requires some new API; internal bug 6930981)
|
|
|