| 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 9cfa91a3c0ad2382dc369a6fe010894e4352f515..eb0beb1450de215557bf1d32ad7b9491f8104daf 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| @@ -79,6 +79,7 @@
|
| #include "public/platform/WebDocumentSubresourceFilter.h"
|
| #include "public/platform/WebInsecureRequestPolicy.h"
|
| #include "public/platform/WebViewScheduler.h"
|
| +#include "wtf/CurrentTime.h"
|
| #include "wtf/Vector.h"
|
| #include <algorithm>
|
| #include <memory>
|
| @@ -412,9 +413,10 @@ void FrameFetchContext::dispatchWillSendRequest(
|
| frame()->loader().progress().willStartLoading(identifier,
|
| request.priority());
|
| }
|
| - InspectorInstrumentation::willSendRequest(frame(), identifier,
|
| - masterDocumentLoader(), request,
|
| - redirectResponse, initiatorInfo);
|
| + InspectorInstrumentation::willSendRequest(
|
| + frame()->document(), identifier, masterDocumentLoader(), request,
|
| + redirectResponse, initiatorInfo, monotonicallyIncreasingTime(),
|
| + currentTime());
|
| if (frame()->frameScheduler())
|
| frame()->frameScheduler()->didStartLoading(identifier);
|
| }
|
| @@ -466,8 +468,8 @@ void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier,
|
| InspectorResourceFinishEvent::data(identifier, finishTime, false,
|
| encodedDataLength));
|
| frame()->loader().progress().completeProgress(identifier);
|
| - InspectorInstrumentation::didFinishLoading(frame(), identifier, finishTime,
|
| - encodedDataLength);
|
| + InspectorInstrumentation::didFinishLoading(frame()->document(), identifier,
|
| + finishTime, encodedDataLength);
|
| if (frame()->frameScheduler())
|
| frame()->frameScheduler()->didStopLoading(identifier);
|
| }
|
| @@ -480,7 +482,8 @@ void FrameFetchContext::dispatchDidFail(unsigned long identifier,
|
| InspectorResourceFinishEvent::data(identifier, 0, true,
|
| encodedDataLength));
|
| frame()->loader().progress().completeProgress(identifier);
|
| - InspectorInstrumentation::didFailLoading(frame(), identifier, error);
|
| + InspectorInstrumentation::didFailLoading(frame()->document(), identifier,
|
| + error);
|
| // Notification to FrameConsole should come AFTER InspectorInstrumentation
|
| // call, DevTools front-end relies on this.
|
| if (!isInternalRequest)
|
| @@ -1051,7 +1054,7 @@ void FrameFetchContext::dispatchDidReceiveResponseInternal(
|
| frameLoaderClient()->dispatchDidReceiveResponse(response);
|
| DocumentLoader* documentLoader = masterDocumentLoader();
|
| InspectorInstrumentation::didReceiveResourceResponse(
|
| - frame(), identifier, documentLoader, response, resource);
|
| + frame()->document(), identifier, documentLoader, response, resource);
|
| // It is essential that inspector gets resource response BEFORE console.
|
| frame()->console().reportResourceResponseReceived(documentLoader, identifier,
|
| response);
|
|
|