Source/WebKit/chromium/public/mac/WebSandboxSupport.h - Issue 7618010: Merge 92269 - [Chromium] Fix OOP font loading to work on 10.6.6 and above.

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/WebKit/chromium/public/mac/WebSandboxSupport.h

Issue 7618010: Merge 92269 - [Chromium] Fix OOP font loading to work on 10.6.6 and above. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 4 months 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

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm ('k') | Source/WebKit/chromium/src/PlatformBridge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebKit/chromium/public/mac/WebSandboxSupport.h

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

--- Source/WebKit/chromium/public/mac/WebSandboxSupport.h (revision 92838)

+++ Source/WebKit/chromium/public/mac/WebSandboxSupport.h (working copy)

@@ -46,7 +46,8 @@

public:

// Given an input font - |srcFont| [which can't be loaded due to sandbox

// restrictions]. Return a font container belonging to an equivalent

- // font file that can be used to access the font.

+ // font file that can be used to access the font and a unique identifier

+ // corresponding to the on-disk font file.

// Note that a font container may contain multiple fonts, the caller is

// responsible for retreiving the appropriate font from the container.

@@ -55,7 +56,7 @@

// parameter and must call ATSFontDeactivate() to unload it when done.

// Returns: true on success, false on error.

- virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out) = 0;

+ virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef*, uint32_t* fontID) = 0;

};

} // namespace WebKit