diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/platform/haiku | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/platform/haiku')
| -rw-r--r-- | WebCore/platform/haiku/ContextMenuHaiku.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/platform/haiku/ContextMenuHaiku.cpp b/WebCore/platform/haiku/ContextMenuHaiku.cpp index b978433..aaff99b 100644 --- a/WebCore/platform/haiku/ContextMenuHaiku.cpp +++ b/WebCore/platform/haiku/ContextMenuHaiku.cpp @@ -75,9 +75,8 @@ private: int m_result; }; -ContextMenu::ContextMenu(const HitTestResult& result) - : m_hitTestResult(result) - , m_platformDescription(new BMenu("context_menu")) +ContextMenu::ContextMenu() + : m_platformDescription(new BMenu("context_menu")) { } @@ -88,8 +87,6 @@ ContextMenu::~ContextMenu() void ContextMenu::appendItem(ContextMenuItem& item) { - checkOrEnableIfNeeded(item); - BMenuItem* menuItem = item.releasePlatformDescription(); if (menuItem) m_platformDescription->AddItem(menuItem); @@ -102,8 +99,6 @@ unsigned ContextMenu::itemCount() const void ContextMenu::insertItem(unsigned position, ContextMenuItem& item) { - checkOrEnableIfNeeded(item); - BMenuItem* menuItem = item.releasePlatformDescription(); if (menuItem) m_platformDescription->AddItem(menuItem, position); |