diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp index 592bb371c..7dbb273fd 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp @@ -22,7 +22,6 @@ #include "Image.h" #include "KURL.h" -#include "QtWebContext.h" #include "SharedBuffer.h" #include "WKURLQt.h" #include "WebContext.h" @@ -40,11 +39,9 @@ static inline QtWebIconDatabaseClient* toQtWebIconDatabaseClient(const void* cli return reinterpret_cast<QtWebIconDatabaseClient*>(const_cast<void*>(clientInfo)); } -QtWebIconDatabaseClient::QtWebIconDatabaseClient(QtWebContext *qtWebContext) +QtWebIconDatabaseClient::QtWebIconDatabaseClient(WebContext *context) { - m_contextId = qtWebContext->contextID(); // The setter calls the getter here as it triggers the startup of the icon database. - WebContext* context = qtWebContext->context(); if (!context->iconDatabase()->isOpen()) context->setIconDatabasePath(context->iconDatabasePath()); m_iconDatabase = context->iconDatabase(); @@ -59,6 +56,7 @@ QtWebIconDatabaseClient::QtWebIconDatabaseClient(QtWebContext *qtWebContext) QtWebIconDatabaseClient::~QtWebIconDatabaseClient() { + m_iconDatabase->close(); WKIconDatabaseSetIconDatabaseClient(toAPI(m_iconDatabase.get()), 0); } |