diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp | |
parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp')
-rw-r--r-- | Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp index 2963dc268..74f8efb1d 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp @@ -33,6 +33,13 @@ #include "WebError.h" #include <wtf/text/WTFString.h> +#if ENABLE(WEB_INTENTS) +#include "WebIntentData.h" +#endif +#if ENABLE(WEB_INTENTS_TAG) +#include "WebIntentServiceInfo.h" +#endif + using namespace WebCore; namespace WebKit { @@ -187,6 +194,30 @@ void InjectedBundlePageLoaderClient::didDetectXSSForFrame(WebPage* page, WebFram userData = adoptRef(toImpl(userDataToPass)); } +#if ENABLE(WEB_INTENTS) +void InjectedBundlePageLoaderClient::didReceiveIntentForFrame(WebPage* page, WebFrame* frame, WebIntentData* intent, RefPtr<APIObject>& userData) +{ + if (!m_client.didReceiveIntentForFrame) + return; + + WKTypeRef userDataToPass = 0; + m_client.didReceiveIntentForFrame(toAPI(page), toAPI(frame), toAPI(intent), &userDataToPass, m_client.clientInfo); + userData = adoptRef(toImpl(userDataToPass)); +} +#endif + +#if ENABLE(WEB_INTENTS_TAG) +void InjectedBundlePageLoaderClient::registerIntentServiceForFrame(WebPage* page, WebFrame* frame, WebIntentServiceInfo* service, RefPtr<APIObject>& userData) +{ + if (!m_client.registerIntentServiceForFrame) + return; + + WKTypeRef userDataToPass = 0; + m_client.registerIntentServiceForFrame(toAPI(page), toAPI(frame), toAPI(service), &userDataToPass, m_client.clientInfo); + userData = adoptRef(toImpl(userDataToPass)); +} +#endif + void InjectedBundlePageLoaderClient::didFirstLayoutForFrame(WebPage* page, WebFrame* frame, RefPtr<APIObject>& userData) { if (!m_client.didFirstLayoutForFrame) |