[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 16:38:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 87439fa4e5b51867095074a3429e1f5b13bba955
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 29 21:47:28 2010 +0000
WebKitSystemInterface.h piece of r72438.
Patch by Anders Carlsson <andersca at apple.com> on 2010-11-29
Reviewed by Sam Weinig and Simon Fraser.
* WebKitSystemInterface.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5280178..b546c9f 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-29 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig and Simon Fraser.
+
+ WebKitSystemInterface.h piece of r72438.
+
+ * WebKitSystemInterface.h:
+
2010-11-22 Adam Roben <aroben at apple.com>
Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files
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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list