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

Unified Diff: ui/ozone/platform/drm/gpu/screen_manager.cc

Issue 1528373002: Replace Pass() with std::move in ui/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: ui/ozone/platform/drm/gpu/screen_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc
index 52959847af076e46e0e00e51e1caa6542b419935..6a221bd20e3cb0cde2480ba6aef95772dc914272 100644
--- a/ui/ozone/platform/drm/gpu/screen_manager.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -216,7 +216,7 @@ HardwareDisplayController* ScreenManager::GetDisplayController(
void ScreenManager::AddWindow(gfx::AcceleratedWidget widget,
scoped_ptr<DrmWindow> window) {
std::pair<WidgetToWindowMap::iterator, bool> result =
- window_map_.add(widget, window.Pass());
+ window_map_.add(widget, std::move(window));
DCHECK(result.second) << "Window already added.";
UpdateControllerToWindowMapping();
}
@@ -226,7 +226,7 @@ scoped_ptr<DrmWindow> ScreenManager::RemoveWindow(
scoped_ptr<DrmWindow> window = window_map_.take_and_erase(widget);
DCHECK(window) << "Attempting to remove non-existing window for " << widget;
UpdateControllerToWindowMapping();
- return window.Pass();
+ return window;
}
DrmWindow* ScreenManager::GetWindow(gfx::AcceleratedWidget widget) {

Powered by Google App Engine
This is Rietveld 408576698