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

Side by Side Diff: webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc

Issue 2781343002: Replace use of system_wrappers/include/logging.h by base/logging.h. (Closed)
Patch Set: Rebased. Created 3 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/x11/x_server_pixel_buffer.h" 11 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 #include <string.h> 14 #include <string.h>
15 #include <sys/shm.h> 15 #include <sys/shm.h>
16 16
17 #include "webrtc/base/logging.h"
17 #include "webrtc/modules/desktop_capture/desktop_frame.h" 18 #include "webrtc/modules/desktop_capture/desktop_frame.h"
18 #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" 19 #include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
19 #include "webrtc/system_wrappers/include/logging.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 namespace { 23 namespace {
24 24
25 // Returns the number of bits |mask| has to be shifted left so its last 25 // Returns the number of bits |mask| has to be shifted left so its last
26 // (most-significant) bit set becomes the most-significant bit of the word. 26 // (most-significant) bit set becomes the most-significant bit of the word.
27 // When |mask| is 0 the function returns 31. 27 // When |mask| is 0 the function returns 31.
28 uint32_t MaskToShift(uint32_t mask) { 28 uint32_t MaskToShift(uint32_t mask) {
29 int shift = 0; 29 int shift = 0;
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 if (IsXImageRGBFormat(image)) { 350 if (IsXImageRGBFormat(image)) {
351 FastBlit(image, data, rect, frame); 351 FastBlit(image, data, rect, frame);
352 } else { 352 } else {
353 SlowBlit(image, data, rect, frame); 353 SlowBlit(image, data, rect, frame);
354 } 354 }
355 355
356 return true; 356 return true;
357 } 357 }
358 358
359 } // namespace webrtc 359 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/x11/shared_x_display.cc ('k') | webrtc/modules/utility/source/process_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698