<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170754] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170754">170754</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-03 09:19:07 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Possible crash in IconDatabase in WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread
<rdar://problem/17437687> and https://bugs.webkit.org/show_bug.cgi?id=134517
Reviewed by Eric Carlson.
Source/WebCore:
Since WebCore::IconDatabase is not RefCounted there’s no obvious way to keep it alive until it is
truly no longer needed.
This isn’t generally a problem because they are usually a singleton that lasts the lifetime of the process.
In the WebKit2 case, WebCore::IconDatabases can come and go as their owning WebIconDatabases come and go.
So we can rely on WebIconDatabase to handle the lifetime appropriately.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::close): If the database is actually closed, notify the client.
(WebCore::IconDatabase::IconDatabase):
(WebCore::IconDatabase::isOpen): Take into account whether there’s any main thread callbacks, plus what
is covered by isOpenBesidesMainThreadCallbacks.
(WebCore::IconDatabase::isOpenBesidesMainThreadCallbacks): Take into account whether the sync thread
is still running and whether or not the database file is still open.
(WebCore::IconDatabase::checkClosedAfterMainThreadCallback): Checks to see if the database has just
become 100% closed and - if so - notify the client.
(WebCore::IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread): Updated to increment the main thread
callback count and to call checkClosedAfterMainThreadCallback when done.
(WebCore::IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread): Ditto.
(WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread): Ditto.
(WebCore::IconDatabase::dispatchDidFinishURLImportOnMainThread): Ditto.
* loader/icon/IconDatabase.h:
* loader/icon/IconDatabaseClient.h:
(WebCore::IconDatabaseClient::didClose): Added. For the IconDatabase to tell its client it is 100% closed.
Source/WebKit2:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::~WebContext): Instead of directly deref’ing the WebIconDatabase, ask it to
deref itself when appropriate.
* UIProcess/WebIconDatabase.cpp:
(WebKit::WebIconDatabase::WebIconDatabase):
(WebKit::WebIconDatabase::didClose): If this WebIconDatabase is supposed to deref itself when
appropriate, do so now.
(WebKit::WebIconDatabase::derefWhenAppropriate): If the WebCore::IconDatabase is still open then
defer this deref.
* UIProcess/WebIconDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseh">trunk/Source/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseClienth">trunk/Source/WebCore/loader/icon/IconDatabaseClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabasecpp">trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabaseh">trunk/Source/WebKit2/UIProcess/WebIconDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebCore/ChangeLog 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-07-03 Brady Eidson <beidson@apple.com>
+
+ Possible crash in IconDatabase in WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread
+ <rdar://problem/17437687> and https://bugs.webkit.org/show_bug.cgi?id=134517
+
+ Reviewed by Eric Carlson.
+
+ Since WebCore::IconDatabase is not RefCounted there’s no obvious way to keep it alive until it is
+ truly no longer needed.
+
+ This isn’t generally a problem because they are usually a singleton that lasts the lifetime of the process.
+
+ In the WebKit2 case, WebCore::IconDatabases can come and go as their owning WebIconDatabases come and go.
+
+ So we can rely on WebIconDatabase to handle the lifetime appropriately.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::close): If the database is actually closed, notify the client.
+ (WebCore::IconDatabase::IconDatabase):
+ (WebCore::IconDatabase::isOpen): Take into account whether there’s any main thread callbacks, plus what
+ is covered by isOpenBesidesMainThreadCallbacks.
+ (WebCore::IconDatabase::isOpenBesidesMainThreadCallbacks): Take into account whether the sync thread
+ is still running and whether or not the database file is still open.
+ (WebCore::IconDatabase::checkClosedAfterMainThreadCallback): Checks to see if the database has just
+ become 100% closed and - if so - notify the client.
+ (WebCore::IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread): Updated to increment the main thread
+ callback count and to call checkClosedAfterMainThreadCallback when done.
+ (WebCore::IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread): Ditto.
+ (WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread): Ditto.
+ (WebCore::IconDatabase::dispatchDidFinishURLImportOnMainThread): Ditto.
+ * loader/icon/IconDatabase.h:
+
+ * loader/icon/IconDatabaseClient.h:
+ (WebCore::IconDatabaseClient::didClose): Added. For the IconDatabase to tell its client it is 100% closed.
+
</ins><span class="cx"> 2014-07-03 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: VoiceOver does not read aria-expanded attribute on controls in Safari
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -168,7 +168,11 @@
</span><span class="cx"> m_removeIconsRequested = false;
</span><span class="cx">
</span><span class="cx"> m_syncDB.close();
</span><del>- ASSERT(!isOpen());
</del><ins>+
+ // If there are still main thread callbacks in flight then the database might not actually be closed yet.
+ // But if it is closed, notify the client now.
+ if (!isOpen() && m_client)
+ m_client->didClose();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::removeAllIcons()
</span><span class="lines">@@ -793,6 +797,7 @@
</span><span class="cx"> , m_syncThreadHasWorkToDo(false)
</span><span class="cx"> , m_retainOrReleaseIconRequested(false)
</span><span class="cx"> , m_initialPruningComplete(false)
</span><ins>+ , m_mainThreadCallbackCount(0)
</ins><span class="cx"> , m_client(defaultClient())
</span><span class="cx"> {
</span><span class="cx"> LOG(IconDatabase, "Creating IconDatabase %p", this);
</span><span class="lines">@@ -864,8 +869,13 @@
</span><span class="cx">
</span><span class="cx"> bool IconDatabase::isOpen() const
</span><span class="cx"> {
</span><ins>+ return isOpenBesidesMainThreadCallbacks() || m_mainThreadCallbackCount;
+}
+
+bool IconDatabase::isOpenBesidesMainThreadCallbacks() const
+{
</ins><span class="cx"> MutexLocker locker(m_syncLock);
</span><del>- return m_syncDB.isOpen();
</del><ins>+ return m_syncThreadRunning || m_syncDB.isOpen();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String IconDatabase::databasePath() const
</span><span class="lines">@@ -2066,45 +2076,73 @@
</span><span class="cx"> SQLiteStatement(m_syncDB, "INSERT INTO IconDatabaseInfo (key, value) VALUES ('ExcludedFromBackup', 1)").executeCommand();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IconDatabase::checkClosedAfterMainThreadCallback()
+{
+ ASSERT_NOT_SYNC_THREAD();
+
+ // If there are still callbacks in flight from the sync thread we cannot possibly be closed.
+ if (--m_mainThreadCallbackCount)
+ return;
+
+ // Even if there's no more pending callbacks the database might otherwise still be open.
+ if (isOpenBesidesMainThreadCallbacks())
+ return;
+
+ // This database is now actually closed! But first notify the client.
+ if (m_client)
+ m_client->didClose();
+}
+
</ins><span class="cx"> void IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread(const String& pageURL)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><ins>+ ++m_mainThreadCallbackCount;
</ins><span class="cx">
</span><span class="cx"> String pageURLCopy = pageURL.isolatedCopy();
</span><span class="cx"> callOnMainThread([this, pageURLCopy] {
</span><del>- m_client->didImportIconURLForPageURL(pageURLCopy);
</del><ins>+ if (m_client)
+ m_client->didImportIconURLForPageURL(pageURLCopy);
+ checkClosedAfterMainThreadCallback();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread(const String& pageURL)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><ins>+ ++m_mainThreadCallbackCount;
</ins><span class="cx">
</span><span class="cx"> String pageURLCopy = pageURL.isolatedCopy();
</span><span class="cx"> callOnMainThread([this, pageURLCopy] {
</span><del>- m_client->didImportIconDataForPageURL(pageURLCopy);
</del><ins>+ if (m_client)
+ m_client->didImportIconDataForPageURL(pageURLCopy);
+ checkClosedAfterMainThreadCallback();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidRemoveAllIconsOnMainThread()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><ins>+ ++m_mainThreadCallbackCount;
</ins><span class="cx">
</span><span class="cx"> callOnMainThread([this] {
</span><del>- m_client->didRemoveAllIcons();
</del><ins>+ if (m_client)
+ m_client->didRemoveAllIcons();
+ checkClosedAfterMainThreadCallback();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidFinishURLImportOnMainThread()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><ins>+ ++m_mainThreadCallbackCount;
</ins><span class="cx">
</span><span class="cx"> callOnMainThread([this] {
</span><del>- m_client->didFinishURLImport();
</del><ins>+ if (m_client)
+ m_client->didFinishURLImport();
+ checkClosedAfterMainThreadCallback();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(ICONDATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -203,6 +203,9 @@
</span><span class="cx"> bool wasExcludedFromBackup();
</span><span class="cx"> void setWasExcludedFromBackup();
</span><span class="cx">
</span><ins>+ bool isOpenBesidesMainThreadCallbacks() const;
+ void checkClosedAfterMainThreadCallback();
+
</ins><span class="cx"> bool m_initialPruningComplete;
</span><span class="cx">
</span><span class="cx"> void setIconURLForPageURLInSQLDatabase(const String&, const String&);
</span><span class="lines">@@ -221,6 +224,7 @@
</span><span class="cx"> void dispatchDidImportIconDataForPageURLOnMainThread(const String&);
</span><span class="cx"> void dispatchDidRemoveAllIconsOnMainThread();
</span><span class="cx"> void dispatchDidFinishURLImportOnMainThread();
</span><ins>+ std::atomic<uint32_t> m_mainThreadCallbackCount;
</ins><span class="cx">
</span><span class="cx"> // The client is set by the main thread before the thread starts, and from then on is only used by the sync thread
</span><span class="cx"> IconDatabaseClient* m_client;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabaseClient.h (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabaseClient.h 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebCore/loader/icon/IconDatabaseClient.h 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> virtual void didChangeIconForPageURL(const String&) = 0;
</span><span class="cx"> virtual void didRemoveAllIcons() = 0;
</span><span class="cx"> virtual void didFinishURLImport() = 0;
</span><ins>+ virtual void didClose() { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-03 Brady Eidson <beidson@apple.com>
+
+ Possible crash in IconDatabase in WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread
+ <rdar://problem/17437687> and https://bugs.webkit.org/show_bug.cgi?id=134517
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::~WebContext): Instead of directly deref’ing the WebIconDatabase, ask it to
+ deref itself when appropriate.
+
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::WebIconDatabase):
+ (WebKit::WebIconDatabase::didClose): If this WebIconDatabase is supposed to deref itself when
+ appropriate, do so now.
+ (WebKit::WebIconDatabase::derefWhenAppropriate): If the WebCore::IconDatabase is still open then
+ defer this deref.
+ * UIProcess/WebIconDatabase.h:
+
</ins><span class="cx"> 2014-07-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r170676): [GTK] UI process crashes when the Web Process crashes
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -257,7 +257,9 @@
</span><span class="cx">
</span><span class="cx"> m_iconDatabase->invalidate();
</span><span class="cx"> m_iconDatabase->clearContext();
</span><del>-
</del><ins>+ WebIconDatabase* rawIconDatabase = m_iconDatabase.release().leakRef();
+ rawIconDatabase->derefWhenAppropriate();
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> m_pluginSiteDataManager->invalidate();
</span><span class="cx"> m_pluginSiteDataManager->clearContext();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> : m_webContext(&context)
</span><span class="cx"> , m_urlImportCompleted(false)
</span><span class="cx"> , m_databaseCleanupDisabled(false)
</span><ins>+ , m_shouldDerefWhenAppropriate(false)
</ins><span class="cx"> {
</span><span class="cx"> m_webContext->addMessageReceiver(Messages::WebIconDatabase::messageReceiverName(), *this);
</span><span class="cx"> }
</span><span class="lines">@@ -284,6 +285,24 @@
</span><span class="cx"> m_urlImportCompleted = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIconDatabase::didClose()
+{
+ if (!m_shouldDerefWhenAppropriate)
+ return;
+
+ deref();
+}
+
+void WebIconDatabase::derefWhenAppropriate()
+{
+ if (m_iconDatabaseImpl && m_iconDatabaseImpl->isOpen()) {
+ m_shouldDerefWhenAppropriate = true;
+ return;
+ }
+
+ deref();
+}
+
</ins><span class="cx"> void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><span class="cx"> m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).get());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.h (170753 => 170754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2014-07-03 15:46:36 UTC (rev 170753)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2014-07-03 16:19:07 UTC (rev 170754)
</span><span class="lines">@@ -84,6 +84,11 @@
</span><span class="cx">
</span><span class="cx"> void setPrivateBrowsingEnabled(bool);
</span><span class="cx">
</span><ins>+ // Called when the WebContext is through with this WebIconDatabase but the
+ // WebCore::IconDatabase possibly isn't done shutting down.
+ // In that case this WebIconDatabase will deref() itself when the time is right.
+ void derefWhenAppropriate();
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebIconDatabase(WebContext&);
</span><span class="cx">
</span><span class="lines">@@ -93,6 +98,7 @@
</span><span class="cx"> virtual void didChangeIconForPageURL(const String&) override;
</span><span class="cx"> virtual void didRemoveAllIcons() override;
</span><span class="cx"> virtual void didFinishURLImport() override;
</span><ins>+ virtual void didClose() override;
</ins><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span><span class="lines">@@ -105,6 +111,7 @@
</span><span class="cx"> std::unique_ptr<WebCore::IconDatabase> m_iconDatabaseImpl;
</span><span class="cx"> bool m_urlImportCompleted;
</span><span class="cx"> bool m_databaseCleanupDisabled;
</span><ins>+ bool m_shouldDerefWhenAppropriate;
</ins><span class="cx"> HashMap<uint64_t, String> m_pendingLoadDecisionURLMap;
</span><span class="cx">
</span><span class="cx"> WebIconDatabaseClient m_iconDatabaseClient;
</span></span></pre>
</div>
</div>
</body>
</html>