Skip to content

Commit

Permalink
Associate PingLoader loaders with routes in the browser.
Browse files Browse the repository at this point in the history
Ping requests currently do not pass through willSendRequest which means they
are not correlated with a RenderFrameHost in the browser. Change this so they
can be.

BUG=302816

Review URL: https://codereview.chromium.org/171083003

git-svn-id: svn://svn.chromium.org/blink/trunk@167528 bbb929c8-8fbe-4397-9dbb-9b2b20218538
  • Loading branch information
davidben@chromium.org committed Feb 20, 2014
1 parent 4950c29 commit 87f0b2a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions third_party/WebKit/Source/core/loader/PingLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,14 @@ PingLoader::PingLoader(Frame* frame, ResourceRequest& request, const FetchInitia
, m_identifier(createUniqueIdentifier())
{
frame->loader().client()->didDispatchPingLoader(request.url());
frame->loader().fetchContext().dispatchWillSendRequest(frame->loader().documentLoader(), m_identifier, request, ResourceResponse(), initiatorInfo);

m_loader = adoptPtr(blink::Platform::current()->createURLLoader());
ASSERT(m_loader);
blink::WrappedResourceRequest wrappedRequest(request);
wrappedRequest.setAllowStoredCredentials(credentialsAllowed == AllowStoredCredentials);
m_loader->loadAsynchronously(wrappedRequest, this);

InspectorInstrumentation::willSendRequest(frame, m_identifier, frame->loader().documentLoader(), request, ResourceResponse(), initiatorInfo);

// If the server never responds, FrameLoader won't be able to cancel this load and
// we'll sit here waiting forever. Set a very generous timeout, just in case.
m_timeout.startOneShot(60000);
Expand Down

0 comments on commit 87f0b2a

Please sign in to comment.