diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
| commit | 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch) | |
| tree | 0287b1a69d84492c901e8bc820e635e7133809a0 /Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | |
| parent | 682ab87480e7757346802ce7f54cfdbdfeb2339e (diff) | |
| download | qtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz | |
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp index ac869fbea..db2ed4128 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp @@ -59,6 +59,12 @@ #include <WebCore/TextResourceDecoder.h> #include <wtf/text/StringBuilder.h> +#if ENABLE(WEB_INTENTS) +#include "IntentData.h" +#include <WebCore/DOMWindowIntents.h> +#include <WebCore/DeliveredIntent.h> +#endif + #if PLATFORM(MAC) || PLATFORM(WIN) #include <WebCore/LegacyWebArchive.h> #endif @@ -236,6 +242,19 @@ void WebFrame::convertHandleToDownload(ResourceHandle* handle, const ResourceReq m_policyDownloadID = 0; } +#if ENABLE(WEB_INTENTS) +void WebFrame::deliverIntent(const IntentData& intentData) +{ + OwnPtr<DeliveredIntentClient> dummyClient; + OwnPtr<MessagePortArray> dummyPorts; + Vector<uint8_t> dataCopy = intentData.data; + RefPtr<DeliveredIntent> deliveredIntent = DeliveredIntent::create(m_coreFrame, dummyClient.release(), intentData.action, intentData.type, + SerializedScriptValue::adopt(dataCopy), dummyPorts.release(), + intentData.extras); + WebCore::DOMWindowIntents::from(m_coreFrame->domWindow())->deliver(deliveredIntent.release()); +} +#endif + String WebFrame::source() const { if (!m_coreFrame) |