Merge 134871

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

 /*
  * 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FontPlatformDataHarfBuzz_h
 #define FontPlatformDataHarfBuzz_h
 
 #include "FontOrientation.h"
 #include "FontRenderStyle.h"
+#include "OpenTypeVerticalData.h"
 #include "SharedBuffer.h"
 #include "SkPaint.h"
 #include "TextOrientation.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringImpl.h>
 
 class SkTypeface;
 typedef uint32_t SkFontID;
 
 namespace WebCore {
 
 class FontDescription;
-class OpenTypeVerticalData;
 
 #if USE(HARFBUZZ_NG)
 class HarfBuzzNGFace;
 #else
 class HarfbuzzFace;
 #endif
 
 // -----------------------------------------------------------------------------
 // FontPlatformData is the handle which WebKit has on a specific face. A face
 // is the tuple of (font, size, ...etc). Here we are just wrapping a Skia
@@ skipping 37 matching lines @@
 
     FontOrientation orientation() const { return m_orientation; }
     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
     void setFakeBold(bool fakeBold) { m_fakeBold = fakeBold; }
     void setFakeItalic(bool fakeItalic) { m_fakeItalic = fakeItalic; }
     bool operator==(const FontPlatformData&) const;
     FontPlatformData& operator=(const FontPlatformData&);
     bool isHashTableDeletedValue() const { return m_typeface == hashTableDeletedFontValue(); }
 
 #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
 
 #if USE(HARFBUZZ_NG)
     HarfBuzzNGFace* harfbuzzFace() const;
 #else
@@ skipping 32 matching lines @@
 #else
     mutable RefPtr<HarfbuzzFace> m_harfbuzzFace;
 #endif
 
     SkTypeface* hashTableDeletedFontValue() const { return reinterpret_cast<SkTypeface*>(-1); }
 };
 
 } // namespace WebCore
 
 #endif // ifdef FontPlatformDataHarfBuzz_h