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

Unified Diff: ui/ozone/platform/drm/host/drm_native_display_delegate.h

Issue 1064453003: [4/4][Ozone-Drm] Keep track of DRM devices in browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@change-page-flip-tracking
Patch Set: Update due to change in ScopedPtrHashMap definition Created 5 years, 8 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
Index: ui/ozone/platform/drm/host/drm_native_display_delegate.h
diff --git a/ui/ozone/platform/drm/host/drm_native_display_delegate.h b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
index f6269bcd96db958affcf3e1f60c46d4befe03014..81193af0f4479ba4a398e7efa0948d8b5a47e348 100644
--- a/ui/ozone/platform/drm/host/drm_native_display_delegate.h
+++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
@@ -7,12 +7,11 @@
#include <map>
#include <queue>
-#include <set>
+#include "base/containers/scoped_ptr_hash_map.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
#include "ui/display/types/native_display_delegate.h"
@@ -24,6 +23,7 @@ namespace ui {
class DeviceManager;
class DisplayManager;
+class DrmDeviceHandle;
class DrmGpuPlatformSupportHost;
struct DisplaySnapshot_Params;
@@ -97,7 +97,8 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate,
// Called as a result of finishing to process the display hotplug event. These
// are responsible for dequing the event and scheduling the next event.
- void OnAddGraphicsDevice(const base::FilePath& path, base::File file);
+ void OnAddGraphicsDevice(const base::FilePath& path,
+ scoped_ptr<DrmDeviceHandle> handle);
void OnUpdateGraphicsDevice();
void OnRemoveGraphicsDevice(const base::FilePath& path);
@@ -141,7 +142,8 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate,
bool task_pending_;
// Keeps track of all the active DRM devices.
- std::set<base::FilePath> drm_devices_;
+ base::ScopedPtrHashMap<base::FilePath, scoped_ptr<DrmDeviceHandle>>
+ drm_devices_;
base::WeakPtrFactory<DrmNativeDisplayDelegate> weak_ptr_factory_;
« no previous file with comments | « ui/ozone/platform/drm/host/drm_device_handle.cc ('k') | ui/ozone/platform/drm/host/drm_native_display_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698