diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:24:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:24:52 +0000 |
| commit | 5d000c47dda53af105cb8098c9fef5288008757b (patch) | |
| tree | cbfba940c62992a4ce68b844dac29e91776c7921 /webkit | |
| parent | ed634bf615561459266438450a8300026ce0224c (diff) | |
| download | chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.zip chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.tar.gz chromium_src-5d000c47dda53af105cb8098c9fef5288008757b.tar.bz2 | |
linux: delete code that worked around gtk <2.18
We now depend on GTK 2.18, and in fact we've been infobaring users
who don't have it informing them that Chrome will stop working.
Review URL: http://codereview.chromium.org/7791004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webcursor_gtk.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc index c315b2a..209e761 100644 --- a/webkit/glue/webcursor_gtk.cc +++ b/webkit/glue/webcursor_gtk.cc @@ -44,23 +44,6 @@ GdkCursor* GetInlineCustomCursor(CustomCursorType type) { return cursor; } -// For GTK 2.16 and beyond, GDK_BLANK_CURSOR is available. Before, we have to -// use a custom cursor. -#if !GTK_CHECK_VERSION(2, 16, 0) -// Get/create a custom cursor which is invisible. -GdkCursor* GetInvisibleCustomCursor() { - static GdkCursor* cursor = NULL; - if (cursor) - return cursor; - const char bits[] = { 0 }; - const GdkColor color = { 0, 0, 0, 0 }; - GdkPixmap* bitmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1); - cursor = gdk_cursor_new_from_pixmap(bitmap, bitmap, &color, &color, 0, 0); - g_object_unref(bitmap); - return cursor; -} -#endif - } // end anonymous namespace int WebCursor::GetCursorType() const { @@ -143,12 +126,7 @@ int WebCursor::GetCursorType() const { case WebCursorInfo::TypeCopy: NOTIMPLEMENTED(); return GDK_LAST_CURSOR; case WebCursorInfo::TypeNone: -// See comment above |GetInvisibleCustomCursor()|. -#if !GTK_CHECK_VERSION(2, 16, 0) - return GDK_CURSOR_IS_PIXMAP; -#else return GDK_BLANK_CURSOR; -#endif case WebCursorInfo::TypeNotAllowed: NOTIMPLEMENTED(); return GDK_LAST_CURSOR; case WebCursorInfo::TypeZoomIn: @@ -171,11 +149,6 @@ gfx::NativeCursor WebCursor::GetNativeCursor() { GdkCursor* WebCursor::GetCustomCursor() { switch (type_) { -// See comment above |GetInvisibleCustomCursor()|. -#if !GTK_CHECK_VERSION(2, 16, 0) - case WebCursorInfo::TypeNone: - return GetInvisibleCustomCursor(); -#endif case WebCursorInfo::TypeZoomIn: return GetInlineCustomCursor(CustomCursorZoomIn); case WebCursorInfo::TypeZoomOut: |