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

Side by Side Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 1553493002: Global conversion of Pass()→std::move() on OS=linux chromecast=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix fragile include order Created 4 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 #include "content/browser/compositor/gpu_process_transport_factory.h" 5 #include "content/browser/compositor/gpu_process_transport_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #if defined(USE_OZONE) 169 #if defined(USE_OZONE)
170 scoped_ptr<ui::OverlayCandidatesOzone> overlay_candidates = 170 scoped_ptr<ui::OverlayCandidatesOzone> overlay_candidates =
171 ui::OzonePlatform::GetInstance() 171 ui::OzonePlatform::GetInstance()
172 ->GetOverlayManager() 172 ->GetOverlayManager()
173 ->CreateOverlayCandidates(widget); 173 ->CreateOverlayCandidates(widget);
174 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 174 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
175 if (overlay_candidates && 175 if (overlay_candidates &&
176 (command_line->HasSwitch(switches::kEnableHardwareOverlays) || 176 (command_line->HasSwitch(switches::kEnableHardwareOverlays) ||
177 command_line->HasSwitch(switches::kOzoneTestSingleOverlaySupport))) { 177 command_line->HasSwitch(switches::kOzoneTestSingleOverlaySupport))) {
178 validator.reset(new BrowserCompositorOverlayCandidateValidatorOzone( 178 validator.reset(new BrowserCompositorOverlayCandidateValidatorOzone(
179 widget, overlay_candidates.Pass())); 179 widget, std::move(overlay_candidates)));
180 } 180 }
181 #elif defined(OS_MACOSX) 181 #elif defined(OS_MACOSX)
182 // Overlays are only supported through the remote layer API. 182 // Overlays are only supported through the remote layer API.
183 if (ui::RemoteLayerAPISupported()) { 183 if (ui::RemoteLayerAPISupported()) {
184 validator.reset(new BrowserCompositorOverlayCandidateValidatorMac(widget)); 184 validator.reset(new BrowserCompositorOverlayCandidateValidatorMac(widget));
185 } 185 }
186 #elif defined(OS_ANDROID) 186 #elif defined(OS_ANDROID)
187 validator.reset(new BrowserCompositorOverlayCandidateValidatorAndroid()); 187 validator.reset(new BrowserCompositorOverlayCandidateValidatorAndroid());
188 #endif 188 #endif
189 189
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, 659 FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
660 observer_list_, 660 observer_list_,
661 OnLostResources()); 661 OnLostResources());
662 662
663 // Kill things that use the shared context before killing the shared context. 663 // Kill things that use the shared context before killing the shared context.
664 lost_gl_helper.reset(); 664 lost_gl_helper.reset();
665 lost_shared_main_thread_contexts = NULL; 665 lost_shared_main_thread_contexts = NULL;
666 } 666 }
667 667
668 } // namespace content 668 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698