diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-29 07:26:08 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-29 07:26:08 (GMT) |
| commit | a7cc30b30df53d6a70208c25f6c12a9f229b3ea6 (patch) | |
| tree | 7764192081a6f36113bc7c2f32419fa36ed7013b /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | |
| parent | fb7d86cf23227302d48db279ec589221d11a1f6a (diff) | |
| parent | 3b00ee50810206a20a5bb1b06e1dfaf593aae7ed (diff) | |
| download | Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.zip Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.tar.gz Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.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.h | 9 |
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 { |