Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 390493003: ozone: Port NativeViewportOzone on top of PlatformWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/native_viewport/native_viewport_ozone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
« no previous file with comments | « mojo/services/native_viewport/native_viewport_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698