diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
| commit | c006edf9b186c4a8a56e888e8f5d1b692e29f1d8 (patch) | |
| tree | e105f4e2389cd17a5392478160d37230f4118960 /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | |
| parent | fd5e86e65adfdecd7bf8a49764d9c9410d877e44 (diff) | |
| parent | 2d003378ff5e7621d5dcc810408039cfe13a8c0a (diff) | |
| download | Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.zip Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.gz Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h index bd63cf5..c958ee0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -35,7 +35,7 @@ class JavaScriptCallFrame; class JSJavaScriptCallFrame : public DOMObjectWithGlobalPointer { typedef DOMObjectWithGlobalPointer Base; public: - JSJavaScriptCallFrame(PassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<JavaScriptCallFrame>); + JSJavaScriptCallFrame(NonNullPassRefPtr<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&); @@ -77,7 +77,7 @@ public: { return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::HasDefaultMark)); } - JSJavaScriptCallFramePrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } + JSJavaScriptCallFramePrototype(NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } }; // Functions |