From 6dbcd09121fe266c7704a524b5cbd7f2754659c0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 14:01:09 +0200 Subject: Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119) New snapshot with prospective build fix for incorrect QtWebKit master module header file creation --- .../WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp') diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp index 02077912b..217f1e80a 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp @@ -72,7 +72,7 @@ void WebIconDatabaseProxy::releaseIconForPageURL(const String& pageURL) m_process->connection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0); } -Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& size) +Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& /*size*/) { CoreIPC::DataReference result; if (!m_process->connection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0)) @@ -83,21 +83,21 @@ Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, co } -String WebIconDatabaseProxy::synchronousIconURLForPageURL(const String& pageURL) +String WebIconDatabaseProxy::synchronousIconURLForPageURL(const String& /*pageURL*/) { // FIXME: This needs to ask the UI process for the iconURL, but it can't do so synchronously because it will slow down page loading. // The parts in WebCore that need this data will have to be changed to work asycnchronously. return String(); } -bool WebIconDatabaseProxy::synchronousIconDataKnownForIconURL(const String& iconURL) +bool WebIconDatabaseProxy::synchronousIconDataKnownForIconURL(const String& /*iconURL*/) { // FIXME: This needs to ask the UI process for the iconURL, but it can't do so synchronously because it will slow down page loading. // The parts in WebCore that need this data will have to be changed to work asycnchronously. return false; } -IconLoadDecision WebIconDatabaseProxy::synchronousLoadDecisionForIconURL(const String& iconURL, DocumentLoader* documentLoader) +IconLoadDecision WebIconDatabaseProxy::synchronousLoadDecisionForIconURL(const String& /*iconURL*/, DocumentLoader*) { // FIXME: This needs to ask the UI process for the iconURL, but it can't do so synchronously because it will slow down page loading. // The parts in WebCore that need this data will have to be changed to work asycnchronously. @@ -124,7 +124,7 @@ void WebIconDatabaseProxy::receivedIconLoadDecision(int decision, uint64_t callb callback->performCallback(static_cast(decision)); } -void WebIconDatabaseProxy::iconDataForIconURL(const String& iconURL, PassRefPtr callback) +void WebIconDatabaseProxy::iconDataForIconURL(const String& /*iconURL*/, PassRefPtr) { } -- cgit v1.2.1