OLD | NEW |
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" | |
16 #include "ui/base/x/x11_util.h" | 15 #include "ui/base/x/x11_util.h" |
17 | 16 |
18 namespace content { | 17 namespace content { |
19 | 18 |
20 ui::PlatformCursor WebCursor::GetPlatformCursor() { | 19 ui::PlatformCursor WebCursor::GetPlatformCursor() { |
21 if (platform_cursor_) | 20 if (platform_cursor_) |
22 return platform_cursor_; | 21 return platform_cursor_; |
23 | 22 |
24 if (custom_data_.size() == 0) | |
25 return 0; | |
26 | |
27 SkBitmap bitmap; | 23 SkBitmap bitmap; |
28 bitmap.allocN32Pixels(custom_size_.width(), custom_size_.height()); | 24 gfx::Point hotspot; |
29 memcpy(bitmap.getAddr32(0, 0), custom_data_.data(), custom_data_.size()); | 25 CreateScaledBitmapAndHotspotFromCustomData(&bitmap, &hotspot); |
30 gfx::Point hotspot = hotspot_; | |
31 ui::ScaleAndRotateCursorBitmapAndHotpoint( | |
32 device_scale_factor_, gfx::Display::ROTATE_0, &bitmap, &hotspot); | |
33 | 26 |
34 XcursorImage* image = ui::SkBitmapToXcursorImage(&bitmap, hotspot); | 27 XcursorImage* image = ui::SkBitmapToXcursorImage(&bitmap, hotspot); |
35 platform_cursor_ = ui::CreateReffedCustomXCursor(image); | 28 platform_cursor_ = ui::CreateReffedCustomXCursor(image); |
36 return platform_cursor_; | 29 return platform_cursor_; |
37 } | 30 } |
38 | 31 |
39 void WebCursor::SetDisplayInfo(const gfx::Display& display) { | |
40 if (device_scale_factor_ == display.device_scale_factor()) | |
41 return; | |
42 | |
43 device_scale_factor_ = display.device_scale_factor(); | |
44 if (platform_cursor_) | |
45 ui::UnrefCustomXCursor(platform_cursor_); | |
46 platform_cursor_ = 0; | |
47 // It is not necessary to recreate platform_cursor_ yet, since it will be | |
48 // recreated on demand when GetPlatformCursor is called. | |
49 } | |
50 | |
51 void WebCursor::InitPlatformData() { | 32 void WebCursor::InitPlatformData() { |
52 platform_cursor_ = 0; | 33 platform_cursor_ = 0; |
53 device_scale_factor_ = 1.f; | 34 device_scale_factor_ = 1.f; |
54 } | 35 } |
55 | 36 |
56 bool WebCursor::SerializePlatformData(base::Pickle* pickle) const { | 37 bool WebCursor::SerializePlatformData(base::Pickle* pickle) const { |
57 return true; | 38 return true; |
58 } | 39 } |
59 | 40 |
60 bool WebCursor::DeserializePlatformData(base::PickleIterator* iter) { | 41 bool WebCursor::DeserializePlatformData(base::PickleIterator* iter) { |
(...skipping 15 matching lines...) Expand all Loading... |
76 if (platform_cursor_) | 57 if (platform_cursor_) |
77 ui::UnrefCustomXCursor(platform_cursor_); | 58 ui::UnrefCustomXCursor(platform_cursor_); |
78 platform_cursor_ = other.platform_cursor_; | 59 platform_cursor_ = other.platform_cursor_; |
79 if (platform_cursor_) | 60 if (platform_cursor_) |
80 ui::RefCustomXCursor(platform_cursor_); | 61 ui::RefCustomXCursor(platform_cursor_); |
81 | 62 |
82 device_scale_factor_ = other.device_scale_factor_; | 63 device_scale_factor_ = other.device_scale_factor_; |
83 } | 64 } |
84 | 65 |
85 } // namespace content | 66 } // namespace content |
OLD | NEW |