WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/win/SimpleFontDataWin.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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 73 matching lines @@
      SelectObject(hdc, oldFont);
      ReleaseDC(0, hdc);
 
      return;
 }
 
 void SimpleFontData::platformCommonDestroy()
 {
     // We don't hash this on Win32, so it's effectively owned by us.
     delete m_smallCapsFontData;
+    m_smallCapsFontData = 0;
 
     ScriptFreeCache(&m_scriptCache);
     delete m_scriptFontProperties;
 }
 
 SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const
 {
     if (!m_smallCapsFontData) {
         float smallCapsHeight = cSmallCapsFontSizeMultiplier * m_font.size();
         if (isCustomFont()) {
@@ skipping 93 matching lines @@
             SelectObject(dc, m_font.hfont());
             ScriptGetFontProperties(dc, scriptCache(), m_scriptFontProperties);
             RestoreDC(dc, -1);
             ReleaseDC(0, dc);
         }
     }
     return m_scriptFontProperties;
 }
 
 }