From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 14:36:32 +0100 Subject: Merge WebKit at r74534: Initial merge by git. Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb --- WebKitLibraries/ChangeLog | 133 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 41 ++++++- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1624528 -> 1624576 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1360684 -> 1375588 bytes .../WebKitSystemInterface/WebKitSystemInterface.h | 7 ++ WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 469556 -> 549448 bytes WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 +++--- WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 ++-- WebKitLibraries/win/tools/vsprops/common.vsprops | 14 ++- .../win/tools/vsprops/debug_wincairo.vsprops | 68 +++++------ WebKitLibraries/win/tools/vsprops/release.vsprops | 4 - 11 files changed, 254 insertions(+), 73 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 5280178..2130f9b 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,136 @@ +2010-12-21 Sam Weinig + + Reviewed by Anders Carlsson. + + Add serialization for CFURLRequestRef and CFURLResponseRef. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2010-12-14 Anders Carlsson + + Reviewed by Dan Bernstein. + + Add WKGetScriptCodeFromCurrentKeyboardInputSource function. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-10 Chris Marrin + + Reviewed by Adam Roben. + + Add CACFContextGetLastCommitTime to WebKitSystemInterface for Windows. + Also got rid of WebKitSystemInterface_debug.lib as recommended by + Adam Roben. No OpenSource builds use it since r72327. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: Removed. + +2010-12-09 Anders Carlsson + + Reviewed by Sam Weinig. + + Cannot use NSKeyedArchiver in WK2 for ResourceResponses + https://bugs.webkit.org/show_bug.cgi?id=50792 + + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-03 Anders Carlsson + + Reviewed by Sam Weinig. + + Dispatch keyboard events in the Carbon event model + https://bugs.webkit.org/show_bug.cgi?id=50503 + + Make WKGetNSEventKeyChar available in 32-bit. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-02 Anders Carlsson + + Reviewed by Sam Weinig. + + Plug-ins should be able to update the mouse cursor + https://bugs.webkit.org/show_bug.cgi?id=50399 + + Add WKEnableSettingCursorWhenInBackground. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-01 Adam Roben + + Don't let harmless errorlevels from the "set" utility leak into + project-specific build scripts + + When using set to unset an environment variable that didn't previously + exist, set raises the errorlevel to 1. This was leaking into + project-specific scripts, causing them to think the build has failed. + We now clear the errorlevel after we finish setting environment + variables. + + Fixes Windows builds mysteriously fail in + some configurations + + Reviewed by Steve Falkenburg. + + * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting + environment variables to get rid of any errorlevel that "set" set. + +2010-12-01 Steve Falkenburg + + Reviewed by Adam Roben. + + vcproj changes can't be applied cleanly by the Windows EWS bot + https://bugs.webkit.org/show_bug.cgi?id=50328 + + * win/tools/vsprops/WinCairo.vsprops: Added property svn:eol-style. + * win/tools/vsprops/cURL.vsprops: Added property svn:eol-style. + * win/tools/vsprops/debug_wincairo.vsprops: Added property svn:eol-style. + +2010-11-29 Steve Falkenburg + + Windows build fix (part 2). + Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files. + + * win/tools/vsprops/common.vsprops: + +2010-11-19 Steve Falkenburg + + Reviewed by Adam Roben. + + Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files + https://bugs.webkit.org/show_bug.cgi?id=49858 + + We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files: + - To simplify editing (editing vsprops build steps is confusing). + - For more readable diffs. + + To add a prebuild/prelink/postbuild step for a vcproj, + Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory. + For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located + in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj). + + * win/tools/vsprops/common.vsprops: + * win/tools/vsprops/release.vsprops: + +2010-11-29 Anders Carlsson + + Reviewed by Sam Weinig and Simon Fraser. + + WebKitSystemInterface.h piece of r72438. + + * WebKitSystemInterface.h: + 2010-11-22 Adam Roben Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 7ec07fb..b593f39 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -143,7 +143,7 @@ CGAffineTransform WKGetUserToBaseCTM(CGContextRef); void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); #else typedef void *WKGlyphVectorRef; -OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); +OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); @@ -157,6 +157,9 @@ size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector); CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); + +CGContextRef WKIOSurfaceContextCreate(IOSurfaceRef, unsigned width, unsigned height, CGColorSpaceRef); +CGImageRef WKIOSurfaceContextCreateImage(CGContextRef context); #endif #ifndef __LP64__ @@ -303,13 +306,11 @@ void WKWindowBounceAnimationSetAnimationProgress(WKWindowBounceAnimationContextR #if defined(__x86_64__) #import - CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); +#endif // defined(__x86_64__) NSUInteger WKGetInputPanelWindowStyle(void); - UInt8 WKGetNSEventKeyChar(NSEvent *); -#endif // defined(__x86_64__) #endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) @class CAPropertyAnimation; @@ -330,12 +331,44 @@ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScale #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) void WKSyncSurfaceToView(NSView *view); + +void WKEnableSettingCursorWhenInBackground(void); + +CFDictionaryRef WKNSURLRequestCreateSerializableRepresentation(NSURLRequest *request, CFTypeRef tokenNull); +NSURLRequest *WKNSURLRequestFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + +CFDictionaryRef WKNSURLResponseCreateSerializableRepresentation(NSURLResponse *response, CFTypeRef tokenNull); +NSURLResponse *WKNSURLResponseFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + +#ifndef __LP64__ +ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void); +#endif + #endif #if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +typedef enum { + WKSandboxExtensionTypeReadOnly, + WKSandboxExtensionTypeWriteOnly, + WKSandboxExtensionTypeReadWrite, +} WKSandboxExtensionType; +typedef struct __WKSandboxExtension *WKSandboxExtensionRef; + +WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type); +void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension); + +bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension); +bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); + +const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); +WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); + +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 678342a..42afe98 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index 1f82d39..1ac278c 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 52aac61..56b93d5 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -144,6 +144,8 @@ void wkCACFContextDestroy(WKCACFContext*); void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef); void wkCACFContextFlush(WKCACFContext*); +CFTimeInterval wkCACFContextGetLastCommitTime(WKCACFContext*); + void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*); void wkCACFContextReleaseD3DResources(WKCACFContext*); @@ -156,6 +158,11 @@ WKCACFUpdateRectEnumerator* wkCACFContextCopyUpdateRectEnumerator(WKCACFContext* const CGRect* wkCACFUpdateRectEnumeratorNextRect(WKCACFUpdateRectEnumerator*); void wkCACFUpdateRectEnumeratorRelease(WKCACFUpdateRectEnumerator*); +CFDictionaryRef wkCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull); +CFURLRequestRef wkCFURLRequestCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); +CFDictionaryRef wkCFURLResponseCreateSerializableRepresentation(CFURLResponseRef cfResponse, CFTypeRef tokenNull); +CFURLResponseRef wkCFURLResponseCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + typedef enum { WKMediaUIPartFullscreenButton = 0, WKMediaUIPartMuteButton, diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 686a355..6c82647 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 9710568..704cd7a 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -1,17 +1,17 @@ - - - - - + + + + + diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops index 3f06aa6..db7680a 100644 --- a/WebKitLibraries/win/tools/vsprops/cURL.vsprops +++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops @@ -1,13 +1,13 @@ - - - - + + + + diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index b9c710c..b787f6b 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -25,7 +25,7 @@ + + + - - - - - - - + + + + + + + + diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops index 8b38b73..6416e3f 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -18,10 +18,6 @@ OptimizeForWindows98="1" /> - -- cgit v1.1