FontResource: use DCHECKs for confirmed CHECKs

third_party/WebKit/Source/core/loader/resource/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 87 matching lines @@
   if (m_loadLimitState == ShortLimitExceeded ||
       m_loadLimitState == LongLimitExceeded)
     static_cast<FontResourceClient*>(c)->fontLoadShortLimitExceeded(this);
   if (m_loadLimitState == LongLimitExceeded)
     static_cast<FontResourceClient*>(c)->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::setRevalidatingRequest(const ResourceRequest& request) {
   // Reload will use the same object, and needs to reset |m_loadLimitState|
   // before any didAddClient() is called again.
-  // TODO(toyoshim): Change following CHECKs to DCHECKs once we confirm these do
-  // not fire.
-  CHECK(isLoaded());
-  CHECK(!m_fontLoadShortLimitTimer.isActive());
-  CHECK(!m_fontLoadLongLimitTimer.isActive());
+  DCHECK(isLoaded());
+  DCHECK(!m_fontLoadShortLimitTimer.isActive());
+  DCHECK(!m_fontLoadLongLimitTimer.isActive());
   m_loadLimitState = LoadNotStarted;
   Resource::setRevalidatingRequest(request);
 }
 
 void FontResource::startLoadLimitTimers() {
-  // TODO(toyoshim): Change CHECK() to DCHECK() if this can survive on Canary
-  // for some days. http://crbug.com/670638
-  CHECK(isLoading());
+  DCHECK(isLoading());
   DCHECK_EQ(m_loadLimitState, LoadNotStarted);
   m_loadLimitState = UnderLimit;
   m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec,
                                          BLINK_FROM_HERE);
   m_fontLoadLongLimitTimer.startOneShot(fontLoadWaitLongLimitSec,
                                         BLINK_FROM_HERE);
 }
 
 bool FontResource::ensureCustomFontData() {
   if (!m_fontData && !errorOccurred() && !isLoading()) {
@@ skipping 13 matching lines @@
 FontPlatformData FontResource::platformDataFromCustomData(
     float size,
     bool bold,
     bool italic,
     FontOrientation orientation) {
   DCHECK(m_fontData);
   return m_fontData->fontPlatformData(size, bold, italic, orientation);
 }
 
 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(isLoading());
   DCHECK_EQ(m_loadLimitState, UnderLimit);
   m_loadLimitState = ShortLimitExceeded;
   ResourceClientWalker<FontResourceClient> walker(clients());
   while (FontResourceClient* client = walker.next())
     client->fontLoadShortLimitExceeded(this);
 }
 
 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(isLoading());
   DCHECK_EQ(m_loadLimitState, ShortLimitExceeded);
   m_loadLimitState = LongLimitExceeded;
   ResourceClientWalker<FontResourceClient> walker(clients());
   while (FontResourceClient* client = walker.next())
     client->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::allClientsAndObserversRemoved() {
   m_fontData.reset();
   Resource::allClientsAndObserversRemoved();
@@ skipping 23 matching lines @@
   Resource::onMemoryDump(level, memoryDump);
   if (!m_fontData)
     return;
   const String name = getMemoryDumpName() + "/decoded_webfont";
   WebMemoryAllocatorDump* dump = memoryDump->createMemoryAllocatorDump(name);
   dump->addScalar("size", "bytes", m_fontData->dataSize());
   memoryDump->addSuballocation(dump->guid(), "malloc");
 }
 
 }  // namespace blink