| Index: content/common/cursors/webcursor_aurawin.cc
|
| diff --git a/content/common/cursors/webcursor_aurawin.cc b/content/common/cursors/webcursor_aurawin.cc
|
| index 23aec8f19a07d5d518fdcce559092b7e784cfd49..03509b87828716d58e1612dd978f22ae359695c0 100644
|
| --- a/content/common/cursors/webcursor_aurawin.cc
|
| +++ b/content/common/cursors/webcursor_aurawin.cc
|
| @@ -18,19 +18,22 @@ ui::PlatformCursor WebCursor::GetPlatformCursor() {
|
| if (custom_cursor_)
|
| return custom_cursor_;
|
|
|
| - custom_cursor_ =
|
| - IconUtil::CreateCursorFromDIB(
|
| - custom_size_,
|
| - hotspot_,
|
| - !custom_data_.empty() ? &custom_data_[0] : NULL,
|
| - custom_data_.size());
|
| + SkBitmap bitmap;
|
| + gfx::Point hotspot;
|
| + CreateScaledBitmapAndHotspotFromCustomData(&bitmap, &hotspot);
|
| +
|
| + gfx::Size custom_size;
|
| + std::vector<char> custom_data;
|
| + CreateCustomData(bitmap, &custom_data, &custom_size);
|
| +
|
| + custom_cursor_ = IconUtil::CreateCursorFromDIB(
|
| + custom_size,
|
| + hotspot,
|
| + !custom_data.empty() ? &custom_data[0] : NULL,
|
| + custom_data.size());
|
| return custom_cursor_;
|
| }
|
|
|
| -void WebCursor::SetDisplayInfo(const gfx::Display& display) {
|
| - // TODO(winguru): Add support for scaling the cursor.
|
| -}
|
| -
|
| void WebCursor::InitPlatformData() {
|
| custom_cursor_ = NULL;
|
| }
|
|
|