WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp

 /*
  * Copyright (c) 2008, 2009, Google 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:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 83 matching lines @@
 
             if (xGlyph)
                 m_avgCharWidth = widthForGlyph(xGlyph);
         }
     }
 }
 
 void SimpleFontData::platformDestroy()
 {
     delete m_smallCapsFontData;
+    m_smallCapsFontData = 0;
 }
 
 SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const
 {
     if (!m_smallCapsFontData) {
         const float smallCapsSize = lroundf(fontDescription.computedSize() * smallCapsFraction);
         m_smallCapsFontData = new SimpleFontData(FontPlatformData(m_font, smallCapsSize));
     }
 
     return m_smallCapsFontData;
@@ skipping 38 matching lines @@
 
     m_font.setupPaint(&paint);
 
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     SkScalar width = paint.measureText(&glyph, 2);
     
     return SkScalarToFloat(width);
 }
 
 }  // namespace WebCore