diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/platform/gtk/ContextMenuItemGtk.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/platform/gtk/ContextMenuItemGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/ContextMenuItemGtk.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/platform/gtk/ContextMenuItemGtk.cpp b/WebCore/platform/gtk/ContextMenuItemGtk.cpp index 84f78c0..cf34640 100644 --- a/WebCore/platform/gtk/ContextMenuItemGtk.cpp +++ b/WebCore/platform/gtk/ContextMenuItemGtk.cpp @@ -232,12 +232,7 @@ void ContextMenuItem::setSubMenu(ContextMenu* menu) m_platformDescription.subMenu = menu->releasePlatformDescription(); m_platformDescription.type = SubmenuType; -#if GLIB_CHECK_VERSION(2,10,0) g_object_ref_sink(G_OBJECT(m_platformDescription.subMenu)); -#else - g_object_ref(G_OBJECT(m_platformDescription.subMenu)); - gtk_object_sink(GTK_OBJECT(m_platformDescription.subMenu)); -#endif } void ContextMenuItem::setChecked(bool shouldCheck) |