diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 7ec07fb..d135304 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -143,7 +143,7 @@ CGAffineTransform WKGetUserToBaseCTM(CGContextRef); void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); #else typedef void *WKGlyphVectorRef; -OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); +OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); @@ -336,6 +336,25 @@ void WKSyncSurfaceToView(NSView *view); CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +typedef enum { + WKSandboxExtensionTypeReadOnly, + WKSandboxExtensionTypeWriteOnly, + WKSandboxExtensionTypeReadWrite, +} WKSandboxExtensionType; +typedef struct __WKSandboxExtension *WKSandboxExtensionRef; + +WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type); +void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension); + +bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension); +bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); + +const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); +WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); + +#endif + #ifdef __cplusplus } #endif |