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

Side by Side Diff: ui/ozone/platform/drm/gpu/screen_manager.h

Issue 1072383003: ozone: drm: Fix HardwareDisplayController use-after-free (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
6 #define UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_ 6 #define UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // those in |mirror|. |original| is an iterator to the HDC where the 110 // those in |mirror|. |original| is an iterator to the HDC where the
111 // controller is currently present. 111 // controller is currently present.
112 bool HandleMirrorMode(HardwareDisplayControllers::iterator original, 112 bool HandleMirrorMode(HardwareDisplayControllers::iterator original,
113 HardwareDisplayControllers::iterator mirror, 113 HardwareDisplayControllers::iterator mirror,
114 const scoped_refptr<DrmDevice>& drm, 114 const scoped_refptr<DrmDevice>& drm,
115 uint32_t crtc, 115 uint32_t crtc,
116 uint32_t connector); 116 uint32_t connector);
117 117
118 DrmWindow* FindWindowAt(const gfx::Rect& bounds) const; 118 DrmWindow* FindWindowAt(const gfx::Rect& bounds) const;
119 119
120 void RemoveController(HardwareDisplayControllers::iterator controller);
121
120 ScanoutBufferGenerator* buffer_generator_; // Not owned. 122 ScanoutBufferGenerator* buffer_generator_; // Not owned.
121 // List of display controllers (active and disabled). 123 // List of display controllers (active and disabled).
122 HardwareDisplayControllers controllers_; 124 HardwareDisplayControllers controllers_;
123 125
124 WidgetToWindowMap window_map_; 126 WidgetToWindowMap window_map_;
125 127
126 DISALLOW_COPY_AND_ASSIGN(ScreenManager); 128 DISALLOW_COPY_AND_ASSIGN(ScreenManager);
127 }; 129 };
128 130
129 } // namespace ui 131 } // namespace ui
130 132
131 #endif // UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_ 133 #endif // UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ui/ozone/platform/drm/gpu/screen_manager.cc » ('j') | ui/ozone/platform/drm/gpu/screen_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698