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/JSHTMLFontElement.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/JSHTMLFontElement.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h index 8a46e7d..61a0b78 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h @@ -30,7 +30,7 @@ class HTMLFontElement; class JSHTMLFontElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFontElement(PassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<HTMLFontElement>); + JSHTMLFontElement(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<HTMLFontElement>); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&); @@ -53,7 +53,7 @@ public: static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - JSHTMLFontElementPrototype(PassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } + JSHTMLFontElementPrototype(NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObject(structure) { } }; // Attributes |