| Index: Source/core/inspector/InspectorResourceAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
|
| index 9fe423a96d6db65075b089e489ce60cfcd73be33..01493490c9825b553e56a4a9a87bb3f56937f41c 100644
|
| --- a/Source/core/inspector/InspectorResourceAgent.cpp
|
| +++ b/Source/core/inspector/InspectorResourceAgent.cpp
|
| @@ -249,6 +249,8 @@ static PassRefPtr<TypeBuilder::Network::Response> buildObjectForResourceResponse
|
| else
|
| headers = buildObjectForHeaders(response.httpHeaderFields());
|
|
|
| + int64_t encodedDataLength = response.resourceLoadInfo() ? response.resourceLoadInfo()->encodedDataLength : -1;
|
| +
|
| RefPtr<TypeBuilder::Network::Response> responseObject = TypeBuilder::Network::Response::create()
|
| .setUrl(urlWithoutFragment(response.url()).string())
|
| .setStatus(status)
|
| @@ -256,7 +258,8 @@ static PassRefPtr<TypeBuilder::Network::Response> buildObjectForResourceResponse
|
| .setHeaders(headers)
|
| .setMimeType(response.mimeType())
|
| .setConnectionReused(response.connectionReused())
|
| - .setConnectionId(response.connectionID());
|
| + .setConnectionId(response.connectionID())
|
| + .setEncodedDataLength(encodedDataLength);
|
|
|
| responseObject->setFromDiskCache(response.wasCached());
|
| if (response.resourceLoadTiming())
|
| @@ -392,7 +395,7 @@ void InspectorResourceAgent::didReceiveData(unsigned long identifier, const char
|
| m_frontend->dataReceived(requestId, currentTime(), dataLength, encodedDataLength);
|
| }
|
|
|
| -void InspectorResourceAgent::didFinishLoading(unsigned long identifier, DocumentLoader* loader, double monotonicFinishTime)
|
| +void InspectorResourceAgent::didFinishLoading(unsigned long identifier, DocumentLoader* loader, double monotonicFinishTime, int64_t encodedDataLength)
|
| {
|
| double finishTime = 0.0;
|
| // FIXME: Expose all of the timing details to inspector and have it calculate finishTime.
|
| @@ -403,14 +406,14 @@ void InspectorResourceAgent::didFinishLoading(unsigned long identifier, Document
|
| m_resourcesData->maybeDecodeDataToContent(requestId);
|
| if (!finishTime)
|
| finishTime = currentTime();
|
| - m_frontend->loadingFinished(requestId, finishTime);
|
| + m_frontend->loadingFinished(requestId, finishTime, encodedDataLength);
|
| }
|
|
|
| void InspectorResourceAgent::didReceiveCORSRedirectResponse(Frame* frame, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, ResourceLoader* resourceLoader)
|
| {
|
| // Update the response and finish loading
|
| didReceiveResourceResponse(frame, identifier, loader, response, resourceLoader);
|
| - didFinishLoading(identifier, loader, 0);
|
| + didFinishLoading(identifier, loader, 0, blink::WebURLLoaderClient::kUnknownEncodedDataLength);
|
| }
|
|
|
| void InspectorResourceAgent::didFailLoading(unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
|
|
|