diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 02:49:39 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 02:49:39 +0000 |
| commit | 14dc9d7104c0cc299c096ab1f8d8552ae422e73a (patch) | |
| tree | cc0f0d42b39496a7a69b0bb80b27efd80e1ce170 | |
| parent | 69271766b8f53ed0778378e9e3a7aa340dddabb2 (diff) | |
| download | chromium_src-14dc9d7104c0cc299c096ab1f8d8552ae422e73a.zip chromium_src-14dc9d7104c0cc299c096ab1f8d8552ae422e73a.tar.gz chromium_src-14dc9d7104c0cc299c096ab1f8d8552ae422e73a.tar.bz2 | |
Android: Enable --composite-to-mailbox
BUG=181640
Review URL: https://chromiumcodereview.appspot.com/12734002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187465 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_browser_main_android.cc | 4 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_browser_main_parts.cc | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index 1c8459d..d6651b5 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "cc/switches.h" #include "chrome/app/breakpad_linux.h" #include "chrome/browser/android/crash_dump_manager.h" #include "chrome/common/chrome_switches.h" @@ -61,6 +62,9 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); MessageLoopForUI::current()->Start(); + CommandLine::ForCurrentProcess()->AppendSwitch( + cc::switches::kCompositeToMailbox); + ChromeBrowserMainParts::PreEarlyInitialization(); } diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 071a444..c938477 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -502,6 +502,8 @@ void RenderWidgetHostViewAndroid::OnSwapCompositorFrame( void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped( const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, int gpu_host_id) { + NOTREACHED() << "Deprecated. Use --composite-to-mailbox."; + if (params.mailbox_name.empty()) return; diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index fee6852..664206c 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -11,6 +11,7 @@ #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "cc/switches.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" @@ -99,6 +100,9 @@ void ShellBrowserMainParts::PreEarlyInitialization() { #if defined(OS_ANDROID) net::NetworkChangeNotifier::SetFactory( new net::NetworkChangeNotifierFactoryAndroid()); + + CommandLine::ForCurrentProcess()->AppendSwitch( + cc::switches::kCompositeToMailbox); #endif } |