Merge 134871

Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.h

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 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.
@@ skipping 79 matching lines @@
     {
         return m_font ? m_font->hash() : NULL;
     }
 
     bool operator==(const FontPlatformData& other) const
     { 
         return m_font == other.m_font && m_size == other.m_size && m_orientation == other.m_orientation;
     }
 
 #if ENABLE(OPENTYPE_VERTICAL)
-    const OpenTypeVerticalData* verticalData() const;
+    PassRefPtr<OpenTypeVerticalData> verticalData() const;
     PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
 #endif
 
 #ifndef NDEBUG
     String description() const;
 #endif
 
     SCRIPT_FONTPROPERTIES* scriptFontProperties() const;
     SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; }
 
@@ skipping 40 matching lines @@
     SkTypeface* m_typeface; // cached from m_font
     int m_lfQuality; // cached from m_font
 
     mutable SCRIPT_CACHE m_scriptCache;
     mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;
 };
 
 } // WebCore
 
 #endif // FontPlatformDataChromiumWin_h