<!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>[210297] branches/safari-602-branch/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/210297">210297</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2017-01-04 16:00:42 -0800 (Wed, 04 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for <a href="http://trac.webkit.org/projects/webkit/changeset/210288">r210288</a>. rdar://problem/29756652</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorebindingsjsScriptControllercpp">branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorebindingsjsScriptControllerh">branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoadercpp">branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (210296 => 210297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2017-01-04 23:46:27 UTC (rev 210296)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2017-01-05 00:00:42 UTC (rev 210297)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2017-01-04 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge patch for r210288.
+
+ 2016-12-22 Brent Fulgham <bfulgham@apple.com>
+
+ Correct DOMWindow handling during FrameLoader::clear
+ https://bugs.webkit.org/show_bug.cgi?id=166357
+ <rdar://problem/29741862>
+
+ Reviewed by Andy Estes.
+
+ Make sure that we always clean up the DOM window when clearing Window properties, even if the document will
+ remain in the page cache. Since 'clearWindowShell' is only used in FrameLoader, divide it's beahvior into
+ two steps:
+
+ 1. Rename 'clearWindowShell' to 'clearWIndowShellsNotMatchingDOMWindow' to better describe its function.
+ Switch to a modern C++ loop. Do not switch to the new DOMWindow here, but detach and clear existing
+ DOMWindow connections.
+
+ 2. Add a new method 'setDOMWindowForWindowShell'. Complete switch to the new DOMWindow.
+
+ This change allows us to disconnect the old DOMWindow, perform the 'setDocument(nullptr)' operation, and then
+ connect to the new Window without leaving the loader in an inconsistent state.
+
+ * loader/bindings/js/ScriptController.cpp:
+ (WebCore::clearWindowShellsNotMatchingDOMWindow): Renamed from 'clearWindowShell'
+ (WebCore::setDOMWindowForWindowShell): Added.
+ * loader/bindings/js/ScriptController.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::clear): Revise to use the new two-step DOMWindow switch logic.
+
+2017-01-04 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r210273.
</span><span class="cx">
</span><span class="cx"> 2017-01-04 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.cpp (210296 => 210297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.cpp 2017-01-04 23:46:27 UTC (rev 210296)
+++ branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.cpp 2017-01-05 00:00:42 UTC (rev 210297)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2008, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> static_cast<JSVMClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptController::clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache)
</del><ins>+void ScriptController::clearWindowShellsNotMatchingDOMWindow(DOMWindow* newDOMWindow, bool goingIntoPageCache)
</ins><span class="cx"> {
</span><span class="cx"> if (m_windowShells.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -204,35 +204,47 @@
</span><span class="cx"> JSLockHolder lock(JSDOMWindowBase::commonVM());
</span><span class="cx">
</span><span class="cx"> Vector<JSC::Strong<JSDOMWindowShell>> windowShells = this->windowShells();
</span><del>- for (size_t i = 0; i < windowShells.size(); ++i) {
- JSDOMWindowShell* windowShell = windowShells[i].get();
-
</del><ins>+ for (auto& windowShell : windowShells) {
</ins><span class="cx"> if (&windowShell->window()->wrapped() == newDOMWindow)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Clear the debugger and console from the current window before setting the new window.
</span><del>- attachDebugger(windowShell, nullptr);
</del><ins>+ attachDebugger(windowShell.get(), nullptr);
</ins><span class="cx"> windowShell->window()->setConsoleClient(nullptr);
</span><ins>+ windowShell->window()->willRemoveFromWindowShell();
+ }
</ins><span class="cx">
</span><del>- windowShell->window()->willRemoveFromWindowShell();
</del><ins>+ // It's likely that resetting our windows created a lot of garbage, unless
+ // it went in a back/forward cache.
+ if (!goingIntoPageCache)
+ collectGarbageAfterWindowShellDestruction();
+}
+
+void ScriptController::setDOMWindowForWindowShell(DOMWindow* newDOMWindow)
+{
+ if (m_windowShells.isEmpty())
+ return;
+
+ JSLockHolder lock(commonVM());
+
+ Vector<JSC::Strong<JSDOMWindowShell>> windowShells = this->windowShells();
+ for (auto& windowShell : windowShells) {
+ if (&windowShell->window()->wrapped() == newDOMWindow)
+ continue;
+
</ins><span class="cx"> windowShell->setWindow(newDOMWindow);
</span><del>-
</del><ins>+
</ins><span class="cx"> // An m_cacheableBindingRootObject persists between page navigations
</span><span class="cx"> // so needs to know about the new JSDOMWindow.
</span><span class="cx"> if (m_cacheableBindingRootObject)
</span><span class="cx"> m_cacheableBindingRootObject->updateGlobalObject(windowShell->window());
</span><del>-
</del><ins>+
</ins><span class="cx"> if (Page* page = m_frame.page()) {
</span><del>- attachDebugger(windowShell, page->debugger());
</del><ins>+ attachDebugger(windowShell.get(), page->debugger());
</ins><span class="cx"> windowShell->window()->setProfileGroup(page->group().identifier());
</span><span class="cx"> windowShell->window()->setConsoleClient(&page->console());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- // It's likely that resetting our windows created a lot of garbage, unless
- // it went in a back/forward cache.
- if (!goingIntoPageCache)
- collectGarbageAfterWindowShellDestruction();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSDOMWindowShell* ScriptController::initScript(DOMWrapperWorld& world)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.h (210296 => 210297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.h 2017-01-04 23:46:27 UTC (rev 210296)
+++ branches/safari-602-branch/Source/WebCore/bindings/js/ScriptController.h 2017-01-05 00:00:42 UTC (rev 210297)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>- * Copyright (C) 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -135,7 +135,8 @@
</span><span class="cx">
</span><span class="cx"> const String* sourceURL() const { return m_sourceURL; } // 0 if we are not evaluating any script
</span><span class="cx">
</span><del>- void clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache);
</del><ins>+ void clearWindowShellsNotMatchingDOMWindow(DOMWindow* newDOMWindow, bool goingIntoPageCache);
+ void setDOMWindowForWindowShell(DOMWindow* newDOMWindow);
</ins><span class="cx"> void updateDocument();
</span><span class="cx">
</span><span class="cx"> void namedItemAdded(HTMLDocument*, const AtomicString&) { }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp (210296 => 210297)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2017-01-04 23:46:27 UTC (rev 210296)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2017-01-05 00:00:42 UTC (rev 210297)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> if (clearWindowProperties) {
</span><span class="cx"> InspectorInstrumentation::frameWindowDiscarded(&m_frame, m_frame.document()->domWindow());
</span><span class="cx"> m_frame.document()->domWindow()->resetUnlessSuspendedForDocumentSuspension();
</span><del>- m_frame.script().clearWindowShell(newDocument->domWindow(), m_frame.document()->inPageCache());
</del><ins>+ m_frame.script().clearWindowShellsNotMatchingDOMWindow(newDocument->domWindow(), m_frame.document()->inPageCache());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_frame.selection().prepareForDestruction();
</span><span class="lines">@@ -622,6 +622,9 @@
</span><span class="cx">
</span><span class="cx"> subframeLoader().clear();
</span><span class="cx">
</span><ins>+ if (clearWindowProperties)
+ m_frame.script().setDOMWindowForWindowShell(newDocument->domWindow());
+
</ins><span class="cx"> if (clearScriptObjects)
</span><span class="cx"> m_frame.script().clearScriptObjects();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>