Title: [149329] trunk/Source
- Revision
- 149329
- Author
- [email protected]
- Date
- 2013-04-29 16:26:12 -0700 (Mon, 29 Apr 2013)
Log Message
Remove StorageTracker::originsLoaded
https://bugs.webkit.org/show_bug.cgi?id=115382
Reviewed by Sam Weinig.
Source/WebCore:
Remove m_finishedImportingOriginIdentifiers.
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::StorageTracker):
(WebCore::StorageTracker::finishedImportingOriginIdentifiers):
* storage/StorageTracker.h:
(StorageTracker):
Source/WebKit2:
Add m_didFinishLoadingOrigins.
* WebProcess/Storage/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::WebKeyValueStorageManager):
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::didFinishLoadingOrigins):
* WebProcess/Storage/WebKeyValueStorageManager.h:
(WebKeyValueStorageManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149328 => 149329)
--- trunk/Source/WebCore/ChangeLog 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebCore/ChangeLog 2013-04-29 23:26:12 UTC (rev 149329)
@@ -1,5 +1,20 @@
2013-04-29 Anders Carlsson <[email protected]>
+ Remove StorageTracker::originsLoaded
+ https://bugs.webkit.org/show_bug.cgi?id=115382
+
+ Reviewed by Sam Weinig.
+
+ Remove m_finishedImportingOriginIdentifiers.
+
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::StorageTracker):
+ (WebCore::StorageTracker::finishedImportingOriginIdentifiers):
+ * storage/StorageTracker.h:
+ (StorageTracker):
+
+2013-04-29 Anders Carlsson <[email protected]>
+
Get rid of StorageTracker::setClient
https://bugs.webkit.org/show_bug.cgi?id=115376
Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (149328 => 149329)
--- trunk/Source/WebCore/storage/StorageTracker.cpp 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2013-04-29 23:26:12 UTC (rev 149329)
@@ -94,7 +94,6 @@
, m_thread(StorageThread::create())
, m_isActive(false)
, m_needsInitialization(false)
- , m_finishedImportingOriginIdentifiers(false)
, m_StorageDatabaseIdleInterval(DefaultStorageDatabaseIdleInterval)
{
}
@@ -178,7 +177,6 @@
void StorageTracker::finishedImportingOriginIdentifiers()
{
- m_finishedImportingOriginIdentifiers = true;
MutexLocker locker(m_databaseMutex);
if (m_client)
m_client->didFinishLoadingOrigins();
Modified: trunk/Source/WebCore/storage/StorageTracker.h (149328 => 149329)
--- trunk/Source/WebCore/storage/StorageTracker.h 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebCore/storage/StorageTracker.h 2013-04-29 23:26:12 UTC (rev 149329)
@@ -55,7 +55,6 @@
void deleteAllOrigins();
void deleteOrigin(SecurityOrigin*);
void deleteOrigin(const String& originIdentifier);
- bool originsLoaded() const { return m_finishedImportingOriginIdentifiers; }
void origins(Vector<RefPtr<SecurityOrigin> >& result);
long long diskUsageForOrigin(SecurityOrigin*);
@@ -117,7 +116,6 @@
bool m_isActive;
bool m_needsInitialization;
- bool m_finishedImportingOriginIdentifiers;
double m_StorageDatabaseIdleInterval;
};
Modified: trunk/Source/WebKit2/ChangeLog (149328 => 149329)
--- trunk/Source/WebKit2/ChangeLog 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-29 23:26:12 UTC (rev 149329)
@@ -1,3 +1,19 @@
+2013-04-29 Anders Carlsson <[email protected]>
+
+ Remove StorageTracker::originsLoaded
+ https://bugs.webkit.org/show_bug.cgi?id=115382
+
+ Reviewed by Sam Weinig.
+
+ Add m_didFinishLoadingOrigins.
+
+ * WebProcess/Storage/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::WebKeyValueStorageManager):
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::didFinishLoadingOrigins):
+ * WebProcess/Storage/WebKeyValueStorageManager.h:
+ (WebKeyValueStorageManager):
+
2013-04-29 Chris Fleizach <[email protected]>
WEB SPEECH Update seatbelt profile to work with speech synthesis
Modified: trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp (149328 => 149329)
--- trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp 2013-04-29 23:26:12 UTC (rev 149329)
@@ -46,6 +46,7 @@
WebKeyValueStorageManager::WebKeyValueStorageManager(WebProcess* process)
: m_process(process)
+ , m_didFinishLoadingOrigins(false)
{
m_process->addMessageReceiver(Messages::WebKeyValueStorageManager::messageReceiverName(), this);
}
@@ -88,7 +89,7 @@
void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
{
- if (!StorageTracker::tracker().originsLoaded()) {
+ if (!m_didFinishLoadingOrigins) {
m_originsRequestCallbackIDs.append(callbackID);
return;
}
@@ -100,6 +101,8 @@
void WebKeyValueStorageManager::didFinishLoadingOrigins()
{
+ m_didFinishLoadingOrigins = true;
+
if (m_originsRequestCallbackIDs.isEmpty())
return;
Modified: trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h (149328 => 149329)
--- trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h 2013-04-29 23:03:28 UTC (rev 149328)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h 2013-04-29 23:26:12 UTC (rev 149329)
@@ -67,12 +67,15 @@
virtual void dispatchDidModifyOrigin(const String&) OVERRIDE;
virtual void didFinishLoadingOrigins() OVERRIDE;
- Vector<uint64_t> m_originsRequestCallbackIDs;
+ WebProcess* m_process;
+
String m_localStorageDirectory;
#if ENABLE(INDEXED_DATABASE)
String m_indexedDBDatabaseDirectory;
#endif
- WebProcess* m_process;
+
+ Vector<uint64_t> m_originsRequestCallbackIDs;
+ bool m_didFinishLoadingOrigins;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
