Remove unused member in WebsiteDataRecord
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 May 2019 22:48:26 +0000 (22:48 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 May 2019 22:48:26 +0000 (22:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=198231

Reviewed by Brent Fulgham.

The data member 'originsWithCredentials' in WebsiteDataRecord is no longer needed since origins
with credentials are now stored in the 'origins' member.

* UIProcess/WebsiteData/WebsiteDataRecord.cpp:
(WebKit::WebsiteDataRecord::addOriginWithCredential): Deleted.
* UIProcess/WebsiteData/WebsiteDataRecord.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchDataAndApply):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245757 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp
Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.h
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

index 2647646..9ef0281 100644 (file)
@@ -1,3 +1,19 @@
+2019-05-24  Per Arne Vollan  <pvollan@apple.com>
+
+        Remove unused member in WebsiteDataRecord
+        https://bugs.webkit.org/show_bug.cgi?id=198231
+
+        Reviewed by Brent Fulgham.
+
+        The data member 'originsWithCredentials' in WebsiteDataRecord is no longer needed since origins
+        with credentials are now stored in the 'origins' member.
+
+        * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+        (WebKit::WebsiteDataRecord::addOriginWithCredential): Deleted.
+        * UIProcess/WebsiteData/WebsiteDataRecord.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::fetchDataAndApply):
+
 2019-05-24  David Quesada  <david_quesada@apple.com>
 
         Crash under WebCore::TimerBase::~TimerBase after a download is canceled
index 3fcbc8f..313ca1b 100644 (file)
@@ -153,10 +153,4 @@ String WebsiteDataRecord::topPrivatelyControlledDomain()
     return emptyString();
 }
 
-void WebsiteDataRecord::addOriginWithCredential(const String& origin)
-{
-    types.add(WebsiteDataType::Credentials);
-    originsWithCredentials.add(origin);
-}
-
 }
index 3dff401..b49c273 100644 (file)
@@ -53,7 +53,6 @@ struct WebsiteDataRecord {
 #if ENABLE(NETSCAPE_PLUGIN_API)
     void addPluginDataHostName(const String& hostName);
 #endif
-    void addOriginWithCredential(const String&);
     void addHSTSCacheHostname(const String& hostName);
 
     String displayName;
@@ -70,7 +69,6 @@ struct WebsiteDataRecord {
 #if ENABLE(NETSCAPE_PLUGIN_API)
     HashSet<String> pluginDataHostNames;
 #endif
-    HashSet<String> originsWithCredentials;
     HashSet<String> HSTSCacheHostNames;
 
     bool matches(const WebCore::RegistrableDomain&) const;
index 0bf5112..4fd0212 100644 (file)
@@ -319,17 +319,6 @@ void WebsiteDataStore::fetchDataAndApply(OptionSet<WebsiteDataType> dataTypes, O
             }
 #endif
 
-            for (auto& origin : websiteData.originsWithCredentials) {
-                auto displayName = WebsiteDataRecord::displayNameForOrigin(WebCore::SecurityOriginData::fromURL(URL(URL(), origin)));
-                ASSERT(!displayName.isEmpty());
-
-                auto& record = m_websiteDataRecords.add(displayName, WebsiteDataRecord { }).iterator->value;
-                if (!record.displayName)
-                    record.displayName = WTFMove(displayName);
-
-                record.addOriginWithCredential(origin);
-            }
-
             for (auto& hostName : websiteData.hostNamesWithHSTSCache) {
                 auto displayName = WebsiteDataRecord::displayNameForHostName(hostName);
                 if (!displayName)