| Index: webkit/glue/webcursor_aura.cc
|
| diff --git a/webkit/glue/webcursor_aura.cc b/webkit/glue/webcursor_aura.cc
|
| index 7610aff3f7c71dab23c368194a75ad9492ee5465..3a061a6fbdfa2284e2ceb905b0f9b1ce7b1efddf 100644
|
| --- a/webkit/glue/webcursor_aura.cc
|
| +++ b/webkit/glue/webcursor_aura.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -98,31 +98,13 @@ gfx::NativeCursor WebCursor::GetNativeCursor() {
|
| return aura::kCursorGrab;
|
| case WebCursorInfo::TypeGrabbing:
|
| return aura::kCursorGrabbing;
|
| - case WebCursorInfo::TypeCustom:
|
| - return aura::kCursorCustom;
|
| + case WebCursorInfo::TypeCustom: {
|
| + aura::Cursor cursor;
|
| + cursor.SetPlatformCursor(GetPlatformCursor());
|
| + return cursor;
|
| + }
|
| default:
|
| NOTREACHED();
|
| return gfx::kNullCursor;
|
| }
|
| }
|
| -
|
| -void WebCursor::InitPlatformData() {
|
| -}
|
| -
|
| -bool WebCursor::SerializePlatformData(Pickle* pickle) const {
|
| - return true;
|
| -}
|
| -
|
| -bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) {
|
| - return true;
|
| -}
|
| -
|
| -bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
|
| - return true;
|
| -}
|
| -
|
| -void WebCursor::CleanupPlatformData() {
|
| -}
|
| -
|
| -void WebCursor::CopyPlatformData(const WebCursor& other) {
|
| -}
|
|
|