diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 17:41:25 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 17:41:25 +0000 |
| commit | a7658a682dc6ccede41e9b18d7daa824bf47919f (patch) | |
| tree | 2c207bb6a5dd577f69c29208644fc59410586b94 | |
| parent | 40404bcddf2a1d19906ab9beb3a4cb1fa4d90f87 (diff) | |
| download | chromium_src-a7658a682dc6ccede41e9b18d7daa824bf47919f.zip chromium_src-a7658a682dc6ccede41e9b18d7daa824bf47919f.tar.gz chromium_src-a7658a682dc6ccede41e9b18d7daa824bf47919f.tar.bz2 | |
Add a hand grab and grabbing cursor
WebKit and Pepper need this, both define it as a valid image
TEST= http://trac.webkit.org/export/37902/trunk/WebCore/manual-tests/cursor.html and hover over "out grab" and "grabbing". You should see an open and closed hand cursor, respectively.
BUG=74699
Review URL: https://chromiumcodereview.appspot.com/10807090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148355 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | webkit/glue/resources/hand_grab.cur | bin | 0 -> 3582 bytes | |||
| -rwxr-xr-x | webkit/glue/resources/hand_grabbing.cur | bin | 0 -> 3582 bytes | |||
| -rw-r--r-- | webkit/glue/webcursor_win.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/resources/hand_grab.cur b/webkit/glue/resources/hand_grab.cur Binary files differnew file mode 100755 index 0000000..4cdf428 --- /dev/null +++ b/webkit/glue/resources/hand_grab.cur diff --git a/webkit/glue/resources/hand_grabbing.cur b/webkit/glue/resources/hand_grabbing.cur Binary files differnew file mode 100755 index 0000000..0d95775 --- /dev/null +++ b/webkit/glue/resources/hand_grabbing.cur diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index 9b334a8..c12813e 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -96,11 +96,10 @@ static LPCWSTR ToCursorID(WebCursorInfo::Type type) { return MAKEINTRESOURCE(IDC_ZOOMIN); case WebCursorInfo::TypeZoomOut: return MAKEINTRESOURCE(IDC_ZOOMOUT); - // TODO(avi): get cursor images for grab/grabbing - // http://crbug.com/74699 case WebCursorInfo::TypeGrab: + return MAKEINTRESOURCE(IDC_HAND_GRAB); case WebCursorInfo::TypeGrabbing: - return IDC_ARROW; + return MAKEINTRESOURCE(IDC_HAND_GRABBING); } NOTREACHED(); return NULL; diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 870bef9..1eb4d7f 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -10,6 +10,8 @@ <release seq="1"> <includes> <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" /> + <include name="IDC_HAND_GRAB" file="resources\hand_grab.cur" type="CURSOR" /> + <include name="IDC_HAND_GRABBING" file="resources\hand_grabbing.cur" type="CURSOR" /> <include name="IDR_INPUT_SPEECH" file="resources\input_speech.png" type="BINDATA" /> <include name="IDR_INPUT_SPEECH_RECORDING" file="resources\input_speech_recording.png" type="BINDATA" /> <include name="IDR_INPUT_SPEECH_WAITING" file="resources\input_speech_waiting.png" type="BINDATA" /> |