<!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>[171863] tags/Safari-600.1.3.3</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/171863">171863</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-07-31 10:18:02 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/171661">r171661</a>. <rdar://problem/17315237></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari600133LayoutTestsChangeLog">tags/Safari-600.1.3.3/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari600133SourceWebCoreChangeLog">tags/Safari-600.1.3.3/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari600133SourceWebCorepageDOMWindowcpp">tags/Safari-600.1.3.3/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#tagsSafari600133SourceWebCorepagePagecpp">tags/Safari-600.1.3.3/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#tagsSafari600133SourceWebCorepagePageh">tags/Safari-600.1.3.3/Source/WebCore/page/Page.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstorageafterwindowcloseexpectedtxt">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close-expected.txt</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstorageafterwindowclosehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close.html</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstoragethensetvalueinstorageafterwindowcloseexpectedtxt">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close-expected.txt</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstoragethensetvalueinstorageafterwindowclosehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesaccessstorageclosewindowandsetvalueinstoragehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/access-storage-close-window-and-set-value-in-storage.html</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesclosewindowandaccessstoragehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-access-storage.html</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesclosewindowandsetvalueinstoragehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-set-value-in-storage.html</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstoragesetvalueinstorageafterwindowcloseexpectedtxt">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close-expected.txt</a></li>
<li><a href="#tagsSafari600133LayoutTestsstoragedomstoragelocalstoragesetvalueinstorageafterwindowclosehtml">tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari600133LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.3/LayoutTests/ChangeLog (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/ChangeLog 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/ChangeLog 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-07-31 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r171661.
+
</ins><span class="cx"> 2014-07-29 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171661.
</span></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstorageafterwindowcloseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close-expected.txt (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close-expected.txt 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close-expected.txt 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-Test that WebKit does not crash when accessing localStorage after calling window.close().
-
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstorageafterwindowclosehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-after-window-close.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setCanOpenWindows();
- testRunner.waitUntilDone();
-}
-</script>
-</head>
-<body onload="window.open('resources/close-window-and-access-storage.html');">
-Test that WebKit does not crash when accessing localStorage after calling window.close().<br>
-</body>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstoragethensetvalueinstorageafterwindowcloseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close-expected.txt (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close-expected.txt 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close-expected.txt 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-Tests that we can't store a value in local storage after calling window.close() even if we created the local storage before the call to window.close().
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS window.localStorage is defined.
-PASS window.localStorage["test"] is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageaccessstoragethensetvalueinstorageafterwindowclosehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-window.jsTestIsAsync = true;
-
-if (window.testRunner) {
- testRunner.setCanOpenWindows();
-
- // We explicitly call testRunner.waitUntilDone() because we call window.open() before
- // js-test-post.js is processed.
- testRunner.waitUntilDone();
-}
-
-function checkResultAndNotifyDone()
-{
- shouldBeDefined('window.localStorage');
- shouldBeUndefined('window.localStorage["test"]');
- window.localStorage.clear();
- finishJSTest();
-}
-</script>
-</head>
-<body>
-<script>
-description("Tests that we can't store a value in local storage after calling window.close() even if we created the local storage before the call to window.close().");
-window.open("resources/access-storage-close-window-and-set-value-in-storage.html");
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesaccessstorageclosewindowandsetvalueinstoragehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/access-storage-close-window-and-set-value-in-storage.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/access-storage-close-window-and-set-value-in-storage.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/access-storage-close-window-and-set-value-in-storage.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-window.localStorage; // Creates local storage
-window.close();
-if (window.localStorage)
- localStorage["test"] = "DidSetValueAfterCallingWindowClose";
-window.opener.checkResultAndNotifyDone();
-</script>
-</head>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesclosewindowandaccessstoragehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-access-storage.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-access-storage.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-access-storage.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-<html>
-<head>
-<script>
-window.close();
-window.localStorage;
-if (window.testRunner)
- testRunner.notifyDone();
-</script>
-</head>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstorageresourcesclosewindowandsetvalueinstoragehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-set-value-in-storage.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-set-value-in-storage.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/resources/close-window-and-set-value-in-storage.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-window.close();
-if (window.localStorage)
- localStorage["test"] = "DidSetValueAfterCallingWindowClose";
-window.opener.checkResultAndNotifyDone();
-</script>
-</head>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstoragesetvalueinstorageafterwindowcloseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close-expected.txt (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close-expected.txt 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close-expected.txt 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-Tests that we can't store a value in local storage after calling window.close().
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS window.localStorage is defined.
-PASS window.localStorage["test"] is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="tagsSafari600133LayoutTestsstoragedomstoragelocalstoragesetvalueinstorageafterwindowclosehtml"></a>
<div class="delfile"><h4>Deleted: tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close.html (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close.html 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/LayoutTests/storage/domstorage/localstorage/set-value-in-storage-after-window-close.html 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-window.jsTestIsAsync = true;
-
-if (window.testRunner) {
- testRunner.setCanOpenWindows();
-
- // We explicitly call testRunner.waitUntilDone() because we call window.open() before
- // js-test-post.js is processed.
- testRunner.waitUntilDone();
-}
-
-function checkResultAndNotifyDone()
-{
- shouldBeDefined('window.localStorage');
- shouldBeUndefined('window.localStorage["test"]');
- window.localStorage.clear();
- finishJSTest();
-}
-</script>
-</head>
-<body>
-<script>
-description("Tests that we can't store a value in local storage after calling window.close().");
-window.open("resources/close-window-and-set-value-in-storage.html");
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="tagsSafari600133SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.3/Source/WebCore/ChangeLog (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/Source/WebCore/ChangeLog 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/Source/WebCore/ChangeLog 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-07-31 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r171661.
+
</ins><span class="cx"> 2014-07-29 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171661.
</span></span></pre></div>
<a id="tagsSafari600133SourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.3/Source/WebCore/page/DOMWindow.cpp (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/Source/WebCore/page/DOMWindow.cpp 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/Source/WebCore/page/DOMWindow.cpp 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -821,38 +821,31 @@
</span><span class="cx"> Storage* DOMWindow::localStorage(ExceptionCode& ec) const
</span><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> Document* document = this->document();
</span><span class="cx"> if (!document)
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> if (!document->securityOrigin()->canAccessLocalStorage(0)) {
</span><span class="cx"> ec = SECURITY_ERR;
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Page* page = document->page();
- // FIXME: We should consider supporting access/modification to local storage
- // after calling window.close(). See <https://bugs.webkit.org/show_bug.cgi?id=135330>.
- if (!page || !page->isClosing()) {
- if (m_localStorage) {
- if (!m_localStorage->area().canAccessStorage(m_frame)) {
- ec = SECURITY_ERR;
- return nullptr;
- }
- return m_localStorage.get();
</del><ins>+ if (m_localStorage) {
+ if (!m_localStorage->area().canAccessStorage(m_frame)) {
+ ec = SECURITY_ERR;
+ return 0;
</ins><span class="cx"> }
</span><ins>+ return m_localStorage.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ Page* page = document->page();
</ins><span class="cx"> if (!page)
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx">
</span><del>- if (page->isClosing())
- return nullptr;
-
</del><span class="cx"> if (!page->settings().localStorageEnabled())
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> RefPtr<StorageArea> storageArea;
</span><span class="cx"> if (!document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
</span><span class="lines">@@ -862,7 +855,7 @@
</span><span class="cx">
</span><span class="cx"> if (!storageArea->canAccessStorage(m_frame)) {
</span><span class="cx"> ec = SECURITY_ERR;
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_localStorage = Storage::create(m_frame, storageArea.release());
</span><span class="lines">@@ -1042,7 +1035,6 @@
</span><span class="cx"> if (!m_frame->loader().shouldClose())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page->setIsClosing();
</del><span class="cx"> page->chrome().closeWindowSoon();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari600133SourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.3/Source/WebCore/page/Page.cpp (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/Source/WebCore/page/Page.cpp 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/Source/WebCore/page/Page.cpp 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -201,7 +201,6 @@
</span><span class="cx"> , m_userContentController(WTF::move(pageClients.userContentController))
</span><span class="cx"> , m_visitedLinkStore(WTF::move(pageClients.visitedLinkStore))
</span><span class="cx"> , m_sessionID(SessionID::defaultSessionID())
</span><del>- , m_isClosing(false)
</del><span class="cx"> {
</span><span class="cx"> ASSERT(m_editorClient);
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari600133SourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.3/Source/WebCore/page/Page.h (171862 => 171863)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.3/Source/WebCore/page/Page.h 2014-07-31 17:16:08 UTC (rev 171862)
+++ tags/Safari-600.1.3.3/Source/WebCore/page/Page.h 2014-07-31 17:18:02 UTC (rev 171863)
</span><span class="lines">@@ -320,9 +320,6 @@
</span><span class="cx"> void setIsInWindow(bool);
</span><span class="cx"> bool isInWindow() const { return m_viewState & ViewState::IsInWindow; }
</span><span class="cx">
</span><del>- void setIsClosing() { m_isClosing = true; }
- bool isClosing() const { return m_isClosing; }
-
</del><span class="cx"> void addViewStateChangeObserver(ViewStateChangeObserver&);
</span><span class="cx"> void removeViewStateChangeObserver(ViewStateChangeObserver&);
</span><span class="cx">
</span><span class="lines">@@ -588,8 +585,6 @@
</span><span class="cx"> HashSet<ViewStateChangeObserver*> m_viewStateChangeObservers;
</span><span class="cx">
</span><span class="cx"> SessionID m_sessionID;
</span><del>-
- bool m_isClosing;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline PageGroup& Page::group()
</span></span></pre>
</div>
</div>
</body>
</html>