From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- WebKitLibraries/ChangeLog | 174 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 54 ++++++- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1715520 -> 1724672 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1409060 -> 1447876 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 11 +- WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 624642 -> 658846 bytes WebKitLibraries/win/tools/scripts/VERSION | 2 +- .../win/tools/vsprops/FeatureDefines.vsprops | 7 +- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 7 +- WebKitLibraries/win/tools/vsprops/common.vsprops | 1 + 10 files changed, 248 insertions(+), 8 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index c6dbfaf..9a9517b 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,177 @@ +2011-03-07 Steve Falkenburg + + Bump version. + + * win/tools/scripts/VERSION: + +2011-03-06 Jessie Berlin + + Reviewed by Sam Weinig. + + WebKit2: Use CFNetwork Sessions API. + https://bugs.webkit.org/show_bug.cgi?id=55435. + + When Private Browsing is enabled, use cookies from a in-memory Cookie Storage based on the + Private Browsing Storage Session. + + Update WebKitSystemInterface headers and libraries with the new functions. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-03-04 Jessie Berlin + + Reviewed by Maciej Stachowiak. + + WebKit2: Use CFNetwork Sessions API. + https://bugs.webkit.org/show_bug.cgi?id=55435. + + When Private Browsing is enabled, get the cached url response from the cache associated with + the Private Browsing Storage Session. + + Update WebKitSystemInterface headers and libraries with the new functions. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-03-03 Jessie Berlin + + Reviewed by Adam Roben. + + WebKit2: Use CFNetwork Sessions API. + https://bugs.webkit.org/show_bug.cgi?id=55435 + + Set the Private Browsing Storage Session on requests when Private Browsing is enabled. + + Update WebKitSystemInterface headers and libraries with the new functions. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-03-02 Jessie Berlin + + Update WebKitSystemInterface libraries. Library changes reviewed by Darin Adler. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2011-03-02 Jessie Berlin + + Windows build fix. Unreviewed. + + * win/lib/WebKitSystemInterface.lib: + +2011-03-02 Jessie Berlin + + Rubber-stamped by Adam Roben. + + WebKit2: Use CFNetwork Sessions API. + https://bugs.webkit.org/show_bug.cgi?id=55435 + + Add the ability to create a Private Browsing Storage Session. + + Update WebKitSystemInterface headers and libraries with the new functions. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-03-02 Daniel Cheng + + Reviewed by David Levin. + + Add feature define for data transfer items + https://bugs.webkit.org/show_bug.cgi?id=55510 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2011-03-02 Adam Roben + + Try to force a clean build on the Windows bots + + Some of the bots are running into bogus linker errors due to MSVC's "minimal rebuild" + feature not rebuilding files it should. See for + an example. + + * win/tools/vsprops/common.vsprops: Touched to force a rebuild. + +2011-03-01 Sheriff Bot + + Unreviewed, rolling out r80079. + http://trac.webkit.org/changeset/80079 + https://bugs.webkit.org/show_bug.cgi?id=55547 + + "Broke the Win debug build?" (Requested by dcheng on #webkit). + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2011-03-01 Daniel Cheng + + Reviewed by David Levin. + + Add feature define for data transfer items + https://bugs.webkit.org/show_bug.cgi?id=55510 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2011-03-01 Sam Weinig + + Reviewed by Anders Carlsson. + + WebKit2 needs to be made localizable + + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2011-02-25 Brian Weinstein + + Fix linking of Chromium Mac build. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2011-02-21 Brian Weinstein + + Reviewed by Adam Roben. + + WebResourceCacheManager should be responsible for managing the CFURLCache as well + as the WebCore memory cache. + https://bugs.webkit.org/show_bug.cgi?id=54886 + Part of + + Update WebKitSystemInterface headers and libraries with new functions. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-02-21 Brian Weinstein + + Rubber-stamped by Dan Bernstein. + + Update WebKitSystemInterface.h on Mac. The header that was in the tree didn't + match the current WebKitSystemInterface.h. + + * WebKitSystemInterface.h: + 2011-02-08 Patrick Gansterer Reviewed by Adam Roben. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 5f2dddb..4d6703c 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -1,6 +1,6 @@ /* WebKitSystemInterface.h - Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. + Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Public header file. */ @@ -22,6 +22,8 @@ typedef enum { } WKCertificateParseResult; CFStringRef WKCopyCFLocalizationPreferredName(CFStringRef localization); +void WKSetDefaultLocalization(CFStringRef localization); + CFStringRef WKSignedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription); WKCertificateParseResult WKAddCertificatesToKeychainFromData(const void *bytes, unsigned length); @@ -86,9 +88,11 @@ void WKUnregisterUniqueIdForElement(id element); // Remote Accessibility API. void WKAXRegisterRemoteApp(void); void WKAXInitializeElementWithPresenterPid(id, pid_t); -CFDataRef WKAXRemoteTokenForElement(id); -id WKAXRemoteElementForToken(CFDataRef); -void WKAXInitializeRemoteElementWithWindow(id remoteElement, id window); +NSData *WKAXRemoteTokenForElement(id); +id WKAXRemoteElementForToken(NSData *); +void WKAXSetWindowForRemoteElement(id remoteWindow, id remoteElement); +void WKAXRegisterRemoteProcess(bool registerProcess, pid_t); +pid_t WKAXRemoteProcessIdentifier(id remoteElement); #endif void WKSetUpFontCache(void); @@ -229,6 +233,18 @@ void WKQTMovieDisableComponent(uint32_t[5]); CFStringRef WKCopyFoundationCacheDirectory(void); +typedef const struct __CFURLStorageSession* CFURLStorageSessionRef; +CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef); +NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest*); +NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest*); + +typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; +CFHTTPCookieStorageRef WKCreatePrivateInMemoryHTTPCookieStorage(CFURLStorageSessionRef); +unsigned WKGetHTTPCookieAcceptPolicy(CFHTTPCookieStorageRef); +NSArray *WKHTTPCookiesForURL(CFHTTPCookieStorageRef, NSURL *); +void WKSetHTTPCookiesForURL(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *); +void WKDeleteHTTPCookie(CFHTTPCookieStorageRef, NSHTTPCookie *); + void WKSetVisibleApplicationName(CFStringRef); typedef enum { @@ -367,6 +383,9 @@ ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void); CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif +CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStore(void); +void WKCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostArray); + #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) typedef enum { WKSandboxExtensionTypeReadOnly, @@ -386,10 +405,37 @@ WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* s typedef struct __WKScrollbarPainter *WKScrollbarPainterRef; WKScrollbarPainterRef WKMakeScrollbarPainter(int controlSize, bool isHorizontal); +WKScrollbarPainterRef WKMakeScrollbarReplacementPainter(WKScrollbarPainterRef oldPainter, int newStyle, int controlSize, bool isHorizontal); +void WKScrollbarPainterSetDelegate(WKScrollbarPainterRef, id scrollbarPainterDelegate); void WKScrollbarPainterPaint(WKScrollbarPainterRef, bool enabled, double value, CGFloat proportion, CGRect frameRect); int WKScrollbarThickness(int controlSize); int WKScrollbarMinimumThumbLength(WKScrollbarPainterRef); int WKScrollbarMinimumTotalLengthNeededForThumb(WKScrollbarPainterRef); +CGFloat WKScrollbarPainterKnobAlpha(WKScrollbarPainterRef); +void WKSetScrollbarPainterKnobAlpha(WKScrollbarPainterRef, CGFloat); +CGFloat WKScrollbarPainterTrackAlpha(WKScrollbarPainterRef); +void WKSetScrollbarPainterTrackAlpha(WKScrollbarPainterRef, CGFloat); +bool WKScrollbarPainterIsHorizontal(WKScrollbarPainterRef); +void WKScrollbarPainterSetOverlayState(WKScrollbarPainterRef, int overlayScrollerState); + +typedef struct __WKScrollbarPainterController *WKScrollbarPainterControllerRef; +WKScrollbarPainterControllerRef WKMakeScrollbarPainterController(id painterControllerDelegate); +void WKSetPainterForPainterController(WKScrollbarPainterControllerRef, WKScrollbarPainterRef, bool isHorizontal); +WKScrollbarPainterRef WKVerticalScrollbarPainterForController(WKScrollbarPainterControllerRef); +WKScrollbarPainterRef WKHorizontalScrollbarPainterForController(WKScrollbarPainterControllerRef); +void WKSetScrollbarPainterControllerStyle(WKScrollbarPainterControllerRef, int newStyle); +void WKContentAreaScrolled(WKScrollbarPainterControllerRef); +void WKContentAreaWillPaint(WKScrollbarPainterControllerRef); +void WKMouseEnteredContentArea(WKScrollbarPainterControllerRef); +void WKMouseExitedContentArea(WKScrollbarPainterControllerRef); +void WKMouseMovedInContentArea(WKScrollbarPainterControllerRef); +void WKWillStartLiveResize(WKScrollbarPainterControllerRef); +void WKContentAreaResized(WKScrollbarPainterControllerRef); +void WKWillEndLiveResize(WKScrollbarPainterControllerRef); +void WKContentAreaDidShow(WKScrollbarPainterControllerRef); +void WKContentAreaDidHide(WKScrollbarPainterControllerRef); + +bool WKScrollbarPainterUsesOverlayScrollers(void); #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 55887f8..d52ce7f 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index 667c394..e54b844 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 7f24a30..5d17561 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -64,6 +64,8 @@ typedef CVImageBufferRef CVPixelBufferRef; typedef struct _CAImageQueue *CAImageQueueRef; typedef unsigned long CFTypeID; typedef struct _CFURLCredential* WKCFURLCredentialRef; +typedef const struct __CFURLStorageSession* CFURLStorageSessionRef; +typedef const struct _CFURLCache* CFURLCacheRef; void wkSetFontSmoothingLevel(int type); int wkGetFontSmoothingLevel(); @@ -87,7 +89,7 @@ CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef); void* wkGetSSLPeerCertificateData(CFDictionaryRef); void* wkGetSSLCertificateChainContext(CFDictionaryRef); CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage(); -CFHTTPCookieStorageRef wkCreatePrivateHTTPCookieStorage(); +CFHTTPCookieStorageRef wkCreatePrivateInMemoryHTTPCookieStorage(CFURLStorageSessionRef); void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool); CFStringRef wkCopyFoundationCacheDirectory(); void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); @@ -95,6 +97,13 @@ void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef); void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts); +CFURLStorageSessionRef wkCreatePrivateStorageSession(CFStringRef identifier); +void wkSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef); +CFURLCacheRef wkCopyURLCache(CFURLStorageSessionRef); + +CFArrayRef wkCFURLCacheCopyAllHostNamesInPersistentStore(); +void wkCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames); + unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 90e9ceb..c6fe998 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION index 910fbe3..2d8c4cd 100644 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ b/WebKitLibraries/win/tools/scripts/VERSION @@ -1 +1 @@ -533 +534 diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index f30932d..6bea548 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > + + + -- cgit v1.1