diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 17:21:40 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 17:21:40 +0000 |
| commit | 8755298521e5dc36c5a7f015b4e2161e679a6e59 (patch) | |
| tree | 706c138bd176531a4a7a4a486ce1d12213abceaf /content/browser/browser_main_runner.cc | |
| parent | a464db4991c68aa22a39ea96b16660c7b8ee724a (diff) | |
| download | chromium_src-8755298521e5dc36c5a7f015b4e2161e679a6e59.zip chromium_src-8755298521e5dc36c5a7f015b4e2161e679a6e59.tar.gz chromium_src-8755298521e5dc36c5a7f015b4e2161e679a6e59.tar.bz2 | |
Revert 165430 - fix win_aura not getting swap_ack (Suspect this revision introduced renderer hangs with threaded compositor on non-Aura Windows builds.)
(hangs win aura rendering on startup)
Regressed at https://chromiumcodereview.appspot.com/11341033/
R=vangelis@chromium.org, jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11363018
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/11359041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
| -rw-r--r-- | content/browser/browser_main_runner.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index beabb02..a58e566 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -14,7 +14,6 @@ #include "content/browser/browser_main_loop.h" #include "content/browser/notification_service_impl.h" #include "content/common/child_process.h" -#include "content/public/browser/compositor_util.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" @@ -102,10 +101,6 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { switches::kMediaPlayerInRenderProcess))); #endif - if (IsThreadedCompositingEnabled()) - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableThreadedCompositing); - main_loop_->CreateThreads(); int result_code = main_loop_->GetResultCode(); if (result_code > 0) |