diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 07:17:01 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 07:17:01 +0000 |
| commit | 99e1e1e28de1d78e145352558892f2a12413896d (patch) | |
| tree | 244a6a21b78f487531fead1c9a0e8d0e50069f84 /ui/aura/bench | |
| parent | a38edc462009e1591e4629b1e17c45d65d324ac5 (diff) | |
| download | chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.zip chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.tar.gz chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.tar.bz2 | |
Revert 202787 "Remove unnecessary ui::CompositorTestSupport"
Suspected to break Linux ChromeOS build
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/19953/steps/compile/logs/stdio
obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::CompositorTestSuite(int, char**)'
obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::~CompositorTestSuite()'
> Remove unnecessary ui::CompositorTestSupport
>
> The ui::CompositorTestSupport class existed to initialize WebKit since
> ui::Compositor depends on cc which used to depend on WebKit being initialized
> to function properly. cc no longer has this requirement, so this class is
> unnecessary.
>
> R=piman, sky
>
> Review URL: https://chromiumcodereview.appspot.com/14744016
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/15838015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 4f0afe1..e397929 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -25,6 +25,7 @@ #include "ui/compositor/compositor_observer.h" #include "ui/compositor/debug_utils.h" #include "ui/compositor/layer.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/gfx/skia_util.h" @@ -301,6 +302,7 @@ int main(int argc, char** argv) { ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); + ui::CompositorTestSupport::Initialize(); aura::Env::GetInstance(); scoped_ptr<aura::TestScreen> test_screen( aura::TestScreen::CreateFullscreen()); @@ -359,5 +361,7 @@ int main(int argc, char** argv) { focus_client.reset(); root_window.reset(); + ui::CompositorTestSupport::Terminate(); + return 0; } |