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/JSHTMLInputElement.cpp | |
| 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/JSHTMLInputElement.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp index d15af5c..ea6e7cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp @@ -167,7 +167,7 @@ bool JSHTMLInputElementPrototype::getOwnPropertyDescriptor(ExecState* exec, cons const ClassInfo JSHTMLInputElement::s_info = { "HTMLInputElement", &JSHTMLElement::s_info, &JSHTMLInputElementTable, 0 }; -JSHTMLInputElement::JSHTMLInputElement(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<HTMLInputElement> impl) +JSHTMLInputElement::JSHTMLInputElement(NonNullPassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<HTMLInputElement> impl) : JSHTMLElement(structure, globalObject, impl) { } @@ -486,7 +486,9 @@ void setJSHTMLInputElementAutofocus(ExecState* exec, JSObject* thisObject, JSVal void setJSHTMLInputElementMaxLength(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast<HTMLInputElement*>(static_cast<JSHTMLInputElement*>(thisObject)->impl()); - imp->setMaxLength(value.toInt32(exec)); + ExceptionCode ec = 0; + imp->setMaxLength(value.toInt32(exec), ec); + setDOMException(exec, ec); } void setJSHTMLInputElementMultiple(ExecState* exec, JSObject* thisObject, JSValue value) |