From ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Jul 2010 12:51:48 +0100 Subject: Merge WebKit at r62496: Initial merge by git Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 --- WebKitLibraries/ChangeLog | 60 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 7 +-- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1578704 -> 1578600 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1300380 -> 1306380 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 605208 -> 605216 bytes .../win/tools/vsprops/FeatureDefines.vsprops | 12 ++++- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 12 ++++- 7 files changed, 86 insertions(+), 5 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index ed55485..68cd1c4 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,63 @@ +2010-07-01 Simon Fraser + + Reviewed by Sam Weinig. + + + + Update WebKitSystemInterface, making some functions used by + WebKit2 available in 32-bit (for reals this time). + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-07-01 Simon Fraser + + Reviewed by Sam Weinig. + + + + Update WebKitSystemInterface, making some functions used by + WebKit2 available in 32-bit. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-06-23 John Gregg + + Reviewed by Kent Tamura. + + add ENABLE_DIRECTORY_UPLOAD build support + https://bugs.webkit.org/show_bug.cgi?id=41100 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2010-06-27 Steve Falkenburg + + Windows (Cairo) build fix. + Add missing ENABLE_WEB_TIMING feature define. + + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2010-06-27 Steve Falkenburg + + Windows build fix. + Disable ENABLE_WEB_TIMING on Windows. + + * win/tools/vsprops/FeatureDefines.vsprops: + +2010-06-26 Tony Gentilcore + + Reviewed by Dimitri Glazkov. + + Add a VS macro for enabling Web Timing support. + https://bugs.webkit.org/show_bug.cgi?id=38924 + + * win/tools/vsprops/FeatureDefines.vsprops: + 2010-06-21 Sam Weinig Reviewed by Anders Carlsson. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index a753b63..4f46719 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -256,7 +256,7 @@ typedef enum { NSControl *WKCreateMediaUIControl(int controlType); -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && defined(__x86_64__) +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) mach_port_t WKInitializeRenderServer(void); @class CALayer; @@ -277,6 +277,7 @@ uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); +#if defined(__x86_64__) #import CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); @@ -284,8 +285,8 @@ CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_ NSUInteger WKGetInputPanelWindowStyle(void); UInt8 WKGetNSEventKeyChar(NSEvent *); - -#endif +#endif // defined(__x86_64__) +#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) @class CAPropertyAnimation; void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 7146bbe..3b4061c 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index cc684cc..5d3106c 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index 53ba34b..a3743e4 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 e7a98e8..71bdc14 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > + + + +