From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/WebKit2/UIProcess/WebLoaderClient.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebLoaderClient.cpp') diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.cpp b/Source/WebKit2/UIProcess/WebLoaderClient.cpp index 2aae01617..ca9d7f6f1 100644 --- a/Source/WebKit2/UIProcess/WebLoaderClient.cpp +++ b/Source/WebKit2/UIProcess/WebLoaderClient.cpp @@ -211,6 +211,14 @@ void WebLoaderClient::processDidBecomeUnresponsive(WebPageProxy* page) m_client.processDidBecomeUnresponsive(toAPI(page), m_client.clientInfo); } +void WebLoaderClient::interactionOccurredWhileProcessUnresponsive(WebPageProxy* page) +{ + if (!m_client.interactionOccurredWhileProcessUnresponsive) + return; + + m_client.interactionOccurredWhileProcessUnresponsive(toAPI(page), m_client.clientInfo); +} + void WebLoaderClient::processDidBecomeResponsive(WebPageProxy* page) { if (!m_client.processDidBecomeResponsive) @@ -243,17 +251,17 @@ bool WebLoaderClient::shouldGoToBackForwardListItem(WebPageProxy* page, WebBackF { // We should only even considering sending the shouldGoToBackForwardListItem() client callback // for version 0 clients. Later versioned clients should get willGoToBackForwardListItem() instead, - // but do to XPC race conditions this one might have been called instead. + // but due to XPC race conditions this one might have been called instead. if (m_client.version > 0 || !m_client.shouldGoToBackForwardListItem) return true; return m_client.shouldGoToBackForwardListItem(toAPI(page), toAPI(item), m_client.clientInfo); } -void WebLoaderClient::willGoToBackForwardListItem(WebPageProxy* page, WebBackForwardListItem* item) +void WebLoaderClient::willGoToBackForwardListItem(WebPageProxy* page, WebBackForwardListItem* item, APIObject* userData) { if (m_client.willGoToBackForwardListItem) - m_client.willGoToBackForwardListItem(toAPI(page), toAPI(item), m_client.clientInfo); + m_client.willGoToBackForwardListItem(toAPI(page), toAPI(item), toAPI(userData), m_client.clientInfo); } void WebLoaderClient::didFailToInitializePlugin(WebPageProxy* page, const String& mimeType) -- cgit v1.2.1