diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/html/HTMLSourceElement.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/html/HTMLSourceElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLSourceElement.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/WebCore/html/HTMLSourceElement.cpp b/Source/WebCore/html/HTMLSourceElement.cpp index c2f93621f..2b331c8bb 100644 --- a/Source/WebCore/html/HTMLSourceElement.cpp +++ b/Source/WebCore/html/HTMLSourceElement.cpp @@ -63,14 +63,16 @@ Node::InsertionNotificationRequest HTMLSourceElement::insertedInto(Node* inserti return InsertionDone; } -void HTMLSourceElement::willRemove() +void HTMLSourceElement::removedFrom(Node* removalRoot) { Element* parent = parentElement(); + if (!parent && removalRoot->isElementNode()) + parent = toElement(removalRoot); if (parent && parent->isMediaElement()) - static_cast<HTMLMediaElement*>(parentNode())->sourceWillBeRemoved(this); - HTMLElement::willRemove(); + toMediaElement(parent)->sourceWasRemoved(this); + HTMLElement::removedFrom(removalRoot); } - + void HTMLSourceElement::setSrc(const String& url) { setAttribute(srcAttr, url); @@ -117,9 +119,9 @@ void HTMLSourceElement::errorEventTimerFired(Timer<HTMLSourceElement>*) dispatchEvent(Event::create(eventNames().errorEvent, false, true)); } -bool HTMLSourceElement::isURLAttribute(Attribute* attribute) const +bool HTMLSourceElement::isURLAttribute(const Attribute& attribute) const { - return attribute->name() == srcAttr || HTMLElement::isURLAttribute(attribute); + return attribute.name() == srcAttr || HTMLElement::isURLAttribute(attribute); } #if ENABLE(MICRODATA) |