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

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

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build after rebase 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_HARDWARE_DISPLAY_CONTROLLER_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
6 #define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_ 6 #define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <xf86drmMode.h> 10 #include <xf86drmMode.h>
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // Buffers need to be declared first so that they are destroyed last. Needed 177 // Buffers need to be declared first so that they are destroyed last. Needed
178 // since the controllers may reference the buffers. 178 // since the controllers may reference the buffers.
179 OverlayPlaneList current_planes_; 179 OverlayPlaneList current_planes_;
180 // Planes currently being queued without having SchedulePageFlip() called. 180 // Planes currently being queued without having SchedulePageFlip() called.
181 OverlayPlaneList pending_planes_; 181 OverlayPlaneList pending_planes_;
182 // Plane lists for which SchedulePageFlip() was called. They are waiting for 182 // Plane lists for which SchedulePageFlip() was called. They are waiting for
183 // previous page flip events to be completed before they can be serviced. 183 // previous page flip events to be completed before they can be serviced.
184 std::deque<PageFlipRequest> requests_; 184 std::deque<PageFlipRequest> requests_;
185 scoped_refptr<ScanoutBuffer> cursor_buffer_; 185 scoped_refptr<ScanoutBuffer> cursor_buffer_;
186 186
187 base::ScopedPtrHashMap<DrmDevice*, HardwareDisplayPlaneList> 187 base::ScopedPtrHashMap<DrmDevice*, scoped_ptr<HardwareDisplayPlaneList>>
188 owned_hardware_planes_; 188 owned_hardware_planes_;
189 189
190 // Stores the CRTC configuration. This is used to identify monitors and 190 // Stores the CRTC configuration. This is used to identify monitors and
191 // configure them. 191 // configure them.
192 ScopedVector<CrtcController> crtc_controllers_; 192 ScopedVector<CrtcController> crtc_controllers_;
193 193
194 // Location of the controller on the screen. 194 // Location of the controller on the screen.
195 gfx::Point origin_; 195 gfx::Point origin_;
196 196
197 // The mode used by the last modesetting operation. 197 // The mode used by the last modesetting operation.
198 drmModeModeInfo mode_; 198 drmModeModeInfo mode_;
199 199
200 bool is_disabled_; 200 bool is_disabled_;
201 201
202 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController); 202 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
203 }; 203 };
204 204
205 } // namespace ui 205 } // namespace ui
206 206
207 #endif // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_ 207 #endif // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698