Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h

Issue 11348334: Merge 134871 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
===================================================================
--- Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h (revision 136288)
+++ Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h (working copy)
@@ -33,6 +33,7 @@
#include "FontOrientation.h"
#include "FontRenderStyle.h"
+#include "OpenTypeVerticalData.h"
#include "SharedBuffer.h"
#include "SkPaint.h"
#include "TextOrientation.h"
@@ -47,7 +48,6 @@
namespace WebCore {
class FontDescription;
-class OpenTypeVerticalData;
#if USE(HARFBUZZ_NG)
class HarfBuzzNGFace;
@@ -105,7 +105,7 @@
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

Powered by Google App Engine
This is Rietveld 408576698