diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /WebKitLibraries | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 36 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 16 | ||||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 2113272 -> 2113504 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLion.a | bin | 610080 -> 634328 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a | bin | 1543948 -> 1582036 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops | 5 |
6 files changed, 57 insertions, 0 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index ed0fadb17..e8f058440 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,39 @@ +2012-05-10 Anders Carlsson <andersca@apple.com> + + WebKit1: Add a way to blacklist specific plug-ins/plug-in versions + https://bugs.webkit.org/show_bug.cgi?id=86150 + <rdar://problem/9551196> + + Reviewed by Sam Weinig. + + Add WKShouldBlockPlugin. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLion.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2012-05-08 Jon Lee <jonlee@apple.com> + + Safari warns that it needs to resend the form in an iFrame when going back + https://bugs.webkit.org/show_bug.cgi?id=82658 + <rdar://problem/11292558> + + Reviewed by Darin Adler. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceLion.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2012-05-07 Eric Seidel <eric@webkit.org> + + Add ENABLE_IFRAME_SEAMLESS so Apple can turn off SEAMLESS if needed + https://bugs.webkit.org/show_bug.cgi?id=85822 + + Reviewed by Adam Barth. + + * win/tools/vsprops/FeatureDefines.vsprops: + 2012-05-06 Eric Seidel <eric@webkit.org> Remove 3D_CANVAS define from vsprops files (it was renamed WEBGL many months ago) diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index a67c8749f..0351a8e0b 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -92,6 +92,7 @@ void WKAccessibilityHandleFocusChanged(void); AXUIElementRef WKCreateAXUIElementRef(id element); void WKUnregisterUniqueIdForElement(id element); +BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString); #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 // Remote Accessibility API. @@ -488,6 +489,21 @@ bool WKExecutableWasLinkedOnOrBeforeLion(void); void WKCGPathAddRoundedRect(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight); #endif +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 +void WKCFURLRequestAllowAllPostCaching(CFURLRequestRef); +#endif + +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 +@class WebFilterEvaluator; + +BOOL WKFilterIsManagedSession(void); +WebFilterEvaluator *WKFilterCreateInstance(NSURLResponse *); +void WKFilterRelease(WebFilterEvaluator *); +BOOL WKFilterWasBlocked(WebFilterEvaluator *); +const char* WKFilterAddData(WebFilterEvaluator *, const char* data, int* length); +const char* WKFilterDataComplete(WebFilterEvaluator *, int* length); +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a Binary files differindex 868149cfd..33116d844 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceLion.a b/WebKitLibraries/libWebKitSystemInterfaceLion.a Binary files differindex add5b2fc7..0252234a9 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLion.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLion.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a Binary files differindex bf3fae34b..c59fc9889 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 342adff1e..5b3ac61eb 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -122,6 +122,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_IFRAME_SEAMLESS" + Value="ENABLE_IFRAME_SEAMLESS" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_INDEXED_DATABASE" Value="" PerformEnvironmentSet="true" |