X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebCore%2FChangeLog;h=ee5ad7ec0138b46486e68ffd6ba3aa530cc7c6bd;hp=df96c0236e80633c318e0f2cc13d344e27ec1df2;hb=9a76ee0907c687888b3feb3b7123f5071047ff3b;hpb=c00c67852574638589beb646b39542956b9b858a

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index df96c0236e80..ee5ad7ec0138 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,45 @@
+2012-03-23  Eric Carlson  <eric.carlson@apple.com>
+
+        Deal with DOM modifications when evaluating source elements.
+        https://bugs.webkit.org/show_bug.cgi?id=81163
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: media/video-beforeload-remove-source.html
+
+        * dom/ContainerNode.cpp: Make NodeVector and collectNodes public, renamed as getChildNodes.
+        (WebCore::ContainerNode::takeAllChildrenFrom): collectNodes -> getChildNodes.
+        (WebCore::ContainerNode::willRemove): collectNodes -> getChildNodes.
+        (WebCore::ContainerNode::willRemoveChildren): collectNodes -> getChildNodes.
+        (WebCore::ContainerNode::insertedIntoDocument): collectNodes -> getChildNodes.
+        (WebCore::ContainerNode::removedFromDocument): collectNodes -> getChildNodes.
+        * dom/ContainerNode.h:
+        (WebCore::getChildNodes):
+
+        * editing/ReplaceSelectionCommand.cpp: Remove unused NodeVector declaration.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): m_nextChildNodeToConsider and m_currentSourceNode
+            are now RefPtrs.
+        (WebCore::HTMLMediaElement::loadTimerFired): Protect HTMLMediaElement from being deleted during
+            a DOM modification during an event callback.
+        (WebCore::HTMLMediaElement::load): Ditto.
+        (WebCore::HTMLMediaElement::selectMediaResource): Set m_nextChildNodeToConsider to the first
+            child node, it will be the first node considered.
+        (WebCore::HTMLMediaElement::havePotentialSourceChild): m_nextChildNodeToConsider and m_currentSourceNode
+            are now RefPtrs.
+        (WebCore::HTMLMediaElement::selectNextSourceChild): Collect all child nodes in a vector before
+            looking for <source> nodes because 'beforeload' event handlers can mutate the DOM. Don't
+            use a <source> that is no longer a child node after 'beforeload'. Use 0 to represent the end
+            of the child node list because m_nextChildNodeToConsider is now a RefPtr so using the previous 
+            sentinel, "this", would cause a retain cycle.
+        (WebCore::HTMLMediaElement::sourceWasAdded):  m_nextChildNodeToConsider and m_currentSourceNode
+            are now RefPtrs.
+        (WebCore::HTMLMediaElement::sourceWillBeRemoved): Ditto.
+        (WebCore::HTMLMediaElement::getPluginProxyParams): Protect HTMLMediaElement from being deleted during
+            a DOM modification during an event callback.
+        * html/HTMLMediaElement.h:
+
 2012-03-23  Dean Jackson  <dino@apple.com>
 
         Disable CSS_SHADERS in Apple builds