Modified: trunk/Source/WebKit/ChangeLog (219831 => 219832)
--- trunk/Source/WebKit/ChangeLog 2017-07-24 18:42:33 UTC (rev 219831)
+++ trunk/Source/WebKit/ChangeLog 2017-07-24 18:55:29 UTC (rev 219832)
@@ -1,3 +1,20 @@
+2017-07-24 Michael Catanzaro <[email protected]>
+
+ [GTK][WPE] Stop using AutodrainedPool in IconDatabase
+ https://bugs.webkit.org/show_bug.cgi?id=174791
+
+ Reviewed by Alex Christensen.
+
+ AutodrainedPool seems to be some NS garbage collection thing that has no implementation on
+ other platforms. Now that IconDatabase is used only by GTK and WPE, we can stop using it.
+
+ * UIProcess/API/glib/IconDatabase.cpp:
+ (WebKit::IconDatabase::setIconDataForIconURL):
+ (WebKit::IconDatabase::setIconURLForPageURL):
+ (WebKit::IconDatabase::iconDatabaseSyncThread):
+ (WebKit::IconDatabase::performURLImport):
+ (WebKit::IconDatabase::readFromDatabase):
+
2017-07-24 Chris Dumez <[email protected]>
Fix lifetime management issue in ResourceLoadStatisticsPersistentStorage::scheduleOrWriteMemoryStore()
Modified: trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp (219831 => 219832)
--- trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp 2017-07-24 18:42:33 UTC (rev 219831)
+++ trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp 2017-07-24 18:55:29 UTC (rev 219832)
@@ -35,7 +35,6 @@
#include <WebCore/SQLiteTransaction.h>
#include <WebCore/SharedBuffer.h>
#include <WebCore/URL.h>
-#include <wtf/AutodrainedPool.h>
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/StdLibExtras.h>
@@ -586,8 +585,6 @@
scheduleOrDeferSyncTimer();
for (auto& pageURL : pageURLs) {
- AutodrainedPool pool;
-
LOG(IconDatabase, "Dispatching notification that retaining pageURL %s has a new icon", urlForLogging(pageURL).ascii().data());
m_client->didChangeIconForPageURL(pageURL);
}
@@ -657,7 +654,6 @@
scheduleOrDeferSyncTimer();
LOG(IconDatabase, "Dispatching notification that we changed an icon mapping for url %s", urlForLogging(pageURL).ascii().data());
- AutodrainedPool pool;
m_client->didChangeIconForPageURL(pageURL);
}
}
@@ -897,10 +893,8 @@
// Existence of a journal file is evidence of a previous crash/force quit and automatically qualifies
// us to do an integrity check
String journalFilename = m_completeDatabasePath + "-journal";
- if (!checkIntegrityOnOpen) {
- AutodrainedPool pool;
+ if (!checkIntegrityOnOpen)
checkIntegrityOnOpen = fileExists(journalFilename);
- }
{
LockHolder locker(m_syncLock);
@@ -1117,7 +1111,6 @@
int result = query.step();
while (result == SQLITE_ROW) {
- AutodrainedPool pool;
String pageURL = query.getColumnText(0);
String iconURL = query.getColumnText(1);
@@ -1228,8 +1221,6 @@
LOG(IconDatabase, "Notifying %lu interested page URLs that their icon URL is known due to the import", static_cast<unsigned long>(urlsToNotify.size()));
// Now that we don't hold any locks, perform the actual notifications
for (auto& url : urlsToNotify) {
- AutodrainedPool pool;
-
LOG(IconDatabase, "Notifying icon info known for pageURL %s", url.ascii().data());
dispatchDidImportIconURLForPageURLOnMainThread(url);
if (shouldStopThreadActivity())
@@ -1449,8 +1440,6 @@
// Now that we don't hold any locks, perform the actual notifications
for (HashSet<String>::const_iterator it = urlsToNotify.begin(), end = urlsToNotify.end(); it != end; ++it) {
- AutodrainedPool pool;
-
LOG(IconDatabase, "Notifying icon received for pageURL %s", urlForLogging(*it).ascii().data());
dispatchDidImportIconDataForPageURLOnMainThread(*it);
if (shouldStopThreadActivity())
