From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebKitLibraries/ChangeLog | 69 ++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 2 +- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1621064 -> 1621352 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1352508 -> 1353260 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 77 ++++++++++++++++++++- WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 1223940 -> 1237016 bytes .../win/lib/WebKitSystemInterface_debug.lib | Bin 458358 -> 482408 bytes WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 4 +- 8 files changed, 147 insertions(+), 5 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index bcd8fab..e15958d 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,72 @@ +2010-10-20 Adam Roben + + Windows build fix + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + Use a WKCFURLCredentialRef type to protect against changes to the + definition of CFURLCredentialRef. + +2010-10-19 Adam Roben + + Windows build fix + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Check in + this file that I meant to check in in r70129. + +2010-10-19 Adam Roben + + Add WKCACFContext and related functions + + Fixes . + + Reviewed by Sam Weinig. + + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2010-10-14 Ada Chan + + Rubber-stamped by Adam Roben. + + Fix Windows build. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2010-10-14 Ada Chan + + Reviewed by Steve Falkenburg. + + Add wkGetSSLCertificateChainContext for fetching the certificate chain. + Needed for https://bugs.webkit.org/show_bug.cgi?id=47603. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2010-10-11 Mike Thole + + Reviewed by Darin Adler. + + Rename WKCertificateInfoGetPeerCertificates() to WKCertificateInfoGetCertificateChain() + https://bugs.webkit.org/show_bug.cgi?id=47495 + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-10-03 Brent Fulgham + + Unreviewed build fix. + + WinCairo also needs access to the header requirement + introduced by Bug 46357. + + * win/tools/vsprops/WinCairo.vsprops: + 2010-09-17 Sam Weinig Reviewed, tweaked, and landed by Anders Carlsson. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 8cb0770..b67906d 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -34,7 +34,7 @@ NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response); NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) -CFArrayRef WKCopyNSURLResponsePeerCertificates(NSURLResponse *response); +CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response); #endif CFStringEncoding WKGetWebDefaultCFStringEncoding(void); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index b3a7ebc..87e9b2d 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index aefd269..7ac0fcb 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 80830a7..a87cfb6 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -30,9 +30,14 @@ struct CGAffineTransform; struct CGPoint; struct CGRect; struct CGSize; +struct IDirect3DDevice9; +struct WKCACFContext; +struct WKCACFUpdateRectEnumerator; +typedef struct _CACFLayer* CACFLayerRef; typedef const struct __CFData* CFDataRef; typedef const struct __CFString* CFStringRef; +typedef double CFTimeInterval; typedef struct CGColor* CGColorRef; typedef struct CGContext* CGContextRef; typedef unsigned short CGFontIndex; @@ -43,7 +48,6 @@ typedef struct _CFURLResponse* CFURLResponseRef; typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; typedef struct _CFURLRequest* CFMutableURLRequestRef; typedef const struct _CFURLRequest* CFURLRequestRef; -typedef struct _CFURLCredential* CFURLCredentialRef; typedef struct __CFHTTPMessage* CFHTTPMessageRef; typedef const struct __CFNumber* CFNumberRef; typedef struct __CFReadStream* CFReadStreamRef; @@ -51,6 +55,13 @@ typedef const struct __CFURL* CFURLRef; typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef; typedef struct tagLOGFONTW LOGFONTW; typedef LOGFONTW LOGFONT; +typedef struct _CACFLayer *CACFLayerRef; +typedef struct __CVBuffer *CVBufferRef; +typedef CVBufferRef CVImageBufferRef; +typedef CVImageBufferRef CVPixelBufferRef; +typedef struct _CAImageQueue *CAImageQueueRef; +typedef unsigned long CFTypeID; +typedef struct _CFURLCredential* WKCFURLCredentialRef; void wkSetFontSmoothingLevel(int type); int wkGetFontSmoothingLevel(); @@ -72,6 +83,7 @@ void wkDrawFocusRing(CGContextRef, CGColorRef, float radius); CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef); void* wkGetSSLPeerCertificateData(CFDictionaryRef); +void* wkGetSSLCertificateChainContext(CFDictionaryRef); CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage(); void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool); CFStringRef wkCopyFoundationCacheDirectory(); @@ -86,10 +98,63 @@ void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL); -CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace); +WKCFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace); CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode); + +enum wkCAImageQueueFlags { + kWKCAImageQueueAsync = 1U << 0, + kWKCAImageQueueFill = 1U << 1, + kWKCAImageQueueProtected = 1U << 2, + kWKCAImageQueueUseCleanAperture = 1U << 3, + kWKCAImageQueueUseAspectRatio = 1U << 4, + kWKCAImageQueueLowQualityColor = 1U << 5, +}; + +enum wkWKCAImageQueueImageType { + kWKCAImageQueueNil = 1, + kWKCAImageQueueSurface, + kWKCAImageQueueBuffer, + kWKCAImageQueueIOSurface, +}; + +enum wkWKCAImageQueueImageFlags { + kWKCAImageQueueOpaque = 1U << 0, + kWKCAImageQueueFlush = 1U << 1, + kWKCAImageQueueWillFlush = 1U << 2, + kWKCAImageQueueFlipped = 1U << 3, + kWKCAImageQueueWaitGPU = 1U << 4, +}; + +typedef void (*wkCAImageQueueReleaseCallback)(unsigned int type, uint64_t id, void *info); +CAImageQueueRef wkCAImageQueueCreate(uint32_t width, uint32_t height, uint32_t capacity); +void wkCAImageQueueInvalidate(CAImageQueueRef iq); +size_t wkCAImageQueueCollect(CAImageQueueRef iq); +bool wkCAImageQueueInsertImage(CAImageQueueRef iq, CFTimeInterval t, unsigned int type, uint64_t id, uint32_t flags, wkCAImageQueueReleaseCallback release, void *info); +uint64_t wkCAImageQueueRegisterPixelBuffer(CAImageQueueRef iq, void *data, size_t data_size, size_t rowbytes, size_t width, size_t height, OSType pixel_format, CFDictionaryRef attachments, uint32_t flags); +void wkCAImageQueueSetFlags(CAImageQueueRef iq, uint32_t mask, uint32_t flags); +uint32_t wkCAImageQueueGetFlags(CAImageQueueRef iq); +CFTypeID wkCAImageQueueGetTypeID(void); + +WKCACFContext* wkCACFContextCreate(); +void wkCACFContextDestroy(WKCACFContext*); + +void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef); +void wkCACFContextFlush(WKCACFContext*); + +void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*); +void wkCACFContextReleaseD3DResources(WKCACFContext*); + +bool wkCACFContextBeginUpdate(WKCACFContext*, void* buffer, size_t bufferSize, CFTimeInterval time, const CGRect& bounds, const CGRect dirtyRects[], size_t dirtyRectCount); +void wkCACFContextRenderUpdate(WKCACFContext*); +void wkCACFContextFinishUpdate(WKCACFContext*); +void wkCACFContextAddUpdateRect(WKCACFContext*, const CGRect&); + +WKCACFUpdateRectEnumerator* wkCACFContextCopyUpdateRectEnumerator(WKCACFContext*); +const CGRect* wkCACFUpdateRectEnumeratorNextRect(WKCACFUpdateRectEnumerator*); +void wkCACFUpdateRectEnumeratorRelease(WKCACFUpdateRectEnumerator*); + typedef enum { WKMediaUIPartFullscreenButton = 0, WKMediaUIPartMuteButton, @@ -126,10 +191,18 @@ typedef enum { WKMediaControllerFlagFocused = 1 << 4 } WKMediaControllerThemeState; +#ifdef __cplusplus +extern "C" { +#endif + bool WKMediaControllerThemeAvailable(int themeStyle); bool WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point); void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize); void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state); void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state); +#ifdef __cplusplus +} +#endif + #endif // WebKitSystemInterface_h diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 40513e6..6e2018b 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib index 124c241..b9f1433 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 60873a3..9710568 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -4,10 +4,10 @@ Version="8.00" Name="WinCairo" > -