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 /ui/snapshot | |
| 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 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index eee20b3..f8a2a94 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -13,6 +13,7 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/compositor/test/draw_waiter_for_test.h" @@ -89,11 +90,12 @@ class SnapshotAuraTest : public testing::Test { // The ContextFactory must exist before any Compositors are created. // Snapshot test tests real drawing and readback, so needs pixel output. bool enable_pixel_output = true; - ui::InitializeContextFactoryForTests(enable_pixel_output); + ui::ContextFactory* context_factory = + ui::InitializeContextFactoryForTests(enable_pixel_output); helper_.reset( new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); - helper_->SetUp(); + helper_->SetUp(context_factory); new ::wm::DefaultActivationClient(helper_->root_window()); } |