Remove MediaQueryList listener from removed HTMLSourceElement.

third_party/WebKit/Source/core/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 66 matching lines @@
 
 HTMLSourceElement::~HTMLSourceElement()
 {
 }
 
 void HTMLSourceElement::createMediaQueryList(const AtomicString& media)
 {
     if (media.isEmpty())
         return;
 
-    if (m_mediaQueryList)
-        m_mediaQueryList->removeListener(m_listener);
+    removeMediaQueryListListener();
     MediaQuerySet* set = MediaQuerySet::create(media);
     m_mediaQueryList = MediaQueryList::create(&document(), &document().mediaQueryMatcher(), set);
-    m_mediaQueryList->addListener(m_listener);
+    addMediaQueryListListener();
 }
 
 void HTMLSourceElement::didMoveToNewDocument(Document& oldDocument)
 {
     createMediaQueryList(fastGetAttribute(mediaAttr));
     HTMLElement::didMoveToNewDocument(oldDocument);
 }
 
 Node::InsertionNotificationRequest HTMLSourceElement::insertedInto(ContainerNode* insertionPoint)
 {
     HTMLElement::insertedInto(insertionPoint);
     Element* parent = parentElement();
     if (isHTMLMediaElement(parent))
         toHTMLMediaElement(parent)->sourceWasAdded(this);
     if (isHTMLPictureElement(parent))
         toHTMLPictureElement(parent)->sourceOrMediaChanged();
     return InsertionDone;
 }
 
 void HTMLSourceElement::removedFrom(ContainerNode* removalRoot)
 {
     Element* parent = parentElement();
     if (!parent && removalRoot->isElementNode())
         parent = toElement(removalRoot);
     if (isHTMLMediaElement(parent))
         toHTMLMediaElement(parent)->sourceWasRemoved(this);
-    if (isHTMLPictureElement(parent))
+    if (isHTMLPictureElement(parent)) {
+        removeMediaQueryListListener();
         toHTMLPictureElement(parent)->sourceOrMediaChanged();
+    }
     HTMLElement::removedFrom(removalRoot);
 }
 
+void HTMLSourceElement::removeMediaQueryListListener()
+{
+    if (m_mediaQueryList)
+        m_mediaQueryList->removeListener(m_listener);
+}
+
+void HTMLSourceElement::addMediaQueryListListener()
+{
+    if (m_mediaQueryList)
+        m_mediaQueryList->addListener(m_listener);
+}
+
 void HTMLSourceElement::setSrc(const String& url)
 {
     setAttribute(srcAttr, AtomicString(url));
 }
 
 const AtomicString& HTMLSourceElement::type() const
 {
     return getAttribute(typeAttr);
 }
 
@@ skipping 54 matching lines @@
 }
 
 DEFINE_TRACE(HTMLSourceElement)
 {
     visitor->trace(m_mediaQueryList);
     visitor->trace(m_listener);
     HTMLElement::trace(visitor);
 }
 
 } // namespace blink