Merge 134871

Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 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 330 matching lines @@
     if (m_style.useSubpixelRendering == FontRenderStyle::NoPreference)
         m_style.useSubpixelRendering = useSkiaSubpixelRendering;
 }
 
 #if ENABLE(OPENTYPE_VERTICAL)
 static SkFontTableTag reverseByteOrder(uint32_t tableTag)
 {
     return (tableTag >> 24) | ((tableTag >> 8) & 0xff00) | ((tableTag & 0xff00) << 8) | ((tableTag & 0xff) << 24);
 }
 
-const OpenTypeVerticalData* FontPlatformData::verticalData() const
+PassRefPtr<OpenTypeVerticalData> FontPlatformData::verticalData() const
 {
     return fontCache()->getVerticalData(uniqueID(), *this);
 }
 
 PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
 {
     RefPtr<SharedBuffer> buffer;
 
     SkFontTableTag tag = reverseByteOrder(table);
     const size_t tableSize = SkFontHost::GetTableSize(uniqueID(), tag);
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         SkFontHost::GetTableData(uniqueID(), tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 #endif
 
 } // namespace WebCore