Attachment 372698 Details for Bug 187460 – Patch

[patch] Patch

bug-187460-20190623165444.patch (text/plain), 15.38 KB, created by Rob Buis on 2019-06-23 07:54:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-06-23 07:54:45 PDT

Size: 15.38 KB

patch

obsolete

>Subversion Revision: 246709
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 80896f8e9f86f52bb683773c1f23577bb9458c6b..75cf10f21956d698d8f20f6d48810206e923a1b0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,41 @@
>+2019-06-23  Rob Buis  <rbuis@igalia.com>
>+
>+        ResourceResponseBase wastes a lot of space because of std::optional<>
>+        https://bugs.webkit.org/show_bug.cgi?id=187460
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Waste less space in ResourceResponseBase by shrinking
>+        ParsedContentRange.
>+
>+        No new tests because there is no behavior change.
>+
>+        * inspector/NetworkResourcesData.cpp:
>+        (WebCore::NetworkResourcesData::responseReceived):
>+        * inspector/agents/InspectorNetworkAgent.cpp:
>+        (WebCore::InspectorNetworkAgent::buildObjectForResourceResponse):
>+        * platform/network/NetworkLoadMetrics.h:
>+        * platform/network/ParsedContentRange.cpp:
>+        (WebCore::areContentRangeValuesValid):
>+        (WebCore::parseContentRange):
>+        (WebCore::ParsedContentRange::ParsedContentRange):
>+        (WebCore::ParsedContentRange::headerValue const):
>+        * platform/network/ParsedContentRange.h:
>+        (WebCore::ParsedContentRange::isValid const):
>+        (WebCore::ParsedContentRange::lastBytePosition const):
>+        * platform/network/ResourceResponseBase.cpp:
>+        (WebCore::ResourceResponseBase::ResourceResponseBase):
>+        (WebCore::ResourceResponseBase::includeCertificateInfo const):
>+        (WebCore::ResourceResponseBase::isSuccessful const):
>+        (WebCore::ResourceResponseBase::httpStatusCode const):
>+        (WebCore::ResourceResponseBase::setHTTPStatusCode):
>+        * platform/network/ResourceResponseBase.h:
>+        (WebCore::ResourceResponseBase::certificateInfo const):
>+        (WebCore::ResourceResponseBase::encode const):
>+        (WebCore::ResourceResponseBase::decode):
>+        * platform/network/curl/ResourceResponseCurl.cpp:
>+        (WebCore::ResourceResponse::setCertificateInfo):
>+
> 2019-06-21  Sihui Liu  <sihui_liu@apple.com>
> 
>         openDatabase should return an empty object when WebSQL is disabled
>diff --git a/Source/WebCore/inspector/NetworkResourcesData.cpp b/Source/WebCore/inspector/NetworkResourcesData.cpp
>index d3b759f29ccf1ae180280d5e173670d29c4f8cc1..10104006a76e7f1990e9bf6c0fe513aaaa59592e 100644
>--- a/Source/WebCore/inspector/NetworkResourcesData.cpp
>+++ b/Source/WebCore/inspector/NetworkResourcesData.cpp
>@@ -165,7 +165,7 @@ void NetworkResourcesData::responseReceived(const String& requestId, const Strin
>     if (InspectorNetworkAgent::shouldTreatAsText(response.mimeType()))
>         resourceData->setDecoder(InspectorNetworkAgent::createTextDecoder(response.mimeType(), response.textEncodingName()));
> 
>-    if (auto& certificateInfo = response.certificateInfo())
>+    if (auto certificateInfo = response.certificateInfo())
>         resourceData->setCertificateInfo(certificateInfo);
> }
> 
>diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>index 3e4e96eb231a054b2121247bc2cb09165f0265b3..e24fc3b15127b476d0a888ef1312e523014a9f07 100644
>--- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>+++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
>@@ -335,7 +335,7 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
>     if (resourceLoader)
>         responseObject->setTiming(buildObjectForTiming(response.deprecatedNetworkLoadMetrics(), *resourceLoader));
> 
>-    if (auto& certificateInfo = response.certificateInfo()) {
>+    if (auto certificateInfo = response.certificateInfo()) {
>         auto securityPayload = Inspector::Protocol::Security::Security::create()
>             .release();
> 
>diff --git a/Source/WebCore/platform/network/NetworkLoadMetrics.h b/Source/WebCore/platform/network/NetworkLoadMetrics.h
>index 03c18b6927a2d4060e98f4d23f1db52841d275ae..b1170837f9cbb687ed696fd466cdc54e81ec2f60 100644
>--- a/Source/WebCore/platform/network/NetworkLoadMetrics.h
>+++ b/Source/WebCore/platform/network/NetworkLoadMetrics.h
>@@ -168,12 +168,12 @@ public:
>     String connectionIdentifier;
>     NetworkLoadPriority priority;
> 
>-    String tlsProtocol;
>-    String tlsCipher;
>-
>     // Whether or not all of the properties (0 or otherwise) have been set.
>     bool complete { false };
> 
>+    String tlsProtocol;
>+    String tlsCipher;
>+
>     HTTPHeaderMap requestHeaders;
> 
>     uint64_t requestHeaderBytesSent;
>diff --git a/Source/WebCore/platform/network/ParsedContentRange.cpp b/Source/WebCore/platform/network/ParsedContentRange.cpp
>index a3d4f044059dfd9a57b31929db8f112c15f62113..233ba3996592cef2a95d3b6f143432d56e3cd6b2 100644
>--- a/Source/WebCore/platform/network/ParsedContentRange.cpp
>+++ b/Source/WebCore/platform/network/ParsedContentRange.cpp
>@@ -31,7 +31,7 @@
> 
> namespace WebCore {
> 
>-static bool areContentRangeValuesValid(int64_t firstBytePosition, int64_t lastBytePosition, int64_t instanceLength)
>+static bool areContentRangeValuesValid(int64_t firstBytePosition, ParsedContentRange::BytePosition lastBytePosition, int64_t instanceLength)
> {
>     // From <http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html>
>     // 14.16 Content-Range
>@@ -40,16 +40,16 @@ static bool areContentRangeValuesValid(int64_t firstBytePosition, int64_t lastBy
>     if (firstBytePosition < 0)
>         return false;
> 
>-    if (lastBytePosition < firstBytePosition)
>+    if (lastBytePosition.value() < firstBytePosition)
>         return false;
> 
>     if (instanceLength == ParsedContentRange::UnknownLength)
>         return true;
> 
>-    return lastBytePosition < instanceLength;
>+    return lastBytePosition.value() < instanceLength;
> }
> 
>-static bool parseContentRange(const String& headerValue, int64_t& firstBytePosition, int64_t& lastBytePosition, int64_t& instanceLength)
>+static bool parseContentRange(const String& headerValue, int64_t& firstBytePosition, ParsedContentRange::BytePosition& lastBytePosition, int64_t& instanceLength)
> {
>     // From <http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html>
>     // 14.16 Content-Range
>@@ -111,7 +111,8 @@ static bool parseContentRange(const String& headerValue, int64_t& firstBytePosit
> 
> ParsedContentRange::ParsedContentRange(const String& headerValue)
> {
>-    m_isValid = parseContentRange(headerValue, m_firstBytePosition, m_lastBytePosition, m_instanceLength);
>+    if (!parseContentRange(headerValue, m_firstBytePosition, m_lastBytePosition, m_instanceLength))
>+        m_lastBytePosition = -1;
> }
> 
> ParsedContentRange::ParsedContentRange(int64_t firstBytePosition, int64_t lastBytePosition, int64_t instanceLength)
>@@ -119,16 +120,17 @@ ParsedContentRange::ParsedContentRange(int64_t firstBytePosition, int64_t lastBy
>     , m_lastBytePosition(lastBytePosition)
>     , m_instanceLength(instanceLength)
> {
>-    m_isValid = areContentRangeValuesValid(m_firstBytePosition, m_lastBytePosition, m_instanceLength);
>+    if (!areContentRangeValuesValid(m_firstBytePosition, m_lastBytePosition, m_instanceLength))
>+        m_lastBytePosition = -1;
> }
> 
> String ParsedContentRange::headerValue() const
> {
>-    if (!m_isValid)
>+    if (!isValid())
>         return String();
>     if (m_instanceLength == UnknownLength)
>-        return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition, "/*");
>-    return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition, '/', m_instanceLength);
>+        return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition.value(), "/*");
>+    return makeString("bytes ", m_firstBytePosition, '-', m_lastBytePosition.value(), '/', m_instanceLength);
> }
> 
> }
>diff --git a/Source/WebCore/platform/network/ParsedContentRange.h b/Source/WebCore/platform/network/ParsedContentRange.h
>index 5a0704bd4b96fdcba90dc14ca466cb8efd7de5c0..426a96d00783b5fca3c98391fbdcc52e6ab13583 100644
>--- a/Source/WebCore/platform/network/ParsedContentRange.h
>+++ b/Source/WebCore/platform/network/ParsedContentRange.h
>@@ -27,6 +27,7 @@
> #define ParsedContentRange_h
> 
> #include <wtf/Forward.h>
>+#include <wtf/Markable.h>
> 
> namespace WebCore {
> 
>@@ -36,22 +37,23 @@ public:
>     ParsedContentRange() { }
>     WEBCORE_EXPORT ParsedContentRange(int64_t firstBytePosition, int64_t lastBytePosition, int64_t instanceLength);
> 
>-    bool isValid() const { return m_isValid; }
>+    bool isValid() const { return (bool)m_lastBytePosition; }
>     int64_t firstBytePosition() const { return m_firstBytePosition; }
>-    int64_t lastBytePosition() const { return m_lastBytePosition; }
>+    int64_t lastBytePosition() const { return m_lastBytePosition.value(); }
>     int64_t instanceLength() const { return m_instanceLength; }
> 
>     WEBCORE_EXPORT String headerValue() const;
> 
>     enum { UnknownLength = std::numeric_limits<int64_t>::max() };
> 
>+    using BytePosition = Markable<int64_t, IntegralMarkableTraits<int64_t, -1>>;
>+
> private:
>     template<typename T> static bool isPositive(T);
> 
>     int64_t m_firstBytePosition { 0 };
>-    int64_t m_lastBytePosition { 0 };
>+    BytePosition m_lastBytePosition;
>     int64_t m_instanceLength { UnknownLength };
>-    bool m_isValid { false };
> };
> 
> }
>diff --git a/Source/WebCore/platform/network/ResourceResponseBase.cpp b/Source/WebCore/platform/network/ResourceResponseBase.cpp
>index 20ac64d57034c69ea92bc7a43536f16d795ffa29..630fc2ed93a59a951f76f50e508cafa018a46df4 100644
>--- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
>@@ -48,7 +48,8 @@ bool isScriptAllowedByNosniff(const ResourceResponse& response)
> }
> 
> ResourceResponseBase::ResourceResponseBase()
>-    : m_haveParsedCacheControlHeader(false)
>+    : m_includesCertificateInfo(false)
>+    , m_haveParsedCacheControlHeader(false)
>     , m_haveParsedAgeHeader(false)
>     , m_haveParsedDateHeader(false)
>     , m_haveParsedExpiresHeader(false)
>@@ -64,7 +65,7 @@ ResourceResponseBase::ResourceResponseBase(const URL& url, const String& mimeTyp
>     , m_mimeType(mimeType)
>     , m_expectedContentLength(expectedLength)
>     , m_textEncodingName(textEncodingName)
>-    , m_certificateInfo(CertificateInfo()) // Empty but valid for synthetic responses.
>+    , m_includesCertificateInfo(true) // Empty but valid for synthetic responses.
>     , m_haveParsedCacheControlHeader(false)
>     , m_haveParsedAgeHeader(false)
>     , m_haveParsedDateHeader(false)
>@@ -261,8 +262,9 @@ void ResourceResponseBase::setType(Type type)
> 
> void ResourceResponseBase::includeCertificateInfo() const
> {
>-    if (m_certificateInfo)
>+    if (m_includesCertificateInfo)
>         return;
>+    m_includesCertificateInfo = true;
>     m_certificateInfo = static_cast<const ResourceResponse*>(this)->platformCertificateInfo();
> }
> 
>@@ -286,18 +288,18 @@ String ResourceResponseBase::sanitizeSuggestedFilename(const String& suggestedFi
> 
> bool ResourceResponseBase::isSuccessful() const
> {
>-    int code = httpStatusCode();
>+    uint16_t code = httpStatusCode();
>     return code >= 200 && code < 300;
> }
> 
>-int ResourceResponseBase::httpStatusCode() const
>+uint16_t ResourceResponseBase::httpStatusCode() const
> {
>     lazyInit(CommonFieldsOnly);
> 
>     return m_httpStatusCode;
> }
> 
>-void ResourceResponseBase::setHTTPStatusCode(int statusCode)
>+void ResourceResponseBase::setHTTPStatusCode(uint16_t statusCode)
> {
>     lazyInit(CommonFieldsOnly);
> 
>diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
>index 9f1b3b2e7fc67935bf788d4977190dee5305855d..c401a6853e282313660b496ee84d5edcf3c05858 100644
>--- a/Source/WebCore/platform/network/ResourceResponseBase.h
>+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
>@@ -60,7 +60,7 @@ public:
>         String mimeType;
>         long long expectedContentLength;
>         String textEncodingName;
>-        int httpStatusCode;
>+        uint16_t httpStatusCode;
>         String httpStatusText;
>         String httpVersion;
>         HTTPHeaderMap httpHeaderFields;
>@@ -89,8 +89,8 @@ public:
>     WEBCORE_EXPORT const String& textEncodingName() const;
>     WEBCORE_EXPORT void setTextEncodingName(const String& name);
> 
>-    WEBCORE_EXPORT int httpStatusCode() const;
>-    WEBCORE_EXPORT void setHTTPStatusCode(int);
>+    WEBCORE_EXPORT uint16_t httpStatusCode() const;
>+    WEBCORE_EXPORT void setHTTPStatusCode(uint16_t);
>     WEBCORE_EXPORT bool isRedirection() const;
> 
>     WEBCORE_EXPORT const String& httpStatusText() const;
>@@ -127,7 +127,13 @@ public:
>     WEBCORE_EXPORT static String sanitizeSuggestedFilename(const String&);
> 
>     WEBCORE_EXPORT void includeCertificateInfo() const;
>-    const Optional<CertificateInfo>& certificateInfo() const { return m_certificateInfo; };
>+    Optional<CertificateInfo> certificateInfo() const
>+    {
>+        if (m_includesCertificateInfo)
>+            return m_certificateInfo;
>+        return WTF::nullopt;
>+    }
>+
>     
>     // These functions return parsed values of the corresponding response headers.
>     WEBCORE_EXPORT bool cacheControlContainsNoCache() const;
>@@ -214,8 +220,6 @@ protected:
>     HTTPHeaderMap m_httpHeaderFields;
>     mutable NetworkLoadMetrics m_networkLoadMetrics;
> 
>-    mutable Optional<CertificateInfo> m_certificateInfo;
>-
> private:
>     mutable Markable<Seconds, Seconds::MarkableTraits> m_age;
>     mutable Markable<WallTime, WallTime::MarkableTraits> m_date;
>@@ -224,6 +228,10 @@ private:
>     mutable ParsedContentRange m_contentRange;
>     mutable CacheControlDirectives m_cacheControlDirectives;
> 
>+protected:
>+    mutable bool m_includesCertificateInfo : 1;
>+
>+private:
>     mutable bool m_haveParsedCacheControlHeader : 1;
>     mutable bool m_haveParsedAgeHeader : 1;
>     mutable bool m_haveParsedDateHeader : 1;
>@@ -240,7 +248,8 @@ private:
>     Tainting m_tainting { Tainting::Basic };
> 
> protected:
>-    int m_httpStatusCode { 0 };
>+    uint16_t m_httpStatusCode;
>+    mutable CertificateInfo m_certificateInfo;
> };
> 
> inline bool operator==(const ResourceResponse& a, const ResourceResponse& b) { return ResourceResponseBase::compare(a, b); }
>@@ -268,6 +277,8 @@ void ResourceResponseBase::encode(Encoder& encoder) const
>         encoder << m_networkLoadMetrics;
> 
>     encoder << m_httpStatusCode;
>+    bool includesCertificateInfo = m_includesCertificateInfo;
>+    encoder << includesCertificateInfo;
>     encoder << m_certificateInfo;
>     encoder.encodeEnum(m_source);
>     encoder.encodeEnum(m_type);
>@@ -306,6 +317,10 @@ bool ResourceResponseBase::decode(Decoder& decoder, ResourceResponseBase& respon
>         return false;
>     if (!decoder.decode(response.m_httpStatusCode))
>         return false;
>+    bool includesCertificateInfo = false;
>+    if (!decoder.decode(includesCertificateInfo))
>+        return false;
>+    response.m_includesCertificateInfo = includesCertificateInfo;
>     if (!decoder.decode(response.m_certificateInfo))
>         return false;
>     if (!decoder.decodeEnum(response.m_source))
>diff --git a/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp b/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp
>index 190a0f20c30a5ab737a5ad1ea6be5f709e0cfcac..3ed2ef0df0dc31e67ca7dc73efe51107b58a3583 100644
>--- a/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp
>+++ b/Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp
>@@ -149,6 +149,7 @@ void ResourceResponse::setStatusLine(const String& header)
> void ResourceResponse::setCertificateInfo(CertificateInfo&& certificateInfo)
> {
>     m_certificateInfo = WTFMove(certificateInfo);
>+    m_includesCertificateInfo = true;
> }
> 
> void ResourceResponse::setDeprecatedNetworkLoadMetrics(NetworkLoadMetrics&& networkLoadMetrics)

Actions: View | Formatted Diff | Diff

Attachments on bug 187460: 346147 | 372680 | 372681 | 372682 | 372683 | 372684 | 372698 | 372702 | 372703 | 372704 | 372706 | 372707 | 372708 | 372712 | 372713 | 372716 | 372738 | 372783 | 372788 | 372789 | 372799 | 372802 | 373173 | 373175 | 373176 | 373194