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

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchManager.cpp

Issue 2804023004: Replace ASSERT with DCHECK in modules/fetch. (Closed)
Patch Set: Created 3 years, 8 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
Index: third_party/WebKit/Source/modules/fetch/FetchManager.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
index 37ad99a8621ae4bf4cc5cddb74b97db9a3f11748..8d906d3792a727e7783b62928f2ddf8a4c74e1a5 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
@@ -192,9 +192,9 @@ class FetchManager::Loader final
}
void didGetReadable() override {
- ASSERT(m_reader);
- ASSERT(m_loader);
- ASSERT(m_response);
+ DCHECK(m_reader);
+ DCHECK(m_loader);
+ DCHECK(m_response);
WebDataConsumerHandle::Result r = WebDataConsumerHandle::Ok;
while (r == WebDataConsumerHandle::Ok) {
@@ -308,7 +308,7 @@ FetchManager::Loader::Loader(ExecutionContext* executionContext,
}
FetchManager::Loader::~Loader() {
- ASSERT(!m_loader);
+ DCHECK(!m_loader);
}
DEFINE_TRACE(FetchManager::Loader) {
@@ -328,7 +328,7 @@ void FetchManager::Loader::didReceiveResponse(
unsigned long,
const ResourceResponse& response,
std::unique_ptr<WebDataConsumerHandle> handle) {
- ASSERT(handle);
+ DCHECK(handle);
// TODO(horo): This check could be false when we will use the response url
// in service worker responses. (crbug.com/553535)
DCHECK(response.url() == m_urlList.back());
@@ -461,7 +461,7 @@ void FetchManager::Loader::didReceiveResponse(
performNetworkError("Invalid Location header.");
return;
}
- ASSERT(m_request->redirect() == WebURLRequest::FetchRedirectModeManual);
+ DCHECK(m_request->redirect() == WebURLRequest::FetchRedirectModeManual);
tkent 2017/04/08 02:29:54 Use DCHECK_EQ if it doesn't cause a build failure.
taintedResponse = responseData->createOpaqueRedirectFilteredResponse();
}
// When the location header doesn't exist, we don't treat the response
@@ -502,7 +502,7 @@ void FetchManager::Loader::didReceiveResponse(
m_resolver->resolve(r);
m_resolver.clear();
} else {
- ASSERT(!m_integrityVerifier);
+ DCHECK(!m_integrityVerifier);
m_integrityVerifier =
new SRIVerifier(std::move(handle), sriConsumer, r, this,
m_request->integrity(), response.url());
@@ -552,7 +552,7 @@ Document* FetchManager::Loader::document() const {
}
void FetchManager::Loader::loadSucceeded() {
- ASSERT(!m_failed);
+ DCHECK(!m_failed);
m_finished = true;
@@ -710,7 +710,7 @@ void FetchManager::Loader::performNetworkError(const String& message) {
void FetchManager::Loader::performHTTPFetch(bool corsFlag,
bool corsPreflightFlag) {
- ASSERT(
+ DCHECK(
SchemeRegistry::shouldTreatURLSchemeAsSupportingFetchAPI(
m_request->url().protocol()) ||
(m_request->url().protocolIs("blob") && !corsFlag && !corsPreflightFlag));
@@ -849,7 +849,7 @@ void FetchManager::Loader::performHTTPFetch(bool corsFlag,
// 'same-origin' mode.
// - We reject non-GET method.
void FetchManager::Loader::performDataFetch() {
- ASSERT(m_request->url().protocolIsData());
+ DCHECK(m_request->url().protocolIsData());
ResourceRequest request(m_request->url());
request.setRequestContext(m_request->context());

Powered by Google App Engine
This is Rietveld 408576698