Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp - Issue 11348334: 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/chromium/FontPlatformDataChromiumWin.cpp

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:

Index: Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

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

--- Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp (revision 136288)

+++ Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp (working copy)

@@ -192,7 +192,7 @@

}

#if ENABLE(OPENTYPE_VERTICAL)

-const OpenTypeVerticalData* FontPlatformData::verticalData() const

+PassRefPtr<OpenTypeVerticalData> FontPlatformData::verticalData() const

{

SkFontID id = typeface()->uniqueID();

return fontCache()->getVerticalData(id, *this);