| Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc
|
| diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
|
| index dc34d737e57c6e1f90f8c3139689870ef2d49389..ee424592fc8a3f28510e6a5cdafb0609f628955a 100644
|
| --- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
|
| +++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
|
| @@ -282,7 +282,9 @@ class OzonePlatformEgltest : public OzonePlatform {
|
|
|
| virtual void InitializeUI() OVERRIDE {
|
| device_manager_ = CreateDeviceManager();
|
| - surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_));
|
| + if (!surface_factory_ozone_)
|
| + surface_factory_ozone_.reset(
|
| + new SurfaceFactoryEgltest(&eglplatform_shim_));
|
| event_factory_ozone_.reset(
|
| new EventFactoryEvdev(NULL, device_manager_.get()));
|
| cursor_factory_ozone_.reset(new CursorFactoryOzone());
|
| @@ -290,7 +292,9 @@ class OzonePlatformEgltest : public OzonePlatform {
|
| }
|
|
|
| virtual void InitializeGPU() OVERRIDE {
|
| - surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_));
|
| + if (!surface_factory_ozone_)
|
| + surface_factory_ozone_.reset(
|
| + new SurfaceFactoryEgltest(&eglplatform_shim_));
|
| gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
|
| }
|
|
|
|
|