diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /WebKitLibraries/WebKitSystemInterface.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 3f3c049..9079919 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -352,13 +352,24 @@ void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); int WKGetHTTPPipeliningPriority(NSURLRequest *); +void WKSetHTTPPipeliningMaximumPriority(int maximumPriority); void WKSetHTTPPipeliningPriority(NSMutableURLRequest *, int priority); +void WKSetHTTPPipeliningMinimumFastLanePriority(int priority); void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL); -BOOL WKIsLatchingWheelEvent(NSEvent *); +#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) +typedef enum { + WKEventPhaseNone = 0, + WKEventPhaseBegan = 1, + WKEventPhaseChanged = 2, + WKEventPhaseEnded = 3, +} WKEventPhase; + +int WKGetNSEventMomentumPhase(NSEvent *); +#endif #ifndef BUILDING_ON_TIGER void WKWindowSetAlpha(NSWindow *window, float alphaValue); @@ -448,6 +459,10 @@ void WKContentAreaDidHide(WKScrollbarPainterControllerRef); bool WKScrollbarPainterUsesOverlayScrollers(void); +NSRange WKExtractWordDefinitionTokenRangeFromContextualString(NSString *contextString, NSRange range, NSDictionary **options); +void WKShowWordDefinitionWindow(NSAttributedString *term, NSPoint screenPoint, NSDictionary *options); +void WKHideWordDefinitionWindow(void); + #endif #ifdef __cplusplus |