[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
beidson at apple.com
beidson at apple.com
Wed Dec 22 15:35:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit de4de4cf9116b226a2eaa779669515cebf704def
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 00:42:39 2010 +0000
Part of https://bugs.webkit.org/show_bug.cgi?id=49222
Rename "WebContextMenuItem" to "WebContextMenuItemData"
Reviewed by Anders Carlsson.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* Shared/WebContextMenuItem.cpp: Removed.
* Shared/WebContextMenuItem.h: Removed.
* Shared/WebContextMenuItemData.cpp: Copied from Shared/WebContextMenuItem.cpp.
(WebKit::WebContextMenuItemData::WebContextMenuItemData):
(WebKit::WebContextMenuItemData::encode):
(WebKit::WebContextMenuItemData::decode):
(WebKit::kitItems):
* Shared/WebContextMenuItemData.h: Copied from Shared/WebContextMenuItem.h.
(WebKit::WebContextMenuItemData::submenu):
* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::contextMenuItemSelected):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(-[WebMenuTarget forwardContextMenuAction:]):
(WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
(WebKit::nsMenuItemVector):
(WebKit::WebContextMenuProxyMac::populate):
(WebKit::WebContextMenuProxyMac::showContextMenu):
* UIProcess/qt/WebContextMenuProxyQt.cpp:
(WebKit::WebContextMenuProxyQt::showContextMenu):
* UIProcess/qt/WebContextMenuProxyQt.h:
* UIProcess/win/WebContextMenuProxyWin.cpp:
(WebKit::WebContextMenuProxyWin::showContextMenu):
* UIProcess/win/WebContextMenuProxyWin.h:
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::itemSelected):
* WebProcess/WebPage/WebContextMenu.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didSelectItemFromActiveContextMenu):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71585 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ebf49f4..40515f9 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,57 @@
+2010-11-08 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Part of https://bugs.webkit.org/show_bug.cgi?id=49222
+ Rename "WebContextMenuItem" to "WebContextMenuItemData"
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+
+ * Shared/WebContextMenuItem.cpp: Removed.
+ * Shared/WebContextMenuItem.h: Removed.
+ * Shared/WebContextMenuItemData.cpp: Copied from Shared/WebContextMenuItem.cpp.
+ (WebKit::WebContextMenuItemData::WebContextMenuItemData):
+ (WebKit::WebContextMenuItemData::encode):
+ (WebKit::WebContextMenuItemData::decode):
+ (WebKit::kitItems):
+ * Shared/WebContextMenuItemData.h: Copied from Shared/WebContextMenuItem.h.
+ (WebKit::WebContextMenuItemData::submenu):
+
+ * UIProcess/WebContextMenuProxy.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::showContextMenu):
+ (WebKit::WebPageProxy::contextMenuItemSelected):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (-[WebMenuTarget forwardContextMenuAction:]):
+ (WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
+ (WebKit::nsMenuItemVector):
+ (WebKit::WebContextMenuProxyMac::populate):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+
+ * UIProcess/qt/WebContextMenuProxyQt.cpp:
+ (WebKit::WebContextMenuProxyQt::showContextMenu):
+ * UIProcess/qt/WebContextMenuProxyQt.h:
+
+ * UIProcess/win/WebContextMenuProxyWin.cpp:
+ (WebKit::WebContextMenuProxyWin::showContextMenu):
+ * UIProcess/win/WebContextMenuProxyWin.h:
+
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ (WebKit::WebContextMenu::itemSelected):
+ * WebProcess/WebPage/WebContextMenu.h:
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didSelectItemFromActiveContextMenu):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2010-11-08 Anders Carlsson <andersca at apple.com>
Reviewed by John Sullivan and Dan Bernstein.
diff --git a/WebKit2/Shared/WebContextMenuItem.cpp b/WebKit2/Shared/WebContextMenuItem.cpp
deleted file mode 100644
index ea83426..0000000
--- a/WebKit2/Shared/WebContextMenuItem.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "WebContextMenuItem.h"
-
-#include "ArgumentCoders.h"
-#include "Arguments.h"
-#include <wtf/text/CString.h>
-#include <WebCore/ContextMenu.h>
-
-namespace WebKit {
-
-WebContextMenuItem::WebContextMenuItem()
- : m_type(WebCore::ActionType)
- , m_action(WebCore::ContextMenuItemTagNoAction)
- , m_enabled(true)
- , m_checked(false)
-{
-}
-
-WebContextMenuItem::WebContextMenuItem(WebCore::ContextMenuItemType type, WebCore::ContextMenuAction action, const String& title, bool enabled, bool checked)
- : m_type(type)
- , m_action(action)
- , m_title(title)
- , m_enabled(enabled)
- , m_checked(checked)
-{
- ASSERT(type == WebCore::ActionType || type == WebCore::CheckableActionType || type == WebCore::SeparatorType);
-}
-
-WebContextMenuItem::WebContextMenuItem(WebCore::ContextMenuAction action, const String& title, bool enabled, const Vector<WebContextMenuItem>& submenu)
- : m_type(WebCore::SubmenuType)
- , m_action(action)
- , m_title(title)
- , m_enabled(enabled)
- , m_checked(false)
- , m_submenu(submenu)
-{
-}
-
-WebContextMenuItem::WebContextMenuItem(WebCore::ContextMenuItem& item, WebCore::ContextMenu* menu)
- : m_type(item.type())
- , m_action(item.action())
- , m_title(item.title())
-{
- if (m_type == WebCore::SubmenuType) {
- Vector<WebCore::ContextMenuItem> coreSubmenu = WebCore::contextMenuItemVector(item.platformSubMenu());
- m_submenu = kitItems(coreSubmenu, menu);
- }
-
- menu->checkOrEnableIfNeeded(item);
-
- m_enabled = item.enabled();
- m_checked = item.checked();
-}
-
-void WebContextMenuItem::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
- encoder->encode(CoreIPC::In(static_cast<uint32_t>(m_type), static_cast<uint32_t>(m_action), m_title, m_checked, m_enabled, m_submenu));
-}
-
-bool WebContextMenuItem::decode(CoreIPC::ArgumentDecoder* decoder, WebContextMenuItem& item)
-{
- uint32_t type;
- uint32_t action;
- String title;
- bool checked;
- bool enabled;
- Vector<WebContextMenuItem> submenu;
-
- if (!decoder->decode(CoreIPC::Out(type, action, title, checked, enabled, submenu)))
- return false;
-
- switch (type) {
- case WebCore::ActionType:
- case WebCore::SeparatorType:
- case WebCore::CheckableActionType:
- item = WebContextMenuItem(static_cast<WebCore::ContextMenuItemType>(type), static_cast<WebCore::ContextMenuAction>(action), title, enabled, checked);
- break;
- case WebCore::SubmenuType:
- item = WebContextMenuItem(static_cast<WebCore::ContextMenuAction>(action), title, enabled, submenu);
- break;
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
-
- return true;
-}
-
-Vector<WebContextMenuItem> kitItems(Vector<WebCore::ContextMenuItem>& coreItems, WebCore::ContextMenu* menu)
-{
- Vector<WebContextMenuItem> result;
- result.reserveCapacity(coreItems.size());
- for (unsigned i = 0; i < coreItems.size(); ++i)
- result.append(WebContextMenuItem(coreItems[i], menu));
-
- return result;
-}
-
-} // namespace WebKit
diff --git a/WebKit2/Shared/WebContextMenuItem.h b/WebKit2/Shared/WebContextMenuItem.h
deleted file mode 100644
index de98b9d..0000000
--- a/WebKit2/Shared/WebContextMenuItem.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebContextMenuItem_h
-#define WebContextMenuItem_h
-
-#include <WebCore/ContextMenuItem.h>
-#include <wtf/text/WTFString.h>
-
-namespace CoreIPC {
- class ArgumentDecoder;
- class ArgumentEncoder;
-}
-
-namespace WebCore {
- class ContextMenu;
-}
-
-namespace WebKit {
-
-class WebContextMenuItem {
-public:
- WebContextMenuItem();
- WebContextMenuItem(WebCore::ContextMenuItem&, WebCore::ContextMenu* menu);
- WebContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, const String& title, bool enabled, bool checked);
- WebContextMenuItem(WebCore::ContextMenuAction, const String& title, bool enabled, const Vector<WebContextMenuItem>& submenu);
-
- WebCore::ContextMenuItemType type() const { return m_type; }
- WebCore::ContextMenuAction action() const { return m_action; }
- const String& title() const { return m_title; }
- bool enabled() const { return m_enabled; }
- bool checked() const { return m_checked; }
- const Vector<WebContextMenuItem>& submenu() const { return m_submenu; }
-
- void encode(CoreIPC::ArgumentEncoder*) const;
- static bool decode(CoreIPC::ArgumentDecoder*, WebContextMenuItem&);
-
-private:
- WebCore::ContextMenuItemType m_type;
- WebCore::ContextMenuAction m_action;
- String m_title;
- bool m_enabled;
- bool m_checked;
- Vector<WebContextMenuItem> m_submenu;
-};
-
-Vector<WebContextMenuItem> kitItems(Vector<WebCore::ContextMenuItem>&, WebCore::ContextMenu*);
-
-} // namespace WebKit
-
-#endif // WebContextMenuItem_h
diff --git a/WebKit2/Shared/WebContextMenuItemData.cpp b/WebKit2/Shared/WebContextMenuItemData.cpp
new file mode 100644
index 0000000..22319f1
--- /dev/null
+++ b/WebKit2/Shared/WebContextMenuItemData.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebContextMenuItemData.h"
+
+#include "ArgumentCoders.h"
+#include "Arguments.h"
+#include <wtf/text/CString.h>
+#include <WebCore/ContextMenu.h>
+
+namespace WebKit {
+
+WebContextMenuItemData::WebContextMenuItemData()
+ : m_type(WebCore::ActionType)
+ , m_action(WebCore::ContextMenuItemTagNoAction)
+ , m_enabled(true)
+ , m_checked(false)
+{
+}
+
+WebContextMenuItemData::WebContextMenuItemData(WebCore::ContextMenuItemType type, WebCore::ContextMenuAction action, const String& title, bool enabled, bool checked)
+ : m_type(type)
+ , m_action(action)
+ , m_title(title)
+ , m_enabled(enabled)
+ , m_checked(checked)
+{
+ ASSERT(type == WebCore::ActionType || type == WebCore::CheckableActionType || type == WebCore::SeparatorType);
+}
+
+WebContextMenuItemData::WebContextMenuItemData(WebCore::ContextMenuAction action, const String& title, bool enabled, const Vector<WebContextMenuItemData>& submenu)
+ : m_type(WebCore::SubmenuType)
+ , m_action(action)
+ , m_title(title)
+ , m_enabled(enabled)
+ , m_checked(false)
+ , m_submenu(submenu)
+{
+}
+
+WebContextMenuItemData::WebContextMenuItemData(WebCore::ContextMenuItem& item, WebCore::ContextMenu* menu)
+ : m_type(item.type())
+ , m_action(item.action())
+ , m_title(item.title())
+{
+ if (m_type == WebCore::SubmenuType) {
+ Vector<WebCore::ContextMenuItem> coreSubmenu = WebCore::contextMenuItemVector(item.platformSubMenu());
+ m_submenu = kitItems(coreSubmenu, menu);
+ }
+
+ menu->checkOrEnableIfNeeded(item);
+
+ m_enabled = item.enabled();
+ m_checked = item.checked();
+}
+
+void WebContextMenuItemData::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encode(CoreIPC::In(static_cast<uint32_t>(m_type), static_cast<uint32_t>(m_action), m_title, m_checked, m_enabled, m_submenu));
+}
+
+bool WebContextMenuItemData::decode(CoreIPC::ArgumentDecoder* decoder, WebContextMenuItemData& item)
+{
+ uint32_t type;
+ uint32_t action;
+ String title;
+ bool checked;
+ bool enabled;
+ Vector<WebContextMenuItemData> submenu;
+
+ if (!decoder->decode(CoreIPC::Out(type, action, title, checked, enabled, submenu)))
+ return false;
+
+ switch (type) {
+ case WebCore::ActionType:
+ case WebCore::SeparatorType:
+ case WebCore::CheckableActionType:
+ item = WebContextMenuItemData(static_cast<WebCore::ContextMenuItemType>(type), static_cast<WebCore::ContextMenuAction>(action), title, enabled, checked);
+ break;
+ case WebCore::SubmenuType:
+ item = WebContextMenuItemData(static_cast<WebCore::ContextMenuAction>(action), title, enabled, submenu);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ return true;
+}
+
+Vector<WebContextMenuItemData> kitItems(Vector<WebCore::ContextMenuItem>& coreItems, WebCore::ContextMenu* menu)
+{
+ Vector<WebContextMenuItemData> result;
+ result.reserveCapacity(coreItems.size());
+ for (unsigned i = 0; i < coreItems.size(); ++i)
+ result.append(WebContextMenuItemData(coreItems[i], menu));
+
+ return result;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebContextMenuItemData.h b/WebKit2/Shared/WebContextMenuItemData.h
new file mode 100644
index 0000000..06685c2
--- /dev/null
+++ b/WebKit2/Shared/WebContextMenuItemData.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebContextMenuItemData_h
+#define WebContextMenuItemData_h
+
+#include <WebCore/ContextMenuItem.h>
+#include <wtf/text/WTFString.h>
+
+namespace CoreIPC {
+ class ArgumentDecoder;
+ class ArgumentEncoder;
+}
+
+namespace WebCore {
+ class ContextMenu;
+}
+
+namespace WebKit {
+
+class WebContextMenuItemData {
+public:
+ WebContextMenuItemData();
+ WebContextMenuItemData(WebCore::ContextMenuItem&, WebCore::ContextMenu* menu);
+ WebContextMenuItemData(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, const String& title, bool enabled, bool checked);
+ WebContextMenuItemData(WebCore::ContextMenuAction, const String& title, bool enabled, const Vector<WebContextMenuItemData>& submenu);
+
+ WebCore::ContextMenuItemType type() const { return m_type; }
+ WebCore::ContextMenuAction action() const { return m_action; }
+ const String& title() const { return m_title; }
+ bool enabled() const { return m_enabled; }
+ bool checked() const { return m_checked; }
+ const Vector<WebContextMenuItemData>& submenu() const { return m_submenu; }
+
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebContextMenuItemData&);
+
+private:
+ WebCore::ContextMenuItemType m_type;
+ WebCore::ContextMenuAction m_action;
+ String m_title;
+ bool m_enabled;
+ bool m_checked;
+ Vector<WebContextMenuItemData> m_submenu;
+};
+
+Vector<WebContextMenuItemData> kitItems(Vector<WebCore::ContextMenuItem>&, WebCore::ContextMenu*);
+
+} // namespace WebKit
+
+#endif // WebContextMenuItemData_h
diff --git a/WebKit2/UIProcess/WebContextMenuProxy.h b/WebKit2/UIProcess/WebContextMenuProxy.h
index defb0a5..098552d 100644
--- a/WebKit2/UIProcess/WebContextMenuProxy.h
+++ b/WebKit2/UIProcess/WebContextMenuProxy.h
@@ -36,13 +36,13 @@ namespace WebCore {
namespace WebKit {
-class WebContextMenuItem;
+class WebContextMenuItemData;
class WebContextMenuProxy : public RefCounted<WebContextMenuProxy> {
public:
virtual ~WebContextMenuProxy();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>& items) = 0;
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>& items) = 0;
virtual void hideContextMenu() = 0;
protected:
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index f941e37..2805e00 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1137,7 +1137,7 @@ void WebPageProxy::hidePopupMenu()
m_activePopupMenu = 0;
}
-void WebPageProxy::showContextMenu(const WebCore::IntPoint& menuLocation, const Vector<WebContextMenuItem>& items)
+void WebPageProxy::showContextMenu(const WebCore::IntPoint& menuLocation, const Vector<WebContextMenuItemData>& items)
{
if (m_activeContextMenu)
m_activeContextMenu->hideContextMenu();
@@ -1147,7 +1147,7 @@ void WebPageProxy::showContextMenu(const WebCore::IntPoint& menuLocation, const
m_activeContextMenu->showContextMenu(menuLocation, items);
}
-void WebPageProxy::contextMenuItemSelected(const WebContextMenuItem& item)
+void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item)
{
process()->send(Messages::WebPage::DidSelectItemFromActiveContextMenu(item), m_pageID);
}
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index b88c301..c66d452 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -32,7 +32,7 @@
#include "GenericCallback.h"
#include "SharedMemory.h"
#include "WKBase.h"
-#include "WebContextMenuItem.h"
+#include "WebContextMenuItemData.h"
#include "WebEvent.h"
#include "WebFindClient.h"
#include "WebFormClient.h"
@@ -235,7 +235,7 @@ public:
void getStatistics(WKContextStatistics*);
- void contextMenuItemSelected(const WebContextMenuItem&);
+ void contextMenuItemSelected(const WebContextMenuItemData&);
private:
WebPageProxy(WebPageNamespace*, uint64_t pageID);
@@ -328,7 +328,7 @@ private:
void hidePopupMenu();
// Context Menu.
- void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>& items);
+ void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>& items);
void takeFocus(bool direction);
void setToolTip(const String&);
diff --git a/WebKit2/UIProcess/WebPageProxy.messages.in b/WebKit2/UIProcess/WebPageProxy.messages.in
index 6207103..c258b9e 100644
--- a/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -124,7 +124,7 @@ messages -> WebPageProxy {
HidePopupMenu()
# ContextMenu
- ShowContextMenu(WebCore::IntPoint point, Vector<WebKit::WebContextMenuItem> items)
+ ShowContextMenu(WebCore::IntPoint point, Vector<WebKit::WebContextMenuItemData> items)
#if USE(ACCELERATED_COMPOSITING)
# Accelerated compsiting messages.
diff --git a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
index 4fcff09..ee4fa3d 100644
--- a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
+++ b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
@@ -49,15 +49,15 @@ public:
}
~WebContextMenuProxyMac();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>&);
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&);
virtual void hideContextMenu();
- void contextMenuItemSelected(const WebContextMenuItem&);
+ void contextMenuItemSelected(const WebContextMenuItemData&);
private:
WebContextMenuProxyMac(WKView*, WebPageProxy*);
- void populate(const Vector<WebContextMenuItem>&);
+ void populate(const Vector<WebContextMenuItemData>&);
RetainPtr<NSPopUpButtonCell> m_popup;
WKView* m_webView;
diff --git a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
index c0eac65..388c5b0 100644
--- a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
@@ -26,7 +26,7 @@
#include "WebContextMenuProxyMac.h"
#include "PageClientImpl.h"
-#include "WebContextMenuItem.h"
+#include "WebContextMenuItemData.h"
#include "WKView.h"
#include <WebCore/IntRect.h>
@@ -63,7 +63,7 @@ using namespace WebCore;
- (void)forwardContextMenuAction:(id)sender
{
- WebKit::WebContextMenuItem item(ActionType, static_cast<ContextMenuAction>([sender tag]), [sender title], [sender isEnabled], [sender state] == NSOnState);
+ WebKit::WebContextMenuItemData item(ActionType, static_cast<ContextMenuAction>([sender tag]), [sender title], [sender isEnabled], [sender state] == NSOnState);
_menuProxy->contextMenuItemSelected(item);
}
@@ -83,7 +83,7 @@ WebContextMenuProxyMac::~WebContextMenuProxyMac()
[m_popup.get() setControlView:nil];
}
-void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItem& item)
+void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
{
m_page->contextMenuItemSelected(item);
}
@@ -97,7 +97,7 @@ static void populateNSMenu(NSMenu* menu, const Vector<RetainPtr<NSMenuItem> >& m
}
}
-static Vector<RetainPtr<NSMenuItem> > nsMenuItemVector(const Vector<WebContextMenuItem>& items)
+static Vector<RetainPtr<NSMenuItem> > nsMenuItemVector(const Vector<WebContextMenuItemData>& items)
{
Vector<RetainPtr<NSMenuItem> > result;
@@ -144,7 +144,7 @@ static Vector<RetainPtr<NSMenuItem> > nsMenuItemVector(const Vector<WebContextMe
return result;
}
-void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItem>& items)
+void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItemData>& items)
{
if (m_popup)
[m_popup.get() removeAllItems];
@@ -158,7 +158,7 @@ void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItem>& items)
populateNSMenu(menu, nsMenuItemVector(items));
}
-void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<WebContextMenuItem>& items)
+void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<WebContextMenuItemData>& items)
{
populate(items);
[[WebMenuTarget sharedMenuTarget] setMenuProxy:this];
diff --git a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
index f569192..3f2e47e 100644
--- a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
+++ b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
@@ -41,7 +41,7 @@ PassRefPtr<WebContextMenuProxyQt> WebContextMenuProxyQt::create()
return adoptRef(new WebContextMenuProxyQt);
}
-void WebContextMenuProxyQt::showContextMenu(const IntPoint&, const Vector<WebContextMenuItem>&)
+void WebContextMenuProxyQt::showContextMenu(const IntPoint&, const Vector<WebContextMenuItemData>&)
{
notImplemented();
}
diff --git a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h
index f5a496f..383990f 100644
--- a/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h
+++ b/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h
@@ -38,7 +38,7 @@ public:
private:
WebContextMenuProxyQt();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>&);
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&);
virtual void hideContextMenu();
};
diff --git a/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp b/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp
index 512fbed..4a5d22a 100644
--- a/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp
+++ b/WebKit2/UIProcess/win/WebContextMenuProxyWin.cpp
@@ -40,7 +40,7 @@ PassRefPtr<WebContextMenuProxyWin> WebContextMenuProxyWin::create()
return adoptRef(new WebContextMenuProxyWin);
}
-void WebContextMenuProxyWin::showContextMenu(const IntPoint&, const Vector<WebContextMenuItem>&)
+void WebContextMenuProxyWin::showContextMenu(const IntPoint&, const Vector<WebContextMenuItemData>&)
{
notImplemented();
}
diff --git a/WebKit2/UIProcess/win/WebContextMenuProxyWin.h b/WebKit2/UIProcess/win/WebContextMenuProxyWin.h
index b196c24..906fef3 100644
--- a/WebKit2/UIProcess/win/WebContextMenuProxyWin.h
+++ b/WebKit2/UIProcess/win/WebContextMenuProxyWin.h
@@ -37,7 +37,7 @@ public:
private:
WebContextMenuProxyWin();
- virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItem>&);
+ virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&);
virtual void hideContextMenu();
};
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 8a7c66b..6d65ca6 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -227,7 +227,7 @@ HEADERS += \
Shared/UserMessageCoders.h \
Shared/VisitedLinkTable.h \
Shared/WebCertificateInfo.h \
- Shared/WebContextMenuItem.h \
+ Shared/WebContextMenuItemData.h \
Shared/WebEvent.h \
Shared/WebError.h \
Shared/WebEventConversion.h \
@@ -397,7 +397,7 @@ SOURCES += \
Shared/qt/WebURLRequestQt.cpp \
Shared/qt/WebURLResponseQt.cpp \
Shared/VisitedLinkTable.cpp \
- Shared/WebContextMenuItem.cpp \
+ Shared/WebContextMenuItemData.cpp \
Shared/WebError.cpp \
Shared/WebEvent.cpp \
Shared/WebEventConversion.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index ffa7ee8..6ba2121 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -186,6 +186,8 @@
1C8E293A12761E5B00BC7BD0 /* WKInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E293812761E5B00BC7BD0 /* WKInspector.cpp */; };
1C8E2A351277852400BC7BD0 /* WebInspectorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2A311277852400BC7BD0 /* WebInspectorMessageReceiver.cpp */; };
1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E2A321277852400BC7BD0 /* WebInspectorMessages.h */; };
+ 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */; };
+ 510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; };
51578B831209ECEF00A37C4A /* WebData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* WebData.h */; };
516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* WebError.h */; };
51871B5B127CB89D00F76232 /* WebContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51871B59127CB89D00F76232 /* WebContextMenu.cpp */; };
@@ -193,8 +195,6 @@
51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */; };
- 51ACBA151279E8C300D203B9 /* WebContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACBA131279E8C300D203B9 /* WebContextMenuItem.cpp */; };
- 51ACBA161279E8C300D203B9 /* WebContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBA141279E8C300D203B9 /* WebContextMenuItem.h */; };
51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */; };
51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */; };
51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */; };
@@ -724,6 +724,8 @@
1C8E2A311277852400BC7BD0 /* WebInspectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorMessageReceiver.cpp; sourceTree = "<group>"; };
1C8E2A321277852400BC7BD0 /* WebInspectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorMessages.h; sourceTree = "<group>"; };
32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = "<group>"; };
+ 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuItemData.cpp; sourceTree = "<group>"; };
+ 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuItemData.h; sourceTree = "<group>"; };
51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };
516A4A5B120A2CCD00C05B7F /* WebError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebError.h; sourceTree = "<group>"; };
51871B59127CB89D00F76232 /* WebContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenu.cpp; sourceTree = "<group>"; };
@@ -731,8 +733,6 @@
51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
51A7F2F4125BF8D4008AEB1D /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Logging.cpp; sourceTree = "<group>"; };
51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuProxy.cpp; sourceTree = "<group>"; };
- 51ACBA131279E8C300D203B9 /* WebContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuItem.cpp; sourceTree = "<group>"; };
- 51ACBA141279E8C300D203B9 /* WebContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuItem.h; sourceTree = "<group>"; };
51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxy.h; sourceTree = "<group>"; };
51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxyMac.h; sourceTree = "<group>"; };
51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuProxyMac.mm; sourceTree = "<group>"; };
@@ -1351,8 +1351,8 @@
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */,
BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
BCF50726124329AA005955AE /* WebCertificateInfo.h */,
- 51ACBA131279E8C300D203B9 /* WebContextMenuItem.cpp */,
- 51ACBA141279E8C300D203B9 /* WebContextMenuItem.h */,
+ 510FBB981288C95E00AFFDF4 /* WebContextMenuItemData.cpp */,
+ 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */,
51578B821209ECEF00A37C4A /* WebData.h */,
BC575612126E0138006F0F12 /* WebError.cpp */,
516A4A5B120A2CCD00C05B7F /* WebError.h */,
@@ -2319,7 +2319,6 @@
935EEBA4127761D6003322B8 /* InjectedBundleBackForwardListItem.h in Headers */,
1A616150127798B5003ACD86 /* DownloadManager.h in Headers */,
1A6161D41278981C003ACD86 /* Download.h in Headers */,
- 51ACBA161279E8C300D203B9 /* WebContextMenuItem.h in Headers */,
51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */,
51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */,
1A119A95127B796200A9ECB1 /* MessageSender.h in Headers */,
@@ -2334,6 +2333,7 @@
1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
BCEE7AD112817988009827DA /* WebProcessProxyMessages.h in Headers */,
1A2D956F12848564001EB962 /* ChildProcess.h in Headers */,
+ 510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */,
1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */,
1AB7D61A1288B9D900CFD08C /* DownloadProxyMessages.h in Headers */,
);
@@ -2657,7 +2657,6 @@
1A61614F127798B5003ACD86 /* DownloadManager.cpp in Sources */,
1A6161D51278981C003ACD86 /* Download.cpp in Sources */,
1A61639612789B2F003ACD86 /* DownloadMac.mm in Sources */,
- 51ACBA151279E8C300D203B9 /* WebContextMenuItem.cpp in Sources */,
51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */,
C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
C0337DB0127A28D0008FF4F4 /* WebMouseEvent.cpp in Sources */,
@@ -2680,6 +2679,7 @@
1A2D92211281DC1B001EB962 /* PluginProxyMac.mm in Sources */,
BCEE7AD012817988009827DA /* WebProcessProxyMessageReceiver.cpp in Sources */,
1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */,
+ 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */,
1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */,
1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */,
);
diff --git a/WebKit2/WebProcess/WebPage/WebContextMenu.cpp b/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
index 60d0341..1f78f83 100644
--- a/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
+++ b/WebKit2/WebProcess/WebPage/WebContextMenu.cpp
@@ -53,7 +53,7 @@ void WebContextMenu::show()
WebProcess::shared().connection()->send(Messages::WebPageProxy::ShowContextMenu(menu->hitTestResult().point(), kitItems(coreItems, menu)), m_page->pageID());
}
-void WebContextMenu::itemSelected(const WebContextMenuItem& item)
+void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
{
WebCore::ContextMenuItem coreItem(WebCore::ActionType, static_cast<WebCore::ContextMenuAction>(item.action()), item.title());
m_page->corePage()->contextMenuController()->contextMenuItemSelected(&coreItem);
diff --git a/WebKit2/WebProcess/WebPage/WebContextMenu.h b/WebKit2/WebProcess/WebPage/WebContextMenu.h
index 380b5e2..3d9291a 100644
--- a/WebKit2/WebProcess/WebPage/WebContextMenu.h
+++ b/WebKit2/WebProcess/WebPage/WebContextMenu.h
@@ -21,7 +21,7 @@
#ifndef WebContextMenu_h
#define WebContextMenu_h
-#include "WebContextMenuItem.h"
+#include "WebContextMenuItemData.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -40,7 +40,7 @@ public:
~WebContextMenu();
void show();
- void itemSelected(const WebContextMenuItem&);
+ void itemSelected(const WebContextMenuItemData&);
private:
WebContextMenu(WebPage*);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index b24f1c3..77e26a1 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -913,7 +913,7 @@ void WebPage::didChangeSelectedIndexForActivePopupMenu(int32_t newIndex)
m_activePopupMenu = 0;
}
-void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItem& item)
+void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItemData& item)
{
ASSERT(m_contextMenu);
m_contextMenu->itemSelected(item);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index eb1c19a..14cde78 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -69,7 +69,7 @@ class InjectedBundleBackForwardList;
class PageOverlay;
class PluginView;
class WebContextMenu;
-class WebContextMenuItem;
+class WebContextMenuItemData;
class WebEvent;
class WebFrame;
class WebInspector;
@@ -257,7 +257,7 @@ private:
void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex);
#if ENABLE(CONTEXT_MENUS)
- void didSelectItemFromActiveContextMenu(const WebContextMenuItem&);
+ void didSelectItemFromActiveContextMenu(const WebContextMenuItemData&);
#endif
OwnPtr<WebCore::Page> m_page;
diff --git a/WebKit2/WebProcess/WebPage/WebPage.messages.in b/WebKit2/WebProcess/WebPage/WebPage.messages.in
index 5a62913..8a783db 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.messages.in
+++ b/WebKit2/WebProcess/WebPage/WebPage.messages.in
@@ -80,7 +80,7 @@ messages -> WebPage {
DidChangeSelectedIndexForActivePopupMenu(int32_t newIndex);
# Context menu.
- DidSelectItemFromActiveContextMenu(WebKit::WebContextMenuItem menuItem);
+ DidSelectItemFromActiveContextMenu(WebKit::WebContextMenuItemData menuItem);
SetWindowResizerSize(WebCore::IntSize intersectsView)
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 5e77751..22ba65e 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -497,11 +497,11 @@
>
</File>
<File
- RelativePath="..\Shared\WebContextMenuItem.cpp"
+ RelativePath="..\Shared\WebContextMenuItemData.cpp"
>
</File>
<File
- RelativePath="..\Shared\WebContextMenuItem.h"
+ RelativePath="..\Shared\WebContextMenuItemData.h"
>
</File>
<File
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list