diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptGlue | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptGlue')
-rw-r--r-- | Source/JavaScriptGlue/ChangeLog | 97 | ||||
-rw-r--r-- | Source/JavaScriptGlue/Configurations/Version.xcconfig | 2 | ||||
-rw-r--r-- | Source/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtrCommon.h | 1 | ||||
-rw-r--r-- | Source/JavaScriptGlue/JSValueWrapper.cpp | 11 | ||||
-rw-r--r-- | Source/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | Source/JavaScriptGlue/UserObjectImp.cpp | 2 | ||||
-rw-r--r-- | Source/JavaScriptGlue/UserObjectImp.h | 2 |
7 files changed, 102 insertions, 17 deletions
diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog index 3188ba7..cc13884 100644 --- a/Source/JavaScriptGlue/ChangeLog +++ b/Source/JavaScriptGlue/ChangeLog @@ -1,3 +1,100 @@ +2011-02-13 Cameron Zwarich <zwarich@apple.com> + + Reviewed by Dan Bernstein. + + Bug 53760 - JSC fails to build with TOT Clang + https://bugs.webkit.org/show_bug.cgi?id=53760 + + Fix -Woverloaded-virtual warnings. + + * UserObjectImp.cpp: + (UserObjectImp::toPrimitive): Use PreferredPrimitiveType instead of JSType to + match the base class. + * UserObjectImp.h: + +2011-02-06 Ryosuke Niwa <rniwa@webkit.org> + + Reviewed by Darin Adler. + + OwnArraryPtr.h uses deleteOwnedPtr but doesn’t include OwnPtrCommon.h + https://bugs.webkit.org/show_bug.cgi?id=52867 + + * ForwardingHeaders/wtf/OwnArrayPtrCommon.h: Removed. + +2011-01-31 Oliver Hunt <oliver@apple.com> + + Convert markstack to a slot visitor API + https://bugs.webkit.org/show_bug.cgi?id=53219 + + rolling r77098, r77099, r77100, r77109, and + r77111 back in, along with a few more Qt fix attempts. + + * JSValueWrapper.cpp: + (JSValueWrapper::JSObjectMark): + +2011-01-30 Csaba Osztrogonác <ossy@webkit.org> + + Unreviewed, rolling out r77098, r77099, r77100, r77109, and + r77111. + http://trac.webkit.org/changeset/77098 + http://trac.webkit.org/changeset/77099 + http://trac.webkit.org/changeset/77100 + http://trac.webkit.org/changeset/77109 + http://trac.webkit.org/changeset/77111 + https://bugs.webkit.org/show_bug.cgi?id=53219 + + Qt build is broken + + * JSValueWrapper.cpp: + (JSValueWrapper::JSObjectMark): + +2011-01-30 Oliver Hunt <oliver@apple.com> + + Convert markstack to a slot visitor API + https://bugs.webkit.org/show_bug.cgi?id=53219 + + rolling r77006 and r77020 back in. + + * JSValueWrapper.cpp: + (JSValueWrapper::JSObjectMark): + +2011-01-28 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r77006 and r77020. + http://trac.webkit.org/changeset/77006 + http://trac.webkit.org/changeset/77020 + https://bugs.webkit.org/show_bug.cgi?id=53360 + + "Broke Windows tests" (Requested by rniwa on #webkit). + + * JSValueWrapper.cpp: + (JSValueWrapper::JSObjectMark): + +2011-01-27 Oliver Hunt <oliver@apple.com> + + Reviewed by Geoffrey Garen. + + Convert markstack to a slot visitor API + https://bugs.webkit.org/show_bug.cgi?id=53219 + + There's no reason to recurse here, the value we + were marking was protected. + + * JSValueWrapper.cpp: + (JSValueWrapper::JSObjectMark): + +2011-01-23 Mark Rowe <mrowe@apple.com> + + Follow-up to r76477. + + Fix the scripts that detect problematic code such as static initializers + and destructors, weak vtables, inappropriate files in the framework wrappers, + and public headers including private headers. These had all been broken + since the projects were moved in to the Source directory as the paths to the + scripts were not updated at that time. + + * JavaScriptGlue.xcodeproj/project.pbxproj: + 2011-01-17 Dan Bernstein <mitz@apple.com> Rubber-stamped by Mark Rowe. diff --git a/Source/JavaScriptGlue/Configurations/Version.xcconfig b/Source/JavaScriptGlue/Configurations/Version.xcconfig index 4b884e2..cee5010 100644 --- a/Source/JavaScriptGlue/Configurations/Version.xcconfig +++ b/Source/JavaScriptGlue/Configurations/Version.xcconfig @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 16; +MINOR_VERSION = 20; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtrCommon.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtrCommon.h deleted file mode 100644 index 0a226f0..0000000 --- a/Source/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtrCommon.h +++ /dev/null @@ -1 +0,0 @@ -#include <JavaScriptCore/OwnArrayPtrCommon.h> diff --git a/Source/JavaScriptGlue/JSValueWrapper.cpp b/Source/JavaScriptGlue/JSValueWrapper.cpp index e0879a0..d9ac497 100644 --- a/Source/JavaScriptGlue/JSValueWrapper.cpp +++ b/Source/JavaScriptGlue/JSValueWrapper.cpp @@ -194,15 +194,4 @@ CFTypeRef JSValueWrapper::JSObjectCopyCFValue(void *data) void JSValueWrapper::JSObjectMark(void *data) { - JSValueWrapper* ptr = (JSValueWrapper*)data; - if (ptr) - { - // This results in recursive marking but will be otherwise safe and correct. - // We claim the array vptr is 0 because we don't have access to it here, and - // claiming 0 is functionally harmless -- it merely means that we can't - // devirtualise marking of arrays when recursing from this point. - MarkStack markStack(0); - markStack.append(ptr->fValue.get()); - markStack.drain(); - } } diff --git a/Source/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj b/Source/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj index 63cd4a9..05f9052 100644 --- a/Source/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj +++ b/Source/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj @@ -332,7 +332,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -f ../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi"; + shellScript = "if [ -f ../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi"; }; 5D2F7D0A0C6878E000B5B72B /* Update Info.plist with version information */ = { isa = PBXShellScriptBuildPhase; @@ -377,7 +377,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -f ../Tools/Scripts/check-for-global-initializers ]; then\n ../Tools/Scripts/check-for-global-initializers || exit $?\nfi"; + shellScript = "if [ -f ../../Tools/Scripts/check-for-global-initializers ]; then\n ../../Tools/Scripts/check-for-global-initializers || exit $?\nfi"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/Source/JavaScriptGlue/UserObjectImp.cpp b/Source/JavaScriptGlue/UserObjectImp.cpp index 1728a7e..340864b 100644 --- a/Source/JavaScriptGlue/UserObjectImp.cpp +++ b/Source/JavaScriptGlue/UserObjectImp.cpp @@ -169,7 +169,7 @@ JSUserObject* UserObjectImp::GetJSUserObject() const return fJSUserObject; } -JSValue UserObjectImp::toPrimitive(ExecState *exec, JSType) const +JSValue UserObjectImp::toPrimitive(ExecState *exec, PreferredPrimitiveType) const { JSValue result = jsUndefined(); JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec), exec); diff --git a/Source/JavaScriptGlue/UserObjectImp.h b/Source/JavaScriptGlue/UserObjectImp.h index 8dbad98..dbd4faa 100644 --- a/Source/JavaScriptGlue/UserObjectImp.h +++ b/Source/JavaScriptGlue/UserObjectImp.h @@ -50,7 +50,7 @@ public: virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&); virtual void put(ExecState *exec, const Identifier &propertyName, JSValue value, PutPropertySlot&); - JSValue toPrimitive(ExecState*, JSType preferredType = UnspecifiedType) const; + JSValue toPrimitive(ExecState*, PreferredPrimitiveType preferredType = NoPreference) const; virtual bool toBoolean(ExecState *exec) const; virtual double toNumber(ExecState *exec) const; virtual UString toString(ExecState *exec) const; |