diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /WebKitLibraries | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 24 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 4 | ||||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLion.a | bin | 636168 -> 629224 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceMountainLion.a | bin | 647568 -> 640344 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a | bin | 1584372 -> 1586796 bytes |
5 files changed, 28 insertions, 0 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 3ed61db6a..a5dd4a4ef 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,27 @@ +2012-08-06 Anders Carlsson <andersca@apple.com> + + If the Apple Java plug-in is blocked and no runtime is installed, don't load it + https://bugs.webkit.org/show_bug.cgi?id=93289 + <rdar://problem/11730092> + + Reviewed by Dan Bernstein. + + Add WKJLIsRuntimeAndWebComponentsInstalled(). + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLion.a: + * libWebKitSystemInterfaceMountainLion.a: + +2012-08-01 Jon Lee <jonlee@apple.com> + + Update WKSI. + + Reviewed by Mark Rowe. + + * libWebKitSystemInterfaceLion.a: + * libWebKitSystemInterfaceMountainLion.a: + * libWebKitSystemInterfaceSnowLeopard.a: + 2012-07-29 Rik Cabanier <cabanier@adobe.com> Add ENABLE_CSS_COMPOSITING flag diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 0d7727f94..6e99ca5ca 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -501,6 +501,10 @@ CGFloat WKNSElasticDeltaForReboundDelta(CGFloat delta); CGFloat WKNSReboundDeltaForElasticDelta(CGFloat delta); #endif +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 +Boolean WKJLIsRuntimeAndWebComponentsInstalled(void); +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLion.a b/WebKitLibraries/libWebKitSystemInterfaceLion.a Binary files differindex 20ff91f52..846cb2dd6 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLion.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLion.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a Binary files differindex ce7db6a0c..0c24ce03f 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a +++ b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a Binary files differindex c224ee77f..875beefbb 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a |