Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
index f84736aba6d9cfef720a23103388cd5ccb9abdce..d3805aca5ab89fe4e9d6a8ee8652d3284573c061 100644 |
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
@@ -1024,7 +1024,8 @@ bool XMLHttpRequest::internalAbort() |
// If, window.onload contains open() and send(), m_loader will be set to |
// non 0 value. So, we cannot continue the outer open(). In such case, |
// just abort the outer open() by returning false. |
- std::unique_ptr<ThreadableLoader> loader = std::move(m_loader); |
+ ThreadableLoader* loader = m_loader; |
haraken
2016/07/29 14:52:51
loader = m_loader.release()
yhirano
2016/08/01 06:20:06
Done.
|
+ m_loader = nullptr; |
loader->cancel(); |
// If abort() called internalAbort() and a nested open() ended up |
@@ -1705,6 +1706,7 @@ DEFINE_TRACE(XMLHttpRequest) |
{ |
visitor->trace(m_responseBlob); |
visitor->trace(m_responseLegacyStream); |
+ visitor->trace(m_loader); |
visitor->trace(m_responseDocument); |
visitor->trace(m_responseDocumentParser); |
visitor->trace(m_responseArrayBuffer); |