diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/gtk/ContextMenuGtk.cpp | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/gtk/ContextMenuGtk.cpp')
-rw-r--r-- | Source/WebCore/platform/gtk/ContextMenuGtk.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Source/WebCore/platform/gtk/ContextMenuGtk.cpp b/Source/WebCore/platform/gtk/ContextMenuGtk.cpp index 423959a..b34631d 100644 --- a/Source/WebCore/platform/gtk/ContextMenuGtk.cpp +++ b/Source/WebCore/platform/gtk/ContextMenuGtk.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Holger Hans Peter Freyther + * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,7 @@ #include "config.h" #include "ContextMenu.h" +#include "NotImplemented.h" #include <gtk/gtk.h> namespace WebCore { @@ -26,14 +28,12 @@ namespace WebCore { ContextMenu::ContextMenu() { m_platformDescription = GTK_MENU(gtk_menu_new()); - - g_object_ref_sink(G_OBJECT(m_platformDescription)); } ContextMenu::~ContextMenu() { if (m_platformDescription) - g_object_unref(m_platformDescription); + gtk_widget_destroy(GTK_WIDGET(m_platformDescription)); } void ContextMenu::appendItem(ContextMenuItem& item) @@ -50,10 +50,9 @@ void ContextMenu::setPlatformDescription(PlatformMenuDescription menu) { ASSERT(menu); if (m_platformDescription) - g_object_unref(m_platformDescription); + gtk_widget_destroy(GTK_WIDGET(m_platformDescription)); m_platformDescription = menu; - g_object_ref(m_platformDescription); } PlatformMenuDescription ContextMenu::platformDescription() const @@ -69,4 +68,12 @@ PlatformMenuDescription ContextMenu::releasePlatformDescription() return description; } +Vector<ContextMenuItem> contextMenuItemVector(const PlatformMenuDescription) +{ + notImplemented(); + + Vector<ContextMenuItem> menuItemVector; + return menuItemVector; +} + } |