From 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 15 Oct 2012 16:08:57 +0200 Subject: Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300) WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314 --- Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp') diff --git a/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp b/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp index 6babfe4dd..d77419ae8 100644 --- a/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp +++ b/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp @@ -80,7 +80,6 @@ static void webkitFaviconDatabaseClose(WebKitFaviconDatabase* database); class IconDatabaseClientGtk : public IconDatabaseClient { public: // IconDatabaseClient interface - virtual bool performImport() { return true; } virtual void didRemoveAllIcons() { }; // Called when an icon is requested while the initial import is @@ -614,18 +613,18 @@ static void webkitFaviconDatabaseImportFinished(WebKitFaviconDatabase* database) Vector toDeleteURLs; PendingIconRequestMap::const_iterator end = database->priv->pendingIconRequests.end(); for (PendingIconRequestMap::const_iterator iter = database->priv->pendingIconRequests.begin(); iter != end; ++iter) { - String iconURL = iconDatabase().synchronousIconURLForPageURL(iter->first); + String iconURL = iconDatabase().synchronousIconURLForPageURL(iter->key); if (!iconURL.isEmpty()) continue; - PendingIconRequestVector* icons = iter->second; + PendingIconRequestVector* icons = iter->value; for (size_t i = 0; i < icons->size(); ++i) { PendingIconRequest* request = icons->at(i).get(); if (request->asyncResult()) request->asyncResultComplete(0); } - toDeleteURLs.append(iter->first); + toDeleteURLs.append(iter->key); } for (size_t i = 0; i < toDeleteURLs.size(); ++i) -- cgit v1.2.1