diff options
Diffstat (limited to 'JavaScriptGlue')
| -rw-r--r-- | JavaScriptGlue/ChangeLog | 25 | ||||
| -rw-r--r-- | JavaScriptGlue/JSUtils.cpp | 2 | ||||
| -rw-r--r-- | JavaScriptGlue/UserObjectImp.cpp | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index 4da0a9b..c7b2dce 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,3 +1,28 @@ +2010-10-25 Oliver Hunt <oliver@apple.com> + + Reviewed by Gavin Barraclough. + + Remove exec and globalData arguments from jsNumber + https://bugs.webkit.org/show_bug.cgi?id=48270 + + Don't pass exec to jsNumber + + * JSUtils.cpp: + (JSObjectKJSValue): + * UserObjectImp.cpp: + (UserObjectImp::toPrimitive): + +2010-10-25 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r70451. + http://trac.webkit.org/changeset/70451 + https://bugs.webkit.org/show_bug.cgi?id=48249 + + Broke set-unloaded-frame-location.html under Qt (Requested by + caseq on #webkit). + + * ForwardingHeaders/wtf/text/TextPosition.h: Removed. + 2010-10-16 Patrick Gansterer <paroga@webkit.org> Reviewed by Adam Barth. diff --git a/JavaScriptGlue/JSUtils.cpp b/JavaScriptGlue/JSUtils.cpp index 5c85475..581999c 100644 --- a/JavaScriptGlue/JSUtils.cpp +++ b/JavaScriptGlue/JSUtils.cpp @@ -164,7 +164,7 @@ JSValue JSObjectKJSValue(JSUserObject* ptr) { double num; CFNumberGetValue((CFNumberRef)cfType, kCFNumberDoubleType, &num); - result = jsNumber(getThreadGlobalExecState(), num); + result = jsNumber(num); handled = true; } else if (typeID == CFBooleanGetTypeID()) diff --git a/JavaScriptGlue/UserObjectImp.cpp b/JavaScriptGlue/UserObjectImp.cpp index 2176f16..1728a7e 100644 --- a/JavaScriptGlue/UserObjectImp.cpp +++ b/JavaScriptGlue/UserObjectImp.cpp @@ -190,7 +190,7 @@ JSValue UserObjectImp::toPrimitive(ExecState *exec, JSType) const } else if (cfType == CFNumberGetTypeID()) { double d = 0.0; CFNumberGetValue((CFNumberRef)cfValue, kCFNumberDoubleType, &d); - result = jsNumber(exec, d); + result = jsNumber(d); } else if (cfType == CFURLGetTypeID()) { CFURLRef absURL = CFURLCopyAbsoluteURL((CFURLRef)cfValue); if (absURL) { |