Merge 92347

Source/WebCore/html/HTMLTrackElement.cpp

 /*
  * Copyright (C) 2011 Google 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<HTMLTrackElement> HTMLTrackElement::create(const QualifiedName& tagName, Document* document)
 {
     return adoptRef(new HTMLTrackElement(tagName, document));
 }
 
 void HTMLTrackElement::insertedIntoTree(bool deep)
 {
     HTMLElement::insertedIntoTree(deep);
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag))) {
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement()) {
         // TODO(annacc):
         // static_cast<HTMLMediaElement*>(parentNode())->trackWasAdded(this);
     }
 }
 
 void HTMLTrackElement::willRemove()
 {
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag))) {
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement()) {
         // TODO(annacc):
         // static_cast<HTMLMediaElement*>(parentNode())->trackWillBeRemoved(this);
     }
     HTMLElement::willRemove();
 }
 
 KURL HTMLTrackElement::src() const
 {
     return document()->completeURL(getAttribute(srcAttr));
 }
@@ skipping 52 matching lines @@
 {
     m_track = LoadableTextTrack::create(kind(), label(), srclang(), isDefault());
 
     if (hasAttribute(srcAttr))
         m_track->load(getNonEmptyURLAttribute(srcAttr), context);
 }
 
 }
 
 #endif