ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h - Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove HDCI stuff Created 5 years, 1 month 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/hardware_display_controller_unittest.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

index 40141f7d46ef45df4698b88ca7209beb3dcef900..6f4c8fd79750698b34d23fa12f872ca11bb4c2a1 100644

--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

@@ -92,7 +92,9 @@ class OZONE_EXPORT HardwareDisplayPlaneManager {

virtual bool Commit(HardwareDisplayPlaneList* plane_list,

bool test_only) = 0;

- const ScopedVector<HardwareDisplayPlane>& planes() { return planes_; }

+ const std::vector<scoped_ptr<HardwareDisplayPlane>>& planes() {

+ return planes_;

+ }

std::vector<uint32_t> GetCompatibleHardwarePlaneIds(const OverlayPlane& plane,

uint32_t crtc_id) const;

@@ -129,7 +131,7 @@ class OZONE_EXPORT HardwareDisplayPlaneManager {

// calls to control it. Not owned.

DrmDevice* drm_;

- ScopedVector<HardwareDisplayPlane> planes_;

+ std::vector<scoped_ptr<HardwareDisplayPlane>> planes_;

std::vector<uint32_t> crtcs_;

DISALLOW_COPY_AND_ASSIGN(HardwareDisplayPlaneManager);