Fix purify complaint about FontData structs being leaked. These are held in ...

webkit/port/platform/graphics/chromium/FontUtilsChromiumWin.cpp

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "FontUtilsChromiumWin.h"
 
 #include <limits>
 
 #include "PlatformString.h"
@@ skipping 102 matching lines @@
     HFONT hfont;
     int ascent;
     mutable SCRIPT_CACHE scriptCache;
 };
 
 // Again, using hash_map does not earn us much here.  page_cycler_test intl2
 // gave us a 'better' result with map than with hash_map even though they're
 // well-within 1-sigma of each other so that the difference is not significant.
 // On the other hand, some pages in intl2 seem to take longer to load with map
 // in the 1st pass. Need to experiment further.
-typedef HashMap<String, FontData*> FontDataCache;
+typedef HashMap<String, FontData> FontDataCache;
 
 }  // namespace
 
 // TODO(jungshik) : this is font fallback code version 0.1
 //  - Cover all the scripts
 //  - Get the default font for each script/generic family from the
 //    preference instead of hardcoding in the source.
 //    (at least, read values from the registry for IE font settings).
 //  - Support generic families (from FontDescription)
 //  - If the default font for a script is not available,
@@ skipping 136 matching lines @@
     String fontKey = String::format("%1d:%d:%ls", style, logfont->lfHeight, family);
     FontDataCache::iterator iter = fontDataCache.find(fontKey);
     FontData *derived;
     if (iter == fontDataCache.end()) {
         ASSERT(wcslen(family) < LF_FACESIZE);
         wcscpy_s(logfont->lfFaceName, LF_FACESIZE, family);
         // TODO(jungshik): CreateFontIndirect always comes up with
         // a font even if there's no font matching the name. Need to
         // check it against what we actually want (as is done in
         // FontCacheWin.cpp)
-        derived = new FontData;
+        pair<FontDataCache::iterator, bool> entry = fontDataCache.add(fontKey, FontData());
+        derived = &entry.first->second;
         derived->hfont = CreateFontIndirect(logfont);
         // GetAscent may return kUndefinedAscent, but we still want to
         // cache it so that we won't have to call CreateFontIndirect once
         // more for HFONT next time.
         derived->ascent = GetAscent(derived->hfont);
-        fontDataCache.add(fontKey, derived);
     } else {
-        derived = iter->second;
+        derived = &iter->second;
         // Last time, GetAscent failed so that only HFONT was
         // cached. Try once more assuming that TryPreloadFont
         // was called by a caller between calls.
         if (kUndefinedAscent == derived->ascent)
             derived->ascent = GetAscent(derived->hfont);
     }
     *hfont = derived->hfont;
     *ascent = derived->ascent;
     *scriptCache = &(derived->scriptCache);
     return *ascent != kUndefinedAscent;
 }
 
 int GetStyleFromLogfont(const LOGFONT* logfont) {
     // TODO(jungshik) : consider defining UNDEFINED or INVALID for style and
     //                  returning it when logfont is NULL
     if (!logfont) {
         ASSERT_NOT_REACHED();
         return FONT_STYLE_NORMAL;
     }
     return (logfont->lfItalic ? FONT_STYLE_ITALIC : FONT_STYLE_NORMAL) |
            (logfont->lfUnderline ? FONT_STYLE_UNDERLINED : FONT_STYLE_NORMAL) |
            (logfont->lfWeight >= 700 ? FONT_STYLE_BOLD : FONT_STYLE_NORMAL);
 }
 
 }  // namespace WebCore