Chromium Code Reviews| Index: third_party/WebKit/Source/core/loader/LinkLoader.cpp |
| diff --git a/third_party/WebKit/Source/core/loader/LinkLoader.cpp b/third_party/WebKit/Source/core/loader/LinkLoader.cpp |
| index 208b30de570ab9194c954f28b6ee10ccecb8cf34..9250483b0c3385bec48678935ac1b2f5c5f69319 100644 |
| --- a/third_party/WebKit/Source/core/loader/LinkLoader.cpp |
| +++ b/third_party/WebKit/Source/core/loader/LinkLoader.cpp |
| @@ -84,13 +84,15 @@ LinkLoader::~LinkLoader() |
| void LinkLoader::linkLoadTimerFired(TimerBase* timer) |
| { |
| - ASSERT_UNUSED(timer, timer == &m_linkLoadTimer); |
| + ALLOW_UNUSED_LOCAL(timer); |
|
yhirano
2016/09/12 04:33:14
ditto as Resource::cancelTimerFired.
hiroshige
2016/09/13 08:43:21
Done.
|
| + DCHECK(timer == &m_linkLoadTimer); |
|
yhirano
2016/09/12 04:33:13
DCHECK_EQ
hiroshige
2016/09/13 08:43:21
Done.
|
| m_client->linkLoaded(); |
| } |
| void LinkLoader::linkLoadingErrorTimerFired(TimerBase* timer) |
| { |
| - ASSERT_UNUSED(timer, timer == &m_linkLoadingErrorTimer); |
| + ALLOW_UNUSED_LOCAL(timer); |
|
yhirano
2016/09/12 04:33:13
ditto as Resource::cancelTimerFired.
hiroshige
2016/09/13 08:43:21
Done.
|
| + DCHECK(timer == &m_linkLoadingErrorTimer); |
|
yhirano
2016/09/12 04:33:13
DCHECK_EQ
hiroshige
2016/09/13 08:43:21
Done.
|
| m_client->linkLoadingErrored(); |
| } |
| @@ -104,7 +106,7 @@ void LinkLoader::triggerEvents(const Resource* resource) |
| void LinkLoader::notifyFinished(Resource* resource) |
| { |
| - ASSERT(this->resource() == resource); |
| + DCHECK(this->resource() == resource); |
|
yhirano
2016/09/12 04:33:13
DCHECK_EQ
hiroshige
2016/09/13 08:43:21
Done.
|
| triggerEvents(resource); |
| clearResource(); |
| @@ -173,7 +175,7 @@ static void preconnectIfNeeded(const LinkRelAttribute& relAttribute, const KURL& |
| bool LinkLoader::getResourceTypeFromAsAttribute(const String& as, Resource::Type& type) |
| { |
| - ASSERT(as.lower() == as); |
| + DCHECK(as.lower() == as); |
|
yhirano
2016/09/12 04:33:13
DCHECK_EQ
hiroshige
2016/09/13 08:43:21
Done.
|
| if (as == "image") { |
| type = Resource::Image; |
| } else if (as == "script") { |
| @@ -217,7 +219,7 @@ void LinkLoader::createLinkPreloadResourceClient(Resource* resource) |
| m_linkPreloadResourceClient = LinkPreloadRawResourceClient::create(this, toRawResource(resource)); |
| break; |
| default: |
| - ASSERT_NOT_REACHED(); |
| + NOTREACHED(); |
| } |
| } |
| @@ -241,7 +243,7 @@ static bool isSupportedType(Resource::Type resourceType, const String& mimeType) |
| case Resource::Raw: |
| return true; |
| default: |
| - ASSERT_NOT_REACHED(); |
| + NOTREACHED(); |
| } |
| return false; |
| } |