From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/UIProcess/WebIconDatabase.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebIconDatabase.cpp') diff --git a/Source/WebKit2/UIProcess/WebIconDatabase.cpp b/Source/WebKit2/UIProcess/WebIconDatabase.cpp index 655921084..7b7f9984b 100644 --- a/Source/WebKit2/UIProcess/WebIconDatabase.cpp +++ b/Source/WebKit2/UIProcess/WebIconDatabase.cpp @@ -228,7 +228,8 @@ void WebIconDatabase::checkIntegrityBeforeOpening() void WebIconDatabase::close() { - m_iconDatabaseImpl->close(); + if (m_iconDatabaseImpl) + m_iconDatabaseImpl->close(); } void WebIconDatabase::initializeIconDatabaseClient(const WKIconDatabaseClient* client) @@ -286,16 +287,6 @@ void WebIconDatabase::didFinishURLImport() m_urlImportCompleted = true; } -void WebIconDatabase::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) -{ - didReceiveWebIconDatabaseMessage(connection, messageID, decoder); -} - -void WebIconDatabase::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr& replyEncoder) -{ - didReceiveSyncWebIconDatabaseMessage(connection, messageID, decoder, replyEncoder); -} - void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL) { m_iconDatabaseClient.iconDataReadyForPageURL(this, WebURL::create(pageURL).get()); -- cgit v1.2.1