Merge 134871

Source/WebCore/platform/graphics/SimpleFontData.cpp

 /*
  * Copyright (C) 2005, 2008, 2010 Apple 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 43 matching lines @@
     , m_verticalData(0)
 #endif
     , m_hasVerticalGlyphs(false)
 {
     platformInit();
     platformGlyphInit();
     platformCharWidthInit();
 #if ENABLE(OPENTYPE_VERTICAL)
     if (platformData.orientation() == Vertical && !isTextOrientationFallback) {
         m_verticalData = platformData.verticalData();
-        m_hasVerticalGlyphs = m_verticalData && m_verticalData->hasVerticalMetrics();
+        m_hasVerticalGlyphs = m_verticalData.get() && m_verticalData->hasVerticalMetrics();
     }
 #endif
 }
 
 SimpleFontData::SimpleFontData(PassOwnPtr<AdditionalFontData> fontData, float fontSize, bool syntheticBold, bool syntheticItalic)
     : m_platformData(FontPlatformData(fontSize, syntheticBold, syntheticItalic))
     , m_fontData(fontData)
     , m_treatAsFixedPitch(false)
     , m_isCustomFont(true)
     , m_isLoading(false)
@@ skipping 172 matching lines @@
             while (count-- > 0 && *fonts) {
                 OwnPtr<SimpleFontData> afont = adoptPtr(*fonts++);
                 GlyphPageTreeNode::pruneTreeCustomFontData(afont.get());
             }
         }
     }
 #endif
 }
 
 } // namespace WebCore