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/ContextMenuItem.h | |
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/ContextMenuItem.h')
-rw-r--r-- | Source/WebCore/platform/ContextMenuItem.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/platform/ContextMenuItem.h b/Source/WebCore/platform/ContextMenuItem.h index 441829f..145d795 100644 --- a/Source/WebCore/platform/ContextMenuItem.h +++ b/Source/WebCore/platform/ContextMenuItem.h @@ -42,7 +42,6 @@ class NSMenuItem; #elif PLATFORM(WIN) typedef struct tagMENUITEMINFOW MENUITEMINFO; #elif PLATFORM(GTK) -#include <GRefPtr.h> typedef struct _GtkMenuItem GtkMenuItem; #elif PLATFORM(QT) #include <QAction> @@ -288,8 +287,6 @@ namespace WebCore { #else #if PLATFORM(MAC) RetainPtr<NSMenuItem> m_platformDescription; -#elif PLATFORM(GTK) - GRefPtr<GtkMenuItem> m_platformDescription; #else PlatformMenuItemDescription m_platformDescription; #endif |