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

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

Issue 1917043005: #include "webrtc/base/constructormagic.h" where appropriate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
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
11 #include "webrtc/modules/desktop_capture/screen_capturer.h" 11 #include "webrtc/modules/desktop_capture/screen_capturer.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <memory> 15 #include <memory>
16 #include <set> 16 #include <set>
17 17
18 #include <X11/extensions/Xdamage.h> 18 #include <X11/extensions/Xdamage.h>
19 #include <X11/extensions/Xfixes.h> 19 #include <X11/extensions/Xfixes.h>
20 #include <X11/Xlib.h> 20 #include <X11/Xlib.h>
21 #include <X11/Xutil.h> 21 #include <X11/Xutil.h>
22 22
23 #include "webrtc/base/checks.h" 23 #include "webrtc/base/checks.h"
24 #include "webrtc/base/constructormagic.h"
24 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" 25 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
25 #include "webrtc/modules/desktop_capture/desktop_frame.h" 26 #include "webrtc/modules/desktop_capture/desktop_frame.h"
26 #include "webrtc/modules/desktop_capture/differ.h" 27 #include "webrtc/modules/desktop_capture/differ.h"
27 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" 28 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
28 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" 29 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
29 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" 30 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
30 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" 31 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
31 #include "webrtc/system_wrappers/include/logging.h" 32 #include "webrtc/system_wrappers/include/logging.h"
32 #include "webrtc/system_wrappers/include/tick_util.h" 33 #include "webrtc/system_wrappers/include/tick_util.h"
33 34
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 if (!options.x_display()) 439 if (!options.x_display())
439 return NULL; 440 return NULL;
440 441
441 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); 442 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux());
442 if (!capturer->Init(options)) 443 if (!capturer->Init(options))
443 capturer.reset(); 444 capturer.reset();
444 return capturer.release(); 445 return capturer.release();
445 } 446 }
446 447
447 } // namespace webrtc 448 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_unittest.cc ('k') | webrtc/modules/desktop_capture/shared_desktop_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698