Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1294)

Unified Diff: Source/core/xmlhttprequest/XMLHttpRequest.cpp

Issue 1161323007: Use nullptr instead of 0 in xml and xmlhttprequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated as per review comment & modified in other files which assigned "0" to ptr. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/xml/XSLTUnicodeSort.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xmlhttprequest/XMLHttpRequest.cpp
diff --git a/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/Source/core/xmlhttprequest/XMLHttpRequest.cpp
index 4ce961a1762f7f990ece57f0ee05e101eec8552b..c700871d5e1f951d57cf282a7f6bdb3fe44aef48 100644
--- a/Source/core/xmlhttprequest/XMLHttpRequest.cpp
+++ b/Source/core/xmlhttprequest/XMLHttpRequest.cpp
@@ -436,11 +436,11 @@ Document* XMLHttpRequest::responseXML(ExceptionState& exceptionState)
{
if (m_responseTypeCode != ResponseTypeDefault && m_responseTypeCode != ResponseTypeDocument) {
exceptionState.throwDOMException(InvalidStateError, "The value is only accessible if the object's 'responseType' is '' or 'document' (was '" + responseType() + "').");
- return 0;
+ return nullptr;
}
if (m_error || m_state != DONE)
- return 0;
+ return nullptr;
if (!m_parsedResponse) {
initResponseDocument();
@@ -463,7 +463,7 @@ Blob* XMLHttpRequest::responseBlob()
// We always return null before DONE.
if (m_error || m_state != DONE)
- return 0;
+ return nullptr;
if (!m_responseBlob) {
if (m_downloadingToFile) {
@@ -487,7 +487,7 @@ Blob* XMLHttpRequest::responseBlob()
}
}
- return m_responseBlob.get();
+ return m_responseBlob;
}
DOMArrayBuffer* XMLHttpRequest::responseArrayBuffer()
@@ -495,7 +495,7 @@ DOMArrayBuffer* XMLHttpRequest::responseArrayBuffer()
ASSERT(m_responseTypeCode == ResponseTypeArrayBuffer);
if (m_error || m_state != DONE)
- return 0;
+ return nullptr;
if (!m_responseArrayBuffer) {
if (m_binaryResponseBuilder && m_binaryResponseBuilder->size()) {
@@ -521,16 +521,16 @@ Stream* XMLHttpRequest::responseLegacyStream()
ASSERT(m_responseTypeCode == ResponseTypeLegacyStream);
if (m_error || (m_state != LOADING && m_state != DONE))
- return 0;
+ return nullptr;
- return m_responseLegacyStream.get();
+ return m_responseLegacyStream;
}
ReadableStream* XMLHttpRequest::responseStream()
{
ASSERT(m_responseTypeCode == ResponseTypeStream);
if (m_error || (m_state != LOADING && m_state != DONE))
- return 0;
+ return nullptr;
return m_responseStream;
}
« no previous file with comments | « Source/core/xml/XSLTUnicodeSort.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698