<!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>[171505] trunk/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/171505">171505</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-23 19:39:53 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ScriptController::updateDocument ASSERT mutating map while iterating map
https://bugs.webkit.org/show_bug.cgi?id=135211
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-07-23
Reviewed by Oliver Hunt.
Avoid iterating over m_windowShells in more places. This prevents
the possibility of a collection during JSC allocation which might
cause a mutation to m_windowShells (HTMLMediaElement destruction).
Have ScriptController defriend ScriptCachedFrameData by providing
a getter for the list of window shells.
* bindings/js/ScriptCachedFrameData.cpp:
(WebCore::ScriptCachedFrameData::ScriptCachedFrameData):
(WebCore::ScriptCachedFrameData::restore):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::windowShells):
(WebCore::ScriptController::clearWindowShell):
(WebCore::ScriptController::attachDebugger):
(WebCore::ScriptController::updateDocument):
* bindings/js/ScriptController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptCachedFrameDatacpp">trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerh">trunk/Source/WebCore/bindings/js/ScriptController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171504 => 171505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-24 01:13:14 UTC (rev 171504)
+++ trunk/Source/WebCore/ChangeLog 2014-07-24 02:39:53 UTC (rev 171505)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-07-23 Joseph Pecoraro <pecoraro@apple.com>
+
+ ScriptController::updateDocument ASSERT mutating map while iterating map
+ https://bugs.webkit.org/show_bug.cgi?id=135211
+
+ Reviewed by Oliver Hunt.
+
+ Avoid iterating over m_windowShells in more places. This prevents
+ the possibility of a collection during JSC allocation which might
+ cause a mutation to m_windowShells (HTMLMediaElement destruction).
+
+ Have ScriptController defriend ScriptCachedFrameData by providing
+ a getter for the list of window shells.
+
+ * bindings/js/ScriptCachedFrameData.cpp:
+ (WebCore::ScriptCachedFrameData::ScriptCachedFrameData):
+ (WebCore::ScriptCachedFrameData::restore):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::windowShells):
+ (WebCore::ScriptController::clearWindowShell):
+ (WebCore::ScriptController::attachDebugger):
+ (WebCore::ScriptController::updateDocument):
+ * bindings/js/ScriptController.h:
+
</ins><span class="cx"> 2014-07-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r171498.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptCachedFrameDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp (171504 => 171505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp 2014-07-24 01:13:14 UTC (rev 171504)
+++ trunk/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp 2014-07-24 02:39:53 UTC (rev 171505)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> JSLockHolder lock(JSDOMWindowBase::commonVM());
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = frame.script();
</span><del>- ScriptController::ShellMap& windowShells = scriptController.m_windowShells;
</del><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = scriptController.windowShells();
</ins><span class="cx">
</span><del>- ScriptController::ShellMap::iterator windowShellsEnd = windowShells.end();
- for (ScriptController::ShellMap::iterator iter = windowShells.begin(); iter != windowShellsEnd; ++iter) {
- JSDOMWindow* window = iter->value->window();
- m_windows.add(iter->key.get(), Strong<JSDOMWindow>(window->vm(), window));
</del><ins>+ for (size_t i = 0; i < windowShells.size(); ++i) {
+ JSDOMWindowShell* windowShell = windowShells[i].get();
+ JSDOMWindow* window = windowShell->window();
+ m_windows.add(&windowShell->world(), Strong<JSDOMWindow>(window->vm(), window));
</ins><span class="cx"> window->setConsoleClient(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx">
</span><span class="cx"> Page* page = frame.page();
</span><span class="cx"> ScriptController& scriptController = frame.script();
</span><del>- ScriptController::ShellMap& windowShells = scriptController.m_windowShells;
</del><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = scriptController.windowShells();
</ins><span class="cx">
</span><del>- for (auto it = windowShells.begin(), end = windowShells.end(); it != end; ++it) {
- DOMWrapperWorld* world = it->key.get();
- JSDOMWindowShell* windowShell = it->value.get();
</del><ins>+ for (size_t i = 0; i < windowShells.size(); ++i) {
+ JSDOMWindowShell* windowShell = windowShells[i].get();
+ DOMWrapperWorld* world = &windowShell->world();
</ins><span class="cx">
</span><span class="cx"> if (JSDOMWindow* window = m_windows.get(world).get())
</span><span class="cx"> windowShell->setWindow(window->vm(), window);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (171504 => 171505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-07-24 01:13:14 UTC (rev 171504)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-07-24 02:39:53 UTC (rev 171505)
</span><span class="lines">@@ -170,6 +170,13 @@
</span><span class="cx"> return DOMWrapperWorld::create(JSDOMWindow::commonVM());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<JSC::Strong<JSDOMWindowShell>> ScriptController::windowShells()
+{
+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells;
+ copyValuesToVector(m_windowShells, windowShells);
+ return windowShells;
+}
+
</ins><span class="cx"> void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds)
</span><span class="cx"> {
</span><span class="cx"> static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
</span><span class="lines">@@ -182,9 +189,7 @@
</span><span class="cx">
</span><span class="cx"> JSLockHolder lock(JSDOMWindowBase::commonVM());
</span><span class="cx">
</span><del>- Vector<JSC::Strong<JSDOMWindowShell>> windowShells;
- copyValuesToVector(m_windowShells, windowShells);
-
</del><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = this->windowShells();
</ins><span class="cx"> for (size_t i = 0; i < windowShells.size(); ++i) {
</span><span class="cx"> JSDOMWindowShell* windowShell = windowShells[i].get();
</span><span class="cx">
</span><span class="lines">@@ -288,8 +293,9 @@
</span><span class="cx">
</span><span class="cx"> void ScriptController::attachDebugger(JSC::Debugger* debugger)
</span><span class="cx"> {
</span><del>- for (ShellMap::iterator iter = m_windowShells.begin(); iter != m_windowShells.end(); ++iter)
- attachDebugger(iter->value.get(), debugger);
</del><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = this->windowShells();
+ for (size_t i = 0; i < windowShells.size(); ++i)
+ attachDebugger(windowShells[i].get(), debugger);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptController::attachDebugger(JSDOMWindowShell* shell, JSC::Debugger* debugger)
</span><span class="lines">@@ -306,9 +312,11 @@
</span><span class="cx">
</span><span class="cx"> void ScriptController::updateDocument()
</span><span class="cx"> {
</span><del>- for (ShellMap::iterator iter = m_windowShells.begin(); iter != m_windowShells.end(); ++iter) {
- JSLockHolder lock(iter->key->vm());
- iter->value->window()->updateDocument();
</del><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = this->windowShells();
+ for (size_t i = 0; i < windowShells.size(); ++i) {
+ JSDOMWindowShell* windowShell = windowShells[i].get();
+ JSLockHolder lock(windowShell->world().vm());
+ windowShell->window()->updateDocument();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (171504 => 171505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.h 2014-07-24 01:13:14 UTC (rev 171504)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h 2014-07-24 02:39:53 UTC (rev 171505)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> class ScriptController {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><del>- friend class ScriptCachedFrameData;
</del><span class="cx"> typedef HashMap<RefPtr<DOMWrapperWorld>, JSC::Strong<JSDOMWindowShell>> ShellMap;
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="lines">@@ -83,6 +82,8 @@
</span><span class="cx"> JSDOMWindowShell* createWindowShell(DOMWrapperWorld&);
</span><span class="cx"> void destroyWindowShell(DOMWrapperWorld&);
</span><span class="cx">
</span><ins>+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells();
+
</ins><span class="cx"> JSDOMWindowShell* windowShell(DOMWrapperWorld& world)
</span><span class="cx"> {
</span><span class="cx"> ShellMap::iterator iter = m_windowShells.find(&world);
</span></span></pre>
</div>
</div>
</body>
</html>