Merge 92347

Source/WebCore/html/HTMLSourceElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 39 matching lines @@
 }
 
 PassRefPtr<HTMLSourceElement> HTMLSourceElement::create(const QualifiedName& tagName, Document* document)
 {
     return adoptRef(new HTMLSourceElement(tagName, document));
 }
 
 void HTMLSourceElement::insertedIntoTree(bool deep)
 {
     HTMLElement::insertedIntoTree(deep);
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag)))
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement())
         static_cast<HTMLMediaElement*>(parentNode())->sourceWasAdded(this);
 }
 
 void HTMLSourceElement::willRemove()
 {
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag)))
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement())
         static_cast<HTMLMediaElement*>(parentNode())->sourceWillBeRemoved(this);
     HTMLElement::willRemove();
 }
     
 void HTMLSourceElement::setSrc(const String& url)
 {
     setAttribute(srcAttr, url);
 }
 
 String HTMLSourceElement::media() const
@@ skipping 38 matching lines @@
 }
 
 bool HTMLSourceElement::isURLAttribute(Attribute* attribute) const
 {
     return attribute->name() == srcAttr;
 }
 
 }
 
 #endif