diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit2/UIProcess/WebLoaderClient.cpp | |
parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/WebLoaderClient.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/WebLoaderClient.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.cpp b/Source/WebKit2/UIProcess/WebLoaderClient.cpp index 92750124e..289e8797d 100644 --- a/Source/WebKit2/UIProcess/WebLoaderClient.cpp +++ b/Source/WebKit2/UIProcess/WebLoaderClient.cpp @@ -27,10 +27,15 @@ #include "WebLoaderClient.h" #include "ImmutableArray.h" -#include "WebBackForwardListItem.h" #include "WKAPICast.h" +#include "WebBackForwardListItem.h" #include <string.h> +#if ENABLE(WEB_INTENTS) +#include "WebIntentData.h" +#include "WebIntentServiceInfo.h" +#endif + using namespace WebCore; namespace WebKit { @@ -163,6 +168,26 @@ void WebLoaderClient::didDetectXSSForFrame(WebPageProxy* page, WebFrameProxy* fr m_client.didDetectXSSForFrame(toAPI(page), toAPI(frame), toAPI(userData), m_client.clientInfo); } +#if ENABLE(WEB_INTENTS) +void WebLoaderClient::didReceiveIntentForFrame(WebPageProxy* page, WebFrameProxy* frame, WebIntentData* intentData) +{ + if (!m_client.didReceiveIntentForFrame) + return; + + m_client.didReceiveIntentForFrame(toAPI(page), toAPI(frame), toAPI(intentData), m_client.clientInfo); +} +#endif + +#if ENABLE(WEB_INTENTS_TAG) +void WebLoaderClient::registerIntentServiceForFrame(WebPageProxy* page, WebFrameProxy* frame, WebIntentServiceInfo* serviceInfo) +{ + if (!m_client.registerIntentServiceForFrame) + return; + + m_client.registerIntentServiceForFrame(toAPI(page), toAPI(frame), toAPI(serviceInfo), m_client.clientInfo); +} +#endif + bool WebLoaderClient::canAuthenticateAgainstProtectionSpaceInFrame(WebPageProxy* page, WebFrameProxy* frame, WebProtectionSpace* protectionSpace) { if (!m_client.canAuthenticateAgainstProtectionSpaceInFrame) |