From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 28 Jun 2010 16:42:48 +0100 Subject: Merge WebKit at r61871: Initial merge by git. Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5 --- WebKitLibraries/ChangeLog | 39 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 12 +++++++ WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1574632 -> 1578704 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1296060 -> 1300380 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 603488 -> 605208 bytes .../win/tools/vsprops/FeatureDefines.vsprops | 7 +++- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 7 +++- 7 files changed, 63 insertions(+), 2 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 273a141..ed55485 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,42 @@ +2010-06-21 Sam Weinig + + Reviewed by Anders Carlsson. + + Update WebKitSystemInterface. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-06-21 Dan Bernstein + + Speculative build fix. + + * WebKitSystemInterface.h: + +2010-06-21 Dan Bernstein + + Reviewed by Darin Adler. + + WebKitSystemInterface part of CSS3: Implement the 'hyphens' and 'hyphenate-character' properties + https://bugs.webkit.org/show_bug.cgi?id=10228 + + * WebKitSystemInterface.h: Added WKGetHyphenationLocationBeforeIndex(). + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-06-21 Satish Sampath + + Reviewed by Steve Block. + + Speech Input Patch 0: Added compilation argument to conditionally compile pending patches. + https://bugs.webkit.org/show_bug.cgi?id=40878 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + 2010-06-02 Sterling Swigart Reviewed by David Levin. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 48defe0..a753b63 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -269,6 +269,14 @@ WKSoftwareCARendererRef WKSoftwareCARendererCreate(uint32_t contextID); void WKSoftwareCARendererDestroy(WKSoftwareCARendererRef); void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect); +typedef struct __WKCARemoteLayerClientRef *WKCARemoteLayerClientRef; + +WKCARemoteLayerClientRef WKCARemoteLayerClientMakeWithServerPort(mach_port_t port); +void WKCARemoteLayerClientInvalidate(WKCARemoteLayerClientRef); +uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); +void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); +CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); + #import CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); @@ -300,6 +308,10 @@ NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); void WKSyncSurfaceToView(NSView *view); #endif +#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) +CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index d99cf68..7146bbe 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index ef9d346..cc684cc 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index 65f874d..53ba34b 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 83cf220..e7a98e8 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > + +