From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp') 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(const_cast(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); } -- cgit v1.2.1