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

Unified Diff: ui/ozone/platform/drm/ozone_platform_drm.cc

Issue 1141243002: [Ozone-Drm] Remove GPU lock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/drm/gpu/gpu_lock.cc ('k') | ui/ozone/platform/drm/ozone_platform_gbm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/ozone_platform_drm.cc
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 6cc4fed92ff364bed75533ff72a0c1a99360aae9..fb22bdcbbd466613b26409e2db346acac6611814 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -20,7 +20,6 @@
#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
#include "ui/ozone/platform/drm/gpu/drm_window.h"
-#include "ui/ozone/platform/drm/gpu/gpu_lock.h"
#include "ui/ozone/platform/drm/gpu/screen_manager.h"
#include "ui/ozone/platform/drm/host/drm_cursor.h"
#include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
@@ -88,9 +87,6 @@ class OzonePlatformDrm : public OzonePlatform {
new DrmNativeDisplayDelegate(display_manager_.get()));
}
void InitializeUI() override {
-#if defined(OS_CHROMEOS)
- gpu_lock_.reset(new GpuLock());
-#endif
drm_device_manager_.reset(new DrmDeviceManager(
scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
window_manager_.reset(new DrmWindowHostManager());
@@ -125,7 +121,6 @@ class OzonePlatformDrm : public OzonePlatform {
private:
// Objects in the "GPU" process.
- scoped_ptr<GpuLock> gpu_lock_;
scoped_ptr<DrmDeviceManager> drm_device_manager_;
scoped_ptr<DrmBufferGenerator> buffer_generator_;
scoped_ptr<ScreenManager> screen_manager_;
« no previous file with comments | « ui/ozone/platform/drm/gpu/gpu_lock.cc ('k') | ui/ozone/platform/drm/ozone_platform_gbm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698