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

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_x11.cc

Issue 2642053003: Allow GCC 4.9 to compile Chromium (Closed)
Patch Set: Created 3 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
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer( 405 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
406 const DesktopCaptureOptions& options) { 406 const DesktopCaptureOptions& options) {
407 if (!options.x_display()) 407 if (!options.x_display())
408 return nullptr; 408 return nullptr;
409 409
410 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); 410 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux());
411 if (!capturer.get()->Init(options)) { 411 if (!capturer.get()->Init(options)) {
412 return nullptr; 412 return nullptr;
413 } 413 }
414 414
415 return capturer; 415 return std::move(capturer);
416 } 416 }
417 417
418 } // namespace webrtc 418 } // namespace webrtc
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698