WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
  * Copyright (C) 2007, 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 45 matching lines @@
     cairo_scaled_font_text_extents(m_font.m_scaledFont, "x", &text_extents);
     m_xHeight = text_extents.height;
     cairo_scaled_font_text_extents(m_font.m_scaledFont, " ", &text_extents);
     m_spaceWidth =  static_cast<int>(text_extents.x_advance);
     m_lineGap = m_lineSpacing - m_ascent - m_descent;
 }
 
 void SimpleFontData::platformDestroy()
 {
     delete m_smallCapsFontData;
+    m_smallCapsFontData = 0;
 
     if (isCustomFont())
         return;
 
     if (m_font.m_pattern && ((FcPattern*)-1 != m_font.m_pattern)) {
         FcPatternDestroy(m_font.m_pattern);
         m_font.m_pattern = 0;
     }
 
     if (m_font.m_fallbacks) {
@@ skipping 56 matching lines @@
     return w;
 }
 
 void SimpleFontData::setFont(cairo_t* cr) const
 {
     ASSERT(cr);
     m_font.setFont(cr);
 }
 
 }