summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 18:29:00 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-25 18:29:00 +0000
commit4b576875ad1b570c3f34f549df27b9e98941dac7 (patch)
treebb81526cf40e2843e51c3548d9a13ce0c4605cd4 /chrome
parent0e6fe11ed699d693198e928723fc4afb13bba729 (diff)
downloadchromium_src-4b576875ad1b570c3f34f549df27b9e98941dac7.zip
chromium_src-4b576875ad1b570c3f34f549df27b9e98941dac7.tar.gz
chromium_src-4b576875ad1b570c3f34f549df27b9e98941dac7.tar.bz2
Don't override user's default cursor with GDK_ARROW.
BUG=8786 Review URL: http://codereview.chromium.org/42587 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_gtk.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 2db5578..08c0d4f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -258,11 +258,15 @@ void RenderWidgetHostViewGtk::UpdateCursor(const WebCursor& cursor) {
// non-pixmap branch.
if (new_cursor_type == current_cursor_type)
return;
- gdk_cursor = gdk_cursor_new(new_cursor_type);
+ if (new_cursor_type == GDK_LAST_CURSOR)
+ gdk_cursor = NULL;
+ else
+ gdk_cursor = gdk_cursor_new(new_cursor_type);
}
gdk_window_set_cursor(view_.get()->window, gdk_cursor);
// The window now owns the cursor.
- gdk_cursor_unref(gdk_cursor);
+ if (gdk_cursor)
+ gdk_cursor_unref(gdk_cursor);
}
void RenderWidgetHostViewGtk::UpdateCursorIfOverSelf() {