diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 21:47:58 +0000 |
| commit | fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9 (patch) | |
| tree | 1d9c539da5aab9ef57883d5f871d91bffdbd9f6b /content/browser/browser_main_loop.cc | |
| parent | 15b4290d997471abce904d693291808e8205ddd3 (diff) | |
| download | chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.zip chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.gz chromium_src-fa69f2b688dd5fcefe3484aaa9b7d99175bc1bb9.tar.bz2 | |
Makes Env contain a ContextFactory
This way when creating the Compositor we can supply the ContextFactory
from the thread local Env to it. This is part of making aura thread
safe.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/296053009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 6f2a7e4..8799798 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -67,6 +67,7 @@ #endif #if defined(USE_AURA) +#include "content/public/browser/context_factory.h" #include "ui/aura/env.h" #endif @@ -942,6 +943,12 @@ int BrowserMainLoop::BrowserThreadsStarted() { } BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); ImageTransportFactory::Initialize(); +#if defined(USE_AURA) + if (aura::Env::GetInstance()) { + aura::Env::GetInstance()->set_context_factory( + content::GetContextFactory()); + } +#endif } #elif defined(OS_ANDROID) established_gpu_channel = true; |