<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184092] releases/WebKitGTK/webkit-2.8/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184092">184092</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 06:32:39 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183064">r183064</a> - Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion
https://bugs.webkit.org/show_bug.cgi?id=143971
Reviewed by Darin Adler.
Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion as
firing JS events can cause arbitrary JS execution which often leads to
security bugs when event firing is forbidden. For e.g. firing events
from ActiveDOMObject::suspend() means JS can construct or destroy
ActiveDOMObjects while we are iterating over them.
* dom/ContainerNode.cpp:
(WebCore::dispatchChildInsertionEvents):
(WebCore::dispatchChildRemovalEvents):
* dom/ContainerNodeAlgorithms.h:
(WebCore::ChildNodeInsertionNotifier::notify):
* dom/Document.cpp:
(WebCore::Document::dispatchWindowEvent):
(WebCore::Document::dispatchWindowLoadEvent):
* dom/Element.cpp:
(WebCore::Element::dispatchFocusInEvent):
(WebCore::Element::dispatchFocusOutEvent):
* dom/EventDispatcher.cpp:
(WebCore::EventDispatcher::dispatchEvent):
* dom/EventTarget.cpp:
(WebCore::EventTarget::fireEventListeners):
* dom/Node.cpp:
(WebCore::Node::dispatchSubtreeModifiedEvent):
(WebCore::Node::dispatchDOMActivateEvent):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache):
(WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
(WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
(WebCore::ScriptExecutionContext::stopActiveDOMObjects):
(WebCore::ScriptExecutionContext::willDestroyActiveDOMObject):
* dom/WebKitNamedFlow.cpp:
(WebCore::WebKitNamedFlow::dispatchRegionOversetChangeEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomContainerNodecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomContainerNodeAlgorithmsh">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNodeAlgorithms.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomDocumentcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomEventDispatchercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventDispatcher.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomEventTargetcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventTarget.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomNodecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomScriptExecutionContextcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomWebKitNamedFlowcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/WebKitNamedFlow.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-04-21 Chris Dumez <cdumez@apple.com>
+
+ Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion
+ https://bugs.webkit.org/show_bug.cgi?id=143971
+
+ Reviewed by Darin Adler.
+
+ Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion as
+ firing JS events can cause arbitrary JS execution which often leads to
+ security bugs when event firing is forbidden. For e.g. firing events
+ from ActiveDOMObject::suspend() means JS can construct or destroy
+ ActiveDOMObjects while we are iterating over them.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::dispatchChildInsertionEvents):
+ (WebCore::dispatchChildRemovalEvents):
+ * dom/ContainerNodeAlgorithms.h:
+ (WebCore::ChildNodeInsertionNotifier::notify):
+ * dom/Document.cpp:
+ (WebCore::Document::dispatchWindowEvent):
+ (WebCore::Document::dispatchWindowLoadEvent):
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchFocusInEvent):
+ (WebCore::Element::dispatchFocusOutEvent):
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventDispatcher::dispatchEvent):
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::fireEventListeners):
+ * dom/Node.cpp:
+ (WebCore::Node::dispatchSubtreeModifiedEvent):
+ (WebCore::Node::dispatchDOMActivateEvent):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::canSuspendActiveDOMObjectsForPageCache):
+ (WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::stopActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::willDestroyActiveDOMObject):
+ * dom/WebKitNamedFlow.cpp:
+ (WebCore::WebKitNamedFlow::dispatchRegionOversetChangeEvent):
+
</ins><span class="cx"> 2015-04-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNode.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNode.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNode.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -799,7 +799,7 @@
</span><span class="cx"> if (child.isInShadowTree())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx">
</span><span class="cx"> RefPtr<Node> c = &child;
</span><span class="cx"> Ref<Document> document(child.document());
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx">
</span><span class="cx"> willCreatePossiblyOrphanedTreeByRemoval(&child);
</span><span class="cx"> InspectorInstrumentation::willRemoveDOMNode(child.document(), child);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomContainerNodeAlgorithmsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNodeAlgorithms.h (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNodeAlgorithms.h 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ContainerNodeAlgorithms.h 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> inline void ChildNodeInsertionNotifier::notify(Node& node)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didInsertDOMNode(node.document(), node);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Document.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Document.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Document.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -3810,7 +3810,7 @@
</span><span class="cx">
</span><span class="cx"> void Document::dispatchWindowEvent(PassRefPtr<Event> event, PassRefPtr<EventTarget> target)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> if (!m_domWindow)
</span><span class="cx"> return;
</span><span class="cx"> m_domWindow->dispatchEvent(event, target);
</span><span class="lines">@@ -3818,7 +3818,7 @@
</span><span class="cx">
</span><span class="cx"> void Document::dispatchWindowLoadEvent()
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> if (!m_domWindow)
</span><span class="cx"> return;
</span><span class="cx"> m_domWindow->dispatchLoadEvent();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Element.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -2071,14 +2071,14 @@
</span><span class="cx">
</span><span class="cx"> void Element::dispatchFocusInEvent(const AtomicString& eventType, RefPtr<Element>&& oldFocusedElement)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> ASSERT(eventType == eventNames().focusinEvent || eventType == eventNames().DOMFocusInEvent);
</span><span class="cx"> dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, WTF::move(oldFocusedElement)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::dispatchFocusOutEvent(const AtomicString& eventType, RefPtr<Element>&& newFocusedElement)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> ASSERT(eventType == eventNames().focusoutEvent || eventType == eventNames().DOMFocusOutEvent);
</span><span class="cx"> dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, WTF::move(newFocusedElement)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventDispatcher.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventDispatcher.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventDispatcher.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">
</span><span class="cx"> bool EventDispatcher::dispatchEvent(Node* origin, PassRefPtr<Event> prpEvent)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> if (!prpEvent)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> ChildNodesLazySnapshot::takeChildNodesLazySnapshot();
</span><span class="cx">
</span><span class="cx"> event->setTarget(&eventTargetRespectingTargetRules(*node));
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> ASSERT(event->target());
</span><span class="cx"> WindowEventContext windowEventContext(node.get(), eventPath.lastContextIfExists());
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomEventTargetcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventTarget.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventTarget.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/EventTarget.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> bool EventTarget::fireEventListeners(Event* event)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> ASSERT(event && !event->type().isEmpty());
</span><span class="cx">
</span><span class="cx"> EventTargetData* d = eventTargetData();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Node.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Node.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/Node.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -2022,7 +2022,7 @@
</span><span class="cx"> if (isInShadowTree())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx">
</span><span class="cx"> if (!document().hasListenerType(Document::DOMSUBTREEMODIFIED_LISTENER))
</span><span class="cx"> return;
</span><span class="lines">@@ -2035,7 +2035,7 @@
</span><span class="cx">
</span><span class="cx"> bool Node::dispatchDOMActivateEvent(int detail, PassRefPtr<Event> underlyingEvent)
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx"> RefPtr<UIEvent> event = UIEvent::create(eventNames().DOMActivateEvent, true, true, document().defaultView(), detail);
</span><span class="cx"> event->setUnderlyingEvent(underlyingEvent);
</span><span class="cx"> dispatchScopedEvent(event);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ScriptExecutionContext.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -187,8 +187,9 @@
</span><span class="cx">
</span><span class="cx"> // We assume that m_activeDOMObjects will not change during iteration: canSuspend
</span><span class="cx"> // functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><del>- // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</del><ins>+ // An ASSERT_WITH_SECURITY_IMPLICATION or RELEASE_ASSERT will fire if this happens, but it's important to code
</ins><span class="cx"> // canSuspend functions so it will not happen!
</span><ins>+ NoEventDispatchAssertion assertNoEventDispatch;
</ins><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects) {
</span><span class="cx"> if (!activeDOMObject->canSuspend()) {
</span><span class="cx"> canSuspend = false;
</span><span class="lines">@@ -225,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> // We assume that m_activeDOMObjects will not change during iteration: suspend
</span><span class="cx"> // functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><del>- // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</del><ins>+ // An ASSERT_WITH_SECURITY_IMPLICATION or RELEASE_ASSERT will fire if this happens, but it's important to code
</ins><span class="cx"> // suspend functions so it will not happen!
</span><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects)
</span><span class="cx"> activeDOMObject->suspend(why);
</span><span class="lines">@@ -254,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> // We assume that m_activeDOMObjects will not change during iteration: resume
</span><span class="cx"> // functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><del>- // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</del><ins>+ // An ASSERT_WITH_SECURITY_IMPLICATION or RELEASE_ASSERT will fire if this happens, but it's important to code
</ins><span class="cx"> // resume functions so it will not happen!
</span><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects)
</span><span class="cx"> activeDOMObject->resume();
</span><span class="lines">@@ -281,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> // We assume that new objects will not be added to m_activeDOMObjects during iteration:
</span><span class="cx"> // stop functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><del>- // A RELEASE_ASSERT will fire if this happens, but it's important to code stop functions
</del><ins>+ // An ASSERT_WITH_SECURITY_IMPLICATION or RELEASE_ASSERT will fire if this happens, but it's important to code stop functions
</ins><span class="cx"> // so it will not happen!
</span><span class="cx"> for (auto* activeDOMObject : possibleActiveDOMObjects) {
</span><span class="cx"> // Check if this object was deleted already. If so, just skip it.
</span><span class="lines">@@ -323,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::willDestroyActiveDOMObject(ActiveDOMObject& activeDOMObject)
</span><span class="cx"> {
</span><del>- ASSERT(!m_activeDOMObjectRemovalForbidden);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!m_activeDOMObjectRemovalForbidden);
</ins><span class="cx"> m_activeDOMObjects.remove(&activeDOMObject);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomWebKitNamedFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/WebKitNamedFlow.cpp (184091 => 184092)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/WebKitNamedFlow.cpp 2015-05-11 13:31:21 UTC (rev 184091)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/WebKitNamedFlow.cpp 2015-05-11 13:32:39 UTC (rev 184092)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> void WebKitNamedFlow::dispatchRegionOversetChangeEvent()
</span><span class="cx"> {
</span><del>- ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</ins><span class="cx">
</span><span class="cx"> // If the flow is in the "NULL" state the event should not be dispatched any more.
</span><span class="cx"> if (flowState() == FlowStateNull)
</span></span></pre>
</div>
</div>
</body>
</html>