Attachment 346151 Details for Bug 188192 – Patch

[patch] Patch

bug-188192-20180731131512.patch (text/plain), 4.33 KB, created by Rob Buis on 2018-07-31 04:15:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2018-07-31 04:15:14 PDT

Size: 4.33 KB

patch

obsolete

>Subversion Revision: 234401
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8cb42ce32ceb0d62bc4ee9c7b6bd36c7cd193643..06e978e2a8eb97e8aaa7f1aa16ab0306a63c6a81 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-07-31  Rob Buis  <rbuis@igalia.com>
>+
>+        Remove ResourceResponse::cacheBodyKey API
>+        https://bugs.webkit.org/show_bug.cgi?id=188192
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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>
> 
>         Shrink GraphicsLayerCA
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ed49439ad3f2eb23541fcb0d167e8419c47458cf..8119f453871d5c4c423803b284f9bfe1db11d9f2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-07-31  Rob Buis  <rbuis@igalia.com>
>+
>+        Remove ResourceResponse::cacheBodyKey API
>+        https://bugs.webkit.org/show_bug.cgi?id=188192
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove unused API.
>+
>+        * NetworkProcess/cache/NetworkCacheEntry.cpp:
>+        (WebKit::NetworkCache::Entry::decodeStorageRecord):
>+
> 2018-07-30  Sihui Liu  <sihui_liu@apple.com>
> 
>         Add support for fetching and remove type  _WKWebsiteDataTypeHSTSCache
>diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
>index 3fdee5ecdef5f99a13923f687fec1c4d244d2565..2a4e49efa95803d2b849102fa5ec465b64df8e63 100644
>--- a/Source/WebCore/platform/network/ResourceResponseBase.h
>+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
>@@ -32,7 +32,6 @@
> #include "NetworkLoadMetrics.h"
> #include "ParsedContentRange.h"
> #include "URL.h"
>-#include <wtf/SHA1.h>
> #include <wtf/WallTime.h>
> 
> namespace WebCore {
>@@ -150,9 +149,6 @@ public:
>         m_source = source;
>     }
> 
>-    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
>     // and should not be part of the ResourceResponse.
>@@ -224,7 +220,6 @@ private:
>     mutable std::optional<WallTime> m_lastModified;
>     mutable ParsedContentRange m_contentRange;
>     mutable CacheControlDirectives m_cacheControlDirectives;
>-    std::optional<SHA1::Digest> m_cacheBodyKey;
> 
>     mutable bool m_haveParsedCacheControlHeader { false };
>     mutable bool m_haveParsedAgeHeader { false };
>@@ -270,7 +265,6 @@ void ResourceResponseBase::encode(Encoder& encoder) const
>     encoder << m_httpStatusCode;
>     encoder << m_certificateInfo;
>     encoder.encodeEnum(m_source);
>-    encoder << m_cacheBodyKey;
>     encoder.encodeEnum(m_type);
>     encoder.encodeEnum(m_tainting);
>     encoder << m_isRedirected;
>@@ -311,8 +305,6 @@ bool ResourceResponseBase::decode(Decoder& decoder, ResourceResponseBase& respon
>         return false;
>     if (!decoder.decodeEnum(response.m_source))
>         return false;
>-    if (!decoder.decode(response.m_cacheBodyKey))
>-        return false;
>     if (!decoder.decodeEnum(response.m_type))
>         return false;
>     if (!decoder.decodeEnum(response.m_tainting))
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp
>index ce2add27378b03612da51829ece7873a9e83975b..ae1188ae3aad8f82d5fc062f5e4ff44ed11de6d1 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheEntry.cpp
>@@ -113,8 +113,6 @@ std::unique_ptr<Entry> Entry::decodeStorageRecord(const Storage::Record& storage
>     if (!decoder.decode(entry->m_response))
>         return nullptr;
>     entry->m_response.setSource(WebCore::ResourceResponse::Source::DiskCache);
>-    if (storageEntry.bodyHash)
>-        entry->m_response.setCacheBodyKey(*storageEntry.bodyHash);
> 
>     bool hasVaryingRequestHeaders;
>     if (!decoder.decode(hasVaryingRequestHeaders))

Actions: View | Formatted Diff | Diff

Attachments on bug 188192: 346151