diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-12-03 07:49:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-03 15:50:18 +0000 |
| commit | c4c9cc88986c37bebe988fecf3b64a53b7070874 (patch) | |
| tree | 7b0a9bc70cb8802ca44896fecfdafcb8044d873b /ash/test/ash_test_helper.cc | |
| parent | bd4e73d47bd0914f6bb43432efa76e90750de962 (diff) | |
| download | chromium_src-c4c9cc88986c37bebe988fecf3b64a53b7070874.zip chromium_src-c4c9cc88986c37bebe988fecf3b64a53b7070874.tar.gz chromium_src-c4c9cc88986c37bebe988fecf3b64a53b7070874.tar.bz2 | |
Revert of ui: compositor: setup in-process gpu ipc forwarding on ozone (patchset #3 id:40001 of https://codereview.chromium.org/767273002/)
Reason for revert:
This CL causes DragDropTest.DragDropAcrossMultiDisplay to crash on Ozone
See http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Tests%20%281%29/builds/6907/steps/interactive_ui_tests/logs/DragDropAcrossMultiDisplay
Original issue's description:
> ui: compositor: setup in-process gpu ipc forwarding on ozone
>
> BUG=437864
> TEST=run ash_unittests on ozone/freon image
>
> Committed: https://crrev.com/a12855418a74cf01d26d281231079a6ec5da710d
> Cr-Commit-Position: refs/heads/master@{#306590}
TBR=spang@chromium.org,oshima@chromium.org,lionel.g.landwerlin@intel.com
NOTREECHECKS=true
NOTRY=true
BUG=437864
Review URL: https://codereview.chromium.org/775073003
Cr-Commit-Position: refs/heads/master@{#306611}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 97abff0..86a50d5 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -40,11 +40,6 @@ #include "ui/aura/window_tree_host_x11.h" #endif -#if defined(USE_OZONE) -#include "ui/ozone/public/ozone_platform.h" -#include "ui/ozone/public/ui_thread_gpu.h" -#endif - namespace ash { namespace test { @@ -56,12 +51,6 @@ AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop) CHECK(message_loop_); #if defined(USE_X11) aura::test::SetUseOverrideRedirectWindowByDefault(true); -#elif defined(USE_OZONE) - // On Ozone we need to setup the in process gpu-process components - // dealing with the display. - ui::OzonePlatform::InitializeForUI(); - ui_thread_.reset(new ui::UiThreadGpu); - ui_thread_->Initialize(); #endif aura::test::InitializeAuraEventGeneratorDelegate(); } |