diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /WebKitLibraries/WebKitSystemInterface.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index d232229..5f2dddb 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -308,6 +308,11 @@ uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); +@class CARenderer; + +void WKCARendererAddChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context); +void WKCARendererRemoveChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context); + typedef struct __WKWindowBounceAnimationContext *WKWindowBounceAnimationContextRef; WKWindowBounceAnimationContextRef WKWindowBounceAnimationContextCreate(NSWindow *window); @@ -327,6 +332,8 @@ UInt8 WKGetNSEventKeyChar(NSEvent *); void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); +int WKGetHTTPPipeliningPriority(NSURLRequest *); +void WKSetHTTPPipeliningPriority(NSMutableURLRequest *, int priority); void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); @@ -377,6 +384,13 @@ bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); +typedef struct __WKScrollbarPainter *WKScrollbarPainterRef; +WKScrollbarPainterRef WKMakeScrollbarPainter(int controlSize, bool isHorizontal); +void WKScrollbarPainterPaint(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, CGRect frameRect); +int WKScrollbarThickness(int controlSize); +int WKScrollbarMinimumThumbLength(WKScrollbarPainterRef); +int WKScrollbarMinimumTotalLengthNeededForThumb(WKScrollbarPainterRef); + #endif #ifdef __cplusplus |