Title: [149378] trunk/Source
Revision
149378
Author
[email protected]
Date
2013-04-30 10:49:58 -0700 (Tue, 30 Apr 2013)

Log Message

More StorageTracker cleanup
https://bugs.webkit.org/show_bug.cgi?id=115429

Reviewed by Andreas Kling.

Source/WebCore:

Make a bunch of member functions private, and remove StorageTracker::syncLocalStorage.

* WebCore.exp.in:
* storage/StorageTracker.cpp:
* storage/StorageTracker.h:
(StorageTracker):

Source/WebKit/mac:

Call PageGroup::syncLocalStorage directly.

* Storage/WebStorageManager.mm:
(-[WebStorageManager syncLocalStorage]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149377 => 149378)


--- trunk/Source/WebCore/ChangeLog	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebCore/ChangeLog	2013-04-30 17:49:58 UTC (rev 149378)
@@ -1,3 +1,17 @@
+2013-04-30  Anders Carlsson  <[email protected]>
+
+        More StorageTracker cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=115429
+
+        Reviewed by Andreas Kling.
+
+        Make a bunch of member functions private, and remove StorageTracker::syncLocalStorage.
+
+        * WebCore.exp.in:
+        * storage/StorageTracker.cpp:
+        * storage/StorageTracker.h:
+        (StorageTracker):
+
 2013-04-30  Andreas Kling  <[email protected]>
 
         REGRESSION(r149313) Crash at WebCore::FrameView::setFrameRect() when navigating back to previous page while find banner is displayed.

Modified: trunk/Source/WebCore/WebCore.exp.in (149377 => 149378)


--- trunk/Source/WebCore/WebCore.exp.in	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebCore/WebCore.exp.in	2013-04-30 17:49:58 UTC (rev 149378)
@@ -396,7 +396,6 @@
 __ZN7WebCore14SecurityPolicy32removeOriginAccessWhitelistEntryERKNS_14SecurityOriginERKN3WTF6StringES7_b
 __ZN7WebCore14StorageTracker12deleteOriginEPNS_14SecurityOriginE
 __ZN7WebCore14StorageTracker16deleteAllOriginsEv
-__ZN7WebCore14StorageTracker16syncLocalStorageEv
 __ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
 __ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
 __ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv

Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (149377 => 149378)


--- trunk/Source/WebCore/storage/StorageTracker.cpp	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp	2013-04-30 17:49:58 UTC (rev 149378)
@@ -565,11 +565,6 @@
     }
 }
 
-void StorageTracker::syncLocalStorage()
-{
-    PageGroup::syncLocalStorage();
-}
-    
 bool StorageTracker::isActive()
 {
     return m_isActive;

Modified: trunk/Source/WebCore/storage/StorageTracker.h (149377 => 149378)


--- trunk/Source/WebCore/storage/StorageTracker.h	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebCore/storage/StorageTracker.h	2013-04-30 17:49:58 UTC (rev 149378)
@@ -62,15 +62,6 @@
     
     bool isActive();
 
-    // Sync to disk on background thread.
-    void syncDeleteAllOrigins();
-    void syncDeleteOrigin(const String& originIdentifier);
-    void syncSetOriginDetails(const String& originIdentifier, const String& databaseFile);
-    void syncImportOriginIdentifiers();
-    void syncFileSystemAndTrackerDatabase();
-
-    void syncLocalStorage();
-
     double storageDatabaseIdleInterval() { return m_StorageDatabaseIdleInterval; }
     void setStorageDatabaseIdleInterval(double interval) { m_StorageDatabaseIdleInterval = interval; }
 
@@ -98,6 +89,13 @@
     
     void setIsActive(bool);
 
+    // Sync to disk on background thread.
+    void syncDeleteAllOrigins();
+    void syncDeleteOrigin(const String& originIdentifier);
+    void syncSetOriginDetails(const String& originIdentifier, const String& databaseFile);
+    void syncImportOriginIdentifiers();
+    void syncFileSystemAndTrackerDatabase();
+
     // Mutex for m_database and m_storageDirectoryPath.
     Mutex m_databaseMutex;
     SQLiteDatabase m_database;

Modified: trunk/Source/WebKit/mac/ChangeLog (149377 => 149378)


--- trunk/Source/WebKit/mac/ChangeLog	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-04-30 17:49:58 UTC (rev 149378)
@@ -1,3 +1,15 @@
+2013-04-30  Anders Carlsson  <[email protected]>
+
+        More StorageTracker cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=115429
+
+        Reviewed by Andreas Kling.
+
+        Call PageGroup::syncLocalStorage directly.
+
+        * Storage/WebStorageManager.mm:
+        (-[WebStorageManager syncLocalStorage]):
+
 2013-04-30  Zalan Bujtas  <[email protected]>
 
         Animations fail to start on http://www.google.com/insidesearch/howsearchworks/thestory/

Modified: trunk/Source/WebKit/mac/Storage/WebStorageManager.mm (149377 => 149378)


--- trunk/Source/WebKit/mac/Storage/WebStorageManager.mm	2013-04-30 17:35:33 UTC (rev 149377)
+++ trunk/Source/WebKit/mac/Storage/WebStorageManager.mm	2013-04-30 17:49:58 UTC (rev 149378)
@@ -84,7 +84,7 @@
 
 - (void)syncLocalStorage
 {
-    StorageTracker::tracker().syncLocalStorage();
+    PageGroup::syncLocalStorage();
 }
 
 - (void)syncFileSystemAndTrackerDatabase
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to