diff options
Diffstat (limited to 'JavaScriptGlue')
| -rw-r--r-- | JavaScriptGlue/ChangeLog | 18 | ||||
| -rw-r--r-- | JavaScriptGlue/Configurations/Version.xcconfig | 4 | ||||
| -rw-r--r-- | JavaScriptGlue/ForwardingHeaders/wtf/ValueCheck.h | 1 | ||||
| -rw-r--r-- | JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj | 8 |
4 files changed, 25 insertions, 6 deletions
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index dc4ede9..df8b3ec 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,3 +1,21 @@ +2010-02-09 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Geoffrey Garen. + + https://bugs.webkit.org/show_bug.cgi?id=34490 + WebCore::ImageEventSender::dispatchPendingEvents() crashes in certain conditions + + * ForwardingHeaders/wtf/ValueCheck.h: Added. + +2010-02-04 Mark Rowe <mrowe@apple.com> + + Reviewed by Timothy Hatcher. + + Build fix. Remove a symbol corresponding to an inline function from the linker export + file to prevent a weak external failure. + + * JavaScriptGlue.xcodeproj/project.pbxproj: Accommodate rename of script. + 2010-01-28 Oliver Hunt <oliver@apple.com> Reviewed by Gavin Barraclough. diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig index 75f9bd4..0e289b1 100644 --- a/JavaScriptGlue/Configurations/Version.xcconfig +++ b/JavaScriptGlue/Configurations/Version.xcconfig @@ -21,8 +21,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -MAJOR_VERSION = 532; -MINOR_VERSION = 9; +MAJOR_VERSION = 533; +MINOR_VERSION = 1; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/JavaScriptGlue/ForwardingHeaders/wtf/ValueCheck.h b/JavaScriptGlue/ForwardingHeaders/wtf/ValueCheck.h new file mode 100644 index 0000000..904b15d --- /dev/null +++ b/JavaScriptGlue/ForwardingHeaders/wtf/ValueCheck.h @@ -0,0 +1 @@ +#include <JavaScriptCore/ValueCheck.h> diff --git a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj index 677cf6f..36bde4a 100644 --- a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj +++ b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj @@ -267,7 +267,7 @@ DD66F3C408F73ED700C75FD7 /* Sources */, DD66F3CD08F73ED700C75FD7 /* Frameworks */, 939D055E09DA033400984996 /* Check For Global Initializers */, - 5D0D53490E9862A70029E223 /* Check For Weak VTables */, + 5D0D53490E9862A70029E223 /* Check For Weak VTables and Externals */, 5DA0F0C00DC2B48900EA22B4 /* Remove Headers If Needed */, ); buildRules = ( @@ -312,7 +312,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 5D0D53490E9862A70029E223 /* Check For Weak VTables */ = { + 5D0D53490E9862A70029E223 /* Check For Weak VTables and Externals */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -320,12 +320,12 @@ inputPaths = ( "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", ); - name = "Check For Weak VTables"; + name = "Check For Weak VTables and Externals"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -f ../WebKitTools/Scripts/check-for-weak-vtables ]; then\n ../WebKitTools/Scripts/check-for-weak-vtables || exit $?\nfi"; + shellScript = "if [ -f ../WebKitTools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../WebKitTools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi"; }; 5D2F7D0A0C6878E000B5B72B /* Update Info.plist with version information */ = { isa = PBXShellScriptBuildPhase; |