From 87f0b2a998b309ec2b1f349aeacecb3ecbbcde35 Mon Sep 17 00:00:00 2001 From: "davidben@chromium.org" Date: Thu, 20 Feb 2014 19:19:13 +0000 Subject: [PATCH] Associate PingLoader loaders with routes in the browser. 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 --- third_party/WebKit/Source/core/loader/PingLoader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp index c629979af1ee5f..e2f2a04f1c5993 100644 --- a/third_party/WebKit/Source/core/loader/PingLoader.cpp +++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp @@ -130,6 +130,7 @@ 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); @@ -137,8 +138,6 @@ PingLoader::PingLoader(Frame* frame, ResourceRequest& request, const FetchInitia 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);