From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Jun 2010 19:36:43 +0100 Subject: Merge webkit.org at r61121: Initial merge by git. Change-Id: Icd6db395c62285be384d137164d95d7466c98760 --- WebKitLibraries/ChangeLog | 10 ++++++++++ WebKitLibraries/WebKitSystemInterface.h | 8 ++++---- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1574648 -> 1574632 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1295892 -> 1296060 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 603600 -> 603488 bytes .../win/tools/vsprops/FeatureDefines.vsprops | 7 ++++++- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 7 ++++++- 7 files changed, 26 insertions(+), 6 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 3783b39..273a141 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,13 @@ +2010-06-02 Sterling Swigart + + Reviewed by David Levin. + + Image Resizer Patch 0: Added compilation argument to conditionally compile pending patches. + https://bugs.webkit.org/show_bug.cgi?id=39906 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + 2010-05-24 Jer Noble No review; build fix only. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 18b612c..48defe0 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -29,9 +29,9 @@ NSString *WKGetPreferredExtensionForMIMEType(NSString *type); NSArray *WKGetExtensionsForMIMEType(NSString *type); NSString *WKGetMIMETypeForExtension(NSString *extension); -NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *); -NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *); -NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *); +NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response); +NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response); +NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response); CFStringEncoding WKGetWebDefaultCFStringEncoding(void); @@ -177,7 +177,7 @@ BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request); BOOL WKCGContextIsBitmapContext(CGContextRef context); -void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, float *wheelTicksX, float *wheelTicksY, BOOL *continuous); +void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *continuous); BOOL WKAppVersionCheckLessThan(NSString *, int, double); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 673465f..d99cf68 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index 20d0bae..ef9d346 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index bcb6ab3..65f874d 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 02ee348..83cf220 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > + +