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

Unified Diff: ui/ozone/platform/dri/ozone_platform_gbm.cc

Issue 356083002: [Ozone] Add Ozone EGL demo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 | « ui/ozone/platform/dri/gbm_surface_factory.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/dri/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 9892c96f80b237719a0b152298ef625a0a07eee8..1ffd179820fd6340ec52574a7985e77189949255 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -104,7 +104,7 @@ class OzonePlatformGbm : public OzonePlatform {
vt_manager_.reset(new VirtualTerminalManager());
// Needed since the browser process creates the accelerated widgets and that
// happens through SFO.
- surface_factory_ozone_.reset(new GbmSurfaceFactory(NULL, NULL, NULL));
+ surface_factory_ozone_.reset(new GbmSurfaceFactory());
device_manager_ = CreateDeviceManager();
gpu_platform_support_host_.reset(new GpuPlatformSupportHostGbm());
@@ -119,10 +119,12 @@ class OzonePlatformGbm : public OzonePlatform {
surface_generator_.reset(new GbmSurfaceGenerator(dri_.get()));
screen_manager_.reset(new ScreenManager(dri_.get(),
surface_generator_.get()));
- surface_factory_ozone_.reset(
- new GbmSurfaceFactory(dri_.get(),
- surface_generator_->device(),
- screen_manager_.get()));
+ if (!surface_factory_ozone_)
+ surface_factory_ozone_.reset(new GbmSurfaceFactory());
+
+ surface_factory_ozone_->InitializeGpu(dri_.get(),
+ surface_generator_->device(),
+ screen_manager_.get());
gpu_platform_support_.reset(
new GpuPlatformSupportGbm(surface_factory_ozone_.get()));
« no previous file with comments | « ui/ozone/platform/dri/gbm_surface_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698