WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/wx/SimpleFontDataWx.cpp

 /*
  * Copyright (C) 2006 Apple Computer, 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:
  *
  * 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 42 matching lines @@
         m_lineSpacing = props.GetLineSpacing();
         m_xHeight = props.GetXHeight();
         m_unitsPerEm = 1; // FIXME!
         m_lineGap = props.GetLineGap();
     }
 }
 
 void SimpleFontData::platformDestroy()
 {
     delete m_smallCapsFontData;
+    m_smallCapsFontData = 0;
 }
 
 SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const
 {
     if (!m_smallCapsFontData){
         FontDescription desc = FontDescription(fontDescription);
         desc.setSpecifiedSize(0.70f*fontDescription.computedSize());
         const FontPlatformData* pdata = new FontPlatformData(desc, desc.family().family());
         m_smallCapsFontData = new SimpleFontData(*pdata);
     }
@@ skipping 16 matching lines @@
 
 float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
 {
     // TODO: fix this! Make GetTextExtents a method of wxFont in 2.9
     int width = 10;
     GetTextExtent(*m_font.font(), (wxChar)glyph, &width, NULL);
     return width;
 }
 
 }