Index: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp |
index ce8c9244306c0d7f29d9b8a9639278ea6b057bc6..df123813aa3931682f3dc571ba2c3adfcc4ce08a 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp |
+++ b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp |
@@ -574,14 +574,13 @@ void InspectorNetworkAgent::ShouldBlockRequest(const ResourceRequest& request, |
} |
void InspectorNetworkAgent::DidBlockRequest( |
- LocalFrame* frame, |
const ResourceRequest& request, |
DocumentLoader* loader, |
const FetchInitiatorInfo& initiator_info, |
ResourceRequestBlockedReason reason) { |
unsigned long identifier = CreateUniqueIdentifier(); |
- WillSendRequestInternal(frame, identifier, loader, request, |
- ResourceResponse(), initiator_info); |
+ WillSendRequestInternal(identifier, loader, request, ResourceResponse(), |
+ initiator_info); |
String request_id = IdentifiersFactory::RequestId(identifier); |
String protocol_reason = BuildBlockedReason(reason); |
@@ -602,14 +601,13 @@ void InspectorNetworkAgent::DidChangeResourcePriority( |
} |
void InspectorNetworkAgent::WillSendRequestInternal( |
- LocalFrame* frame, |
unsigned long identifier, |
DocumentLoader* loader, |
const ResourceRequest& request, |
const ResourceResponse& redirect_response, |
const FetchInitiatorInfo& initiator_info) { |
String request_id = IdentifiersFactory::RequestId(identifier); |
- String loader_id = IdentifiersFactory::LoaderId(loader); |
+ String loader_id = loader ? IdentifiersFactory::LoaderId(loader) : ""; |
resources_data_->ResourceCreated(request_id, loader_id, request.Url()); |
InspectorPageAgent::ResourceType type = InspectorPageAgent::kOtherResource; |
@@ -621,11 +619,12 @@ void InspectorNetworkAgent::WillSendRequestInternal( |
resources_data_->SetResourceType(request_id, type); |
} |
- String frame_id = |
- loader->GetFrame() ? IdentifiersFactory::FrameId(loader->GetFrame()) : ""; |
+ String frame_id = loader && loader->GetFrame() |
+ ? IdentifiersFactory::FrameId(loader->GetFrame()) |
+ : ""; |
std::unique_ptr<protocol::Network::Initiator> initiator_object = |
BuildInitiatorObject( |
- loader->GetFrame() ? loader->GetFrame()->GetDocument() : 0, |
+ loader && loader->GetFrame() ? loader->GetFrame()->GetDocument() : 0, |
initiator_info); |
if (initiator_info.name == FetchInitiatorTypeNames::document) { |
FrameNavigationInitiatorMap::iterator it = |
@@ -637,8 +636,11 @@ void InspectorNetworkAgent::WillSendRequestInternal( |
std::unique_ptr<protocol::Network::Request> request_info( |
BuildObjectForResourceRequest(request)); |
- request_info->setMixedContentType(MixedContentTypeForContextType( |
- MixedContentChecker::ContextTypeForInspector(frame, request))); |
+ if (loader) { |
+ request_info->setMixedContentType(MixedContentTypeForContextType( |
+ MixedContentChecker::ContextTypeForInspector(loader->GetFrame(), |
+ request))); |
+ } |
request_info->setReferrerPolicy( |
GetReferrerPolicy(request.GetReferrerPolicy())); |
@@ -648,15 +650,15 @@ void InspectorNetworkAgent::WillSendRequestInternal( |
String resource_type = InspectorPageAgent::ResourceTypeJson(type); |
GetFrontend()->requestWillBeSent( |
request_id, frame_id, loader_id, |
- UrlWithoutFragment(loader->Url()).GetString(), std::move(request_info), |
- MonotonicallyIncreasingTime(), CurrentTime(), std::move(initiator_object), |
+ loader ? UrlWithoutFragment(loader->Url()).GetString() : "", |
+ std::move(request_info), MonotonicallyIncreasingTime(), CurrentTime(), |
+ std::move(initiator_object), |
BuildObjectForResourceResponse(redirect_response), resource_type); |
if (pending_xhr_replay_data_ && !pending_xhr_replay_data_->Async()) |
GetFrontend()->flush(); |
} |
void InspectorNetworkAgent::WillSendRequest( |
- LocalFrame* frame, |
unsigned long identifier, |
DocumentLoader* loader, |
ResourceRequest& request, |
@@ -696,7 +698,7 @@ void InspectorNetworkAgent::WillSendRequest( |
if (state_->booleanProperty(NetworkAgentState::kBypassServiceWorker, false)) |
request.SetServiceWorkerMode(WebURLRequest::ServiceWorkerMode::kNone); |
- WillSendRequestInternal(frame, identifier, loader, request, redirect_response, |
+ WillSendRequestInternal(identifier, loader, request, redirect_response, |
initiator_info); |
if (!host_id_.IsEmpty()) |
@@ -715,7 +717,6 @@ void InspectorNetworkAgent::MarkResourceAsCached(unsigned long identifier) { |
} |
void InspectorNetworkAgent::DidReceiveResourceResponse( |
- LocalFrame* frame, |
unsigned long identifier, |
DocumentLoader* loader, |
const ResourceResponse& response, |
@@ -751,7 +752,9 @@ void InspectorNetworkAgent::DidReceiveResourceResponse( |
// doesn't affect Resource lifetime. |
if (cached_resource) |
resources_data_->AddResource(request_id, cached_resource); |
- String frame_id = IdentifiersFactory::FrameId(frame); |
+ String frame_id = loader && loader->GetFrame() |
+ ? IdentifiersFactory::FrameId(loader->GetFrame()) |
+ : ""; |
String loader_id = loader ? IdentifiersFactory::LoaderId(loader) : ""; |
resources_data_->ResponseReceived(request_id, frame_id, response); |
resources_data_->SetResourceType(request_id, type); |
@@ -774,15 +777,15 @@ void InspectorNetworkAgent::DidReceiveResourceResponse( |
// following didReceiveResponse as there will be no calls to didReceiveData |
// from the network stack. |
if (is_not_modified && cached_resource && cached_resource->EncodedSize()) |
- DidReceiveData(frame, identifier, 0, cached_resource->EncodedSize()); |
+ DidReceiveData(identifier, loader, 0, cached_resource->EncodedSize()); |
} |
static bool IsErrorStatusCode(int status_code) { |
return status_code >= 400; |
} |
-void InspectorNetworkAgent::DidReceiveData(LocalFrame*, |
- unsigned long identifier, |
+void InspectorNetworkAgent::DidReceiveData(unsigned long identifier, |
+ DocumentLoader* loader, |
const char* data, |
int data_length) { |
String request_id = IdentifiersFactory::RequestId(identifier); |
@@ -804,15 +807,14 @@ void InspectorNetworkAgent::DidReceiveData(LocalFrame*, |
} |
void InspectorNetworkAgent::DidReceiveEncodedDataLength( |
- LocalFrame*, |
unsigned long identifier, |
int encoded_data_length) { |
String request_id = IdentifiersFactory::RequestId(identifier); |
resources_data_->AddPendingEncodedDataLength(request_id, encoded_data_length); |
} |
-void InspectorNetworkAgent::DidFinishLoading(LocalFrame*, |
- unsigned long identifier, |
+void InspectorNetworkAgent::DidFinishLoading(unsigned long identifier, |
+ DocumentLoader*, |
double monotonic_finish_time, |
int64_t encoded_data_length, |
int64_t decoded_body_length) { |
@@ -849,8 +851,8 @@ void InspectorNetworkAgent::DidReceiveCORSRedirectResponse( |
const ResourceResponse& response, |
Resource* resource) { |
// Update the response and finish loading |
- DidReceiveResourceResponse(frame, identifier, loader, response, resource); |
- DidFinishLoading(frame, identifier, 0, |
+ DidReceiveResourceResponse(identifier, loader, response, resource); |
+ DidFinishLoading(identifier, loader, 0, |
WebURLLoaderClient::kUnknownEncodedDataLength, 0); |
} |
@@ -938,9 +940,11 @@ void InspectorNetworkAgent::WillLoadXHR(XMLHttpRequest* xhr, |
void InspectorNetworkAgent::DelayedRemoveReplayXHR(XMLHttpRequest* xhr) { |
if (!replay_xhrs_.Contains(xhr)) |
return; |
+ // TODO(horo): |m_removeFinishedReplayXHRTimer| is null on workers. |
+ DCHECK(remove_finished_replay_xhr_timer_); |
replay_xhrs_to_be_deleted_.insert(xhr); |
replay_xhrs_.erase(xhr); |
- remove_finished_replay_xhr_timer_.StartOneShot(0, BLINK_FROM_HERE); |
+ remove_finished_replay_xhr_timer_->StartOneShot(0, BLINK_FROM_HERE); |
} |
void InspectorNetworkAgent::DidFailXHRLoading(ExecutionContext* context, |
@@ -1411,7 +1415,7 @@ Response InspectorNetworkAgent::setCacheDisabled(bool cache_disabled) { |
// We should extract network cache state into a global entity which can be |
// queried from FrameLoader and other places. |
state_->setBoolean(NetworkAgentState::kCacheDisabled, cache_disabled); |
- if (cache_disabled) |
+ if (cache_disabled && IsMainThread()) |
GetMemoryCache()->EvictResources(); |
return Response::OK(); |
} |
@@ -1451,8 +1455,10 @@ void InspectorNetworkAgent::DidCommitLoad(LocalFrame* frame, |
if (loader->GetFrame() != inspected_frames_->Root()) |
return; |
- if (state_->booleanProperty(NetworkAgentState::kCacheDisabled, false)) |
+ if (state_->booleanProperty(NetworkAgentState::kCacheDisabled, false) && |
+ IsMainThread()) { |
GetMemoryCache()->EvictResources(MemoryCache::kDoNotEvictUnusedPreloads); |
+ } |
resources_data_->Clear(IdentifiersFactory::LoaderId(loader)); |
} |
@@ -1503,9 +1509,10 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, |
bool* base64_encoded) { |
// First try to fetch content from the cached resource. |
Resource* cached_resource = document->Fetcher()->CachedResource(url); |
- if (!cached_resource) |
+ if (!cached_resource && IsMainThread()) { |
cached_resource = GetMemoryCache()->ResourceForURL( |
url, document->Fetcher()->GetCacheIdentifier()); |
+ } |
if (cached_resource && InspectorPageAgent::CachedResourceContent( |
cached_resource, content, base64_encoded)) |
return true; |
@@ -1538,10 +1545,13 @@ InspectorNetworkAgent::InspectorNetworkAgent(InspectedFrames* inspected_frames) |
g_maximum_resource_buffer_size)), |
pending_request_(nullptr), |
remove_finished_replay_xhr_timer_( |
- TaskRunnerHelper::Get(TaskType::kUnspecedLoading, |
- inspected_frames->Root()), |
- this, |
- &InspectorNetworkAgent::RemoveFinishedReplayXHRFired) {} |
+ inspected_frames |
+ ? new TaskRunnerTimer<InspectorNetworkAgent>( |
+ TaskRunnerHelper::Get(TaskType::kUnspecedLoading, |
+ inspected_frames->Root()), |
+ this, |
+ &InspectorNetworkAgent::RemoveFinishedReplayXHRFired) |
+ : nullptr) {} |
void InspectorNetworkAgent::ShouldForceCORSPreflight(bool* result) { |
if (state_->booleanProperty(NetworkAgentState::kCacheDisabled, false)) |