diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-15 09:57:36 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-15 09:57:36 (GMT) |
| commit | 336dfcef05cb63df0a6d550b59a4badc7a0f01c1 (patch) | |
| tree | a218ec97413e0c8ebc9600ac5db9b2adea485b32 /src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp | |
| parent | e44d64510e019e5d3b379b704cfb824e0d7ccc9d (diff) | |
| download | Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.zip Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.gz Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.bz2 | |
Merge of master
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp index d24a024..cd1b40a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/GetterSetter.cpp @@ -38,17 +38,17 @@ void GetterSetter::mark() m_setter->mark(); } -JSValuePtr GetterSetter::toPrimitive(ExecState*, PreferredPrimitiveType) const +JSValue GetterSetter::toPrimitive(ExecState*, PreferredPrimitiveType) const { ASSERT_NOT_REACHED(); return jsNull(); } -bool GetterSetter::getPrimitiveNumber(ExecState*, double& number, JSValuePtr& value) +bool GetterSetter::getPrimitiveNumber(ExecState*, double& number, JSValue& value) { ASSERT_NOT_REACHED(); number = 0; - value = noValue(); + value = JSValue(); return true; } @@ -73,7 +73,7 @@ UString GetterSetter::toString(ExecState*) const JSObject* GetterSetter::toObject(ExecState* exec) const { ASSERT_NOT_REACHED(); - return jsNull()->toObject(exec); + return jsNull().toObject(exec); } bool GetterSetter::isGetterSetter() const |