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

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

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 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
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // Queue of the frames buffers. 114 // Queue of the frames buffers.
115 ScreenCaptureFrameQueue queue_; 115 ScreenCaptureFrameQueue queue_;
116 116
117 // Invalid region from the previous capture. This is used to synchronize the 117 // Invalid region from the previous capture. This is used to synchronize the
118 // current with the last buffer used. 118 // current with the last buffer used.
119 DesktopRegion last_invalid_region_; 119 DesktopRegion last_invalid_region_;
120 120
121 // |Differ| for use when polling for changes. 121 // |Differ| for use when polling for changes.
122 rtc::scoped_ptr<Differ> differ_; 122 rtc::scoped_ptr<Differ> differ_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(ScreenCapturerLinux); 124 RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerLinux);
125 }; 125 };
126 126
127 ScreenCapturerLinux::ScreenCapturerLinux() 127 ScreenCapturerLinux::ScreenCapturerLinux()
128 : callback_(NULL), 128 : callback_(NULL),
129 gc_(NULL), 129 gc_(NULL),
130 root_window_(BadValue), 130 root_window_(BadValue),
131 has_xfixes_(false), 131 has_xfixes_(false),
132 xfixes_event_base_(-1), 132 xfixes_event_base_(-1),
133 xfixes_error_base_(-1), 133 xfixes_error_base_(-1),
134 use_damage_(false), 134 use_damage_(false),
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 if (!options.x_display()) 442 if (!options.x_display())
443 return NULL; 443 return NULL;
444 444
445 rtc::scoped_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); 445 rtc::scoped_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux());
446 if (!capturer->Init(options)) 446 if (!capturer->Init(options))
447 capturer.reset(); 447 capturer.reset();
448 return capturer.release(); 448 return capturer.release();
449 } 449 }
450 450
451 } // namespace webrtc 451 } // 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