<rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=…

…48699 Context menu support for WebKit 2. Reviewed by Anders Carlsson. WebCore: Add a "showContextMenu" call to Chrome/ChromeClient: * loader/EmptyClients.h: (WebCore::EmptyChromeClient::showContextMenu): * page/Chrome.cpp: (WebCore::Chrome::showContextMenu): * page/Chrome.h: * page/ChromeClient.h: Add a "platform description to ContextMenuItem" creator, will be needed by WebKit2 * platform/ContextMenu.h: * platform/mac/ContextMenuMac.mm: (WebCore::contextMenuItemVector): * platform/mac/ContextMenuItemMac.mm: (WebCore::ContextMenuItem::checked): WebKit2 ports now need this implemented. Stub these out to keep their WK2 ports building: * platform/qt/ContextMenuItemQt.cpp: (WebCore::ContextMenuItem::checked): * platform/qt/ContextMenuQt.cpp: (WebCore::contextMenuItemVector): * platform/win/ContextMenuItemWin.cpp: (WebCore::ContextMenuItem::checked): * platform/win/ContextMenuWin.cpp: (WebCore::contextMenuItemVector): WebKit/chromium: * src/ChromeClientImpl.h: (WebKit::ChromeClientImpl::showContextMenu): WebKit/efl: * WebCoreSupport/ChromeClientEfl.h: (WebCore::ChromeClientEfl::showContextMenu): WebKit/gtk: * WebCoreSupport/ChromeClientGtk.h: (WebKit::ChromeClient::showContextMenu): WebKit/haiku: * WebCoreSupport/ChromeClientHaiku.h: (WebCore::ChromeClientHaiku::showContextMenu): WebKit/mac: * WebCoreSupport/WebChromeClient.h: (WebChromeClient::showContextMenu): WebKit/qt: * WebCoreSupport/ChromeClientQt.h: (WebCore::ChromeClientQt::showContextMenu): WebKit/win: * WebCoreSupport/WebChromeClient.h: (WebChromeClient::showContextMenu): WebKit/wx: * WebKitSupport/ChromeClientWx.h: (WebCore::ChromeClientWx::showContextMenu): WebKit2: * WebKit2.pro: * WebKit2.xcodeproj/project.pbxproj: * win/WebKit2.vcproj: * Shared/WebContextMenuItem.cpp: Added. (WebKit::WebContextMenuItem::WebContextMenuItem): (WebKit::WebContextMenuItem::encode): (WebKit::WebContextMenuItem::decode): (WebKit::kitItems): * Shared/WebContextMenuItem.h: Added. * UIProcess/API/mac/PageClientImpl.h: * UIProcess/API/mac/PageClientImpl.mm: (WebKit::PageClientImpl::createContextMenuProxy): * UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::createContextMenuProxy): Stub to keep the build working. * UIProcess/API/qt/qwkpage_p.h: * UIProcess/PageClient.h: * UIProcess/WebContextMenuProxy.cpp: Added. (WebKit::WebContextMenuProxy::~WebContextMenuProxy): (WebKit::WebContextMenuProxy::WebContextMenuProxy): * UIProcess/WebContextMenuProxy.h: Added. * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::showContextMenu): Shows the menu after receiving the message from the WebProcess. (WebKit::WebPageProxy::contextMenuItemSelected): Sends info about the selected menu item to the WebProcess * UIProcess/WebPageProxy.h: * UIProcess/WebPageProxy.messages.in: * UIProcess/mac/WebContextMenuProxyMac.h: Added. (WebKit::WebContextMenuProxyMac::create): * UIProcess/mac/WebContextMenuProxyMac.mm: Added. (+[WebMenuTarget sharedMenuTarget]): (-[WebMenuTarget WebKit::]): (-[WebMenuTarget setMenuProxy:WebKit::]): (-[WebMenuTarget forwardContextMenuAction:]): (WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac): (WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac): (WebKit::WebContextMenuProxyMac::contextMenuItemSelected): (WebKit::populateNSMenu): (WebKit::nsMenuItemVector): (WebKit::WebContextMenuProxyMac::populate): (WebKit::WebContextMenuProxyMac::showContextMenu): (WebKit::WebContextMenuProxyMac::hideContextMenu): * UIProcess/win/WebView.cpp: (WebKit::WebView::createContextMenuProxy): Stub for now. * UIProcess/win/WebView.h: * WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::WebChromeClient::showContextMenu): * WebProcess/WebCoreSupport/WebChromeClient.h: * WebProcess/WebCoreSupport/WebContextMenuClient.cpp: (WebKit::WebContextMenuClient::getCustomMenuFromDefaultItems): Return the WebCore-provided default menu for now. Embedding app customization will come later (see bug 48720) * WebProcess/WebPage/WebContextMenu.cpp: Added. (WebKit::WebContextMenu::WebContextMenu): (WebKit::WebContextMenu::~WebContextMenu): (WebKit::WebContextMenu::show): (WebKit::WebContextMenu::itemSelected): * WebProcess/WebPage/WebContextMenu.h: Added. (WebKit::WebContextMenu::create): * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::contextMenu): (WebKit::handleMouseEvent): Pass right mouse presses along to WebCore as both a mouse event and context menu event, the same way WebKit1 does. (WebKit::WebPage::didSelectItemFromActiveContextMenu): * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/WebPage.messages.in: Canonical link: https://commits.webkit.org/61539@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@71041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 1, 2010 · d5452b9c96540b978c3e53496478a2c31a0fff92 · d5452b9
1 parent 2cb498f
commit d5452b9c96540b978c3e53496478a2c31a0fff92
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        Add a "showContextMenu" call to Chrome/ChromeClient:
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::showContextMenu):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::showContextMenu):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+
+        Add a "platform description to ContextMenuItem" creator, will be needed by WebKit2
+        * platform/ContextMenu.h:
+        * platform/mac/ContextMenuMac.mm:
+        (WebCore::contextMenuItemVector):
+
+        * platform/mac/ContextMenuItemMac.mm:
+        (WebCore::ContextMenuItem::checked): WebKit2 ports now need this implemented.
+
+        Stub these out to keep their WK2 ports building:
+        * platform/qt/ContextMenuItemQt.cpp:
+        (WebCore::ContextMenuItem::checked):
+        * platform/qt/ContextMenuQt.cpp:
+        (WebCore::contextMenuItemVector):
+        * platform/win/ContextMenuItemWin.cpp:
+        (WebCore::ContextMenuItem::checked):
+        * platform/win/ContextMenuWin.cpp:
+        (WebCore::contextMenuItemVector):
+
 2010-11-01  Eric Carlson  <eric.carlson@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
@@ -1225,9 +1225,22 @@ __ZNK7WebCore18RenderLayerBacking20compositingLayerTypeEv
 #if ENABLE(CONTEXT_MENUS)
 __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
 __ZN7WebCore12EventHandler20sendContextMenuEventEP7NSEvent
+__ZN7WebCore12EventHandler20sendContextMenuEventERKNS_18PlatformMouseEventE
 __ZN7WebCore15ContextMenuItem26releasePlatformDescriptionEv
+__ZN7WebCore15ContextMenuItemC1ENS_19ContextMenuItemTypeENS_17ContextMenuActionERKN3WTF6StringEPNS_11ContextMenuE
+__ZN7WebCore15ContextMenuItemD1Ev
 __ZN7WebCore21ContextMenuController16clearContextMenuEv
+__ZN7WebCore21ContextMenuController23contextMenuItemSelectedEPNS_15ContextMenuItemE
+__ZN7WebCore21contextMenuItemVectorEP14NSMutableArray
+__ZN7WebCore6Chrome15showContextMenuEv
 __ZNK7WebCore11ContextMenu19platformDescriptionEv
+__ZNK7WebCore11ContextMenu21checkOrEnableIfNeededERNS_15ContextMenuItemE
+__ZNK7WebCore15ContextMenuItem15platformSubMenuEv
+__ZNK7WebCore15ContextMenuItem4typeEv
+__ZNK7WebCore15ContextMenuItem5titleEv
+__ZNK7WebCore15ContextMenuItem6actionEv
+__ZNK7WebCore15ContextMenuItem7checkedEv
+__ZNK7WebCore15ContextMenuItem7enabledEv
 #endif
 
 #if ENABLE(DASHBOARD_SUPPORT)

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -21298,6 +21298,7 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,

diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
@@ -139,6 +139,10 @@ class EmptyChromeClient : public ChromeClient {
     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptyPopupMenu()); }
     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptySearchPopupMenu()); }
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
+
     virtual void setStatusbarText(const String&) { }
 
     virtual bool tabsToLinks() const { return false; }

diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
@@ -502,4 +502,11 @@ PassRefPtr<SearchPopupMenu> Chrome::createSearchPopupMenu(PopupMenuClient* clien
     return m_client->createSearchPopupMenu(client);
 }
 
+#if ENABLE(CONTEXT_MENUS)
+void Chrome::showContextMenu()
+{
+    m_client->showContextMenu();
+}
+#endif
+
 } // namespace WebCore
diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
@@ -155,6 +155,10 @@ namespace WebCore {
         PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
         PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
 
+#if ENABLE(CONTEXT_MENUS)
+        void showContextMenu();
+#endif
+
     private:
         Page* m_page;
         ChromeClient* m_client;

diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
@@ -269,6 +269,10 @@ namespace WebCore {
         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0;
         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0;
 
+#if ENABLE(CONTEXT_MENUS)
+        virtual void showContextMenu() = 0;
+#endif
+
         virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
 
     protected:

diff --git a/WebCore/platform/ContextMenu.h b/WebCore/platform/ContextMenu.h
@@ -91,6 +91,8 @@ namespace WebCore {
 #endif
     };
 
+Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription);
+
 }
 
 #endif // ContextMenu_h
diff --git a/WebCore/platform/mac/ContextMenuItemMac.mm b/WebCore/platform/mac/ContextMenuItemMac.mm
@@ -154,6 +154,11 @@
     return [m_platformDescription.get() isEnabled];
 }
 
+bool ContextMenuItem::checked() const
+{
+    return [m_platformDescription.get() state] == NSOnState;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(CONTEXT_MENUS)
diff --git a/WebCore/platform/mac/ContextMenuMac.mm b/WebCore/platform/mac/ContextMenuMac.mm
@@ -153,6 +153,19 @@ static void setMenuItemTarget(NSMenuItem* menuItem)
     return m_platformDescription.releaseRef();
 }
 
+Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription menu)
+{
+    Vector<ContextMenuItem> items;
+    unsigned count = [menu count];
+    if (menu)
+        items.reserveCapacity(count);
+
+    for (unsigned i = 0; i < count; ++i)
+        items.append(ContextMenuItem([menu objectAtIndex:i]));
+
+    return items;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(CONTEXT_MENUS)
diff --git a/WebCore/platform/qt/ContextMenuItemQt.cpp b/WebCore/platform/qt/ContextMenuItemQt.cpp
@@ -104,6 +104,12 @@ void ContextMenuItem::setChecked(bool on)
     m_platformDescription.checked = on;
 }
 
+bool ContextMenuItem::checked() const
+{
+    // FIXME - Implement
+    return false;
+}
+
 void ContextMenuItem::setEnabled(bool on)
 {
     m_platformDescription.enabled = on;

diff --git a/WebCore/platform/qt/ContextMenuQt.cpp b/WebCore/platform/qt/ContextMenuQt.cpp
@@ -74,6 +74,11 @@ PlatformMenuDescription ContextMenu::releasePlatformDescription()
     return PlatformMenuDescription();
 }
 
+Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription)
+{
+    // FIXME - Implement    
+    return Vector<ContextMenuItem>();
+}
 
 }
 // vim: ts=4 sw=4 et
diff --git a/WebCore/platform/win/ContextMenuItemWin.cpp b/WebCore/platform/win/ContextMenuItemWin.cpp
@@ -184,6 +184,12 @@ void ContextMenuItem::setChecked(bool checked)
     }
 }
 
+bool ContextMenuItem::checked() const
+{
+    // FIXME - Implement
+    return false;
+}
+
 void ContextMenuItem::setEnabled(bool enabled)
 {
     m_platformDescription->fMask |= MIIM_STATE;

diff --git a/WebCore/platform/win/ContextMenuWin.cpp b/WebCore/platform/win/ContextMenuWin.cpp
@@ -155,4 +155,10 @@ HMENU ContextMenu::releasePlatformDescription()
     return description;
 }
 
+Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription)
+{
+    // FIXME - Implement    
+    return Vector<ContextMenuItem>();
+}
+
 }
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * src/ChromeClientImpl.h:
+        (WebKit::ChromeClientImpl::showContextMenu):
+
 2010-11-01  Pavel Feldman  <pfeldman@chromium.org>
 
         Not reviewed: Chromium build fix.

diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
@@ -174,6 +174,10 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
+
 private:
     void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*);
 

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/ChromeClientEfl.h:
+        (WebCore::ChromeClientEfl::showContextMenu):
+
 2010-10-29  Daniel Bates  <dbates@rim.com>
 
         No review, rolling out 70971.

diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -115,6 +115,10 @@ class ChromeClientEfl : public ChromeClient {
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
 #endif
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
+
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
     virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
     virtual void formStateDidChange(const Node*);

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/ChromeClientGtk.h:
+        (WebKit::ChromeClient::showContextMenu):
+
 2010-11-01  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Xan Lopez.

diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -116,6 +116,9 @@ namespace WebKit {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
         virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*);
+#endif
+#if ENABLE(CONTEXT_MENUS)
+        virtual void showContextMenu() { }
 #endif
         virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
         virtual void chooseIconForFiles(const Vector<WTF::String>&, WebCore::FileChooser*);

diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/ChromeClientHaiku.h:
+        (WebCore::ChromeClientHaiku::showContextMenu):
+
 2010-10-29  Alexey Proskuryakov  <ap@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -137,6 +137,9 @@ namespace WebCore {
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
         virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
 #endif
+#if ENABLE(CONTEXT_MENUS)
+        virtual void showContextMenu() { }
+#endif
 
         // This is an asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolococation.

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::showContextMenu):
+
 2010-10-29  Daniel Bates  <dbates@rim.com>
 
         No review, rolling out 70971.

diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.h b/WebKit/mac/WebCoreSupport/WebChromeClient.h
@@ -178,6 +178,9 @@ class WebChromeClient : public WebCore::ChromeClient {
     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
 private:
     WebView *m_webView;
 };
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/ChromeClientQt.h:
+        (WebCore::ChromeClientQt::showContextMenu):
+
 2010-10-31  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Antonio Gomes.

diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -134,6 +134,9 @@ namespace WebCore {
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
         virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
 #endif
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
 
 #if ENABLE(NOTIFICATIONS)
         virtual NotificationPresenter* notificationPresenter() const;

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::showContextMenu):
+
 2010-11-01  Adam Roben  <aroben@apple.com>
 
         Cancel main resource loads after we hand them off to the media engine

diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.h b/WebKit/win/WebCoreSupport/WebChromeClient.h
@@ -122,6 +122,10 @@ class WebChromeClient : public WebCore::ChromeClient {
     virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*);
 #endif
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
+
     virtual void populateVisitedLinks();
 
     virtual bool paintCustomScrollbar(WebCore::GraphicsContext*, const WebCore::FloatRect&, WebCore::ScrollbarControlSize, 

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699
+        Context menu support for WebKit 2.
+
+        * WebKitSupport/ChromeClientWx.h:
+        (WebCore::ChromeClientWx::showContextMenu):
+
 2010-10-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -129,6 +129,10 @@ class ChromeClientWx : public ChromeClient {
     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*);
 #endif
 
+#if ENABLE(CONTEXT_MENUS)
+    virtual void showContextMenu() { }
+#endif
+
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
     virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);