diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 21:29:36 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 21:29:36 +0000 |
commit | 11e04ce0c6a47c3fc6561816c01656875292622d (patch) | |
tree | da0826ec7e19ce06c42e1d65cd4b5166627ae8aa /webkit/glue/webcursor_gtk.cc | |
parent | 4f6e87b9b51b050d45eb2f1175f80de94dd5892b (diff) | |
download | chromium_src-11e04ce0c6a47c3fc6561816c01656875292622d.zip chromium_src-11e04ce0c6a47c3fc6561816c01656875292622d.tar.gz chromium_src-11e04ce0c6a47c3fc6561816c01656875292622d.tar.bz2 |
Implement the grab/grabbing cursors (for Mac/GTK).
BUG=73356
TEST=comment 12 on the bug has a test page; ensure the last two cursors (grab and grabbing) show open and closed hand cursors (respectively) and don't crash
Review URL: http://codereview.chromium.org/6591105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webcursor_gtk.cc')
-rw-r--r-- | webkit/glue/webcursor_gtk.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc index ca3555a..c315b2a 100644 --- a/webkit/glue/webcursor_gtk.cc +++ b/webkit/glue/webcursor_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -153,6 +153,8 @@ int WebCursor::GetCursorType() const { NOTIMPLEMENTED(); return GDK_LAST_CURSOR; case WebCursorInfo::TypeZoomIn: case WebCursorInfo::TypeZoomOut: + case WebCursorInfo::TypeGrab: + case WebCursorInfo::TypeGrabbing: case WebCursorInfo::TypeCustom: return GDK_CURSOR_IS_PIXMAP; } @@ -178,6 +180,10 @@ GdkCursor* WebCursor::GetCustomCursor() { return GetInlineCustomCursor(CustomCursorZoomIn); case WebCursorInfo::TypeZoomOut: return GetInlineCustomCursor(CustomCursorZoomOut); + case WebCursorInfo::TypeGrab: + return GetInlineCustomCursor(CustomCursorGrab); + case WebCursorInfo::TypeGrabbing: + return GetInlineCustomCursor(CustomCursorGrabbing); } if (type_ != WebCursorInfo::TypeCustom) { |