Merge 134871

Source/WebCore/platform/graphics/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * 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 95 matching lines @@
 #elif PLATFORM(CHROMIUM) && OS(WINDOWS)
     PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, wchar_t* outFontFamilyName);
 #endif
 
 #if ENABLE(OPENTYPE_VERTICAL)
 #if USE(SKIA)
     typedef uint32_t FontFileKey;
 #else
     typedef AtomicString FontFileKey;
 #endif
-    OpenTypeVerticalData* getVerticalData(const FontFileKey&, const FontPlatformData&);
+    PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
 #endif
 
     struct SimpleFontFamily {
         String name;
         bool isBold;
         bool isItalic;
     };
     static void getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale, SimpleFontFamily*);
 
 private:
@@ skipping 34 matching lines @@
 
 class FontCachePurgePreventer {
 public:
     FontCachePurgePreventer() { fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { fontCache()->enablePurging(); }
 };
 
 }
 
 #endif