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

Side by Side Diff: ui/ozone/platform/drm/gpu/drm_display.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: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_DRM_DISPLAY_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_H_
6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_H_ 6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 16 matching lines...) Expand all
27 DrmDisplay(ScreenManager* screen_manager, 27 DrmDisplay(ScreenManager* screen_manager,
28 const scoped_refptr<DrmDevice>& drm); 28 const scoped_refptr<DrmDevice>& drm);
29 ~DrmDisplay(); 29 ~DrmDisplay();
30 30
31 int64_t display_id() const { return display_id_; } 31 int64_t display_id() const { return display_id_; }
32 scoped_refptr<DrmDevice> drm() const { return drm_; } 32 scoped_refptr<DrmDevice> drm() const { return drm_; }
33 uint32_t crtc() const { return crtc_; } 33 uint32_t crtc() const { return crtc_; }
34 uint32_t connector() const { return connector_; } 34 uint32_t connector() const { return connector_; }
35 const std::vector<drmModeModeInfo>& modes() const { return modes_; } 35 const std::vector<drmModeModeInfo>& modes() const { return modes_; }
36 36
37 DisplaySnapshot_Params Update(HardwareDisplayControllerInfo* info, 37 DisplaySnapshot_Params Update(const HardwareDisplayControllerInfo& info,
38 size_t device_index); 38 size_t device_index);
39 39
40 bool Configure(const drmModeModeInfo* mode, const gfx::Point& origin); 40 bool Configure(const drmModeModeInfo* mode, const gfx::Point& origin);
41 bool GetHDCPState(HDCPState* state); 41 bool GetHDCPState(HDCPState* state);
42 bool SetHDCPState(HDCPState state); 42 bool SetHDCPState(HDCPState state);
43 void SetGammaRamp(const std::vector<GammaRampRGBEntry>& lut); 43 void SetGammaRamp(const std::vector<GammaRampRGBEntry>& lut);
44 44
45 private: 45 private:
46 ScreenManager* screen_manager_; // Not owned. 46 ScreenManager* screen_manager_; // Not owned.
47 47
48 int64_t display_id_ = -1; 48 int64_t display_id_ = -1;
49 scoped_refptr<DrmDevice> drm_; 49 scoped_refptr<DrmDevice> drm_;
50 uint32_t crtc_ = 0; 50 uint32_t crtc_ = 0;
51 uint32_t connector_ = 0; 51 uint32_t connector_ = 0;
52 std::vector<drmModeModeInfo> modes_; 52 std::vector<drmModeModeInfo> modes_;
53 gfx::Point origin_; 53 gfx::Point origin_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(DrmDisplay); 55 DISALLOW_COPY_AND_ASSIGN(DrmDisplay);
56 }; 56 };
57 57
58 } // namespace ui 58 } // namespace ui
59 59
60 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_H_ 60 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698