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

Side by Side Diff: content/common/cursors/webcursor_aurax11.cc

Issue 538333002: gn/linux: warnings as errors, turn on Wextra (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 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
« no previous file with comments | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/cursors/webcursor_ozone.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/cursors/webcursor.h" 5 #include "content/common/cursors/webcursor.h"
6 6
7 #include <X11/cursorfont.h> 7 #include <X11/cursorfont.h>
8 #include <X11/Xcursor/Xcursor.h> 8 #include <X11/Xcursor/Xcursor.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 12 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
13 #include "ui/base/cursor/cursor.h" 13 #include "ui/base/cursor/cursor.h"
14 #include "ui/base/cursor/cursor_loader_x11.h" 14 #include "ui/base/cursor/cursor_loader_x11.h"
15 #include "ui/base/cursor/cursor_util.h" 15 #include "ui/base/cursor/cursor_util.h"
16 #include "ui/base/x/x11_util.h" 16 #include "ui/base/x/x11_util.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 const ui::PlatformCursor WebCursor::GetPlatformCursor() { 20 ui::PlatformCursor WebCursor::GetPlatformCursor() {
21 if (platform_cursor_) 21 if (platform_cursor_)
22 return platform_cursor_; 22 return platform_cursor_;
23 23
24 if (custom_data_.size() == 0) 24 if (custom_data_.size() == 0)
25 return 0; 25 return 0;
26 26
27 SkBitmap bitmap; 27 SkBitmap bitmap;
28 bitmap.allocN32Pixels(custom_size_.width(), custom_size_.height()); 28 bitmap.allocN32Pixels(custom_size_.width(), custom_size_.height());
29 memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size()); 29 memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size());
30 gfx::Point hotspot = hotspot_; 30 gfx::Point hotspot = hotspot_;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 if (platform_cursor_) 76 if (platform_cursor_)
77 ui::UnrefCustomXCursor(platform_cursor_); 77 ui::UnrefCustomXCursor(platform_cursor_);
78 platform_cursor_ = other.platform_cursor_; 78 platform_cursor_ = other.platform_cursor_;
79 if (platform_cursor_) 79 if (platform_cursor_)
80 ui::RefCustomXCursor(platform_cursor_); 80 ui::RefCustomXCursor(platform_cursor_);
81 81
82 device_scale_factor_ = other.device_scale_factor_; 82 device_scale_factor_ = other.device_scale_factor_;
83 } 83 }
84 84
85 } // namespace content 85 } // namespace content
OLDNEW
« no previous file with comments | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/cursors/webcursor_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698