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

Side by Side Diff: webrtc/modules/desktop_capture/win/cursor.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/win/cursor.h" 11 #include "webrtc/modules/desktop_capture/win/cursor.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" 17 #include "webrtc/modules/desktop_capture/win/scoped_gdi_object.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/desktop_geometry.h" 19 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
19 #include "webrtc/modules/desktop_capture/mouse_cursor.h" 20 #include "webrtc/modules/desktop_capture/mouse_cursor.h"
20 #include "webrtc/system_wrappers/include/logging.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 namespace { 25 namespace {
26 26
27 #if defined(WEBRTC_ARCH_LITTLE_ENDIAN) 27 #if defined(WEBRTC_ARCH_LITTLE_ENDIAN)
28 28
29 #define RGBA(r, g, b, a) \ 29 #define RGBA(r, g, b, a) \
30 ((((a) << 24) & 0xff000000) | \ 30 ((((a) << 24) & 0xff000000) | \
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 // Pre-multiply the resulting pixels since MouseCursor uses premultiplied 240 // Pre-multiply the resulting pixels since MouseCursor uses premultiplied
241 // images. 241 // images.
242 AlphaMul(reinterpret_cast<uint32_t*>(image->data()), width, height); 242 AlphaMul(reinterpret_cast<uint32_t*>(image->data()), width, height);
243 243
244 return new MouseCursor( 244 return new MouseCursor(
245 image.release(), DesktopVector(hotspot_x, hotspot_y)); 245 image.release(), DesktopVector(hotspot_x, hotspot_y));
246 } 246 }
247 247
248 } // namespace webrtc 248 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_drawer_unittest.cc ('k') | webrtc/modules/desktop_capture/win/d3d_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698