Skip to content

Commit

Permalink
Have ResourceResponse use String members instead of AtomString
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=268367
rdar://121916584

Reviewed by Youenn Fablet.

To be usable with WorkQueue, we can't use AtomString with ResourceResponse.
So we change the members to be String instead.

No change in observable behaviour.

* Source/WebCore/Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::create):
* Source/WebCore/Modules/websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::readServerHandshake):
(WebCore::WebSocketHandshake::readStatusLine):
* Source/WebCore/Modules/websockets/WebSocketHandshake.h:
* Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::interceptWithResponse):
(WebCore::InspectorNetworkAgent::interceptRequestWithResponse):
* Source/WebCore/loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::setResponseMIMEType):
* Source/WebCore/loader/DocumentLoader.h:
* Source/WebCore/platform/network/BlobResourceHandle.cpp:
(WebCore::BlobResourceHandle::notifyResponseOnSuccess):
* Source/WebCore/platform/network/ResourceResponseBase.cpp:
(WebCore::m_textEncodingName):
(WebCore::m_httpStatusText):
(WebCore::m_httpVersion):
(WebCore::ResourceResponseBase::crossThreadData const):
(WebCore::ResourceResponseBase::fromCrossThreadData):
(WebCore::ResourceResponseBase::mimeType const):
(WebCore::ResourceResponseBase::setMimeType):
(WebCore::ResourceResponseBase::textEncodingName const):
(WebCore::ResourceResponseBase::setTextEncodingName):
(WebCore::ResourceResponseBase::httpStatusText const):
(WebCore::ResourceResponseBase::setHTTPStatusText):
(WebCore::ResourceResponseBase::httpVersion const):
(WebCore::ResourceResponseBase::setHTTPVersion):
(WebCore::ResourceResponseBase::getResponseData const):
* Source/WebCore/platform/network/ResourceResponseBase.h:
* Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp:
(WebCore::ResourceResponse::ResourceResponse):
(WebCore::ResourceResponse::appendHTTPHeaderField):
* Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::ResourceResponse):
* Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp:
(WebKit::NetworkDataTaskBlob::dispatchDidReceiveResponse):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didReceiveResponse):
* Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:
(WebKit::ServiceWorkerFetchTask::processResponse):
* Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::didGetFileInfo):
* Source/WebKit/Shared/API/glib/WebKitURIResponse.cpp:
(webkit_uri_response_get_mime_type):
* Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp:
(webkitURISchemeRequestReadCallback):

Canonical link: https://commits.webkit.org/273784@main
  • Loading branch information
jyavenard committed Jan 30, 2024
1 parent 90ca555 commit 54068d0
Show file tree
Hide file tree
Showing 17 changed files with 72 additions and 71 deletions.
8 changes: 4 additions & 4 deletions Source/WebCore/Modules/fetch/FetchResponse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ ExceptionOr<Ref<FetchResponse>> FetchResponse::create(ScriptExecutionContext& co
auto r = adoptRef(*new FetchResponse(&context, WTFMove(body), WTFMove(headers), { }));
r->suspendIfNeeded();

AtomString mimeType { extractMIMETypeFromMediaType(contentType) };
r->m_internalResponse.setMimeType(mimeType.isEmpty() ? AtomString { defaultMIMEType() } : mimeType);
r->m_internalResponse.setTextEncodingName(extractCharsetFromMediaType(contentType).toAtomString());
auto mimeType = extractMIMETypeFromMediaType(contentType);
r->m_internalResponse.setMimeType(mimeType.isEmpty() ? String { defaultMIMEType() } : WTFMove(mimeType));
r->m_internalResponse.setTextEncodingName(extractCharsetFromMediaType(contentType).toString());

if (auto expectedContentLength = parseContentLength(r->m_headers->fastGet(HTTPHeaderName::ContentLength)))
r->m_internalResponse.setExpectedContentLength(*expectedContentLength);

// 3. Set response’s response’s status to init["status"].
r->m_internalResponse.setHTTPStatusCode(init.status);
// 4. Set response’s response’s status message to init["statusText"].
r->m_internalResponse.setHTTPStatusText(init.statusText);
r->m_internalResponse.setHTTPStatusText(init.statusText.releaseString());

return r;
}
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/Modules/websockets/WebSocketHandshake.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ int WebSocketHandshake::readServerHandshake(const uint8_t* header, size_t len)
{
m_mode = Incomplete;
int statusCode;
AtomString statusText;
String statusText;
int lineLength = readStatusLine(header, len, statusCode, statusText);
if (lineLength == -1)
return -1;
Expand All @@ -232,7 +232,7 @@ int WebSocketHandshake::readServerHandshake(const uint8_t* header, size_t len)

m_serverHandshakeResponse = ResourceResponse();
m_serverHandshakeResponse.setHTTPStatusCode(statusCode);
m_serverHandshakeResponse.setHTTPStatusText(statusText);
m_serverHandshakeResponse.setHTTPStatusText(WTFMove(statusText));

if (statusCode != 101) {
m_mode = Failed;
Expand Down Expand Up @@ -356,7 +356,7 @@ static inline bool headerHasValidHTTPVersion(StringView httpStatusLine)
// Returns the header length (including "\r\n"), or -1 if we have not received enough data yet.
// If the line is malformed or the status code is not a 3-digit number,
// statusCode and statusText will be set to -1 and a null string, respectively.
int WebSocketHandshake::readStatusLine(const uint8_t* header, size_t headerLength, int& statusCode, AtomString& statusText)
int WebSocketHandshake::readStatusLine(const uint8_t* header, size_t headerLength, int& statusCode, String& statusText)
{
// Arbitrary size limit to prevent the server from sending an unbounded
// amount of data with no newlines and forcing us to buffer it all.
Expand Down Expand Up @@ -426,7 +426,7 @@ int WebSocketHandshake::readStatusLine(const uint8_t* header, size_t headerLengt
}

statusCode = parseInteger<int>(statusCodeString).value();
statusText = AtomString(space2 + 1, end - space2 - 3); // Exclude "\r\n".
statusText = String(space2 + 1, end - space2 - 3); // Exclude "\r\n".
return lineLength;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/Modules/websockets/WebSocketHandshake.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class WebSocketHandshake {

private:

int readStatusLine(const uint8_t* header, size_t headerLength, int& statusCode, AtomString& statusText);
int readStatusLine(const uint8_t* header, size_t headerLength, int& statusCode, String& statusText);

// Reads all headers except for the two predefined ones.
const uint8_t* readHTTPHeaders(const uint8_t* start, const uint8_t* end);
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class InspectorThreadableLoaderClient final : public ThreadableLoaderClient {
m_statusCode = response.httpStatusCode();

// FIXME: This assumes text only responses. We should support non-text responses as well.
PAL::TextEncoding textEncoding(response.textEncodingName().string());
PAL::TextEncoding textEncoding(response.textEncodingName());
bool useDetector = false;
if (!textEncoding.isValid()) {
textEncoding = PAL::UTF8Encoding();
Expand Down Expand Up @@ -1275,9 +1275,9 @@ Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithResponse(const
if (status)
overrideResponse.setHTTPStatusCode(*status);
if (!!statusText)
overrideResponse.setHTTPStatusText(AtomString { statusText });
overrideResponse.setHTTPStatusText(String { statusText });
if (!!mimeType)
overrideResponse.setMimeType(AtomString { mimeType });
overrideResponse.setMimeType(String { mimeType });
if (headers) {
HTTPHeaderMap explicitHeaders;
for (auto& header : *headers) {
Expand Down Expand Up @@ -1333,7 +1333,7 @@ Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequestWithRespons
ResourceResponse response(pendingRequest->m_loader->url(), mimeType, data->size(), String());
response.setSource(ResourceResponse::Source::InspectorOverride);
response.setHTTPStatusCode(status);
response.setHTTPStatusText(AtomString { statusText });
response.setHTTPStatusText(String { statusText });
HTTPHeaderMap explicitHeaders;
for (auto& header : headers.get()) {
auto headerValue = header.value->asString();
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/loader/DocumentLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1934,9 +1934,9 @@ URL DocumentLoader::documentURL() const
#if PLATFORM(IOS_FAMILY)

// FIXME: This method seems to violate the encapsulation of this class.
void DocumentLoader::setResponseMIMEType(const AtomString& responseMIMEType)
void DocumentLoader::setResponseMIMEType(const String& responseMIMEType)
{
m_response.setMimeType(responseMIMEType);
m_response.setMimeType(String { responseMIMEType });
}

#endif
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/loader/DocumentLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class DocumentLoader
const String& responseMIMEType() const;
#if PLATFORM(IOS_FAMILY)
// FIXME: This method seems to violate the encapsulation of this class.
WEBCORE_EXPORT void setResponseMIMEType(const AtomString&);
WEBCORE_EXPORT void setResponseMIMEType(const String&);
#endif
const String& currentContentType() const;
void replaceRequestURLForSameDocumentNavigation(const URL&);
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/platform/network/BlobResourceHandle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ void BlobResourceHandle::notifyResponseOnSuccess()
response.setHTTPStatusText(m_isRangeRequest ? httpPartialContentText : httpOKText);

response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_blobData->contentType());
response.setTextEncodingName(extractCharsetFromMediaType(m_blobData->contentType()).toAtomString());
response.setTextEncodingName(extractCharsetFromMediaType(m_blobData->contentType()).toString());
response.setHTTPHeaderField(HTTPHeaderName::ContentLength, String::number(m_totalRemainingSize));
addPolicyContainerHeaders(response, m_blobData->policyContainer());

Expand Down
51 changes: 26 additions & 25 deletions Source/WebCore/platform/network/ResourceResponseBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData> d
: m_url(data ? data->url : URL { })
, m_mimeType(data ? data->mimeType : AtomString { })
, m_expectedContentLength(data ? data->expectedContentLength : 0)
, m_textEncodingName(data ? data->textEncodingName : AtomString { })
, m_httpStatusText(data ? data->httpStatusText : AtomString { })
, m_httpVersion(data ? data->httpVersion : AtomString { })
, m_textEncodingName(data ? data->textEncodingName : String { })
, m_httpStatusText(data ? data->httpStatusText : String { })
, m_httpVersion(data ? data->httpVersion : String { })
, m_httpHeaderFields(data ? data->httpHeaderFields : HTTPHeaderMap { })
, m_networkLoadMetrics(data && data->networkLoadMetrics ? Box<NetworkLoadMetrics>::create(*data->networkLoadMetrics) : Box<NetworkLoadMetrics> { })
, m_certificateInfo(data ? data->certificateInfo : std::nullopt)
Expand Down Expand Up @@ -117,12 +117,13 @@ ResourceResponseData ResourceResponseBase::crossThreadData() const
{
CrossThreadData data;
data.url = url().isolatedCopy();
data.mimeType = mimeType().string().isolatedCopy();
data.mimeType = mimeType().isolatedCopy();
data.expectedContentLength = expectedContentLength();
data.textEncodingName = textEncodingName().string().isolatedCopy();
data.textEncodingName = textEncodingName().isolatedCopy();
data.httpStatusCode = httpStatusCode();
data.httpStatusText = httpStatusText().string().isolatedCopy();
data.httpVersion = httpVersion().string().isolatedCopy();
data.httpStatusText = httpStatusText().isolatedCopy();
data.httpVersion = httpVersion().isolatedCopy();

data.httpHeaderFields = httpHeaderFields().isolatedCopy();
if (m_networkLoadMetrics)
data.networkLoadMetrics = m_networkLoadMetrics->isolatedCopy();
Expand All @@ -144,13 +145,13 @@ ResourceResponse ResourceResponseBase::fromCrossThreadData(CrossThreadData&& dat
ResourceResponse response;

response.setURL(data.url);
response.setMimeType(AtomString { WTFMove(data.mimeType) });
response.setMimeType(WTFMove(data.mimeType));
response.setExpectedContentLength(data.expectedContentLength);
response.setTextEncodingName(AtomString { WTFMove(data.textEncodingName) });
response.setTextEncodingName(WTFMove(data.textEncodingName));

response.setHTTPStatusCode(data.httpStatusCode);
response.setHTTPStatusText(AtomString { WTFMove(data.httpStatusText) });
response.setHTTPVersion(AtomString { WTFMove(data.httpVersion) });
response.setHTTPStatusText(WTFMove(data.httpStatusText));
response.setHTTPVersion(WTFMove(data.httpVersion));

response.m_httpHeaderFields = WTFMove(data.httpHeaderFields);
if (data.networkLoadMetrics)
Expand Down Expand Up @@ -262,20 +263,20 @@ void ResourceResponseBase::setURL(const URL& url)
// FIXME: Should invalidate or update platform response if present.
}

const AtomString& ResourceResponseBase::mimeType() const
const String& ResourceResponseBase::mimeType() const
{
lazyInit(CommonFieldsOnly);

return m_mimeType;
}

void ResourceResponseBase::setMimeType(const AtomString& mimeType)
void ResourceResponseBase::setMimeType(String&& mimeType)
{
lazyInit(CommonFieldsOnly);
m_isNull = false;

// FIXME: MIME type is determined by HTTP Content-Type header. We should update the header, so that it doesn't disagree with m_mimeType.
m_mimeType = mimeType;
m_mimeType = WTFMove(mimeType);

// FIXME: Should invalidate or update platform response if present.
}
Expand All @@ -298,14 +299,14 @@ void ResourceResponseBase::setExpectedContentLength(long long expectedContentLen
// FIXME: Should invalidate or update platform response if present.
}

const AtomString& ResourceResponseBase::textEncodingName() const
const String& ResourceResponseBase::textEncodingName() const
{
lazyInit(CommonFieldsOnly);

return m_textEncodingName;
}

void ResourceResponseBase::setTextEncodingName(AtomString&& encodingName)
void ResourceResponseBase::setTextEncodingName(String&& encodingName)
{
lazyInit(CommonFieldsOnly);
m_isNull = false;
Expand Down Expand Up @@ -375,30 +376,30 @@ bool ResourceResponseBase::isRedirection() const
return isRedirectionStatusCode(m_httpStatusCode);
}

const AtomString& ResourceResponseBase::httpStatusText() const
const String& ResourceResponseBase::httpStatusText() const
{
lazyInit(AllFields);

return m_httpStatusText;
}

void ResourceResponseBase::setHTTPStatusText(const AtomString& statusText)
void ResourceResponseBase::setHTTPStatusText(String&& statusText)
{
lazyInit(AllFields);

m_httpStatusText = statusText;
m_httpStatusText = WTFMove(statusText);

// FIXME: Should invalidate or update platform response if present.
}

const AtomString& ResourceResponseBase::httpVersion() const
const String& ResourceResponseBase::httpVersion() const
{
lazyInit(AllFields);

return m_httpVersion;
}

void ResourceResponseBase::setHTTPVersion(const AtomString& versionText)
void ResourceResponseBase::setHTTPVersion(String&& versionText)
{
lazyInit(AllFields);

Expand Down Expand Up @@ -884,12 +885,12 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons

return { ResourceResponseData {
URL { m_url },
String { m_mimeType.string() },
String { m_mimeType },
m_expectedContentLength,
String { m_textEncodingName.string() },
String { m_textEncodingName },
m_httpStatusCode,
String { m_httpStatusText.string() },
String { m_httpVersion.string() },
String { m_httpStatusText },
String { m_httpVersion },
HTTPHeaderMap { m_httpHeaderFields },
m_networkLoadMetrics ? std::optional(*m_networkLoadMetrics) : std::nullopt,
m_source,
Expand Down
24 changes: 12 additions & 12 deletions Source/WebCore/platform/network/ResourceResponseBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,24 @@ class ResourceResponseBase {
WEBCORE_EXPORT const URL& url() const;
WEBCORE_EXPORT void setURL(const URL&);

WEBCORE_EXPORT const AtomString& mimeType() const;
WEBCORE_EXPORT void setMimeType(const AtomString&);
WEBCORE_EXPORT const String& mimeType() const;
WEBCORE_EXPORT void setMimeType(String&&);

WEBCORE_EXPORT long long expectedContentLength() const;
WEBCORE_EXPORT void setExpectedContentLength(long long expectedContentLength);

WEBCORE_EXPORT const AtomString& textEncodingName() const;
WEBCORE_EXPORT void setTextEncodingName(AtomString&&);
WEBCORE_EXPORT const String& textEncodingName() const;
WEBCORE_EXPORT void setTextEncodingName(String&&);

WEBCORE_EXPORT int httpStatusCode() const;
WEBCORE_EXPORT void setHTTPStatusCode(int);
WEBCORE_EXPORT bool isRedirection() const;

WEBCORE_EXPORT const AtomString& httpStatusText() const;
WEBCORE_EXPORT void setHTTPStatusText(const AtomString&);
WEBCORE_EXPORT const String& httpStatusText() const;
WEBCORE_EXPORT void setHTTPStatusText(String&&);

WEBCORE_EXPORT const AtomString& httpVersion() const;
WEBCORE_EXPORT void setHTTPVersion(const AtomString&);
WEBCORE_EXPORT const String& httpVersion() const;
WEBCORE_EXPORT void setHTTPVersion(String&&);
WEBCORE_EXPORT bool isHTTP09() const;

WEBCORE_EXPORT const HTTPHeaderMap& httpHeaderFields() const;
Expand Down Expand Up @@ -245,11 +245,11 @@ class ResourceResponseBase {

protected:
URL m_url;
AtomString m_mimeType;
String m_mimeType;
long long m_expectedContentLength { 0 };
AtomString m_textEncodingName;
AtomString m_httpStatusText;
AtomString m_httpVersion;
String m_textEncodingName;
String m_httpStatusText;
String m_httpVersion;
HTTPHeaderMap m_httpHeaderFields;
Box<NetworkLoadMetrics> m_networkLoadMetrics;

Expand Down
6 changes: 3 additions & 3 deletions Source/WebCore/platform/network/curl/ResourceResponseCurl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@ ResourceResponse::ResourceResponse(CurlResponse& response)
break;
}

setMimeType(AtomString { extractMIMETypeFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).convertToASCIILowercase() });
setTextEncodingName(extractCharsetFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).toAtomString());
setMimeType(extractMIMETypeFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).convertToASCIILowercase());
setTextEncodingName(extractCharsetFromMediaType(httpHeaderField(HTTPHeaderName::ContentType)).toString());
setCertificateInfo(WTFMove(response.certificateInfo));
setSource(ResourceResponse::Source::Network);
}

void ResourceResponse::appendHTTPHeaderField(const String& header)
{
if (startsWithLettersIgnoringASCIICase(header, "http/"_s)) {
setHTTPStatusText(extractReasonPhraseFromHTTPStatusLine(header.trim(deprecatedIsSpaceOrNewline)));
setHTTPStatusText(String { extractReasonPhraseFromHTTPStatusLine(header.trim(deprecatedIsSpaceOrNewline)) });
return;
}

Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ResourceResponse::ResourceResponse(SoupMessage* soupMessage, const CString& snif
}

m_httpStatusCode = soup_message_get_status(soupMessage);
setHTTPStatusText(AtomString::fromLatin1(soup_message_get_reason_phrase(soupMessage)));
setHTTPStatusText(String::fromLatin1(soup_message_get_reason_phrase(soupMessage)));

m_certificate = soup_message_get_tls_peer_certificate(soupMessage);
m_tlsErrors = soup_message_get_tls_peer_certificate_errors(soupMessage);
Expand All @@ -69,10 +69,10 @@ ResourceResponse::ResourceResponse(SoupMessage* soupMessage, const CString& snif
contentType = String::fromLatin1(sniffedContentType.data());
else
contentType = String::fromLatin1(officialType);
setMimeType(AtomString { extractMIMETypeFromMediaType(contentType) });
setMimeType(extractMIMETypeFromMediaType(contentType));
if (m_mimeType.isEmpty() && m_httpStatusCode != SOUP_STATUS_NOT_MODIFIED)
setMimeType(AtomString { MIMETypeRegistry::mimeTypeForPath(m_url.path()) });
setTextEncodingName(extractCharsetFromMediaType(contentType).toAtomString());
setMimeType(MIMETypeRegistry::mimeTypeForPath(m_url.path()));
setTextEncodingName(extractCharsetFromMediaType(contentType).toString());

setExpectedContentLength(soup_message_headers_get_content_length(responseHeaders));
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ void NetworkDataTaskBlob::dispatchDidReceiveResponse()
response.setHTTPStatusText(m_isRangeRequest ? httpPartialContentText : httpOKText);

response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_blobData->contentType());
response.setTextEncodingName(extractCharsetFromMediaType(m_blobData->contentType()).toAtomString());
response.setTextEncodingName(extractCharsetFromMediaType(m_blobData->contentType()).toString());
response.setHTTPHeaderField(HTTPHeaderName::ContentLength, String::number(m_totalRemainingSize));
addPolicyContainerHeaders(response, m_blobData->policyContainer());

Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ void NetworkResourceLoader::didReceiveInformationalResponse(ResourceResponse&& r

void NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedResponse, PrivateRelayed privateRelayed, ResponseCompletionHandler&& completionHandler)
{
LOADER_RELEASE_LOG("didReceiveResponse: (httpStatusCode=%d, MIMEType=%" PUBLIC_LOG_STRING ", expectedContentLength=%" PRId64 ", hasCachedEntryForValidation=%d, hasNetworkLoadChecker=%d)", receivedResponse.httpStatusCode(), receivedResponse.mimeType().string().utf8().data(), receivedResponse.expectedContentLength(), !!m_cacheEntryForValidation, !!m_networkLoadChecker);
LOADER_RELEASE_LOG("didReceiveResponse: (httpStatusCode=%d, MIMEType=%" PUBLIC_LOG_STRING ", expectedContentLength=%" PRId64 ", hasCachedEntryForValidation=%d, hasNetworkLoadChecker=%d)", receivedResponse.httpStatusCode(), receivedResponse.mimeType().utf8().data(), receivedResponse.expectedContentLength(), !!m_cacheEntryForValidation, !!m_networkLoadChecker);

#if ENABLE(CONTENT_FILTERING)
if (m_contentFilter && !m_contentFilter->continueAfterResponseReceived(receivedResponse))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void ServiceWorkerFetchTask::processResponse(ResourceResponse&& response, bool n
return;
#endif

SWFETCH_RELEASE_LOG("processResponse: (httpStatusCode=%d, MIMEType=%" PUBLIC_LOG_STRING ", expectedContentLength=%" PRId64 ", needsContinueDidReceiveResponseMessage=%d, source=%u)", response.httpStatusCode(), response.mimeType().string().utf8().data(), response.expectedContentLength(), needsContinueDidReceiveResponseMessage, static_cast<unsigned>(response.source()));
SWFETCH_RELEASE_LOG("processResponse: (httpStatusCode=%d, MIMEType=%" PUBLIC_LOG_STRING ", expectedContentLength=%" PRId64 ", needsContinueDidReceiveResponseMessage=%d, source=%u)", response.httpStatusCode(), response.mimeType().utf8().data(), response.expectedContentLength(), needsContinueDidReceiveResponseMessage, static_cast<unsigned>(response.source()));
m_wasHandled = true;
if (m_timeoutTimer)
m_timeoutTimer->stop();
Expand Down
Loading

0 comments on commit 54068d0

Please sign in to comment.