diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 48defe0..a753b63 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -269,6 +269,14 @@ WKSoftwareCARendererRef WKSoftwareCARendererCreate(uint32_t contextID); void WKSoftwareCARendererDestroy(WKSoftwareCARendererRef); void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect); +typedef struct __WKCARemoteLayerClientRef *WKCARemoteLayerClientRef; + +WKCARemoteLayerClientRef WKCARemoteLayerClientMakeWithServerPort(mach_port_t port); +void WKCARemoteLayerClientInvalidate(WKCARemoteLayerClientRef); +uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); +void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); +CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); + #import <mach/mig.h> CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); @@ -300,6 +308,10 @@ NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); void WKSyncSurfaceToView(NSView *view); #endif +#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) +CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); +#endif + #ifdef __cplusplus } #endif |