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

Unified Diff: third_party/WebKit/Source/core/fetch/FontResource.cpp

Issue 2327643003: Replace ASSERT*() with DCHECK*() in core/fetch/ and core/loader/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ASSERT_UNUSED Created 4 years, 3 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/core/fetch/FontResource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.cpp b/third_party/WebKit/Source/core/fetch/FontResource.cpp
index 090cf6bb404ade769d9f1cb268aad84a0c03319c..db8d9ffdb229b005601b615587795636de533210 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/FontResource.cpp
@@ -72,7 +72,7 @@ static void recordPackageFormatHistogram(FontPackageFormat format)
FontResource* FontResource::fetch(FetchRequest& request, ResourceFetcher* fetcher)
{
- ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone);
+ DCHECK(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextFont);
return toFontResource(fetcher->requestResource(request, FontResourceFactory()));
}
@@ -92,7 +92,7 @@ FontResource::~FontResource()
void FontResource::didAddClient(ResourceClient* c)
{
- ASSERT(FontResourceClient::isExpectedType(c));
+ DCHECK(FontResourceClient::isExpectedType(c));
Resource::didAddClient(c);
if (m_loadLimitState == ShortLimitExceeded || m_loadLimitState == LongLimitExceeded)
static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
@@ -110,10 +110,10 @@ void FontResource::setRevalidatingRequest(const ResourceRequest& request)
void FontResource::startLoadLimitTimersIfNeeded()
{
- ASSERT(!stillNeedsLoad());
+ DCHECK(!stillNeedsLoad());
if (isLoaded() || m_fontLoadLongLimitTimer.isActive())
return;
- ASSERT(m_loadLimitState == UnderLimit);
+ DCHECK(m_loadLimitState == UnderLimit);
m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec, BLINK_FROM_HERE);
m_fontLoadLongLimitTimer.startOneShot(fontLoadWaitLongLimitSec, BLINK_FROM_HERE);
}
@@ -136,7 +136,7 @@ bool FontResource::ensureCustomFontData()
FontPlatformData FontResource::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation)
{
- ASSERT(m_fontData);
+ DCHECK(m_fontData);
return m_fontData->fontPlatformData(size, bold, italic, orientation);
}
@@ -144,7 +144,7 @@ void FontResource::fontLoadShortLimitCallback(TimerBase*)
{
if (!isLoading())
return;
- ASSERT(m_loadLimitState == UnderLimit);
+ DCHECK(m_loadLimitState == UnderLimit);
m_loadLimitState = ShortLimitExceeded;
ResourceClientWalker<FontResourceClient> walker(clients());
while (FontResourceClient* client = walker.next())
@@ -155,7 +155,7 @@ void FontResource::fontLoadLongLimitCallback(TimerBase*)
{
if (!isLoading())
return;
- ASSERT(m_loadLimitState == ShortLimitExceeded);
+ DCHECK(m_loadLimitState == ShortLimitExceeded);
m_loadLimitState = LongLimitExceeded;
ResourceClientWalker<FontResourceClient> walker(clients());
while (FontResourceClient* client = walker.next())

Powered by Google App Engine
This is Rietveld 408576698