Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp

Issue 2316573002: PlzNavigate: Support ResourceTiming API (Closed)
Patch Set: nit: ResourceResponseInfo->ResourceResponseInfos Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
diff --git a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
index 99fb5f8e2e58253ebc1ad73f37a71c494c32ed23..680542e6a3d8f419be02c34a016b5fcd0044f1e8 100644
--- a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
@@ -15,7 +15,7 @@ std::unique_ptr<ResourceTimingInfo> ResourceTimingInfo::adopt(std::unique_ptr<Cr
std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(data->m_type), data->m_initialTime, data->m_isMainResource);
info->m_originalTimingAllowOrigin = AtomicString(data->m_originalTimingAllowOrigin);
info->m_loadFinishTime = data->m_loadFinishTime;
- info->m_initialRequest = ResourceRequest(data->m_initialRequest.get());
+ info->m_initialURL = data->m_initialURL.copy();
info->m_finalResponse = ResourceResponse(data->m_finalResponse.get());
for (auto& responseData : data->m_redirectChain)
info->m_redirectChain.append(ResourceResponse(responseData.get()));
@@ -30,7 +30,7 @@ std::unique_ptr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData(
data->m_originalTimingAllowOrigin = m_originalTimingAllowOrigin.getString().isolatedCopy();
data->m_initialTime = m_initialTime;
data->m_loadFinishTime = m_loadFinishTime;
- data->m_initialRequest = m_initialRequest.copyData();
+ data->m_initialURL = m_initialURL.copy();
data->m_finalResponse = m_finalResponse.copyData();
for (const auto& response : m_redirectChain)
data->m_redirectChain.append(response.copyData());
@@ -39,7 +39,7 @@ std::unique_ptr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData(
return data;
}
-void ResourceTimingInfo::addRedirect(const ResourceResponse& redirectResponse, long long encodedDataLength, bool crossOrigin)
+void ResourceTimingInfo::addRedirect(const ResourceResponse& redirectResponse, bool crossOrigin)
{
m_redirectChain.append(redirectResponse);
if (m_hasCrossOriginRedirect)
@@ -48,8 +48,8 @@ void ResourceTimingInfo::addRedirect(const ResourceResponse& redirectResponse, l
m_hasCrossOriginRedirect = true;
m_transferSize = 0;
} else {
- DCHECK_GE(encodedDataLength, 0);
- m_transferSize += encodedDataLength;
+ DCHECK_GE(redirectResponse.encodedDataLength(), 0);
+ m_transferSize += redirectResponse.encodedDataLength();
}
}

Powered by Google App Engine
This is Rietveld 408576698