| Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| index 049c2e27133a05c7fed4fc1962116c16e9474ea6..9f2874dc80b37326e45e29610d1d5b0006546bdb 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| @@ -413,14 +413,19 @@ void FrameFetchContext::dispatchDidReceiveResponse(
|
|
|
| void FrameFetchContext::dispatchDidReceiveData(unsigned long identifier,
|
| const char* data,
|
| - int dataLength,
|
| - int encodedDataLength) {
|
| + int dataLength) {
|
| + frame()->loader().progress().incrementProgress(identifier, dataLength);
|
| + InspectorInstrumentation::didReceiveData(frame(), identifier, data,
|
| + dataLength);
|
| +}
|
| +
|
| +void FrameFetchContext::dispatchDidReceiveEncodedData(unsigned long identifier,
|
| + int encodedDataLength) {
|
| TRACE_EVENT1(
|
| "devtools.timeline", "ResourceReceivedData", "data",
|
| InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
|
| - frame()->loader().progress().incrementProgress(identifier, dataLength);
|
| - InspectorInstrumentation::didReceiveData(frame(), identifier, data,
|
| - dataLength, encodedDataLength);
|
| + InspectorInstrumentation::didReceiveEncodedDataLength(frame(), identifier,
|
| + encodedDataLength);
|
| }
|
|
|
| void FrameFetchContext::dispatchDidDownloadData(unsigned long identifier,
|
| @@ -430,8 +435,9 @@ void FrameFetchContext::dispatchDidDownloadData(unsigned long identifier,
|
| "devtools.timeline", "ResourceReceivedData", "data",
|
| InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
|
| frame()->loader().progress().incrementProgress(identifier, dataLength);
|
| - InspectorInstrumentation::didReceiveData(frame(), identifier, 0, dataLength,
|
| - encodedDataLength);
|
| + InspectorInstrumentation::didReceiveData(frame(), identifier, 0, dataLength);
|
| + InspectorInstrumentation::didReceiveEncodedDataLength(frame(), identifier,
|
| + encodedDataLength);
|
| }
|
|
|
| void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier,
|
| @@ -449,6 +455,7 @@ void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier,
|
|
|
| void FrameFetchContext::dispatchDidFail(unsigned long identifier,
|
| const ResourceError& error,
|
| + int64_t encodedDataLength,
|
| bool isInternalRequest) {
|
| TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
|
| InspectorResourceFinishEvent::data(identifier, 0, true));
|
| @@ -483,7 +490,7 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(
|
| }
|
|
|
| if (resource->encodedSize() > 0)
|
| - dispatchDidReceiveData(identifier, 0, resource->encodedSize(), 0);
|
| + dispatchDidReceiveData(identifier, 0, resource->encodedSize());
|
|
|
| dispatchDidFinishLoading(identifier, 0, 0);
|
| }
|
|
|