diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 02:28:32 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 02:28:32 +0000 |
| commit | 66fc6a60850c307d8f61be24b520f0c4d56d7619 (patch) | |
| tree | 908ca702cded44aa8a3e90e85b28606693094868 /content/browser/compositor | |
| parent | 953444293227a5ae7c06a31c05f12f7476c33e43 (diff) | |
| download | chromium_src-66fc6a60850c307d8f61be24b520f0c4d56d7619.zip chromium_src-66fc6a60850c307d8f61be24b520f0c4d56d7619.tar.gz chromium_src-66fc6a60850c307d8f61be24b520f0c4d56d7619.tar.bz2 | |
ozone: Initialize a subsystem only if necessary.
Some of the ozone subsystems don't need to be initialized in the GPU
process (e.g. events). So let the ozone-platform know what process the
platform is being initialized for, and initialize only the subsystems
that make sense for that process.
The changes include:
* Remove SetInstance() from EventFactoryOzone, SurfaceFactoryOzone and
CursorFactoryOzone. Instead, set the instance from the constructor.
* Require the platforms to provide one explicit constructor for the UI
and GPU processes through the OzonePlatform interface.
* Do not initialize any of the sub-systems in InitializeGPU() in all
platforms.
* Move the initialization of ozone-platform into aura::Env::Init.
* Move the creation of udev-monitor in DeviceManagerUdev from the
constructor to ScanDevices(), since it needs the message-loop, and the
message-loop is constructed later.
* Update EventFactoryEvdev to set the ui_task_runner_ from
OnDispatcherListChanged(), since this too is created before the
message-loop.
BUG=361137
R=piman@chromium.org
TBR=spang@chromium.org
Review URL: https://codereview.chromium.org/291473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/compositor')
| -rw-r--r-- | content/browser/compositor/software_output_device_ozone_unittest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc index 9f98767..158e932 100644 --- a/content/browser/compositor/software_output_device_ozone_unittest.cc +++ b/content/browser/compositor/software_output_device_ozone_unittest.cc @@ -102,7 +102,6 @@ void SoftwareOutputDeviceOzoneTest::SetUp() { ui::InitializeContextFactoryForTests(enable_pixel_output_); surface_factory_.reset(new MockSurfaceFactoryOzone()); - gfx::SurfaceFactoryOzone::SetInstance(surface_factory_.get()); const gfx::Size size(500, 400); compositor_.reset(new ui::Compositor( |