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

Unified Diff: third_party/WebKit/Source/core/loader/resource/FontResource.cpp

Issue 2550123002: FontResource: use CHECKs to confirm if crrev.com/2551823002 fixes the issue (Closed)
Patch Set: Created 4 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/resource/FontResource.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/FontResource.cpp b/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
index 15569e199bf50ed0dd9f3facdeacd3be32f4e5bc..603ba3abe1e5d289d9c4b6d6afb1f95406b7d69b 100644
--- a/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
@@ -110,7 +110,9 @@ void FontResource::setRevalidatingRequest(const ResourceRequest& request) {
}
void FontResource::startLoadLimitTimers() {
- DCHECK(isLoading());
+ // TODO(toyoshim): Change CHECK() to DCHECK() if this can survive on Canary
+ // for some days. http://crbug.com/670638
+ CHECK(isLoading());
DCHECK_EQ(m_loadLimitState, LoadNotStarted);
m_loadLimitState = UnderLimit;
m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec,
@@ -144,6 +146,9 @@ FontPlatformData FontResource::platformDataFromCustomData(
}
void FontResource::fontLoadShortLimitCallback(TimerBase*) {
+ // TODO(toyoshim): Change CHECK() to DCHECK() and remove if(!isLoading()) if
+ // this can survive on Canary for some days. http://crbug.com/670638
+ CHECK(isLoading());
if (!isLoading())
return;
DCHECK_EQ(m_loadLimitState, UnderLimit);
@@ -154,6 +159,9 @@ void FontResource::fontLoadShortLimitCallback(TimerBase*) {
}
void FontResource::fontLoadLongLimitCallback(TimerBase*) {
+ // TODO(toyoshim): Change CHECK() to DCHECK() and remove if(!isLoading()) if
+ // this can survive on Canary for some days. http://crbug.com/670638
+ CHECK(isLoading());
if (!isLoading())
return;
DCHECK_EQ(m_loadLimitState, ShortLimitExceeded);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698