<!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>[168680] 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/168680">168680</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-13 07:44:50 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make a few icon database improvements
https://bugs.webkit.org/show_bug.cgi?id=132812
Reviewed by Brady Eidson.
Source/WebCore:
* WebCore.exp.in: Export more IconDatabase functions, since they are now called
by WebKit2 through pointers to a class marked final.
* loader/icon/IconDatabase.cpp: Removed unneeded includes. Use override for
virtual functions.
* loader/icon/IconDatabase.h: Removed unneeded includes. Marked the class final.
Use override for virtual functions. Use a public constructor instead of a create
function.
* loader/icon/IconDatabaseBase.h: Removed unneeded includes.
Source/WebKit2:
* UIProcess/API/C/WKIconDatabase.cpp:
(WKIconDatabaseCopyIconDataForPageURL): Moved the actual implementation of this
out of the bindings into the WebIconDatabase class.
* UIProcess/API/C/WKIconDatabase.h: Fixed argument names that were inconsistent.
* UIProcess/WebIconDatabase.cpp: Removed unneeded includes.
(WebKit::WebIconDatabase::create): Pass a reference instead of a pointer.
(WebKit::WebIconDatabase::WebIconDatabase): Take a reference instead of a pointer.
(WebKit::WebIconDatabase::invalidate): Use nullptr.
(WebKit::WebIconDatabase::setDatabasePath): Use make_unique.
(WebKit::WebIconDatabase::setIconDataForIconURL): Removed unneeded local variable.
(WebKit::WebIconDatabase::imageForPageURL): Use nullptr.
(WebKit::WebIconDatabase::nativeImageForPageURL): Ditto.
(WebKit::WebIconDatabase::didFinishURLImport): Use a modern for loop.
(WebKit::WebIconDatabase::iconDataForPageURL): Added. Moved this here from
WKIconDatabase.cpp, but also changed to use createWithoutCopying to avoid making
another copy of the data for each icon.
* UIProcess/WebIconDatabase.h: Removed unneeded includes. Derive from
IconDatabaseClient privately. Use nullptr. Added iconDataForPageURL member
function. Use a reference for the constructor argument. Use override for
virtual functions. Use unique_ptr instead of OwnPtr.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCoreloadericonIconDatabaseBaseh">trunk/Source/WebCore/loader/icon/IconDatabaseBase.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKIconDatabasecpp">trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKIconDatabaseh">trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h</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 (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-12 Darin Adler <darin@apple.com>
+
+ Make a few icon database improvements
+ https://bugs.webkit.org/show_bug.cgi?id=132812
+
+ Reviewed by Brady Eidson.
+
+ * WebCore.exp.in: Export more IconDatabase functions, since they are now called
+ by WebKit2 through pointers to a class marked final.
+
+ * loader/icon/IconDatabase.cpp: Removed unneeded includes. Use override for
+ virtual functions.
+
+ * loader/icon/IconDatabase.h: Removed unneeded includes. Marked the class final.
+ Use override for virtual functions. Use a public constructor instead of a create
+ function.
+
+ * loader/icon/IconDatabaseBase.h: Removed unneeded includes.
+
</ins><span class="cx"> 2014-05-13 Kiran <kiran.guduru@samsung.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] MediaStream.addTrack Should not check for active state.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -2991,16 +2991,23 @@
</span><span class="cx"> __ZN7WebCore12IconDatabase20delayDatabaseCleanupEv
</span><span class="cx"> __ZN7WebCore12IconDatabase20retainIconForPageURLERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore12IconDatabase20retainedPageURLCountEv
</span><ins>+__ZN7WebCore12IconDatabase20setIconURLForPageURLERKN3WTF6StringES4_
</ins><span class="cx"> __ZN7WebCore12IconDatabase21releaseIconForPageURLERKN3WTF6StringE
</span><ins>+__ZN7WebCore12IconDatabase21setIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
</ins><span class="cx"> __ZN7WebCore12IconDatabase23defaultDatabaseFilenameEv
</span><span class="cx"> __ZN7WebCore12IconDatabase23iconRecordCountWithDataEv
</span><span class="cx"> __ZN7WebCore12IconDatabase25setPrivateBrowsingEnabledEb
</span><ins>+__ZN7WebCore12IconDatabase25synchronousIconForPageURLERKN3WTF6StringERKNS_7IntSizeE
</ins><span class="cx"> __ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
</span><ins>+__ZN7WebCore12IconDatabase28synchronousIconURLForPageURLERKN3WTF6StringE
+__ZN7WebCore12IconDatabase33synchronousLoadDecisionForIconURLERKN3WTF6StringEPNS_14DocumentLoaderE
+__ZN7WebCore12IconDatabase4openERKN3WTF6StringES4_
</ins><span class="cx"> __ZN7WebCore12IconDatabase5closeEv
</span><span class="cx"> __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
</span><span class="cx"> __ZN7WebCore12IconDatabaseC1Ev
</span><span class="cx"> __ZNK7WebCore12IconDatabase12databasePathEv
</span><span class="cx"> __ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv
</span><ins>+__ZNK7WebCore12IconDatabase6isOpenEv
</ins><span class="cx"> __ZNK7WebCore12IconDatabase9isEnabledEv
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -34,16 +34,13 @@
</span><span class="cx"> #include "IconDatabaseClient.h"
</span><span class="cx"> #include "IconRecord.h"
</span><span class="cx"> #include "Image.h"
</span><del>-#include "IntSize.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include "SQLiteTransaction.h"
</span><span class="cx"> #include "SuddenTermination.h"
</span><span class="cx"> #include <wtf/AutodrainedPool.h>
</span><del>-#include <wtf/CurrentTime.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/text/CString.h>
</del><span class="cx">
</span><span class="cx"> // For methods that are meant to support API from the main thread - should not be called internally
</span><span class="cx"> #define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_THREAD())
</span><span class="lines">@@ -90,19 +87,19 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-class DefaultIconDatabaseClient : public IconDatabaseClient {
</del><ins>+class DefaultIconDatabaseClient final : public IconDatabaseClient {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- virtual void didImportIconURLForPageURL(const String&) { }
- virtual void didImportIconDataForPageURL(const String&) { }
- virtual void didChangeIconForPageURL(const String&) { }
- virtual void didRemoveAllIcons() { }
- virtual void didFinishURLImport() { }
</del><ins>+ virtual void didImportIconURLForPageURL(const String&) override { }
+ virtual void didImportIconDataForPageURL(const String&) override { }
+ virtual void didChangeIconForPageURL(const String&) override { }
+ virtual void didRemoveAllIcons() override { }
+ virtual void didFinishURLImport() override { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static IconDatabaseClient* defaultClient()
</span><span class="cx"> {
</span><del>- static IconDatabaseClient* defaultClient = new DefaultIconDatabaseClient();
</del><ins>+ static IconDatabaseClient* defaultClient = new DefaultIconDatabaseClient;
</ins><span class="cx"> return defaultClient;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -28,99 +28,84 @@
</span><span class="cx"> #define IconDatabase_h
</span><span class="cx">
</span><span class="cx"> #include "IconDatabaseBase.h"
</span><ins>+
+#if ENABLE(ICONDATABASE)
+#include "SQLiteDatabase.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
</del><ins>+#endif
</ins><span class="cx">
</span><del>-#if ENABLE(ICONDATABASE)
-#include "SQLiteDatabase.h"
-#include <wtf/Threading.h>
-#endif // ENABLE(ICONDATABASE)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DocumentLoader;
-class Image;
-class IntSize;
-class IconDatabaseClient;
-class IconRecord;
-class IconSnapshot;
-class URL;
-class PageURLRecord;
-class PageURLSnapshot;
-class SharedBuffer;
-class SuddenTerminationDisabler;
-
-#if ENABLE(ICONDATABASE)
-class SQLTransaction;
-#endif
-
</del><span class="cx"> #if !ENABLE(ICONDATABASE)
</span><del>-// For builds with IconDatabase disabled, they'll just use a default derivation of IconDatabaseBase. Which does nothing.
-class IconDatabase : public IconDatabaseBase {
</del><ins>+
+// Dummy version of IconDatabase that does nothing.
+class IconDatabase final : public IconDatabaseBase {
+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><del>- static PassOwnPtr<IconDatabase> create() { return adoptPtr(new IconDatabase); }
</del><span class="cx"> static void delayDatabaseCleanup() { }
</span><span class="cx"> static void allowDatabaseCleanup() { }
</span><span class="cx"> static void checkIntegrityBeforeOpening() { }
</span><span class="cx"> static String defaultDatabaseFilename() { return "WebpageIcons.db"; }
</span><span class="cx"> };
</span><del>-#else
</del><span class="cx">
</span><del>-class IconDatabase : public IconDatabaseBase {
</del><ins>+#else
+
+class IconRecord;
+class IconSnapshot;
+class PageURLRecord;
+class PageURLSnapshot;
+class SuddenTerminationDisabler;
+
+class IconDatabase final : public IconDatabaseBase {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><span class="cx"> // *** Main Thread Only ***
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<IconDatabase> create() { return adoptPtr(new IconDatabase); }
</del><ins>+ IconDatabase();
</ins><span class="cx"> ~IconDatabase();
</span><span class="cx">
</span><del>- virtual void setClient(IconDatabaseClient*);
</del><ins>+ virtual void setClient(IconDatabaseClient*) override;
</ins><span class="cx">
</span><del>- virtual bool open(const String& directory, const String& filename);
- virtual void close();
</del><ins>+ virtual bool open(const String& directory, const String& filename) override;
+ virtual void close() override;
</ins><span class="cx">
</span><del>- virtual void removeAllIcons();
</del><ins>+ virtual void removeAllIcons() override;
</ins><span class="cx">
</span><span class="cx"> void readIconForPageURLFromDisk(const String&);
</span><span class="cx">
</span><del>- virtual Image* defaultIcon(const IntSize&);
</del><ins>+ virtual Image* defaultIcon(const IntSize&) override;
</ins><span class="cx">
</span><del>- virtual void retainIconForPageURL(const String&);
- virtual void releaseIconForPageURL(const String&);
- virtual void setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String&);
- virtual void setIconURLForPageURL(const String& iconURL, const String& pageURL);
</del><ins>+ virtual void retainIconForPageURL(const String&) override;
+ virtual void releaseIconForPageURL(const String&) override;
+ virtual void setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String&) override;
+ virtual void setIconURLForPageURL(const String& iconURL, const String& pageURL) override;
</ins><span class="cx">
</span><del>- virtual Image* synchronousIconForPageURL(const String&, const IntSize&);
- virtual PassNativeImagePtr synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize&);
- virtual String synchronousIconURLForPageURL(const String&);
- virtual bool synchronousIconDataKnownForIconURL(const String&);
- virtual IconLoadDecision synchronousLoadDecisionForIconURL(const String&, DocumentLoader*);
-
- virtual void setEnabled(bool);
- virtual bool isEnabled() const;
-
- virtual void setPrivateBrowsingEnabled(bool flag);
</del><ins>+ virtual Image* synchronousIconForPageURL(const String&, const IntSize&) override;
+ virtual PassNativeImagePtr synchronousNativeIconForPageURL(const String& pageURLOriginal, const IntSize&) override;
+ virtual String synchronousIconURLForPageURL(const String&) override;
+ virtual bool synchronousIconDataKnownForIconURL(const String&) override;
+ virtual IconLoadDecision synchronousLoadDecisionForIconURL(const String&, DocumentLoader*) override;
+
+ virtual void setEnabled(bool) override;
+ virtual bool isEnabled() const override;
+
+ virtual void setPrivateBrowsingEnabled(bool flag) override;
</ins><span class="cx"> bool isPrivateBrowsingEnabled() const;
</span><del>-
</del><ins>+
</ins><span class="cx"> static void delayDatabaseCleanup();
</span><span class="cx"> static void allowDatabaseCleanup();
</span><span class="cx"> static void checkIntegrityBeforeOpening();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Support for WebCoreStatistics in WebKit
</span><del>- virtual size_t pageURLMappingCount();
- virtual size_t retainedPageURLCount();
- virtual size_t iconRecordCount();
- virtual size_t iconRecordCountWithData();
</del><ins>+ virtual size_t pageURLMappingCount() override;
+ virtual size_t retainedPageURLCount() override;
+ virtual size_t iconRecordCount() override;
+ virtual size_t iconRecordCountWithData() override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- IconDatabase();
</del><span class="cx"> friend IconDatabaseBase& iconDatabase();
</span><span class="cx">
</span><span class="cx"> static void notifyPendingLoadDecisionsOnMainThread(void*);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabaseBase.h (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabaseBase.h 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebCore/loader/icon/IconDatabaseBase.h 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -26,12 +26,11 @@
</span><span class="cx"> #ifndef IconDatabaseBase_h
</span><span class="cx"> #define IconDatabaseBase_h
</span><span class="cx">
</span><del>-#include "ImageSource.h"
-#include "SharedBuffer.h"
-
</del><ins>+#include "NativeImagePtr.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/RefCounted.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx"> class IconDatabaseClient;
</span><span class="cx"> class Image;
</span><span class="cx"> class IntSize;
</span><ins>+class SharedBuffer;
</ins><span class="cx">
</span><span class="cx"> enum IconLoadDecision {
</span><span class="cx"> IconLoadYes,
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-05-12 Darin Adler <darin@apple.com>
+
+ Make a few icon database improvements
+ https://bugs.webkit.org/show_bug.cgi?id=132812
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/API/C/WKIconDatabase.cpp:
+ (WKIconDatabaseCopyIconDataForPageURL): Moved the actual implementation of this
+ out of the bindings into the WebIconDatabase class.
+
+ * UIProcess/API/C/WKIconDatabase.h: Fixed argument names that were inconsistent.
+
+ * UIProcess/WebIconDatabase.cpp: Removed unneeded includes.
+ (WebKit::WebIconDatabase::create): Pass a reference instead of a pointer.
+ (WebKit::WebIconDatabase::WebIconDatabase): Take a reference instead of a pointer.
+ (WebKit::WebIconDatabase::invalidate): Use nullptr.
+ (WebKit::WebIconDatabase::setDatabasePath): Use make_unique.
+ (WebKit::WebIconDatabase::setIconDataForIconURL): Removed unneeded local variable.
+ (WebKit::WebIconDatabase::imageForPageURL): Use nullptr.
+ (WebKit::WebIconDatabase::nativeImageForPageURL): Ditto.
+ (WebKit::WebIconDatabase::didFinishURLImport): Use a modern for loop.
+ (WebKit::WebIconDatabase::iconDataForPageURL): Added. Moved this here from
+ WKIconDatabase.cpp, but also changed to use createWithoutCopying to avoid making
+ another copy of the data for each icon.
+
+ * UIProcess/WebIconDatabase.h: Removed unneeded includes. Derive from
+ IconDatabaseClient privately. Use nullptr. Added iconDataForPageURL member
+ function. Use a reference for the constructor argument. Use override for
+ virtual functions. Use unique_ptr instead of OwnPtr.
+
</ins><span class="cx"> 2014-05-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 on iOS needs to capture the main thread's floating point environment.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -29,9 +29,6 @@
</span><span class="cx"> #include "APIData.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebIconDatabase.h"
</span><del>-#include <WebCore/Image.h>
-#include <WebCore/SharedBuffer.h>
-#include <WebKit/WKData.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -74,15 +71,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKIconDatabaseCopyIconDataForPageURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef pageURL)
</span><span class="cx"> {
</span><del>- WebCore::Image* image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(pageURL));
- if (!image)
- return nullptr;
-
- WebCore::SharedBuffer* iconData = image->data();
- if (!iconData)
- return nullptr;
-
- return WKDataCreate(reinterpret_cast<const unsigned char*>(iconData->data()), iconData->size());
</del><ins>+ return toAPI(toImpl(iconDatabaseRef)->iconDataForPageURL(toWTFString(pageURL)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKIconDatabaseEnableDatabaseCleanup(WKIconDatabaseRef iconDatabaseRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> WK_EXPORT void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
</span><span class="cx"> WK_EXPORT void WKIconDatabaseReleaseIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
</span><span class="cx"> WK_EXPORT void WKIconDatabaseSetIconDataForIconURL(WKIconDatabaseRef iconDatabase, WKDataRef iconData, WKURLRef iconURL);
</span><del>-WK_EXPORT void WKIconDatabaseSetIconURLForPageURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef iconURLRef, WKURLRef pageURLRef);
-WK_EXPORT WKURLRef WKIconDatabaseCopyIconURLForPageURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef pageURLRef);
-WK_EXPORT WKDataRef WKIconDatabaseCopyIconDataForPageURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef pageURL);
</del><ins>+WK_EXPORT void WKIconDatabaseSetIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef iconURL, WKURLRef pageURL);
+WK_EXPORT WKURLRef WKIconDatabaseCopyIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
+WK_EXPORT WKDataRef WKIconDatabaseCopyIconDataForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKIconDatabaseEnableDatabaseCleanup(WKIconDatabaseRef iconDatabase);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -26,17 +26,14 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebIconDatabase.h"
</span><span class="cx">
</span><del>-#include "DataReference.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebIconDatabaseMessages.h"
</span><span class="cx"> #include "WebIconDatabaseProxyMessages.h"
</span><del>-#include "WebPreferences.h"
</del><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/IconDatabase.h>
</span><del>-#include <WebCore/IconDatabaseBase.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
</del><ins>+#include <WebCore/Image.h>
+#include <WebCore/SharedBuffer.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -44,15 +41,15 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebIconDatabase> WebIconDatabase::create(WebContext* context)
</span><span class="cx"> {
</span><del>- return adoptRef(new WebIconDatabase(context));
</del><ins>+ return adoptRef(new WebIconDatabase(*context));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebIconDatabase::~WebIconDatabase()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebIconDatabase::WebIconDatabase(WebContext* context)
- : m_webContext(context)
</del><ins>+WebIconDatabase::WebIconDatabase(WebContext& context)
+ : m_webContext(&context)
</ins><span class="cx"> , m_urlImportCompleted(false)
</span><span class="cx"> , m_databaseCleanupDisabled(false)
</span><span class="cx"> {
</span><span class="lines">@@ -61,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::invalidate()
</span><span class="cx"> {
</span><del>- setGlobalIconDatabase(0);
</del><ins>+ setGlobalIconDatabase(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::setDatabasePath(const String& path)
</span><span class="lines">@@ -71,7 +68,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_iconDatabaseImpl = IconDatabase::create();
</del><ins>+ m_iconDatabaseImpl = std::make_unique<IconDatabase>();
</ins><span class="cx"> m_iconDatabaseImpl->setClient(this);
</span><span class="cx"> IconDatabase::delayDatabaseCleanup();
</span><span class="cx"> m_databaseCleanupDisabled = true;
</span><span class="lines">@@ -83,8 +80,8 @@
</span><span class="cx">
</span><span class="cx"> if (!m_iconDatabaseImpl->open(directoryName(path), pathGetFileName(path))) {
</span><span class="cx"> LOG_ERROR("Unable to open WebKit2 icon database on disk");
</span><del>- m_iconDatabaseImpl.clear();
- setGlobalIconDatabase(0);
</del><ins>+ m_iconDatabaseImpl = nullptr;
+ setGlobalIconDatabase(nullptr);
</ins><span class="cx"> IconDatabase::allowDatabaseCleanup();
</span><span class="cx"> m_databaseCleanupDisabled = false;
</span><span class="cx"> }
</span><span class="lines">@@ -103,7 +100,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> IconDatabase::allowDatabaseCleanup();
</span><span class="cx"> m_databaseCleanupDisabled = false;
</span><span class="cx"> }
</span><span class="lines">@@ -132,9 +129,7 @@
</span><span class="cx"> LOG(IconDatabase, "WK2 UIProcess setting icon data (%i bytes) for page URL %s", (int)iconData.size(), iconURL.ascii().data());
</span><span class="cx"> if (!m_iconDatabaseImpl)
</span><span class="cx"> return;
</span><del>-
- RefPtr<SharedBuffer> buffer = SharedBuffer::create(iconData.data(), iconData.size());
- m_iconDatabaseImpl->setIconDataForIconURL(buffer.release(), iconURL);
</del><ins>+ m_iconDatabaseImpl->setIconDataForIconURL(SharedBuffer::create(iconData.data(), iconData.size()), iconURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::synchronousIconDataForPageURL(const String&, IPC::DataReference& iconData)
</span><span class="lines">@@ -148,7 +143,6 @@
</span><span class="cx"> iconURL = String();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> iconURL = m_iconDatabaseImpl->synchronousIconURLForPageURL(pageURL);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,7 +176,7 @@
</span><span class="cx"> ASSERT(!m_urlImportCompleted);
</span><span class="cx">
</span><span class="cx"> m_pendingLoadDecisionURLMap.set(callbackID, iconURL);
</span><del>- return;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME (Multi-WebProcess): <rdar://problem/12240223> We need to know which connection to send this message to.
</span><span class="lines">@@ -194,20 +188,20 @@
</span><span class="cx"> notifyIconDataReadyForPageURL(pageURL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Image* WebIconDatabase::imageForPageURL(const String& pageURL, const WebCore::IntSize& iconSize)
</del><ins>+Image* WebIconDatabase::imageForPageURL(const String& pageURL, const IntSize& iconSize)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_webContext || !m_iconDatabaseImpl || !m_iconDatabaseImpl->isOpen() || pageURL.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // The WebCore IconDatabase ignores the passed in size parameter.
</span><span class="cx"> // If that changes we'll need to rethink how this API is exposed.
</span><span class="cx"> return m_iconDatabaseImpl->synchronousIconForPageURL(pageURL, iconSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::NativeImagePtr WebIconDatabase::nativeImageForPageURL(const String& pageURL, const WebCore::IntSize& iconSize)
</del><ins>+NativeImagePtr WebIconDatabase::nativeImageForPageURL(const String& pageURL, const IntSize& iconSize)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_webContext || !m_iconDatabaseImpl || !m_iconDatabaseImpl->isOpen() || pageURL.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return m_iconDatabaseImpl->synchronousNativeIconForPageURL(pageURL, iconSize);
</span><span class="cx"> }
</span><span class="lines">@@ -224,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::removeAllIcons()
</span><span class="cx"> {
</span><del>- m_iconDatabaseImpl->removeAllIcons();
</del><ins>+ m_iconDatabaseImpl->removeAllIcons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::checkIntegrityBeforeOpening()
</span><span class="lines">@@ -269,27 +263,24 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_webContext)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT(!m_urlImportCompleted);
</span><span class="cx">
</span><span class="cx"> LOG(IconDatabase, "WK2 UIProcess URL import complete, notifying all %i pending page URL load decisions", m_pendingLoadDecisionURLMap.size());
</span><del>-
- HashMap<uint64_t, String>::iterator i = m_pendingLoadDecisionURLMap.begin();
- HashMap<uint64_t, String>::iterator end = m_pendingLoadDecisionURLMap.end();
</del><span class="cx">
</span><del>- for (; i != end; ++i) {
- LOG(IconDatabase, "WK2 UIProcess performing delayed callback on callback ID %i for page url %s", (int)i->key, i->value.ascii().data());
- IconLoadDecision decision = m_iconDatabaseImpl->synchronousLoadDecisionForIconURL(i->value, 0);
</del><ins>+ for (auto& slot : m_pendingLoadDecisionURLMap) {
+ LOG(IconDatabase, "WK2 UIProcess performing delayed callback on callback ID %i for page url %s", (int)slot.key, slot.value.ascii().data());
+ IconLoadDecision decision = m_iconDatabaseImpl->synchronousLoadDecisionForIconURL(slot.value, nullptr);
</ins><span class="cx">
</span><del>- // Decisions should never be unknown after the inital import is complete
</del><ins>+ // Decisions should never be unknown after the inital import is complete.
</ins><span class="cx"> ASSERT(decision != IconLoadUnknown);
</span><span class="cx">
</span><span class="cx"> // FIXME (Multi-WebProcess): <rdar://problem/12240223> We need to know which connection to send this message to.
</span><del>- m_webContext->sendToAllProcesses(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(decision), i->key));
</del><ins>+ m_webContext->sendToAllProcesses(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision(static_cast<int>(decision), slot.key));
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> m_pendingLoadDecisionURLMap.clear();
</span><del>-
</del><ins>+
</ins><span class="cx"> m_urlImportCompleted = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -305,4 +296,23 @@
</span><span class="cx"> m_iconDatabaseImpl->setPrivateBrowsingEnabled(privateBrowsingEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<API::Data> WebIconDatabase::iconDataForPageURL(const String& pageURL)
+{
+ auto* image = imageForPageURL(pageURL);
+ if (!image)
+ return nullptr;
+
+ SharedBuffer* sharedBuffer = image->data();
+ if (!sharedBuffer)
+ return nullptr;
+
+ // Balanced by deref() below.
+ sharedBuffer->ref();
+ return API::Data::createWithoutCopying(reinterpret_cast<const unsigned char*>(sharedBuffer->data()), sharedBuffer->size(),
+ [](unsigned char*, const void* untypedSharedBuffer) {
+ // Balanced by ref() above.
+ static_cast<SharedBuffer*>(const_cast<void*>(untypedSharedBuffer))->deref();
+ }, sharedBuffer);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.h (168679 => 168680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2014-05-13 13:56:15 UTC (rev 168679)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2014-05-13 14:44:50 UTC (rev 168680)
</span><span class="lines">@@ -27,21 +27,14 @@
</span><span class="cx"> #define WebIconDatabase_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-
</del><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "WebIconDatabaseClient.h"
</span><span class="cx"> #include <WebCore/IconDatabaseClient.h>
</span><del>-#include <WebCore/ImageSource.h>
</del><span class="cx"> #include <WebCore/IntSize.h>
</span><del>-#include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
</del><ins>+#include <WebCore/NativeImagePtr.h>
</ins><span class="cx">
</span><del>-namespace IPC {
-class ArgumentDecoder;
-class DataReference;
</del><ins>+namespace API {
+class Data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -53,13 +46,13 @@
</span><span class="cx">
</span><span class="cx"> class WebContext;
</span><span class="cx">
</span><del>-class WebIconDatabase : public API::ObjectImpl<API::Object::Type::IconDatabase>, public WebCore::IconDatabaseClient, private IPC::MessageReceiver {
</del><ins>+class WebIconDatabase : public API::ObjectImpl<API::Object::Type::IconDatabase>, private WebCore::IconDatabaseClient, private IPC::MessageReceiver {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<WebIconDatabase> create(WebContext*);
</span><span class="cx"> virtual ~WebIconDatabase();
</span><span class="cx">
</span><span class="cx"> void invalidate();
</span><del>- void clearContext() { m_webContext = 0; }
</del><ins>+ void clearContext() { m_webContext = nullptr; }
</ins><span class="cx"> void setDatabasePath(const String&);
</span><span class="cx"> void enableDatabaseCleanup();
</span><span class="cx">
</span><span class="lines">@@ -67,17 +60,19 @@
</span><span class="cx"> void releaseIconForPageURL(const String&);
</span><span class="cx"> void setIconURLForPageURL(const String&, const String&);
</span><span class="cx"> void setIconDataForIconURL(const IPC::DataReference&, const String&);
</span><del>-
</del><ins>+
</ins><span class="cx"> void synchronousIconDataForPageURL(const String&, IPC::DataReference&);
</span><span class="cx"> void synchronousIconURLForPageURL(const String&, String&);
</span><span class="cx"> void synchronousIconDataKnownForIconURL(const String&, bool&) const;
</span><span class="cx"> void synchronousLoadDecisionForIconURL(const String&, int&) const;
</span><del>-
</del><ins>+
</ins><span class="cx"> void getLoadDecisionForIconURL(const String&, uint64_t callbackID);
</span><span class="cx"> void didReceiveIconForPageURL(const String&);
</span><span class="cx">
</span><span class="cx"> WebCore::Image* imageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
</span><span class="cx"> WebCore::NativeImagePtr nativeImageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
</span><ins>+ PassRefPtr<API::Data> iconDataForPageURL(const String& pageURL);
+
</ins><span class="cx"> bool isOpen();
</span><span class="cx"> bool isUrlImportCompleted();
</span><span class="cx">
</span><span class="lines">@@ -88,16 +83,16 @@
</span><span class="cx"> void initializeIconDatabaseClient(const WKIconDatabaseClientBase*);
</span><span class="cx">
</span><span class="cx"> void setPrivateBrowsingEnabled(bool);
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><del>- WebIconDatabase(WebContext*);
</del><ins>+ explicit WebIconDatabase(WebContext&);
</ins><span class="cx">
</span><span class="cx"> // WebCore::IconDatabaseClient
</span><del>- virtual void didImportIconURLForPageURL(const String&);
- virtual void didImportIconDataForPageURL(const String&);
- virtual void didChangeIconForPageURL(const String&);
- virtual void didRemoveAllIcons();
- virtual void didFinishURLImport();
</del><ins>+ virtual void didImportIconURLForPageURL(const String&) override;
+ virtual void didImportIconDataForPageURL(const String&) override;
+ virtual void didChangeIconForPageURL(const String&) override;
+ virtual void didRemoveAllIcons() override;
+ virtual void didFinishURLImport() 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">@@ -106,8 +101,8 @@
</span><span class="cx"> void notifyIconDataReadyForPageURL(const String&);
</span><span class="cx">
</span><span class="cx"> WebContext* m_webContext;
</span><del>-
- OwnPtr<WebCore::IconDatabase> m_iconDatabaseImpl;
</del><ins>+
+ std::unique_ptr<WebCore::IconDatabase> m_iconDatabaseImpl;
</ins><span class="cx"> bool m_urlImportCompleted;
</span><span class="cx"> bool m_databaseCleanupDisabled;
</span><span class="cx"> HashMap<uint64_t, String> m_pendingLoadDecisionURLMap;
</span></span></pre>
</div>
</div>
</body>
</html>