From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- WebKitLibraries/ChangeLog | 77 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 14 ++++ WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1662544 -> 1715520 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1405092 -> 1409060 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 5 ++ WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 556678 -> 624642 bytes .../win/tools/vsprops/FeatureDefines.vsprops | 12 +++- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 12 +++- WebKitLibraries/win/tools/vsprops/common.vsprops | 2 +- 9 files changed, 119 insertions(+), 3 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 7b91aba..c6dbfaf 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,80 @@ +2011-02-08 Patrick Gansterer + + Reviewed by Adam Roben. + + [WIN] Add missing forward declarations in WebKitSystemInterface.h + https://bugs.webkit.org/show_bug.cgi?id=53889 + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + +2011-02-04 Steve Falkenburg + + Reviewed by Adam Roben. + + Bump Windows minimum system requirement to XPSP2 + https://bugs.webkit.org/show_bug.cgi?id=53807 + + * win/tools/vsprops/common.vsprops: + +2011-02-03 James Kozianski + + Reviewed by Dimitri Glazkov. + + Add navigator.registerProtocolHandler behind a flag. + https://bugs.webkit.org/show_bug.cgi?id=52609 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2011-02-02 Steve Lacey + + Reviewed by Eric Carlson. + + Implement basic media statistics on media elements. + https://bugs.webkit.org/show_bug.cgi?id=53322 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2011-01-28 Anders Carlsson + + Build fix. + + Update WKSI. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2011-01-26 David Kilzer + + Add experimental support for HTTP pipelining in CFNetwork + + + Reviewed by Antti Koivisto. + + * WebKitSystemInterface.h: + New methods added for HTTP pipelining support. + (WKGetHTTPPipeliningPriority): Added. + (WKSetHTTPPipeliningPriority): Added. + Unrelated methods added after updating the header. + (WKMakeScrollbarPainter): Added. + (WKScrollbarPainterPaint): Added. + * libWebKitSystemInterfaceLeopard.a: Updated. + * libWebKitSystemInterfaceSnowLeopard.a: Updated. + +2011-01-24 Jer Noble + + Reviewed by Eric Carlson. + + REGRESSION (r72119): Audio never plays on Star Wars intro animation + https://bugs.webkit.org/show_bug.cgi?id=52467 + + Add wkGetQuickTimeMIMETypeList() function. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + 2011-01-18 Anders Carlsson Reviewed by Darin Adler. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index d232229..5f2dddb 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -308,6 +308,11 @@ uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); +@class CARenderer; + +void WKCARendererAddChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context); +void WKCARendererRemoveChangeNotificationObserver(CARenderer *, void (*callback)(void*), void* context); + typedef struct __WKWindowBounceAnimationContext *WKWindowBounceAnimationContextRef; WKWindowBounceAnimationContextRef WKWindowBounceAnimationContextCreate(NSWindow *window); @@ -327,6 +332,8 @@ UInt8 WKGetNSEventKeyChar(NSEvent *); void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); +int WKGetHTTPPipeliningPriority(NSURLRequest *); +void WKSetHTTPPipeliningPriority(NSMutableURLRequest *, int priority); void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); @@ -377,6 +384,13 @@ bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); +typedef struct __WKScrollbarPainter *WKScrollbarPainterRef; +WKScrollbarPainterRef WKMakeScrollbarPainter(int controlSize, bool isHorizontal); +void WKScrollbarPainterPaint(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, CGRect frameRect); +int WKScrollbarThickness(int controlSize); +int WKScrollbarMinimumThumbLength(WKScrollbarPainterRef); +int WKScrollbarMinimumTotalLengthNeededForThumb(WKScrollbarPainterRef); + #endif #ifdef __cplusplus diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index dd0d652..55887f8 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index d2e5a5f..667c394 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 744f80b..7f24a30 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -35,6 +35,7 @@ struct WKCACFContext; struct WKCACFUpdateRectEnumerator; typedef struct _CACFLayer* CACFLayerRef; +typedef const struct __CFArray* CFArrayRef; typedef const struct __CFData* CFDataRef; typedef const struct __CFString* CFStringRef; typedef double CFTimeInterval; @@ -46,6 +47,7 @@ typedef CGFontIndex CGGlyph; typedef wchar_t UChar; typedef struct _CFURLResponse* CFURLResponseRef; typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; +typedef struct __CFDictionary* CFMutableDictionaryRef; typedef struct _CFURLRequest* CFMutableURLRequestRef; typedef const struct _CFURLRequest* CFURLRequestRef; typedef struct __CFHTTPMessage* CFHTTPMessageRef; @@ -169,6 +171,9 @@ CFURLRequestRef wkCFURLRequestCreateFromSerializableRepresentation(CFDictionaryR CFDictionaryRef wkCFURLResponseCreateSerializableRepresentation(CFURLResponseRef cfResponse, CFTypeRef tokenNull); CFURLResponseRef wkCFURLResponseCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); +typedef void (*wkQuickTimeMIMETypeCallBack)(const char* mimeType); +void wkGetQuickTimeMIMETypeList(wkQuickTimeMIMETypeCallBack); + typedef enum { WKMediaUIPartFullscreenButton = 0, WKMediaUIPartMuteButton, diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index f1af3b0..90e9ceb 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index eaa660b..f30932d 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > + + + +