diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/html/HTMLScriptElement.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/html/HTMLScriptElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLScriptElement.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebCore/html/HTMLScriptElement.cpp b/Source/WebCore/html/HTMLScriptElement.cpp index 57f8511b2..30ae332c3 100644 --- a/Source/WebCore/html/HTMLScriptElement.cpp +++ b/Source/WebCore/html/HTMLScriptElement.cpp @@ -64,8 +64,6 @@ void HTMLScriptElement::parseAttribute(const QualifiedName& name, const AtomicSt handleSourceAttribute(value); else if (name == asyncAttr) handleAsyncAttribute(); - else if (name == onloadAttr) - setAttributeEventListener(eventNames().loadEvent, createAttributeEventListener(this, name, value)); else if (name == onbeforeloadAttr) setAttributeEventListener(eventNames().beforeloadEvent, createAttributeEventListener(this, name, value)); else @@ -83,18 +81,17 @@ void HTMLScriptElement::setText(const String &value) { RefPtr<Node> protectFromMutationEvents(this); - ExceptionCode ec = 0; int numChildren = childNodeCount(); if (numChildren == 1 && firstChild()->isTextNode()) { - toText(firstChild())->setData(value, ec); + toText(firstChild())->setData(value, IGNORE_EXCEPTION); return; } if (numChildren > 0) removeChildren(); - appendChild(document()->createTextNode(value.impl()), ec); + appendChild(document()->createTextNode(value.impl()), IGNORE_EXCEPTION); } void HTMLScriptElement::setAsync(bool async) |