diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index ed68410..18b612c 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -29,8 +29,9 @@ NSString *WKGetPreferredExtensionForMIMEType(NSString *type); NSArray *WKGetExtensionsForMIMEType(NSString *type); NSString *WKGetMIMETypeForExtension(NSString *extension); -NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response); -NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response); +NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *); +NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *); +NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *); CFStringEncoding WKGetWebDefaultCFStringEncoding(void); @@ -176,7 +177,7 @@ BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request); BOOL WKCGContextIsBitmapContext(CGContextRef context); -void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *continuous); +void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, float *wheelTicksX, float *wheelTicksY, BOOL *continuous); BOOL WKAppVersionCheckLessThan(NSString *, int, double); @@ -191,6 +192,8 @@ int WKQTMovieGetType(QTMovie* movie); BOOL WKQTMovieHasClosedCaptions(QTMovie* movie); void WKQTMovieSetShowClosedCaptions(QTMovie* movie, BOOL showClosedCaptions); +void WKQTMovieSelectPreferredAlternates(QTMovie* movie); +void WKQTMovieSelectPreferredAlternateTrackForMediaType(QTMovie* movie, NSString* mediaType); unsigned WKQTIncludeOnlyModernMediaFileTypes(void); int WKQTMovieDataRate(QTMovie* movie); @@ -294,6 +297,7 @@ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScale #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); +void WKSyncSurfaceToView(NSView *view); #endif #ifdef __cplusplus |