Merge 138812

Source/WebCore/platform/graphics/FontCache.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * 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. 
@@ skipping 337 matching lines @@
     return getLastResortFallbackFont(fontDescription, DoNotRetain).leakRef();
 }
 
 void FontCache::releaseFontData(const SimpleFontData* fontData)
 {
     ASSERT(gFontDataCache);
     ASSERT(!fontData->isCustomFont());
 
     FontDataCache::iterator it = gFontDataCache->find(fontData->platformData());
     ASSERT(it != gFontDataCache->end());
+    if (it == gFontDataCache->end())
+        return;
 
     ASSERT(it->value.second);
     if (!--it->value.second)
         gInactiveFontData->add(it->value.first);
 }
 
 void FontCache::purgeInactiveFontDataIfNeeded()
 {
     if (gInactiveFontData && !m_purgePreventCount && gInactiveFontData->size() > cMaxInactiveFontData)
         purgeInactiveFontData(gInactiveFontData->size() - cTargetInactiveFontData);
@@ skipping 182 matching lines @@
         clients.append(*it);
 
     ASSERT(numClients == clients.size());
     for (size_t i = 0; i < numClients; ++i)
         clients[i]->fontCacheInvalidated();
 
     purgeInactiveFontData();
 }
 
 } // namespace WebCore