From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 11 Aug 2009 17:01:47 +0100 Subject: Merge in WebKit r47029. --- WebKitLibraries/ChangeLog | 312 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 56 +++- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 2066560 -> 1790264 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 0 -> 1488420 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 857484 -> 872272 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 4 + WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 127700 -> 134314 bytes .../win/lib/WebKitSystemInterface_debug.lib | Bin 67662 -> 65782 bytes WebKitLibraries/win/tools/scripts/PRODUCTVERSION | 2 +- WebKitLibraries/win/tools/scripts/VERSION | 2 +- WebKitLibraries/win/tools/scripts/auto-version.sh | 11 +- WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 15 + WebKitLibraries/win/tools/vsprops/cURL.vsprops | 13 + WebKitLibraries/win/tools/vsprops/common.vsprops | 12 +- 14 files changed, 405 insertions(+), 22 deletions(-) create mode 100644 WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a create mode 100644 WebKitLibraries/win/tools/vsprops/WinCairo.vsprops create mode 100644 WebKitLibraries/win/tools/vsprops/cURL.vsprops (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 886e6a9..66f1e38 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,315 @@ +2009-08-10 Peter Kasting + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Even more line ending-stripping for auto-version.sh, based on output + provided by Jessie Berlin. + + * win/tools/scripts/auto-version.sh: + +2009-08-10 Brent Fulgham + + Reviewed by Adam Roben. + + https://bugs.webkit.org/show_bug.cgi?id=28048. + Move various WinCairo build settings into *.vsprops file. + + * win/tools/vsprops/cURL.vsprops: Added. + +2009-08-06 Peter Kasting + + Reviewed by Adam Barth. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Strip line endings at all points auto-version.sh reads data, not just + the one I happened to run into. + + * win/tools/scripts/auto-version.sh: + +2009-07-27 Peter Kasting + + Reviewed by Adam Roben. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Correctly parse command output, even when the line endings are not LF, + so that we don't create an autoversion.h that MSVC chokes on. + + * win/tools/scripts/auto-version.sh: + +2009-07-13 Brent Fulgham + + Reviewed by Adam Roben. + + Add new configuration flag for redistributable Windows build. + https://bugs.webkit.org/show_bug.cgi=27087 + + * win/tools/vsprops/WinCairo.vsprops: Added. Defines the + new WIN_CAIRO flag used to drive non-Apple Windows build. + +2009-07-10 Eric Carlson + + Reviewed by Simon Fraser. + + Update WebKitSystemInterface for . + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-07-06 Eric Carlson + + Update WebKitSystemInterface for . + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-07-06 Anders Carlsson + + Update WebKitSystemInterface. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-07-02 Pierre d'Herbemont + + Reviewed by Simon Fraser. + + Update WebKitSystemInterface for + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-07-01 Eric Carlson + + Reviewed by Simon Fraser. + + Update WebKitSystemInterface for + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-06-29 Eric Carlson + + Reviewed by Simon Fraser. + + Update WebKitSystemInterface for + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-06-25 Simon Fraser + + Rubber-stamped by Mark Rowe. + + + + Update the media controller images. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-06-16 Simon Fraser + + Rubber-stamped by Anders Carlsson. + + Update WebKitSystemInterface for . + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-06-02 Anders Carlsson + + Rubber-stamped by Mark Rowe. + + Update WebKitSystemInterface. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-05-27 Mark Rowe + + Rubber-stamped by Dan Bernstein. + + Update WebKitSystemInterface. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: Added. + * libWebKitSystemInterfaceTiger.a: + +2009-05-26 Anders Carlsson + + Reviewed by Dan Bernstein. + + + REGRESSION (r35515): Tiger crash painting the selection on registration page of car2go.com + + Remove WKCGContextIsSafeToClip. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceTiger.a: + +2009-05-21 Dan Bernstein + + Rubber-stamped by Mark Rowe. + + - correct a copyright header accidently reverted in r43964 + + * WebKitSystemInterface.h: + +2009-05-21 Dan Bernstein + + Reviewed by Anders Carlsson. + + - WebKitSystemInterface part of REGRESSION + (r35515): Tiger crash painting the selection on registration page of + car2go.com + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceTiger.a: + +2009-05-07 Simon Fraser + + Source changes reviewed by Darin Adler + + Endcap of media controls slider is fuzzy + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-28 Steve Falkenburg + + Fix extraneous warning about AnalyzeWithLargeStack not being defined in Windows builds. + Indirected definition through a UserMacro. + + Reviewed by Mark Rowe. + + * win/tools/vsprops/common.vsprops: + +2009-04-28 Steve Falkenburg + + Fix extraneous warning about PRODUCTION not being defined in Windows builds. + Indirected definition for __PRODUCTION__ through a UserMacro. + + Reviewed by Mark Rowe. + + * win/tools/vsprops/common.vsprops: + +2009-04-24 Simon Fraser + + Source changes reviewed by Darin Adler + + https://bugs.webkit.org/show_bug.cgi?id=22242 + + Update WebKitSystemInterface for Mac with fixes for video controller drawing. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-22 Ada Chan + + Update WebKitSystemInterface with new method that maps CFNetwork error code to localized description. + + Reviewed by Darin Adler. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2009-04-20 Steve Falkenburg + + Separate JavaScriptCore.dll from WebKit.dll. + Slight performance improvement or no change on benchmarks. + + Allows us to break a circular dependency between CFNetwork and WebKit on Windows, + and simplifies standalone JavaScriptCore builds. + + Reviewed by Oliver Hunt. + + * win/tools/vsprops/common.vsprops: Add BUILDING_{project} preprocessor define. + +2009-04-18 Pierre d'Herbemont + + Reviewed by Mark Rowe. + + video.buffered and video.seekable are not + the same. video.buffered should return only what is buffered and + not what is seekable + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-18 Pierre d'Herbemont + + Reviewed by Adele Peterson. + + work around QTKit no longer reaching + QTMovieLoadStateComplete + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-15 Steve Falkenburg + + Updated WebKitSystemInterface for Windows. + Changes needed for + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2009-04-14 Mark Rowe + + Update WebKitSystemInterface so that the Tiger portion supports PowerPC. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-13 Antti Koivisto + + Reviewed by Darin Adler. + + Increase the connection count per host + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-10 Eric Carlson + + WebKitSystemInterface changes for + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-04-10 Simon Fraser + + Fix the leopard build by updating WebKitSystemInterface. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + +2009-03-30 Steve Falkenburg + + Bump version to 530. + + * win/tools/scripts/VERSION: + 2009-03-26 Adam Roben Remove SafariThemeConstants.h, which is now provided by diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 0aca1a7..0efa2f4 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -1,6 +1,6 @@ /* WebKitSystemInterface.h - Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. Public header file. */ @@ -179,25 +179,39 @@ void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *contin BOOL WKAppVersionCheckLessThan(NSString *, int, double); +typedef enum { + WKMovieTypeUnknown, + WKMovieTypeDownload, + WKMovieTypeStoredStream, + WKMovieTypeLiveStream +} WKMovieType; + +int WKQTMovieGetType(QTMovie* movie); + +unsigned WKQTIncludeOnlyModernMediaFileTypes(void); int WKQTMovieDataRate(QTMovie* movie); float WKQTMovieMaxTimeLoaded(QTMovie* movie); +float WKQTMovieMaxTimeSeekable(QTMovie* movie); +NSString *WKQTMovieMaxTimeLoadedChangeNotification(void); void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync); CFStringRef WKCopyFoundationCacheDirectory(void); typedef enum { WKMediaUIPartFullscreenButton = 0, - WKMediaUIPartMuteButton = 1, - WKMediaUIPartPlayButton = 2, - WKMediaUIPartSeekBackButton = 3, - WKMediaUIPartSeekForwardButton = 4, - WKMediaUIPartSlider = 5, - WKMediaUIPartSliderThumb = 6, - WKMediaUIPartUnMuteButton = 7, - WKMediaUIPartPauseButton = 8, - WKMediaUIPartTimelineContainer = 9, - WKMediaUIPartCurrentTimeDisplay = 10, - WKMediaUIPartTimeRemainingDisplay= 11 + WKMediaUIPartMuteButton, + WKMediaUIPartPlayButton, + WKMediaUIPartSeekBackButton, + WKMediaUIPartSeekForwardButton, + WKMediaUIPartSlider, + WKMediaUIPartSliderThumb, + WKMediaUIPartRewindButton, + WKMediaUIPartSeekToRealtimeButton, + WKMediaUIPartUnMuteButton, + WKMediaUIPartPauseButton, + WKMediaUIPartBackground, + WKMediaUIPartCurrentTimeDisplay, + WKMediaUIPartTimeRemainingDisplay } WKMediaUIPart; typedef enum { @@ -205,10 +219,16 @@ typedef enum { WKMediaControllerThemeQT = 2 } WKMediaControllerThemeStyle; +typedef enum { + WKMediaControllerFlagDisabled = 1 << 0, + WKMediaControllerFlagPressed = 1 << 1, + WKMediaControllerFlagDrawEndCaps = 1 << 3, +} WKMediaControllerThemeState; + 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, BOOL active); -void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration); +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); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && defined(__x86_64__) mach_port_t WKInitializeRenderServer(void); @@ -227,11 +247,19 @@ void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect); CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); +NSUInteger WKGetInputPanelWindowStyle(void); + +UInt8 WKGetNSEventKeyChar(NSEvent *); + #endif @class CAPropertyAnimation; void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); +unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); + +BOOL WKIsLatchingWheelEvent(NSEvent *); + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 539905d..1e9e637 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a new file mode 100644 index 0000000..61daf46 Binary files /dev/null and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index d556a39..83fa4dc 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 1d7adb4..d2183d4 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -74,4 +74,8 @@ void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef); void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts); +unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); + +CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode); + #endif // WebKitSystemInterface_h diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 2145701..718f791 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 dda46d8..02b431a 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/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION index 5186d07..aa31e71 100644 --- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION +++ b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION @@ -1 +1 @@ -4.0 +4.0.3 \ No newline at end of file diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION index 9dbddfa..625c09b 100644 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ b/WebKitLibraries/win/tools/scripts/VERSION @@ -1 +1 @@ -528 +532 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index 1d35903..06f7667 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -29,7 +29,7 @@ VERSIONPATH=$VERSIONPATH/include VERSIONFILE=$VERSIONPATH/autoversion.h mkdir -p "$VERSIONPATH" -PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"` +PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'` MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` @@ -38,10 +38,11 @@ if [ "$TINYVERSION" == "" ]; then fi if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - PROPOSEDVERSION=$(cat "$SRCPATH/VERSION") + PROPOSEDVERSION=`cat $SRCPATH/VERSION` else PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" fi +PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'` BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` @@ -52,14 +53,16 @@ fi if [ "$BLDVARIANTVERSION" == "" ]; then BLDVARIANTVERSION=0 fi -SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'` +SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'` BLDNMBR="$PROPOSEDVERSION" BLDNMBRSHORT="$BLDNMBR" if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION" + BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.*\S+)\s*$/\1/'` + BLDDATE=`echo "$(date)" | sed -r 's/(.*\S+)\s*$/\1/'` + BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION" fi cat > "$VERSIONFILE" < + + + + diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops new file mode 100644 index 0000000..3f06aa6 --- /dev/null +++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops @@ -0,0 +1,13 @@ + + + + diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 96aad07..4c7c9df 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -9,7 +9,7 @@ @@ -44,4 +44,12 @@ Culture="1033" AdditionalIncludeDirectories=""$(IntDir)\include"" /> + + -- cgit v1.1