WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/gtk/SimpleFontDataPango.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
  * Copyright (C) 2007 Pioneer Research Center USA, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 62 matching lines @@
             m_font.m_context = 0;
         }
 
         if (m_font.m_scaledFont) {
             cairo_scaled_font_destroy(m_font.m_scaledFont);
             m_font.m_scaledFont = 0;
         }
     }
 
     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 42 matching lines @@
     return w;
 }
 
 void SimpleFontData::setFont(cairo_t* cr) const
 {
     ASSERT(cr);
     m_font.setFont(cr);
 }
 
 }