Chromium Code Reviews| Index: Source/core/xmlhttprequest/XMLHttpRequest.cpp |
| diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
| similarity index 98% |
| rename from Source/core/xml/XMLHttpRequest.cpp |
| rename to Source/core/xmlhttprequest/XMLHttpRequest.cpp |
| index d1b15249e0c69fdd201afe94b8ad21cc4ff53626..f93cf281d434fc46f1797d5412ee246a33f15b1d 100644 |
| --- a/Source/core/xml/XMLHttpRequest.cpp |
| +++ b/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
| @@ -21,7 +21,7 @@ |
| */ |
| #include "config.h" |
| -#include "core/xml/XMLHttpRequest.h" |
| +#include "core/xmlhttprequest/XMLHttpRequest.h" |
| #include "bindings/core/v8/ExceptionState.h" |
| #include "core/FetchInitiatorTypeNames.h" |
| @@ -53,8 +53,8 @@ |
| #include "core/streams/ReadableStreamImpl.h" |
| #include "core/streams/Stream.h" |
| #include "core/streams/UnderlyingSource.h" |
| -#include "core/xml/XMLHttpRequestProgressEvent.h" |
| -#include "core/xml/XMLHttpRequestUpload.h" |
| +#include "core/xmlhttprequest/XMLHttpRequestProgressEvent.h" |
| +#include "core/xmlhttprequest/XMLHttpRequestUpload.h" |
| #include "platform/Logging.h" |
| #include "platform/RuntimeEnabledFeatures.h" |
| #include "platform/SharedBuffer.h" |
| @@ -527,13 +527,12 @@ void XMLHttpRequest::dispatchReadyStateChangeEvent() |
| InspectorInstrumentation::didDispatchXHRReadyStateChangeEvent(cookie); |
| if (m_state == DONE && !m_error) { |
| - { |
| - TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "XHRLoad", "data", InspectorXhrLoadEvent::data(executionContext(), this)); |
| - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); |
| - InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchXHRLoadEvent(executionContext(), this); |
| - dispatchProgressEventFromSnapshot(EventTypeNames::load); |
| - InspectorInstrumentation::didDispatchXHRLoadEvent(cookie); |
| - } |
|
tyoshino (SeeGerritForStatus)
2014/10/27 03:56:20
did this cause presubmit error?
yhirano
2014/10/27 03:58:13
It did, though I think it's a false-positive.
tyoshino (SeeGerritForStatus)
2014/10/27 04:02:05
OK. I like this kind of use of braces for limiting
|
| + TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "XHRLoad", "data", InspectorXhrLoadEvent::data(executionContext(), this)); |
| + TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack()); |
| + InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchXHRLoadEvent(executionContext(), this); |
| + dispatchProgressEventFromSnapshot(EventTypeNames::load); |
| + InspectorInstrumentation::didDispatchXHRLoadEvent(cookie); |
| + |
| dispatchProgressEventFromSnapshot(EventTypeNames::loadend); |
| TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data()); |
| } |