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

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

Issue 2603863002: Remove base::ScopedPtrHashMap from ozone. (Closed)
Patch Set: fixes Created 3 years, 11 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>
11 11
12 #include <deque> 12 #include <deque>
13 #include <map> 13 #include <map>
14 #include <memory> 14 #include <memory>
15 #include <unordered_map>
15 #include <vector> 16 #include <vector>
16 17
17 #include "base/callback.h" 18 #include "base/callback.h"
18 #include "base/containers/scoped_ptr_hash_map.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/memory/scoped_vector.h" 20 #include "base/memory/scoped_vector.h"
21 #include "ui/gfx/swap_result.h" 21 #include "ui/gfx/swap_result.h"
22 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" 22 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
23 #include "ui/ozone/platform/drm/gpu/overlay_plane.h" 23 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
24 24
25 namespace gfx { 25 namespace gfx {
26 class Point; 26 class Point;
27 } 27 }
28 28
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 return crtc_controllers_; 153 return crtc_controllers_;
154 } 154 }
155 155
156 scoped_refptr<DrmDevice> GetAllocationDrmDevice() const; 156 scoped_refptr<DrmDevice> GetAllocationDrmDevice() const;
157 157
158 private: 158 private:
159 bool ActualSchedulePageFlip(const OverlayPlaneList& plane_list, 159 bool ActualSchedulePageFlip(const OverlayPlaneList& plane_list,
160 bool test_only, 160 bool test_only,
161 const PageFlipCallback& callback); 161 const PageFlipCallback& callback);
162 162
163 base::ScopedPtrHashMap<DrmDevice*, std::unique_ptr<HardwareDisplayPlaneList>> 163 std::unordered_map<DrmDevice*, std::unique_ptr<HardwareDisplayPlaneList>>
164 owned_hardware_planes_; 164 owned_hardware_planes_;
165 165
166 // Stores the CRTC configuration. This is used to identify monitors and 166 // Stores the CRTC configuration. This is used to identify monitors and
167 // configure them. 167 // configure them.
168 std::vector<std::unique_ptr<CrtcController>> crtc_controllers_; 168 std::vector<std::unique_ptr<CrtcController>> crtc_controllers_;
169 169
170 // Location of the controller on the screen. 170 // Location of the controller on the screen.
171 gfx::Point origin_; 171 gfx::Point origin_;
172 172
173 bool is_disabled_; 173 bool is_disabled_;
174 174
175 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController); 175 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
176 }; 176 };
177 177
178 } // namespace ui 178 } // namespace ui
179 179
180 #endif // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_ 180 #endif // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698