Title: [112459] branches/chromium/1025/Source/WebCore
- Revision
- 112459
- Author
- [email protected]
- Date
- 2012-03-28 15:34:08 -0700 (Wed, 28 Mar 2012)
Log Message
Merge 111775
BUG=117400
Review URL: https://chromiumcodereview.appspot.com/9892004
Modified Paths
Diff
Modified: branches/chromium/1025/Source/WebCore/dom/ContainerNode.cpp (112458 => 112459)
--- branches/chromium/1025/Source/WebCore/dom/ContainerNode.cpp 2012-03-28 22:33:48 UTC (rev 112458)
+++ branches/chromium/1025/Source/WebCore/dom/ContainerNode.cpp 2012-03-28 22:34:08 UTC (rev 112459)
@@ -853,16 +853,20 @@
{
if (!deep)
return;
+ forbidEventDispatch();
for (Node* child = m_firstChild; child; child = child->nextSibling())
child->insertedIntoTree(true);
+ allowEventDispatch();
}
void ContainerNode::removedFromTree(bool deep)
{
if (!deep)
return;
+ forbidEventDispatch();
for (Node* child = m_firstChild; child; child = child->nextSibling())
child->removedFromTree(true);
+ allowEventDispatch();
}
void ContainerNode::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
Modified: branches/chromium/1025/Source/WebCore/html/HTMLMediaElement.cpp (112458 => 112459)
--- branches/chromium/1025/Source/WebCore/html/HTMLMediaElement.cpp 2012-03-28 22:33:48 UTC (rev 112458)
+++ branches/chromium/1025/Source/WebCore/html/HTMLMediaElement.cpp 2012-03-28 22:34:08 UTC (rev 112459)
@@ -714,6 +714,11 @@
void HTMLMediaElement::loadInternal()
{
+ // Some of the code paths below this function dispatch the BeforeLoad event. This ASSERT helps
+ // us catch those bugs more quickly without needing all the branches to align to actually
+ // trigger the event.
+ ASSERT(!eventDispatchForbidden());
+
// If we can't start a load right away, start it later.
Page* page = document()->page();
if (pageConsentRequiredForLoad() && page && !page->canStartMedia()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
