summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/APICast.h
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-10-26 10:41:56 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-10-26 10:41:56 (GMT)
commit968f7c0e65a293a7d7b9a87601e853894d9794ed (patch)
tree3a86b71dd69cf4b759bb20b62c18cfeb02a28ef0 /src/3rdparty/webkit/JavaScriptCore/API/APICast.h
parent3481db791c3b48e28f1a9531b247adf6562edb71 (diff)
parente2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff)
downloadQt-968f7c0e65a293a7d7b9a87601e853894d9794ed.zip
Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.gz
Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.bz2
Merge branch '4.6' into 4.6-platform
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/APICast.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/APICast.h2
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);
}