diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
commit | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch) | |
tree | d49911209b132da58d838efa852daf28d516df21 /WebKitLibraries | |
parent | 87eb0cb35bad8784770ebc807e6c982432e47107 (diff) | |
download | external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2 |
Initial Contribution
Diffstat (limited to 'WebKitLibraries')
-rw-r--r-- | WebKitLibraries/ChangeLog | 692 | ||||
-rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 23 | ||||
-rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 1775088 -> 1791488 bytes | |||
-rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceTiger.a | bin | 684612 -> 730628 bytes | |||
-rw-r--r-- | WebKitLibraries/win/tools/scripts/VERSION | 2 | ||||
-rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 76 |
6 files changed, 753 insertions, 40 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog new file mode 100644 index 0000000..ed9e1d8 --- /dev/null +++ b/WebKitLibraries/ChangeLog @@ -0,0 +1,692 @@ +2008-02-15 Mark Rowe <mrowe@apple.com> + + Merge r30084 to Safari-3-1-branch. + + 2008-02-07 Ada Chan <adachan@apple.com> + + Added 4 new methods: + wkSetClientCertificateInSSLProperties, + wkCanAccessCFURLRequestHTTPBodyParts, + wkCFURLRequestCopyHTTPRequestBodyParts, + wkCFURLRequestSetHTTPRequestBodyParts + + Rubber-stamped by Steve. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2008-02-04 Timothy Hatcher <timothy@apple.com> + + <rdar://problem/5722735> Merge fix for SQLITE_FULL error + is given even if the max_page_count is increased (2920) + + * libWebCoreSQLite3.a: + +2008-02-01 Steve Falkenburg <sfalken@apple.com> + + <rdar://problem/5717523> Don't set DEP opt-in flag (data execution prevention) since it is incompaible with the video plugin used on CNN.com + + Rubber-stamped by Jon Honeycutt. + + * win/tools/vsprops/common.vsprops: + +2008-01-29 Mark Rowe <mrowe@apple.com> + + Reviewed by Tim Hatcher. + + <rdar://problem/5600926> WebCore on Tiger must link to its own copy of SQLite 3.4 or newer (so HTML database behavior will be correct). + + * WebCoreSQLite3/sqlite3.h: Added. + * WebCoreSQLite3/sqlite3ext.h: Added. + * libWebCoreSQLite3.a: Added. + +2008-01-29 Alexey Proskuryakov <ap@webkit.org> + + Debug (external) build fix. + + Removed _DEBUG preprocessor definition, which indicates that debug libraries are used (while they aren't). + This preprocessor definition is automatically set by Visual Studio as needed anyway. + + * win/tools/vsprops/debug.vsprops: + +2008-01-17 Steve Falkenburg <sfalken@apple.com> + + Add preprocessor define accidently dropped in my unification, + and required by some builds. Fixes an issue that caused both + debug and release DLLs to be loaded. + + Rubber-stamped by Jon Honeycutt. + + * win/tools/vsprops/debug_internal.vsprops: + +2008-01-16 Steve Falkenburg <sfalken@apple.com> + + Use recommended security-related compiler settings. + + Reviewed by Adam. + + * win/tools/vsprops/common.vsprops: + +2008-01-16 Steve Falkenburg <sfalken@apple.com> + + Build fix. + + * win/tools/vsprops/release.vsprops: + +2008-01-15 Adele Peterson <adele@apple.com> + + Reviewed by Adam and Antti. + + Updated libraries for <rdar://problem/5619062> Add load progress indicator to video controls + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + * win/include/SafariTheme: Added. + * win/include/SafariTheme/SafariThemeConstants.h: Added. Placeholder empty header until we release an updated WebKitSupportLibrary. + +2008-01-14 Steve Falkenburg <sfalken@apple.com> + + Use shared vsprops for most vcproj properties. + + Reviewed by Darin. + + * win/tools/vsprops/common.vsprops: + * win/tools/vsprops/debug.vsprops: + * win/tools/vsprops/debug_internal.vsprops: + * win/tools/vsprops/release.vsprops: + +2008-01-11 Steve Falkenburg <sfalken@apple.com> + + Share common files across projects. + + Unify vsprops files + Debug: common.vsprops, debug.vsprops + Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops + Release: common.vsprops, release.vsprops + + Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops. + debug_internal.vsprops will be mostly empty except for file path prefix modifiers. + + Moved auto-version.sh, VERSION, PRODUCTVERSION to tools. + + Reviewed by Adam Roben. + + * win/tools/WinTools.make: + * win/tools/scripts: Added. + * win/tools/scripts/PRODUCTVERSION: Added. + * win/tools/scripts/VERSION: Added. + * win/tools/scripts/auto-version.sh: Copied from WebCore/WebCore.vcproj/auto-version.sh. + * win/tools/vsprops/debug.vsprops: + * win/tools/vsprops/debug_internal.vsprops: Added. + * win/tools/vsprops/release.vsprops: + +2008-01-11 Steve Falkenburg <sfalken@apple.com> + + Add shared vsprops to help unify our Windows tools settings. + + Reviewed by Hyatt. + + * win/tools: Added. + * win/tools/WinTools.make: Added. + * win/tools/vsprops: Added. + * win/tools/vsprops/common.vsprops: Added. + * win/tools/vsprops/debug.vsprops: Added. + * win/tools/vsprops/release.vsprops: Added. + +2008-01-07 Mark Rowe <mrowe@apple.com> + + Update Tiger library to a G3-friendly version. + + * libWebKitSystemInterfaceTiger.a: + +2008-01-07 Adele Peterson <adele@apple.com> + + Reviewed by Antti, Adam, and Mitz. + + WebKitLibraries part of fix for + <rdar://problem/5619073> Updated look for <video> controls + <rdar://problem/5619057> Add volume control to video controls + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2008-01-03 Mark Rowe <mrowe@apple.com> + + Update Tiger library to a G3-friendly version. + + * libWebKitSystemInterfaceTiger.a: + +2008-01-03 Adele Peterson <adele@apple.com> + + Update libraries for <rdar://problem/4106190> Include "Where from" metadata in drag-and-dropped images + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-12-21 Mark Rowe <mrowe@apple.com> + + Rubber-stamped by Dan Bernstein. + + Fix http://bugs.webkit.org/show_bug.cgi?id=16549. + Bug 16549: WebKit nightly build failing to launch on PowerPC G3s + + * libWebKitSystemInterfaceTiger.a: Update to a G3-friendly version. + +2007-12-07 Dan Bernstein <mitz@apple.com> + + Reviewed by Darin Adler. + + - updated system interface for fixing <rdar://problem/5499918> REGRESSION: insertion point in input field with custom border cuts holes in focus ring interior edges + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-11-27 John Sullivan <sullivan@apple.com> + + Fixed 5614525, caused by a recent bug in WKGetExtensionsForMIMEType + that affects Safari. + + reviewed by Kevin Decker + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-11-26 Timothy Hatcher <timothy@apple.com> + + Reviewed by Adam Roben. + + Bug 16137: Web Inspector window on Leopard should have a unified toolbar and window title + http://bugs.webkit.org/show_bug.cgi?id=16137 + + Add a new function to make bottom window corners square for textured windows. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceTiger.a: + * libWebKitSystemInterfaceLeopard.a: + +2007-11-23 Adam Roben <aroben@apple.com> + + Add wkSetPatternPhaseInUserSpace to WebKitSystemInterface on Windows + + Reviewed by Tim. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Added + declaration. + * win/lib/WebKitSystemInterface.lib: Updated. + * win/lib/WebKitSystemInterface_debug.lib: Updated. + +2007-11-16 Anders Carlsson <andersca@apple.com> + + Reviewed by Adam. + + <rdar://problem/5603832> + XMLHttpRequest readyState 3 & responseText buffer issues. + + Add wkSetCFURLRequestShouldContentSniff. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-11-05 Antti Koivisto <antti@apple.com> + + Reviewed by Sam. + + Update WKQTMovieViewSetDrawSynchronously. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-11-02 Antti Koivisto <antti@apple.com> + + Reviewed by Darin. + + Update to add WKQTMovieViewSetDrawSynchronously + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-10-26 Adele Peterson <adele@apple.com> + + Reviewed by Tim Hatcher. + + Updating header too for WKDrawCapsLockIndicator. + + * WebKitSystemInterface.h: + +2007-10-26 Adele Peterson <adele@apple.com> + + Reviewed by Oliver. + + Adding WKDrawCapsLockIndicator in preparation for fixing the caps lock indicator. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-10-25 Adam Roben <aroben@apple.com> + + Add wkSetPatternBaseCTM. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-10-25 Sam Weinig <sam@webkit.org> + + Fix the windows build. + + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-10-25 Timothy Hatcher <timothy@apple.com> + + Add WKSetPatternBaseCTM. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2007-10-25 Timothy Hatcher <timothy@apple.com> + + Reviewed by Adam. + + Update the Leopard WebKitSystemInterface to be 4-way univeral to include 64-bit. + + * libWebKitSystemInterfaceLeopard.a: + +2007-10-25 Sam Weinig <sam@webkit.org> + + Added wrapper for getting the foundation cache directory. + + Reviewed by Adam Roben. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-10-24 Adam Roben <aroben@apple.com> + + Added some font-related functions needed for <rdar://5549919> + + Reviewed by Ada. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-10-24 Timothy Hatcher <timothy@apple.com> + + Reviewed by Mark Rowe. + + <rdar://problem/5069711> OpenSource version of libWebKitSystemInterface.a is Tiger only, causes issues if used on Leopard + + Add system specific versions of WebKitSystemInterface. + + * libWebKitSystemInterface.a: Removed. + * libWebKitSystemInterfaceLeopard.a: Added. + * libWebKitSystemInterfaceTiger.a: Added. + +2007-10-11 Ada Chan <adachan@apple.com> + + <rdar://problem/5534421> + Added wkGetDefaultHTTPCookieStorage(). Updated libraries. + + Reviewed by Darin. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-09-27 Sam Weinig <sam@webkit.org> + + Build fix. Ran update-webkitsysteminterface script on Tiger, because + the resulting binary differs when built on Tiger. + + * libWebKitSystemInterface.a: + +2007-09-27 David Hyatt <hyatt@apple.com> + + Update WebKitSYstemInterface for @font-face changes. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-09-18 Geoffrey Garen <ggaren@apple.com> + + Build fix. Ran update-webkitsysteminterface script on Tiger, because + the resulting binary differs when built on Tiger. See + <rdar://problem/5490613>. + + * libWebKitSystemInterface.a: + +2007-09-18 Geoffrey Garen <ggaren@apple.com> + + Build fix. Ran update-webkitsysteminterface script. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-08-28 Anders Carlsson <andersca@apple.com> + + Add WKSetNSURLRequestShouldContentSniff. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-08-28 Ada Chan <adachan@apple.com> + + <rdar://problem/4876242> Added SPI to fetch SSL certificate information. + Updated libraries. + + Reviewed by Adam. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-07-23 Ada Chan <adachan@apple.com> + + Reviewed by Steve. + + Update WebKitSystemInterface.{h,lib}. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-07-19 Ada Chan <adachan@apple.com> + + Rubber-stamped by Adam. + + Update libraries. + + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-07-06 Adam Roben <aroben@apple.com> + + Update WebKitSystemInterface.{h,lib} for <rdar://problem/5301994> + + Reviewed by Alice. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2007-06-29 Antti Koivisto <antti@apple.com> + + Reviewed by Maciej. + + Added WKQTMovieDataRate and WKQTMovieMaxTimeLoaded + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-03-29 Beth Dakin <bdakin@apple.com> + + Rubber-stamped by Adam. + + Keep OpenSource building. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-03-28 Antti Koivisto <antti@apple.com> + + Update libWebKitSystemInterface, previous version was out of date. + + * libWebKitSystemInterface.a: + +2007-03-27 Antti Koivisto <antti@apple.com> + + Reviewed by Darin. + + Added wkGetWheelEventDeltas + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2007-03-07 Mark Rowe <mrowe@apple.com> + + Build fix. Rebuild against 10.4 SDK. + + * libWebKitSystemInterface.a: + +2007-03-06 Kevin Decker <kdecker@apple.com> + + Reviewed by Brady + + Fixed: <rdar://problem/4126976> private keys imported by WebKit should not be accessible by all applications + + * libWebKitSystemInterface.a: + +2007-02-21 Anders Carlsson <acarlsson@apple.com> + + Add new version with WKCGContextIsBitmapContext. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2006-12-16 Adele Peterson <adele@apple.com> + + Reviewed by Adam. + + WebKitLibraries part of fix for: + <rdar://problem/4463829> Switch to use new search field implementation for <input type="search"> + + Added wkDrawTextFieldCellFocusRing. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2006-10-11 Darin Adler <darin@apple.com> + + Reviewed by John Sullivan. + + * WebKitSystemInterface.h: Updated to a C++-compatible version. + +2006-08-31 Adele Peterson <adele@apple.com> + + Reviewed by John Sullivan. + + Removed wkSecureEventInput and wkSetSecureEventInput, since this can be done with API. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2006-08-30 Adele Peterson <adele@apple.com> + + Reviewed by Hyatt. + + Updated for http://bugs.webkit.org/show_bug.cgi?id=10575 + Enable secure input mode for new password fields + + * WebKitSystemInterface.h: Added WKSetSecureEventInput and WKSecureEventInput; + * libWebKitSystemInterface.a: + +2006-07-09 Anders Carlsson <acarlsson@apple.com> + + Reviewed by Darin. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + Add WKPathFromFont. + +2006-07-05 Adele Peterson <adele@apple.com> + + Reviewed by Maciej and Hyatt. + + * WebKitSystemInterface.h: Updated. + * libWebKitSystemInterface.a: Updated. + +2006-06-16 Adele Peterson <adele@apple.com> + + Reviewed by Alice. + + * WebKitSystemInterface.h: Added WKDrawBezeledTextArea(). + * libWebKitSystemInterface.a: ditto. + +2006-04-01 Eric Seidel <eseidel@apple.com> + + * libWebKitSystemInterface.a: commit a universal binary. + +2006-04-01 Darin Adler <darin@apple.com> + + Reviewed by Beth. + + * libWebKitSystemInterface.a: Changed alpha in the focus-ring drawing + code to use the system default alpha. + +2006-03-17 Eric Seidel <eseidel@apple.com> + + * libWebKitSystemInterface.a: commit a universal binary. + +2006-03-17 Adele Peterson <adele@apple.com> + + * WebKitSystemInterface.h: Added WKDrawBezeledTextFieldCell() + * libWebKitSystemInterface.a: ditto + +2006-02-28 John Sullivan <sullivan@apple.com> + + * WebKitSystemInterface.h: Removed WKMouseIsDown() + * libWebKitSystemInterface.a: ditto + +2006-02-23 Timothy Hatcher <timothy@apple.com> + + New build to fix the i386 arch. (The _cuEnc64 symbol was missing.) + + * libWebKitSystemInterface.a: + +2006-02-19 Darin Adler <darin@apple.com> + + * WebKitSystemInterface.h: Added WKDrawFocusRing. + * libWebKitSystemInterface.a: Ditto. + +2006-02-06 John Sullivan <sullivan@apple.com> + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + removed WKExecutableLinkedInTigerOrEarlier + +2005-11-01 Darin Adler <darin@apple.com> + + * libWebKitSystemInterface.a: Updated. + +2005-10-04 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-09-08 Justin Garcia <justin.garcia@apple.com> + + * WebKitSystemInterface.h: Update to latest + * libWebKitSystemInterface.a: ditto + +2005-09-04 Darin Adler <darin@apple.com> + + * WebKitSystemInterface.h: Update to latest + * libWebKitSystemInterface.a: Ditto. + +2005-08-07 Darin Adler <darin@apple.com> + + * libWebKitSystemInterface.a: Universal binary. + * WebKitSystemInterface.h: Updated for calls that Eric recently removed. + +2005-07-01 John Sullivan <sullivan@apple.com> + + - added WKExecutableLinkedInTigerOrEarlier + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated for crashing bugfix + + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-06 Maciej Stachowiak <mjs@apple.com> + + - updated + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-05 Maciej Stachowiak <mjs@apple.com> + + - added a few more bits of SPI + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-05 Maciej Stachowiak <mjs@apple.com> + + - added file type and NSURLResponse caching SPI + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + +2005-06-05 Maciej Stachowiak <mjs@apple.com> + + - initial checkin of WebKitSystemInterface binary + + * WebKitSystemInterface.h: Added. + * libWebKitSystemInterface.a: Added. + diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index eb64426..de8cb12 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 Apple Inc. All rights reserved. Public header file. */ @@ -31,11 +31,17 @@ NSString *WKGetMIMETypeForExtension(NSString *extension); NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response); NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response); +NSTimeInterval WKGetNSURLResponseCalculatedExpiration(NSURLResponse *response); +BOOL WKGetNSURLResponseMustRevalidate(NSURLResponse *response); CFStringEncoding WKGetWebDefaultCFStringEncoding(void); +float WKSecondsSinceLastInputEvent(void); +CFStringRef WKPreferRGB32Key(void); + void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path); void WKSetNSURLConnectionDefersCallbacks(NSURLConnection *connection, BOOL defers); +float WKSecondsSinceLastInputEvent(void); void WKShowKeyAndMain(void); #ifndef __LP64__ @@ -52,7 +58,7 @@ WKNSURLConnectionDelegateProxyPtr WKCreateNSURLConnectionDelegateProxy(void); void WKDisableCGDeferredUpdates(void); -Class WKNSURLProtocolClassForRequest(NSURLRequest *request); +Class WKNSURLProtocolClassForReqest(NSURLRequest *request); void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff); unsigned WKGetNSAutoreleasePoolCount(void); @@ -103,7 +109,7 @@ void WKDrawBezeledTextArea(NSRect, BOOL enabled); void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); void WKSendUserChangeNotifications(void); -#ifndef __LP64__ +#ifndef __LP64__ BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent); void WKSendKeyEventToTSM(NSEvent *theEvent); void WKCallDrawingNotification(CGrafPtr port, Rect *bounds); @@ -111,6 +117,7 @@ void WKCallDrawingNotification(CGrafPtr port, Rect *bounds); BOOL WKGetGlyphTransformedAdvances(CGFontRef, NSFont*, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance); CGFontRef WKGetCGFontFromNSFont(NSFont *font); +void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range); NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch); void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font); @@ -118,11 +125,6 @@ ATSUFontID WKGetNSFontATSUFontId(NSFont *font); void WKReleaseStyleGroup(void *group); BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext); -#ifdef BUILDING_ON_TIGER -// CGFontGetAscent, CGFontGetDescent, CGFontGetLeading and CGFontGetUnitsPerEm were not available until Leopard -void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); -#endif - void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform); void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint); @@ -135,6 +137,7 @@ void WKClearGlyphVector(WKGlyphVectorRef glyphs); int WKGetGlyphVectorNumGlyphs(WKGlyphVectorRef glyphVector); ATSLayoutRecord *WKGetGlyphVectorFirstRecord(WKGlyphVectorRef glyphVector); size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector); +ATSGlyphRef WKGetDefaultGlyphForChar(NSFont *font, UniChar c); #ifndef __LP64__ NSEvent *WKCreateNSEventWithCarbonEvent(EventRef eventRef); @@ -147,10 +150,8 @@ void WKNSWindowRestoreCGContext(NSWindow *, CGContextRef); void WKNSWindowMakeBottomCornersSquare(NSWindow *); -#ifdef BUILDING_ON_TIGER -// WKSupportsMultipartXMixedReplace is not required on Leopard as multipart/x-mixed-replace is always handled by NSURLRequest BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request); -#endif +NSString* WKPathFromFont(NSFont *font); BOOL WKCGContextIsBitmapContext(CGContextRef context); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a Binary files differindex c7ba1d0..48fbd61 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a Binary files differindex 0db47d0..b73a60a 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceTiger.a +++ b/WebKitLibraries/libWebKitSystemInterfaceTiger.a diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION index 6bf9900..642ea6f 100644 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ b/WebKitLibraries/win/tools/scripts/VERSION @@ -1 +1 @@ -526 +525 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index 6bbfb5c..a93f4af 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -30,30 +30,29 @@ VERSIONFILE=$VERSIONPATH/autoversion.h mkdir -p "$VERSIONPATH" PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"` -MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` -MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` -TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` +MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"` +MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"` +TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"` if [ "$TINYVERSION" == "" ]; then TINYVERSION=0 fi if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - PROPOSEDVERSION=$(cat "$SRCPATH/VERSION") + echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE" else - PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" + echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE" fi -if [ `echo "$PROPOSEDVERSION" | grep -c -E "4\.|4$"` -ne 0 ]; then - echo " - Can't set WebKit's version to something that ends in a 4! - If we do, someone's going to think it's Netscape 4. - Radar bug 3787996 has some details." +if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then + echo "Can't set WebKit's version to something that ends in a 4!" + echo "If we do, someone's going to think it's Netscape 4." + echo "Radar bug 3787996 has some details." exit 1 fi -BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` -BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` -BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'` +BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"` +BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"` +BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"` if [ "$BLDMINORVERSION" == "" ]; then BLDMINORVERSION=0 fi @@ -62,22 +61,43 @@ if [ "$BLDVARIANTVERSION" == "" ]; then fi SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'` -BLDNMBR="$PROPOSEDVERSION" -BLDNMBRSHORT="$BLDNMBR" +BLDNMBR=`cat "$VERSIONFILE"` +BLDNMBRSHORT=`cat "$VERSIONFILE"` +BUILDER="" if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION" + echo -n "+" >> "$VERSIONFILE" + BLDNMBRSHORT=`cat "$VERSIONFILE"` + echo -n " " >> "$VERSIONFILE" + echo -n `whoami` >> "$VERSIONFILE" + echo -n " - " >> "$VERSIONFILE" + echo -n `date` >> "$VERSIONFILE" + echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE" + BLDNMBR=`cat "$VERSIONFILE"` fi -cat > "$VERSIONFILE" <<EOF -#define __VERSION_TEXT__ "$PRODUCTVERSION ($BLDNMBR)" -#define __BUILD_NUMBER_SHORT__ "$BLDNMBRSHORT" -#define __VERSION_MAJOR__ $MAJORVERSION -#define __VERSION_MINOR__ $MINORVERSION -#define __VERSION_TINY__ $TINYVERSION -#define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION -#define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION -#define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION -#define __SVN_REVISION__ $SVNREVISION -EOF +echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE" +echo -n $PRODUCTVERSION >> "$VERSIONFILE" +echo -n " (" >> "$VERSIONFILE" +echo -n $BLDNMBR >> "$VERSIONFILE" +echo ')"' >> "$VERSIONFILE" +echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE" +echo -n $BLDNMBRSHORT >> "$VERSIONFILE" +echo '"' >> "$VERSIONFILE" + +echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE" +echo $MAJORVERSION >> "$VERSIONFILE" +echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE" +echo $MINORVERSION >> "$VERSIONFILE" +echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE" +echo $TINYVERSION >> "$VERSIONFILE" + +echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE" +echo $BLDMAJORVERSION >> "$VERSIONFILE" +echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE" +echo $BLDMINORVERSION >> "$VERSIONFILE" +echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE" +echo $BLDVARIANTVERSION >> "$VERSIONFILE" + +echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE" +echo $SVNREVISION >> "$VERSIONFILE" |