diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-20 11:58:35 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-20 12:02:51 (GMT) |
| commit | 4c97aff92561c7d2ab0bd0da920f1c3b708158a1 (patch) | |
| tree | 461266931f1ffcd5a0a23f495eb7850c637b990b /src/script/bridge/qscriptqobject.cpp | |
| parent | c9d8f3ea0cbd550354b3d99c9ad51255c2db8f1d (diff) | |
| download | Qt-4c97aff92561c7d2ab0bd0da920f1c3b708158a1.zip Qt-4c97aff92561c7d2ab0bd0da920f1c3b708158a1.tar.gz Qt-4c97aff92561c7d2ab0bd0da920f1c3b708158a1.tar.bz2 | |
Fix "fixme" in QtFunction::mark()
QtFunction::mark() does not cause infinite recursion any more.
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index ff88921..bb701ce 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -267,9 +267,7 @@ void QtFunction::mark() { Q_ASSERT(!marked()); if (data->object && !data->object.marked()) { - // FIXME: Causes infinite recursion because the object will mark this function, - // which will again mark the object, and so on. Need an "is marking" flag. -// data->object.mark(); + JSC::asObject(data->object)->JSC::JSObject::mark(); } JSC::InternalFunction::mark(); } |