| Index: third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| index 8a116939f12005545086bf24939d594322f46168..9686c880e654745137cbf253474f4f5ebc3b211d 100644
|
| --- a/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp
|
| @@ -40,7 +40,6 @@
|
| #include "core/frame/FrameConsole.h"
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| -#include "core/inspector/InspectorTraceEvents.h"
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/loader/FrameLoaderClient.h"
|
| #include "core/loader/MixedContentChecker.h"
|
| @@ -141,7 +140,6 @@ PingLoader::PingLoader(LocalFrame* frame, ResourceRequest& request, const FetchI
|
| {
|
| frame->loader().client()->didDispatchPingLoader(request.url());
|
|
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(m_identifier, frame, request));
|
| InspectorInstrumentation::willSendRequest(frame, m_identifier, frame->loader().documentLoader(), request, ResourceResponse(), initiatorInfo);
|
|
|
| m_loader = adoptPtr(Platform::current()->createURLLoader());
|
| @@ -173,7 +171,6 @@ void PingLoader::dispose()
|
| void PingLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& response)
|
| {
|
| if (LocalFrame* frame = this->frame()) {
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
|
| const ResourceResponse& resourceResponse = response.toResourceResponse();
|
| InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier, 0, resourceResponse, 0);
|
| didFailLoading(frame);
|
| @@ -183,37 +180,29 @@ void PingLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& respons
|
|
|
| void PingLoader::didReceiveData(WebURLLoader*, const char*, int, int)
|
| {
|
| - if (LocalFrame* frame = this->frame()) {
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
|
| + if (LocalFrame* frame = this->frame())
|
| didFailLoading(frame);
|
| - }
|
| dispose();
|
| }
|
|
|
| void PingLoader::didFinishLoading(WebURLLoader*, double, int64_t)
|
| {
|
| - if (LocalFrame* frame = this->frame()) {
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
|
| + if (LocalFrame* frame = this->frame())
|
| didFailLoading(frame);
|
| - }
|
| dispose();
|
| }
|
|
|
| void PingLoader::didFail(WebURLLoader*, const WebURLError& resourceError)
|
| {
|
| - if (LocalFrame* frame = this->frame()) {
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
|
| + if (LocalFrame* frame = this->frame())
|
| didFailLoading(frame);
|
| - }
|
| dispose();
|
| }
|
|
|
| void PingLoader::timeout(Timer<PingLoader>*)
|
| {
|
| - if (LocalFrame* frame = this->frame()) {
|
| - TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(m_identifier, 0, true));
|
| + if (LocalFrame* frame = this->frame())
|
| didFailLoading(frame);
|
| - }
|
| dispose();
|
| }
|
|
|
|
|