WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/SimpleFontData.cpp

 /*
  * Copyright (C) 2005, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov
  *
  * 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 113 matching lines @@
             LOG_ERROR("Font maps SPACE and ZERO WIDTH SPACE to the same glyph. Glyph width not overridden.");
     }
 
     m_missingGlyphData.fontData = this;
     m_missingGlyphData.glyph = 0;
 }
 #endif
 
 SimpleFontData::~SimpleFontData()
 {
+#if ENABLE(SVG_FONTS)
+    if (!m_svgFontData || !m_svgFontData->svgFontFaceElement())
+#endif
+        platformDestroy();
+
     if (!isCustomFont()) {
         if (m_smallCapsFontData)
             fontCache()->releaseFontData(m_smallCapsFontData);
         GlyphPageTreeNode::pruneTreeFontData(this);
     }
-
-#if ENABLE(SVG_FONTS)
-    if (!m_svgFontData || !m_svgFontData->svgFontFaceElement())
-#endif
-        platformDestroy();
 }
 
 const SimpleFontData* SimpleFontData::fontDataForCharacter(UChar32) const
 {
     return this;
 }
 
 bool SimpleFontData::isSegmented() const
 {
     return false;
 }
 
 } // namespace WebCore