Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h - Issue 11299089: Merge 134871

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11299089: Merge 134871 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

===================================================================

--- Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h (revision 135210)

+++ 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