| Index: third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp
|
| index 1615aac85e0c65f7eedf3123c69e4257dddfdc3d..aefd2c3f8b2be73ce858d4311b7d1ce683d54ec2 100644
|
| --- a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.cpp
|
| @@ -74,7 +74,7 @@ void HTMLImportLoader::startLoading(RawResource* resource)
|
|
|
| void HTMLImportLoader::responseReceived(Resource* resource, const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle)
|
| {
|
| - ASSERT_UNUSED(handle, !handle);
|
| + DCHECK(!handle);
|
| // Resource may already have been loaded with the import loader
|
| // being added as a client later & now being notified. Fail early.
|
| if (resource->loadFailedOrCanceled() || response.httpStatusCode() >= 400 || !response.httpHeaderField(HTTPNames::Content_Disposition).isNull()) {
|
| @@ -103,15 +103,15 @@ void HTMLImportLoader::notifyFinished(Resource* resource)
|
|
|
| HTMLImportLoader::State HTMLImportLoader::startWritingAndParsing(const ResourceResponse& response)
|
| {
|
| - ASSERT(m_controller);
|
| - ASSERT(!m_imports.isEmpty());
|
| + DCHECK(m_controller);
|
| + DCHECK(!m_imports.isEmpty());
|
| DocumentInit init = DocumentInit(response.url(), 0, m_controller->master()->contextDocument(), m_controller)
|
| .withRegistrationContext(m_controller->master()->registrationContext());
|
| m_document = HTMLDocument::create(init);
|
| m_writer = DocumentWriter::create(m_document.get(), AllowAsynchronousParsing, response.mimeType(), "UTF-8");
|
|
|
| DocumentParser* parser = m_document->parser();
|
| - ASSERT(parser);
|
| + DCHECK(parser);
|
| parser->addClient(this);
|
|
|
| return StateLoading;
|
| @@ -158,7 +158,7 @@ void HTMLImportLoader::notifyParserStopped()
|
| setState(finishLoading());
|
|
|
| DocumentParser* parser = m_document->parser();
|
| - ASSERT(parser);
|
| + DCHECK(parser);
|
| parser->removeClient(this);
|
| }
|
|
|
| @@ -180,20 +180,20 @@ void HTMLImportLoader::didFinishLoading()
|
|
|
| clearResource();
|
|
|
| - ASSERT(!m_document || !m_document->parsing());
|
| + DCHECK(!m_document || !m_document->parsing());
|
| }
|
|
|
| void HTMLImportLoader::moveToFirst(HTMLImportChild* import)
|
| {
|
| size_t position = m_imports.find(import);
|
| - ASSERT(kNotFound != position);
|
| + DCHECK_NE(kNotFound, position);
|
| m_imports.remove(position);
|
| m_imports.insert(0, import);
|
| }
|
|
|
| void HTMLImportLoader::addImport(HTMLImportChild* import)
|
| {
|
| - ASSERT(kNotFound == m_imports.find(import));
|
| + DCHECK_EQ(kNotFound, m_imports.find(import));
|
|
|
| m_imports.append(import);
|
| import->normalize();
|
| @@ -203,7 +203,7 @@ void HTMLImportLoader::addImport(HTMLImportChild* import)
|
|
|
| void HTMLImportLoader::removeImport(HTMLImportChild* client)
|
| {
|
| - ASSERT(kNotFound != m_imports.find(client));
|
| + DCHECK_NE(kNotFound, m_imports.find(client));
|
| m_imports.remove(m_imports.find(client));
|
| }
|
|
|
|
|