summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-31 01:52:57 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-31 01:52:57 (GMT)
commitaa9cf406d62004519ad54596e1c391f9a6439210 (patch)
treedd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h
parent987aec28b950e1c9817a20a9dd71afc071cd93ea (diff)
parent56b6a5924008ab5cdbae36e9662eddba923acd5e (diff)
downloadQt-aa9cf406d62004519ad54596e1c391f9a6439210.zip
Qt-aa9cf406d62004519ad54596e1c391f9a6439210.tar.gz
Qt-aa9cf406d62004519ad54596e1c391f9a6439210.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h')
-rw-r--r--src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h
index 166ee60..3dff1bc 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h
+++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h
@@ -23,6 +23,7 @@
#if ENABLE(JAVASCRIPT_DEBUGGER)
+#include "DOMObjectWithSVGContext.h"
#include "JSDOMBinding.h"
#include <runtime/JSGlobalObject.h>
#include <runtime/ObjectPrototype.h>
@@ -31,10 +32,10 @@ namespace WebCore {
class JavaScriptCallFrame;
-class JSJavaScriptCallFrame : public DOMObject {
- typedef DOMObject Base;
+class JSJavaScriptCallFrame : public DOMObjectWithGlobalPointer {
+ typedef DOMObjectWithGlobalPointer Base;
public:
- JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, PassRefPtr<JavaScriptCallFrame>);
+ JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<JavaScriptCallFrame>);
virtual ~JSJavaScriptCallFrame();
static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
@@ -60,7 +61,7 @@ private:
RefPtr<JavaScriptCallFrame> m_impl;
};
-JSC::JSValue toJS(JSC::ExecState*, JavaScriptCallFrame*);
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JavaScriptCallFrame*);
JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValue);
class JSJavaScriptCallFramePrototype : public JSC::JSObject {