diff options
author | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
---|---|---|
committer | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
commit | ad3e723c334d72b746979b284910ac9b698b2d0b (patch) | |
tree | 28fa320fcbd38938345f30817d75f19716c4e534 /src/3rdparty/webkit/JavaScriptCore/API/APICast.h | |
parent | c4d8d7fd35c8ac7fd2c14208e5e7ca0a35c101e1 (diff) | |
parent | 4cd683231190443e5243f66098c7322e3808a131 (diff) | |
download | Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.zip Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.gz Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.bz2 |
Merge commit 'origin/4.6' into large-file-support
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/APICast.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/APICast.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/APICast.h b/src/3rdparty/webkit/JavaScriptCore/API/APICast.h index b6d1532..b9167a8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/APICast.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/APICast.h @@ -27,6 +27,7 @@ #define APICast_h #include "JSAPIValueWrapper.h" +#include "JSGlobalObject.h" #include "JSValue.h" #include <wtf/Platform.h> #include <wtf/UnusedParam.h> @@ -118,6 +119,7 @@ inline JSContextRef toRef(JSC::ExecState* e) inline JSGlobalContextRef toGlobalRef(JSC::ExecState* e) { + ASSERT(e == e->lexicalGlobalObject()->globalExec()); return reinterpret_cast<JSGlobalContextRef>(e); } |