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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 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
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_thread_proxy.cc ('k') | ui/ozone/platform/drm/gpu/drm_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_DRM_WINDOW_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_ 6 #define UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 DrmDeviceManager* device_manager_; // Not owned. 112 DrmDeviceManager* device_manager_; // Not owned.
113 ScreenManager* screen_manager_; // Not owned. 113 ScreenManager* screen_manager_; // Not owned.
114 114
115 // The current bounds of the window. 115 // The current bounds of the window.
116 gfx::Rect bounds_; 116 gfx::Rect bounds_;
117 117
118 // The controller associated with the current window. This may be nullptr if 118 // The controller associated with the current window. This may be nullptr if
119 // the window isn't over an active display. 119 // the window isn't over an active display.
120 HardwareDisplayController* controller_ = nullptr; 120 HardwareDisplayController* controller_ = nullptr;
121 scoped_ptr<DrmOverlayValidator> overlay_validator_; 121 std::unique_ptr<DrmOverlayValidator> overlay_validator_;
122 122
123 base::RepeatingTimer cursor_timer_; 123 base::RepeatingTimer cursor_timer_;
124 124
125 scoped_refptr<DrmBuffer> cursor_buffers_[2]; 125 scoped_refptr<DrmBuffer> cursor_buffers_[2];
126 int cursor_frontbuffer_ = 0; 126 int cursor_frontbuffer_ = 0;
127 127
128 std::vector<SkBitmap> cursor_bitmaps_; 128 std::vector<SkBitmap> cursor_bitmaps_;
129 gfx::Point cursor_location_; 129 gfx::Point cursor_location_;
130 int cursor_frame_ = 0; 130 int cursor_frame_ = 0;
131 int cursor_frame_delay_ms_ = 0; 131 int cursor_frame_delay_ms_ = 0;
132 132
133 OverlayPlaneList last_submitted_planes_; 133 OverlayPlaneList last_submitted_planes_;
134 134
135 bool force_buffer_reallocation_ = false; 135 bool force_buffer_reallocation_ = false;
136 136
137 DISALLOW_COPY_AND_ASSIGN(DrmWindow); 137 DISALLOW_COPY_AND_ASSIGN(DrmWindow);
138 }; 138 };
139 139
140 } // namespace ui 140 } // namespace ui
141 141
142 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_ 142 #endif // UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_thread_proxy.cc ('k') | ui/ozone/platform/drm/gpu/drm_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698