[webkit-changes] [184637] trunk/Source/WebKit2

Wed, 20 May 2015 08:54:20 -0700

Title: [184637] trunk/Source/WebKit2
Revision
184637
Author
[email protected]
Date
2015-05-20 08:53:55 -0700 (Wed, 20 May 2015)

Log Message

Rename WebsiteDataStore::isNonPersistent() to WebsiteDataStore::isPersistent().
https://bugs.webkit.org/show_bug.cgi?id=145111

Patch by Sungmann Cho <[email protected]> on 2015-05-20
Reviewed by Darin Adler.

This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=144158.

* UIProcess/API/APIWebsiteDataStore.cpp:
(API::WebsiteDataStore::isPersistent):
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
* UIProcess/WebsiteData/WebsiteDataStore.h:
(WebKit::WebsiteDataStore::isPersistent):
(WebKit::WebsiteDataStore::isNonPersistent): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (184636 => 184637)


--- trunk/Source/WebKit2/ChangeLog	2015-05-20 15:49:33 UTC (rev 184636)
+++ trunk/Source/WebKit2/ChangeLog	2015-05-20 15:53:55 UTC (rev 184637)
@@ -1,3 +1,21 @@
+2015-05-20  Sungmann Cho  <[email protected]>
+
+        Rename WebsiteDataStore::isNonPersistent() to WebsiteDataStore::isPersistent().
+        https://bugs.webkit.org/show_bug.cgi?id=145111
+
+        Reviewed by Darin Adler.
+
+        This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=144158.
+
+        * UIProcess/API/APIWebsiteDataStore.cpp:
+        (API::WebsiteDataStore::isPersistent):
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::fetchData):
+        (WebKit::WebsiteDataStore::removeData):
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        (WebKit::WebsiteDataStore::isPersistent):
+        (WebKit::WebsiteDataStore::isNonPersistent): Deleted.
+
 2015-05-20  Hyungwook Lee  <[email protected]>
 
         [EFL] Fix build failure, linker does not find libXext.

Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (184636 => 184637)


--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp	2015-05-20 15:49:33 UTC (rev 184636)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp	2015-05-20 15:53:55 UTC (rev 184637)
@@ -63,7 +63,7 @@
 
 bool WebsiteDataStore::isPersistent()
 {
-    return !m_websiteDataStore->isNonPersistent();
+    return m_websiteDataStore->isPersistent();
 }
 
 #if !PLATFORM(COCOA)

Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184636 => 184637)


--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp	2015-05-20 15:49:33 UTC (rev 184636)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp	2015-05-20 15:53:55 UTC (rev 184637)
@@ -213,7 +213,7 @@
 
     RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
 
-    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, isNonPersistent());
+    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
     if (networkProcessAccessType != ProcessAccessType::None) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
@@ -241,7 +241,7 @@
         }
     }
 
-    auto webProcessAccessType = computeWebProcessAccessTypeForDataFetch(dataTypes, isNonPersistent());
+    auto webProcessAccessType = computeWebProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
     if (webProcessAccessType != ProcessAccessType::None) {
         for (auto& process : processes()) {
             switch (webProcessAccessType) {
@@ -292,7 +292,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
 
         callbackAggregator->addPendingCallback();
@@ -314,7 +314,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
         StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
 
         callbackAggregator->addPendingCallback();
@@ -334,7 +334,7 @@
     }
 
 #if ENABLE(DATABASE_PROCESS)
-    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
             processPools.add(&process->processPool());
@@ -415,7 +415,7 @@
 
     RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
 
-    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
     if (networkProcessAccessType != ProcessAccessType::None) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
@@ -443,7 +443,7 @@
         }
     }
 
-    auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+    auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
     if (webProcessAccessType != ProcessAccessType::None) {
         for (auto& process : processes()) {
             switch (webProcessAccessType) {
@@ -484,7 +484,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
 
         callbackAggregator->addPendingCallback();
@@ -500,7 +500,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
         StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
 
         callbackAggregator->addPendingCallback();
@@ -515,7 +515,7 @@
     }
 
 #if ENABLE(DATABASE_PROCESS)
-    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
             processPools.add(&process->processPool());
@@ -575,7 +575,7 @@
 
     RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
 
-    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+    auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
     if (networkProcessAccessType != ProcessAccessType::None) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
@@ -609,7 +609,7 @@
         }
     }
 
-    auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, isNonPersistent());
+    auto webProcessAccessType = computeWebProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
     if (webProcessAccessType != ProcessAccessType::None) {
         for (auto& process : processes()) {
             switch (webProcessAccessType) {
@@ -651,7 +651,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
 
         HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
@@ -673,7 +673,7 @@
         });
     }
 
-    if (dataTypes & WebsiteDataTypeWebSQLDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
         StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
 
         HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
@@ -696,7 +696,7 @@
     }
 
 #if ENABLE(DATABASE_PROCESS)
-    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && !isNonPersistent()) {
+    if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
         HashSet<WebProcessPool*> processPools;
         for (auto& process : processes())
             processPools.add(&process->processPool());

Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (184636 => 184637)


--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h	2015-05-20 15:49:33 UTC (rev 184636)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h	2015-05-20 15:53:55 UTC (rev 184637)
@@ -57,8 +57,7 @@
 
     uint64_t identifier() const { return m_identifier; }
 
-    // FIXME: Change this to isPersistent() and update callers.
-    bool isNonPersistent() const { return m_sessionID.isEphemeral(); }
+    bool isPersistent() const { return !m_sessionID.isEphemeral(); }
     WebCore::SessionID sessionID() const { return m_sessionID; }
 
     static void cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to