diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/WebIconDatabase.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebIconDatabase.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebIconDatabase.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
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<CoreIPC::MessageEncoder>& replyEncoder) -{ - didReceiveSyncWebIconDatabaseMessage(connection, messageID, decoder, replyEncoder); -} - void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL) { m_iconDatabaseClient.iconDataReadyForPageURL(this, WebURL::create(pageURL).get()); |