Gardening: Fix tests failing on Win7(dbg) caused by hitting an assert in FontCache::addSideloadedFo…

Source/platform/fonts/win/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 30 matching lines @@
 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h"
 #include "platform/fonts/win/FontFallbackWin.h"
 
 namespace blink {
 
 HashMap<String, RefPtr<SkTypeface> >* FontCache::s_sideloadedFonts = 0;
 
 // static
 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface)
 {
+    if (!typeface)

[tkent, 2014/09/08 08:14:52]

Do you think null typeface is the culprit of the following assertion?

    void ref() const {
        SkASSERT(fRefCnt > 0);

+        return;
     if (!s_sideloadedFonts)
         s_sideloadedFonts = new HashMap<String, RefPtr<SkTypeface> >;
     SkString name;
     typeface->getFamilyName(&name);
     s_sideloadedFonts->set(name.c_str(), typeface);
 }
 
 FontCache::FontCache()
     : m_purgePreventCount(0)
 {
@@ skipping 259 matching lines @@
         if (typefacesMatchesFamily(tf.get(), family)) {
             result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
             break;
         }
     }
 
     return result;
 }
 
 } // namespace blink