Merge 134871

Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h

 /*
  * Copyright (C) 2012 Koji Ishii <kojiishi@gmail.com>
  *
  * 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef OpenTypeVerticalData_h
 #define OpenTypeVerticalData_h
 
 #if ENABLE(OPENTYPE_VERTICAL)
 
 #include "Glyph.h"
 #include <wtf/HashMap.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class FontPlatformData;
 class GlyphPage;
 class SimpleFontData;
 
-class OpenTypeVerticalData {
+class OpenTypeVerticalData : public RefCounted<OpenTypeVerticalData> {
 public:
-    OpenTypeVerticalData(const FontPlatformData&);
+    static PassRefPtr<OpenTypeVerticalData> create(const FontPlatformData& platformData)
+    {
+        return adoptRef(new OpenTypeVerticalData(platformData));
+    }
 
     bool isOpenType() const { return !m_advanceWidths.isEmpty(); }
     bool hasVerticalMetrics() const { return !m_advanceHeights.isEmpty(); }
     float advanceHeight(const SimpleFontData*, Glyph) const;
     void getVerticalTranslationsForGlyphs(const SimpleFontData*, const Glyph*, size_t, float* outXYArray) const;
     void substituteWithVerticalGlyphs(const SimpleFontData*, GlyphPage*, unsigned offset, unsigned length) const;
 
 private:
+    explicit OpenTypeVerticalData(const FontPlatformData&);
+
     void loadMetrics(const FontPlatformData&);
     void loadVerticalGlyphSubstitutions(const FontPlatformData&);
     bool hasVORG() const { return !m_vertOriginY.isEmpty(); }
 
     HashMap<Glyph, Glyph> m_verticalGlyphMap;
     Vector<uint16_t> m_advanceWidths;
     Vector<uint16_t> m_advanceHeights;
     Vector<int16_t> m_topSideBearings;
     int16_t m_defaultVertOriginY;
     HashMap<Glyph, int16_t> m_vertOriginY;
 
     friend class FontCache;
     bool m_inFontCache; // for mark & sweep in FontCache::purgeInactiveFontData()
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(OPENTYPE_VERTICAL)
 
 #endif // OpenTypeVerticalData_h