diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index b67906d..7ec07fb 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -60,6 +60,8 @@ void WKDisableCGDeferredUpdates(void); Class WKNSURLProtocolClassForRequest(NSURLRequest *request); void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff); +void WKSetCookieStoragePrivateBrowsingEnabled(BOOL enabled); + unsigned WKGetNSAutoreleasePoolCount(void); void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button); @@ -152,6 +154,11 @@ ATSLayoutRecord *WKGetGlyphVectorFirstRecord(WKGlyphVectorRef glyphVector); size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector); #endif +CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*); +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); +#endif + #ifndef __LP64__ NSEvent *WKCreateNSEventWithCarbonEvent(EventRef eventRef); NSEvent *WKCreateNSEventWithCarbonMouseMoveEvent(EventRef inEvent, NSWindow *window); @@ -288,6 +295,12 @@ uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); +typedef struct __WKWindowBounceAnimationContext *WKWindowBounceAnimationContextRef; + +WKWindowBounceAnimationContextRef WKWindowBounceAnimationContextCreate(NSWindow *window); +void WKWindowBounceAnimationContextDestroy(WKWindowBounceAnimationContextRef context); +void WKWindowBounceAnimationSetAnimationProgress(WKWindowBounceAnimationContextRef context, double animationProgress); + #if defined(__x86_64__) #import <mach/mig.h> @@ -316,7 +329,6 @@ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScale #endif #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) -NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); void WKSyncSurfaceToView(NSView *view); #endif |