Changeset 234422 in webkit

Timestamp:

Jul 31, 2018 5:01:48 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Remove ResourceResponse::cacheBodyKey API
​https://bugs.webkit.org/show_bug.cgi?id=188192

Patch by Rob Buis <​rbuis@igalia.com> on 2018-07-31
Reviewed by Frédéric Wang.

Source/WebCore:

Removed unused API.

No new tests needed since this API is not used.

• platform/network/ResourceResponseBase.h:

(WebCore::ResourceResponseBase::encode const):
(WebCore::ResourceResponseBase::decode):
(WebCore::ResourceResponseBase::cacheBodyKey const): Deleted.
(WebCore::ResourceResponseBase::setCacheBodyKey): Deleted.

Source/WebKit:

Remove unused API.

• NetworkProcess/cache/NetworkCacheEntry.cpp:

(WebKit::NetworkCache::Entry::decodeStorageRecord):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/ResourceResponseBase.h (modified) (5 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-31  Rob Buis  <rbuis@igalia.com>
+
+        Remove ResourceResponse::cacheBodyKey API
+        https://bugs.webkit.org/show_bug.cgi?id=188192
+
+        Reviewed by Frédéric Wang.
+
+        Removed unused API.
+
+        No new tests needed since this API is not used.
+
+        * platform/network/ResourceResponseBase.h:
+        (WebCore::ResourceResponseBase::encode const):
+        (WebCore::ResourceResponseBase::decode):
+        (WebCore::ResourceResponseBase::cacheBodyKey const): Deleted.
+        (WebCore::ResourceResponseBase::setCacheBodyKey): Deleted.
+
 2018-07-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/network/ResourceResponseBase.h

@@ -33 +33 @@
 #include "ParsedContentRange.h"
 #include "URL.h"
-#include <wtf/SHA1.h>
 #include <wtf/WallTime.h>
 
@@ -151 +150 @@
     }
 
-    const std::optional<SHA1::Digest>& cacheBodyKey() const { return m_cacheBodyKey; }
-    void setCacheBodyKey(const SHA1::Digest& key) { m_cacheBodyKey = key; }
-
     // FIXME: This should be eliminated from ResourceResponse.
     // Network loading metrics should be delivered via didFinishLoad
@@ -225 +221 @@
     mutable ParsedContentRange m_contentRange;
     mutable CacheControlDirectives m_cacheControlDirectives;
-    std::optional<SHA1::Digest> m_cacheBodyKey;
 
     mutable bool m_haveParsedCacheControlHeader { false };
@@ -271 +266 @@
     encoder << m_certificateInfo;
     encoder.encodeEnum(m_source);
-    encoder << m_cacheBodyKey;
     encoder.encodeEnum(m_type);
     encoder.encodeEnum(m_tainting);
@@ -312 +306 @@
     if (!decoder.decodeEnum(response.m_source))
         return false;
-    if (!decoder.decode(response.m_cacheBodyKey))
-        return false;
     if (!decoder.decodeEnum(response.m_type))
         return false;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-31  Rob Buis  <rbuis@igalia.com>
+
+        Remove ResourceResponse::cacheBodyKey API
+        https://bugs.webkit.org/show_bug.cgi?id=188192
+
+        Reviewed by Frédéric Wang.
+
+        Remove unused API.
+
+        * NetworkProcess/cache/NetworkCacheEntry.cpp:
+        (WebKit::NetworkCache::Entry::decodeStorageRecord):
+
 2018-07-30  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp

@@ -114 +114 @@
         return nullptr;
     entry->m_response.setSource(WebCore::ResourceResponse::Source::DiskCache);
-    if (storageEntry.bodyHash)
-        entry->m_response.setCacheBodyKey(*storageEntry.bodyHash);
 
     bool hasVaryingRequestHeaders;