From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Mar 2012 14:11:15 +0100 Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API. --- Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp') diff --git a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp index 897511cc5..3f7d0289f 100644 --- a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp +++ b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp @@ -34,11 +34,14 @@ namespace WebKit { -bool WebPageContextMenuClient::getContextMenuFromProposedMenu(WebPageProxy* page, const Vector& proposedMenuVector, Vector& customMenu, APIObject* userData) +bool WebPageContextMenuClient::getContextMenuFromProposedMenu(WebPageProxy* page, const Vector& proposedMenuVector, Vector& customMenu, const WebHitTestResult::Data& hitTestResultData, APIObject* userData) { - if (!m_client.getContextMenuFromProposedMenu) + if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0) return false; - + + if (m_client.version == kWKPageContextMenuClientCurrentVersion && !m_client.getContextMenuFromProposedMenu) + return false; + unsigned size = proposedMenuVector.size(); RefPtr proposedMenu = MutableArray::create(); proposedMenu->reserveCapacity(size); @@ -46,7 +49,12 @@ bool WebPageContextMenuClient::getContextMenuFromProposedMenu(WebPageProxy* page proposedMenu->append(WebContextMenuItem::create(proposedMenuVector[i]).get()); WKArrayRef newMenu = 0; - m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(proposedMenu.get()), &newMenu, toAPI(userData), m_client.clientInfo); + if (m_client.version == kWKPageContextMenuClientCurrentVersion) { + RefPtr webHitTestResult = WebHitTestResult::create(hitTestResultData); + m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(proposedMenu.get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.clientInfo); + } else + m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(proposedMenu.get()), &newMenu, toAPI(userData), m_client.clientInfo); + RefPtr array = adoptRef(toImpl(newMenu)); customMenu.clear(); -- cgit v1.2.1