<!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>[212500] branches/safari-603-branch</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/212500">212500</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 16:56:44 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212173">r212173</a>. rdar://problem/29904368</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestseditingmacinputunconfirmedtextnavigationwithpagecachehtml">branches/safari-603-branch/LayoutTests/editing/mac/input/unconfirmed-text-navigation-with-page-cache.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastharnesspagecachecrashondataurlshtml">branches/safari-603-branch/LayoutTests/fast/harness/page-cache-crash-on-data-urls.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastharnessusepagecachehtml">branches/safari-603-branch/LayoutTests/fast/harness/use-page-cache.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastloaderstateobjectsnopopstatewhenbacktostatelessentrywithpagecachehtml">branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/no-popstate-when-back-to-stateless-entry-with-page-cache.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastloaderstateobjectspopstatefireswithpagecachehtml">branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtileddrawingscrollpositionpagecacherestorationhtml">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomDocumentcpp">branches/safari-603-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomDocumenth">branches/safari-603-branch/Source/WebCore/dom/Document.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorehistoryCachedFramecpp">branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehistoryCachedFrameh">branches/safari-603-branch/Source/WebCore/history/CachedFrame.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorehistoryPageCachecpp">branches/safari-603-branch/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLFrameElementBasecpp">branches/safari-603-branch/Source/WebCore/html/HTMLFrameElementBase.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreloaderFrameLoadercpp">branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageDOMWindowcpp">branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageDiagnosticLoggingKeyscpp">branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageDiagnosticLoggingKeysh">branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePagecpp">branches/safari-603-branch/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePageh">branches/safari-603-branch/Source/WebCore/page/Page.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageSettingsin">branches/safari-603-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebViewmm">branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinChangeLog">branches/safari-603-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinInterfacesIWebPreferencesPrivateidl">branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebPreferenceKeysPrivateh">branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebPreferencescpp">branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebPreferencesh">branches/safari-603-branch/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebViewcpp">branches/safari-603-branch/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreemacDumpRenderTreemm">branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreewinDumpRenderTreecpp">branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnerTestControllercpp">branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestseditingmacinputunconfirmedtextnavigationwithpagecachehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/editing/mac/input/unconfirmed-text-navigation-with-page-cache.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/mac/input/unconfirmed-text-navigation-with-page-cache.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/editing/mac/input/unconfirmed-text-navigation-with-page-cache.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Window we will be controlling.
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastharnesspagecachecrashondataurlshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/fast/harness/page-cache-crash-on-data-urls.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/harness/page-cache-crash-on-data-urls.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/fast/harness/page-cache-crash-on-data-urls.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx"> log("open page with data urls");
</span><span class="cx"> window.open("resources/cached-page-with-data-urls.html");
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastharnessusepagecachehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/fast/harness/use-page-cache.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/harness/use-page-cache.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/fast/harness/use-page-cache.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx"> log("open page-1");
</span><span class="cx"> window.open("resources/cached-page-1.html");
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastloaderstateobjectsnopopstatewhenbacktostatelessentrywithpagecachehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/no-popstate-when-back-to-stateless-entry-with-page-cache.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/no-popstate-when-back-to-stateless-entry-with-page-cache.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/no-popstate-when-back-to-stateless-entry-with-page-cache.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -14,7 +14,6 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx"> testWindow = window.open('resources/no-popstate-when-back-to-stateless-entry-1.html');
</span><span class="cx"> if (!testWindow)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastloaderstateobjectspopstatefireswithpagecachehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -14,7 +14,6 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx"> testWindow = window.open('resources/popstate-fires-with-page-cache-1.html');
</span><span class="cx"> if (!testWindow)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtileddrawingscrollpositionpagecacherestorationhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.setCanOpenWindows();
</span><span class="cx"> testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
</span><del>- testRunner.overridePreference("WebKitAllowsPageCacheWithWindowOpenerKey", 1);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.finishedTest = function (layerTree)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -1,5 +1,72 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212173. rdar://problem/29904368
+
+ 2017-02-10 Daniel Bates <dabates@apple.com>
+
+ Detach frame from document when entering page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166774
+ <rdar://problem/29904368>
+
+ Reviewed by Chris Dumez.
+
+ When a page enters the page cache it is unnecessary for it to hold a reference to its
+ associated frame because subsequent interactions with the page do not need to make use
+ of it. Once a page exits the page cache we associate it with its frame.
+
+ * dom/Document.cpp:
+ (WebCore::Document::frameDestroyed): Update comment to reflect the renaming of disconnectFromFrame().
+ (WebCore::Document::attachToCachedFrame): Added.
+ (WebCore::Document::detachFromCachedFrame): Added.
+ (WebCore::Document::prepareForDestruction): Only call CSSAnimationController::detachFromDocument() if
+ we have a frame. Substitute detachFromFrame() for disconnectFromFrame() as the latter was renamed to
+ the former.
+ (WebCore::Document::hasEverCalledWindowOpen): Deleted.
+ (WebCore::Document::markHasCalledWindowOpen): Deleted.
+ (WebCore::Document::disconnectFromFrame): Renamed to detachFromFrame.
+ * dom/Document.h:
+ (WebCore::Document::detachFromFrame): Renamed; formerly named disconnectFromFrame(). Changed
+ visibility from public to private and made this function inline.
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::pruneDetachedChildFrames): Remove cached child frames that were
+ removed from the page when it was in the page cache as there is no need to restore such frames.
+ (WebCore::CachedFrameBase::restore): Call pruneDetachedChildFrames() before restoring the
+ frame tree.
+ (WebCore::CachedFrame::CachedFrame): Detach from the frame.
+ (WebCore::CachedFrame::open): Assert that we have a document and re-attach the frame.
+ (WebCore::CachedFrame::destroy): Update assertion as this function should only be called for a
+ frameless document. Only detach the FrameView, DocumentLoader, and Page when the cached frame is for
+ subframe and is associated with a Page object. Call CSSAnimationController::detachFromDocument() to
+ detach the animation controller from the document as it is being destroyed. We have to do this here
+ because the document does not have a frame. And Document::prepareForDestruction() only calls
+ CSSAnimationController::detachFromDocument() if the document has a frame.
+ * history/CachedFrame.h:
+ * history/PageCache.cpp:
+ (WebCore::canCachePage): Remove logic that prevents caching of a page that called window.open()
+ or has an opener as it is feasible to keep such pages in the page cache.
+ * html/HTMLFrameElementBase.cpp:
+ (WebCore::HTMLFrameElementBase::finishedInsertingSubtree): Fix style nit.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::frameDetached): Only stop all loaders and stop active DOM objects if the
+ page is not in- or about to enter- the page cache. A page in the page cache has finished loading
+ and its active DOM objects are suspended. Also fix style nit in comment.
+ (WebCore::FrameLoader::detachFromParent): Only stop all loaders if the page is not in- or about to
+ enter- the page cache. A page in the page cache has finished loading. Also added a comment to explain
+ that we protect the frame because stopAllLoaders() can cause the frame to be deallocated.
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::createWindow): Remove logic to call markHasCalledWindowOpen() as this
+ function will be removed.
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::hasCalledWindowOpenKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::hasOpenerKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+ * page/Page.cpp:
+ (WebCore::Page::openedByWindowOpen): Deleted.
+ * page/Page.h:
+ * page/Settings.in: Remove setting allowsPageCacheWithWindowOpener.
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212172. rdar://problem/30476807
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><ins>+#include "CachedFrame.h"
</ins><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="lines">@@ -835,23 +836,6 @@
</span><span class="cx"> return documentElement() && documentElement()->hasTagName(htmlTag) && documentElement()->hasAttributeWithoutSynchronization(manifestAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Document::hasEverCalledWindowOpen() const
-{
- auto& topDocument = this->topDocument();
- if (&topDocument == this)
- return m_hasEverCalledWindowOpen;
- return topDocument.hasEverCalledWindowOpen();
-}
-
-void Document::markHasCalledWindowOpen()
-{
- auto& topDocument = this->topDocument();
- if (&topDocument == this)
- m_hasEverCalledWindowOpen = true;
- else
- topDocument.markHasCalledWindowOpen();
-}
-
</del><span class="cx"> DocumentType* Document::doctype() const
</span><span class="cx"> {
</span><span class="cx"> for (Node* node = firstChild(); node; node = node->nextSibling()) {
</span><span class="lines">@@ -2222,18 +2206,30 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::disconnectFromFrame()
-{
- observeFrame(nullptr);
-}
-
</del><span class="cx"> void Document::frameDestroyed()
</span><span class="cx"> {
</span><del>- // disconnectFromFrame() must be called before destroying the Frame.
</del><ins>+ // detachFromFrame() must be called before destroying the Frame.
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!m_frame);
</span><span class="cx"> FrameDestructionObserver::frameDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::attachToCachedFrame(CachedFrameBase& cachedFrame)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(cachedFrame.document() == this);
+ ASSERT(cachedFrame.view());
+ ASSERT(m_pageCacheState == Document::InPageCache);
+ observeFrame(&cachedFrame.view()->frame());
+}
+
+void Document::detachFromCachedFrame(CachedFrameBase& cachedFrame)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(cachedFrame.document() == this);
+ ASSERT(cachedFrame.view());
+ ASSERT(m_frame == &cachedFrame.view()->frame());
+ ASSERT(m_pageCacheState == Document::InPageCache);
+ detachFromFrame();
+}
+
</ins><span class="cx"> void Document::destroyRenderTree()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasLivingRenderTree());
</span><span class="lines">@@ -2350,7 +2346,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- disconnectFromFrame();
</del><ins>+ detachFromFrame();
</ins><span class="cx">
</span><span class="cx"> m_hasPreparedForDestruction = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> class CSSStyleDeclaration;
</span><span class="cx"> class CSSStyleSheet;
</span><span class="cx"> class CachedCSSStyleSheet;
</span><ins>+class CachedFrameBase;
</ins><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class CachedScript;
</span><span class="cx"> class CanvasRenderingContext;
</span><span class="lines">@@ -375,9 +376,6 @@
</span><span class="cx"> WEBCORE_EXPORT bool hasFocus() const;
</span><span class="cx">
</span><span class="cx"> bool hasManifest() const;
</span><del>-
- bool hasEverCalledWindowOpen() const;
- void markHasCalledWindowOpen();
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ExceptionOr<Ref<Element>> createElementForBindings(const AtomicString& tagName);
</span><span class="cx"> WEBCORE_EXPORT Ref<DocumentFragment> createDocumentFragment();
</span><span class="lines">@@ -564,7 +562,6 @@
</span><span class="cx">
</span><span class="cx"> void didBecomeCurrentDocumentInFrame();
</span><span class="cx"> void destroyRenderTree();
</span><del>- void disconnectFromFrame();
</del><span class="cx"> void prepareForDestruction();
</span><span class="cx">
</span><span class="cx"> // Override ScriptExecutionContext methods to do additional work
</span><span class="lines">@@ -1302,6 +1299,9 @@
</span><span class="cx"> void didRemoveInDocumentShadowRoot(ShadowRoot&);
</span><span class="cx"> const HashSet<ShadowRoot*>& inDocumentShadowRoots() const { return m_inDocumentShadowRoots; }
</span><span class="cx">
</span><ins>+ void attachToCachedFrame(CachedFrameBase&);
+ void detachFromCachedFrame(CachedFrameBase&);
+
</ins><span class="cx"> protected:
</span><span class="cx"> enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
</span><span class="cx"> Document(Frame*, const URL&, unsigned = DefaultDocumentClass, unsigned constructionFlags = 0);
</span><span class="lines">@@ -1315,6 +1315,8 @@
</span><span class="cx"> friend class IgnoreDestructiveWriteCountIncrementer;
</span><span class="cx"> friend class IgnoreOpensDuringUnloadCountIncrementer;
</span><span class="cx">
</span><ins>+ void detachFromFrame() { observeFrame(nullptr); }
+
</ins><span class="cx"> void updateTitleElement(Element* newTitleElement);
</span><span class="cx"> void frameDestroyed() final;
</span><span class="cx">
</span><span class="lines">@@ -1493,7 +1495,6 @@
</span><span class="cx"> bool m_bParsing;
</span><span class="cx">
</span><span class="cx"> Timer m_styleRecalcTimer;
</span><del>- bool m_hasEverCalledWindowOpen { false };
</del><span class="cx"> bool m_pendingStyleRecalcShouldForce;
</span><span class="cx"> bool m_inStyleRecalc;
</span><span class="cx"> bool m_closeAfterStyleRecalc;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/history/CachedFrame.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -75,6 +75,17 @@
</span><span class="cx"> ASSERT(!m_document);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CachedFrameBase::pruneDetachedChildFrames()
+{
+ for (size_t i = m_childFrames.size(); i;) {
+ --i;
+ if (m_childFrames[i]->view()->frame().page())
+ continue;
+ m_childFrames[i]->destroy();
+ m_childFrames.remove(i);
+ }
+}
+
</ins><span class="cx"> void CachedFrameBase::restore()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_document->view() == m_view);
</span><span class="lines">@@ -98,8 +109,11 @@
</span><span class="cx">
</span><span class="cx"> frame.loader().client().didRestoreFromPageCache();
</span><span class="cx">
</span><ins>+ pruneDetachedChildFrames();
+
</ins><span class="cx"> // Reconstruct the FrameTree. And open the child CachedFrames in their respective FrameLoaders.
</span><span class="cx"> for (unsigned i = 0; i < m_childFrames.size(); ++i) {
</span><ins>+ ASSERT(m_childFrames[i]->view()->frame().page());
</ins><span class="cx"> frame.tree().appendChild(&m_childFrames[i]->view()->frame());
</span><span class="cx"> m_childFrames[i]->open();
</span><span class="cx"> }
</span><span class="lines">@@ -191,6 +205,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ m_document->detachFromCachedFrame(*this);
+
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!m_documentLoader->isLoading());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,9 +213,12 @@
</span><span class="cx"> void CachedFrame::open()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_view);
</span><ins>+ ASSERT(m_document);
</ins><span class="cx"> if (!m_isMainFrame)
</span><span class="cx"> m_view->frame().page()->incrementSubframeCount();
</span><span class="cx">
</span><ins>+ m_document->attachToCachedFrame(*this);
+
</ins><span class="cx"> m_view->frame().loader().open(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,11 +254,11 @@
</span><span class="cx"> // Only CachedFrames that are still in the PageCache should be destroyed in this manner
</span><span class="cx"> ASSERT(m_document->pageCacheState() == Document::InPageCache);
</span><span class="cx"> ASSERT(m_view);
</span><del>- ASSERT(m_document->frame() == &m_view->frame());
</del><ins>+ ASSERT(!m_document->frame());
</ins><span class="cx">
</span><span class="cx"> m_document->domWindow()->willDestroyCachedFrame();
</span><span class="cx">
</span><del>- if (!m_isMainFrame) {
</del><ins>+ if (!m_isMainFrame && m_view->frame().page()) {
</ins><span class="cx"> m_view->frame().loader().detachViewsAndDocumentLoader();
</span><span class="cx"> m_view->frame().detachFromPage();
</span><span class="cx"> }
</span><span class="lines">@@ -252,6 +271,8 @@
</span><span class="cx">
</span><span class="cx"> Frame::clearTimers(m_view.get(), m_document.get());
</span><span class="cx">
</span><ins>+ m_view->frame().animation().detachFromDocument(m_document.get());
+
</ins><span class="cx"> // FIXME: Why do we need to call removeAllEventListeners here? When the document is in page cache, this method won't work
</span><span class="cx"> // fully anyway, because the document won't be able to access its DOMWindow object (due to being frameless).
</span><span class="cx"> m_document->removeAllEventListeners();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehistoryCachedFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/history/CachedFrame.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/history/CachedFrame.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/history/CachedFrame.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -52,7 +52,9 @@
</span><span class="cx"> protected:
</span><span class="cx"> CachedFrameBase(Frame&);
</span><span class="cx"> ~CachedFrameBase();
</span><del>-
</del><ins>+
+ void pruneDetachedChildFrames();
+
</ins><span class="cx"> RefPtr<Document> m_document;
</span><span class="cx"> RefPtr<DocumentLoader> m_documentLoader;
</span><span class="cx"> RefPtr<FrameView> m_view;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/history/PageCache.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/history/PageCache.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/history/PageCache.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -193,19 +193,6 @@
</span><span class="cx">
</span><span class="cx"> DiagnosticLoggingClient& diagnosticLoggingClient = page.diagnosticLoggingClient();
</span><span class="cx"> bool isCacheable = canCacheFrame(page.mainFrame(), diagnosticLoggingClient, indentLevel + 1);
</span><del>-
- if (page.openedByWindowOpen() && !page.settings().allowsPageCacheWithWindowOpener()) {
- PCLOG(" -Page has been opened via window.open()");
- logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasOpenerKey());
- isCacheable = false;
- }
-
- auto* topDocument = page.mainFrame().document();
- if (topDocument && topDocument->hasEverCalledWindowOpen()) {
- PCLOG(" -Page has called window.open()");
- logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasCalledWindowOpenKey());
- isCacheable = false;
- }
</del><span class="cx">
</span><span class="cx"> if (!page.settings().usesPageCache() || page.isResourceCachingDisabled()) {
</span><span class="cx"> PCLOG(" -Page settings says b/f cache disabled");
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLFrameElementBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLFrameElementBase.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLFrameElementBase.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLFrameElementBase.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> if (!inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // DocumentFragments don't kick of any loads.
</del><ins>+ // DocumentFragments don't kick off any loads.
</ins><span class="cx"> if (!document().frame())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -2511,25 +2511,31 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::frameDetached()
</span><span class="cx"> {
</span><del>- // Calling stopAllLoaders can cause the frame to be deallocated, including the frame loader.
</del><ins>+ // Calling stopAllLoaders() can cause the frame to be deallocated, including the frame loader.
</ins><span class="cx"> Ref<Frame> protectedFrame(m_frame);
</span><span class="cx">
</span><del>- stopAllLoaders();
- m_frame.document()->stopActiveDOMObjects();
</del><ins>+ if (m_frame.document()->pageCacheState() != Document::InPageCache) {
+ stopAllLoaders();
+ m_frame.document()->stopActiveDOMObjects();
+ }
+
</ins><span class="cx"> detachFromParent();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoader::detachFromParent()
</span><span class="cx"> {
</span><ins>+ // Calling stopAllLoaders() can cause the frame to be deallocated, including the frame loader.
</ins><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx">
</span><span class="cx"> closeURL();
</span><span class="cx"> history().saveScrollPositionAndViewStateToItem(history().currentItem());
</span><span class="cx"> detachChildren();
</span><del>- // stopAllLoaders() needs to be called after detachChildren(), because detachedChildren()
- // will trigger the unload event handlers of any child frames, and those event
- // handlers might start a new subresource load in this frame.
- stopAllLoaders();
</del><ins>+ if (m_frame.document()->pageCacheState() != Document::InPageCache) {
+ // stopAllLoaders() needs to be called after detachChildren() if the document is not in the page cache,
+ // because detachedChildren() will trigger the unload event handlers of any child frames, and those event
+ // handlers might start a new subresource load in this frame.
+ stopAllLoaders();
+ }
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::frameDetachedFromParent(m_frame);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/DOMWindow.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -2196,8 +2196,6 @@
</span><span class="cx">
</span><span class="cx"> newFrame->loader().setOpener(&openerFrame);
</span><span class="cx"> newFrame->page()->setOpenedByDOM();
</span><del>- if (auto* openerDocument = openerFrame.document())
- openerDocument->markHasCalledWindowOpen();
</del><span class="cx">
</span><span class="cx"> if (newFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
</span><span class="cx"> return newFrame;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -663,16 +663,6 @@
</span><span class="cx"> return ASCIILiteral("font");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::hasCalledWindowOpenKey()
-{
- return ASCIILiteral("hasCalledWindowOpen");
-}
-
-String DiagnosticLoggingKeys::hasOpenerKey()
-{
- return ASCIILiteral("hasOpener");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("pruned.memoryPressure");
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> WEBCORE_EXPORT static String entryWronglyNotWarmedUpKey();
</span><span class="cx"> static String expiredKey();
</span><span class="cx"> static String fontKey();
</span><del>- static String hasCalledWindowOpenKey();
- static String hasOpenerKey();
</del><span class="cx"> static String hasPluginsKey();
</span><span class="cx"> static String httpsNoStoreKey();
</span><span class="cx"> static String imageKey();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Page.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -461,17 +461,6 @@
</span><span class="cx"> m_openedByDOM = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Page::openedByWindowOpen() const
-{
- auto* document = m_mainFrame->document();
- if (!document)
- return false;
- auto* window = document->domWindow();
- if (!window)
- return false;
- return window->opener();
-}
-
</del><span class="cx"> void Page::goToItem(HistoryItem& item, FrameLoadType type)
</span><span class="cx"> {
</span><span class="cx"> // stopAllLoaders may end up running onload handlers, which could cause further history traversals that may lead to the passed in HistoryItem
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Page.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Page.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/Page.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -180,8 +180,6 @@
</span><span class="cx"> bool openedByDOM() const;
</span><span class="cx"> void setOpenedByDOM();
</span><span class="cx">
</span><del>- bool openedByWindowOpen() const;
-
</del><span class="cx"> WEBCORE_EXPORT void goToItem(HistoryItem&, FrameLoadType);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setGroupName(const String&);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Settings.in (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Settings.in 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebCore/page/Settings.in 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -297,5 +297,3 @@
</span><span class="cx"> es6ModulesEnabled initial=false
</span><span class="cx">
</span><span class="cx"> shouldSuppressKeyboardInputDuringProvisionalNavigation initial=false
</span><del>-
-allowsPageCacheWithWindowOpener initial=false
</del></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212173. rdar://problem/29904368
+
+ 2017-02-10 Daniel Bates <dabates@apple.com>
+
+ Detach frame from document when entering page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166774
+ <rdar://problem/29904368>
+
+ Reviewed by Chris Dumez.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences allowsPageCacheWithWindowOpener]): Deleted.
+ (-[WebPreferences setAllowsPageCacheWithWindowOpener:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211254. rdar://problem/30188490
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -83,7 +83,6 @@
</span><span class="cx"> #define WebAutomaticSpellingCorrectionEnabled @"WebAutomaticSpellingCorrectionEnabled"
</span><span class="cx"> #define WebKitDOMPasteAllowedPreferenceKey @"WebKitDOMPasteAllowedPreferenceKey"
</span><span class="cx"> #define WebKitUsesPageCachePreferenceKey @"WebKitUsesPageCachePreferenceKey"
</span><del>-#define WebKitAllowsPageCacheWithWindowOpenerKey @"WebKitAllowsPageCacheWithWindowOpenerKey"
</del><span class="cx"> #define WebKitPageCacheSupportsPluginsPreferenceKey @"WebKitPageCacheSupportsPluginsPreferenceKey"
</span><span class="cx"> #define WebKitFTPDirectoryTemplatePath @"WebKitFTPDirectoryTemplatePath"
</span><span class="cx"> #define WebKitForceFTPDirectoryListings @"WebKitForceFTPDirectoryListings"
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -478,7 +478,6 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitDOMPasteAllowedPreferenceKey,
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitUsesPageCachePreferenceKey,
</span><del>- [NSNumber numberWithBool:NO], WebKitAllowsPageCacheWithWindowOpenerKey,
</del><span class="cx"> [NSNumber numberWithInt:cacheModelForMainBundle()], WebKitCacheModelPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitPageCacheSupportsPluginsPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitDeveloperExtrasEnabledPreferenceKey,
</span><span class="lines">@@ -2432,16 +2431,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)allowsPageCacheWithWindowOpener
-{
- return [self _boolValueForKey:WebKitAllowsPageCacheWithWindowOpenerKey];
-}
-
-- (void)setAllowsPageCacheWithWindowOpener:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAllowsPageCacheWithWindowOpenerKey];
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (void)_invalidateCachedPreferences
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -295,9 +295,6 @@
</span><span class="cx"> - (NSString *)pictographFontFamily;
</span><span class="cx"> - (void)setPictographFontFamily:(NSString *)family;
</span><span class="cx">
</span><del>-- (BOOL)allowsPageCacheWithWindowOpener;
-- (void)setAllowsPageCacheWithWindowOpener:(BOOL)flag;
-
</del><span class="cx"> - (BOOL)pageCacheSupportsPlugins;
</span><span class="cx"> - (void)setPageCacheSupportsPlugins:(BOOL)flag;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -2667,7 +2667,6 @@
</span><span class="cx"> settings.setTextDirectionSubmenuInclusionBehavior(core([preferences textDirectionSubmenuInclusionBehavior]));
</span><span class="cx"> settings.setDOMPasteAllowed([preferences isDOMPasteAllowed]);
</span><span class="cx"> settings.setUsesPageCache([self usesPageCache]);
</span><del>- settings.setAllowsPageCacheWithWindowOpener([preferences allowsPageCacheWithWindowOpener]);
</del><span class="cx"> settings.setPageCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
</span><span class="cx"> settings.setBackForwardCacheExpirationInterval([preferences _backForwardCacheExpirationInterval]);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212173. rdar://problem/29904368
+
+ 2017-02-10 Daniel Bates <dabates@apple.com>
+
+ Detach frame from document when entering page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166774
+ <rdar://problem/29904368>
+
+ Reviewed by Chris Dumez.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::setAllowsPageCacheWithWindowOpener): Deleted.
+ (WebPreferences::allowsPageCacheWithWindowOpener): Deleted.
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211254. rdar://problem/30188490
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -91,9 +91,6 @@
</span><span class="cx"> HRESULT experimentalNotificationsEnabled([out, retval] BOOL *enabled);
</span><span class="cx"> HRESULT setExperimentalNotificationsEnabled([in] BOOL enabled);
</span><span class="cx">
</span><del>- HRESULT allowsPageCacheWithWindowOpener([out, retval] BOOL* usesPageCache);
- HRESULT setAllowsPageCacheWithWindowOpener([in] BOOL usesPageCache);
-
</del><span class="cx"> HRESULT setShouldUseHighResolutionTimers([in] BOOL useHighResolutionTimers);
</span><span class="cx"> HRESULT shouldUseHighResolutionTimers([out, retval] BOOL* useHighResolutionTimers);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> #define WebKitIconDatabaseLocationKey "WebKitIconDatabaseLocation"
</span><span class="cx"> #define WebKitIconDatabaseEnabledPreferenceKey "WebKitIconDatabaseEnabled"
</span><span class="cx"> #define WebKitUsesPageCachePreferenceKey "WebKitUsesPageCachePreferenceKey"
</span><del>-#define WebKitAllowsPageCacheWithWindowOpenerKey "WebKitAllowsPageCacheWithWindowOpenerKey"
</del><span class="cx"> #define WebKitCacheModelPreferenceKey "WebKitCacheModelPreferenceKey"
</span><span class="cx"> #define WebKitLocalStorageDatabasePathPreferenceKey "WebKitLocalStorageDatabasePath"
</span><span class="cx"> #define WebKitHyperlinkAuditingEnabledPreferenceKey "WebKitHyperlinkAuditingEnabled"
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferences.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -262,7 +262,6 @@
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebGrammarCheckingEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(AllowContinuousSpellCheckingPreferenceKey), kCFBooleanTrue);
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitUsesPageCachePreferenceKey), kCFBooleanTrue);
</span><del>- CFDictionaryAddValue(defaults, CFSTR(WebKitAllowsPageCacheWithWindowOpenerKey), kCFBooleanFalse);
</del><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitLocalStorageDatabasePathPreferenceKey), CFSTR(""));
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFStringRef> cacheModelRef = adoptCF(CFStringCreateWithFormat(0, 0, CFSTR("%d"), WebCacheModelDocumentViewer));
</span><span class="lines">@@ -1605,20 +1604,6 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebPreferences::setAllowsPageCacheWithWindowOpener(BOOL value)
-{
- setBoolValue(WebKitAllowsPageCacheWithWindowOpenerKey, value);
- return S_OK;
-}
-
-HRESULT WebPreferences::allowsPageCacheWithWindowOpener(_Out_ BOOL* enabled)
-{
- if (!enabled)
- return E_POINTER;
- *enabled = boolValueForKey(WebKitAllowsPageCacheWithWindowOpenerKey);
- return S_OK;
-}
-
</del><span class="cx"> HRESULT WebPreferences::setZoomsTextOnly(BOOL zoomsTextOnly)
</span><span class="cx"> {
</span><span class="cx"> setBoolValue(WebKitZoomsTextOnlyPreferenceKey, zoomsTextOnly);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebPreferences.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebPreferences.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/WebPreferences.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -159,8 +159,6 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setLocalStorageDatabasePath(_In_ BSTR);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE experimentalNotificationsEnabled(_Out_ BOOL*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setExperimentalNotificationsEnabled(BOOL);
</span><del>- virtual HRESULT STDMETHODCALLTYPE allowsPageCacheWithWindowOpener(_Out_ BOOL*);
- virtual HRESULT STDMETHODCALLTYPE setAllowsPageCacheWithWindowOpener(BOOL);
</del><span class="cx">
</span><span class="cx"> // These two methods are no-ops, and only retained to keep
</span><span class="cx"> // the Interface consistent. DO NOT USE THEM.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebView.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -5401,11 +5401,6 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings.setExperimentalNotificationsEnabled(enabled);
</span><span class="cx">
</span><del>- hr = prefsPrivate->allowsPageCacheWithWindowOpener(&enabled);
- if (FAILED(hr))
- return hr;
- settings.setAllowsPageCacheWithWindowOpener(enabled);
-
</del><span class="cx"> hr = prefsPrivate->isWebSecurityEnabled(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212173. rdar://problem/29904368
+
+ 2017-02-10 Daniel Bates <dabates@apple.com>
+
+ Detach frame from document when entering page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166774
+ <rdar://problem/29904368>
+
+ Reviewed by Chris Dumez.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAllowsPageCacheWithWindowOpener): Deleted.
+ (WKPreferencesGetAllowsPageCacheWithWindowOpener): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212167. rdar://problem/30428673
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -138,7 +138,6 @@
</span><span class="cx"> macro(WebArchiveDebugModeEnabled, webArchiveDebugModeEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(UsesPageCache, usesPageCache, Bool, bool, true, "", "") \
</span><del>- macro(AllowsPageCacheWithWindowOpener, allowsPageCacheWithWindowOpener, Bool, bool, false, "", "") \
</del><span class="cx"> macro(PageCacheSupportsPlugins, pageCacheSupportsPlugins, Bool, bool, true, "", "") \
</span><span class="cx"> macro(AuthorAndUserStylesEnabled, authorAndUserStylesEnabled, Bool, bool, true, "", "") \
</span><span class="cx"> macro(PaginateDuringLayoutEnabled, paginateDuringLayoutEnabled, Bool, bool, false, "", "") \
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -623,16 +623,6 @@
</span><span class="cx"> return toImpl(preferencesRef)->usesPageCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetAllowsPageCacheWithWindowOpener(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setAllowsPageCacheWithWindowOpener(enabled);
-}
-
-bool WKPreferencesGetAllowsPageCacheWithWindowOpener(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->allowsPageCacheWithWindowOpener();
-}
-
</del><span class="cx"> void WKPreferencesSetPageCacheSupportsPlugins(WKPreferencesRef preferencesRef, bool pageCacheSupportsPlugins)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setPageCacheSupportsPlugins(pageCacheSupportsPlugins);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -143,10 +143,6 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetPageCacheEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetPageCacheEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span><del>-// Defaults to false.
-WK_EXPORT void WKPreferencesSetAllowsPageCacheWithWindowOpener(WKPreferencesRef preferences, bool enabled);
-WK_EXPORT bool WKPreferencesGetAllowsPageCacheWithWindowOpener(WKPreferencesRef preferences);
-
</del><span class="cx"> // Defaults to true.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetPageCacheSupportsPlugins(WKPreferencesRef preferences, bool pageCacheSupportsPlugins);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetPageCacheSupportsPlugins(WKPreferencesRef preferences);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -246,7 +246,6 @@
</span><span class="cx"> macro(WebKitPageCacheSupportsPluginsPreferenceKey, PageCacheSupportsPlugins, pageCacheSupportsPlugins) \
</span><span class="cx"> macro(WebKitPluginsEnabled, PluginsEnabled, pluginsEnabled) \
</span><span class="cx"> macro(WebKitUsesPageCachePreferenceKey, UsesPageCache, usesPageCache) \
</span><del>- macro(WebKitAllowsPageCacheWithWindowOpenerKey, AllowsPageCacheWithWindowOpener, allowsPageCacheWithWindowOpener) \
</del><span class="cx"> macro(WebKitWebAudioEnabled, WebAudioEnabled, webAudioEnabled) \
</span><span class="cx"> macro(WebKitWebGLEnabled, WebGLEnabled, webGLEnabled) \
</span><span class="cx"> macro(WebKitXSSAuditorEnabled, XSSAuditorEnabled, xssAuditorEnabled) \
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -2992,7 +2992,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> settings.setLocalFileContentSniffingEnabled(store.getBoolValueForKey(WebPreferencesKey::localFileContentSniffingEnabledKey()));
</span><span class="cx"> settings.setUsesPageCache(store.getBoolValueForKey(WebPreferencesKey::usesPageCacheKey()));
</span><del>- settings.setAllowsPageCacheWithWindowOpener(store.getBoolValueForKey(WebPreferencesKey::allowsPageCacheWithWindowOpenerKey()));
</del><span class="cx"> settings.setPageCacheSupportsPlugins(store.getBoolValueForKey(WebPreferencesKey::pageCacheSupportsPluginsKey()));
</span><span class="cx"> settings.setAuthorAndUserStylesEnabled(store.getBoolValueForKey(WebPreferencesKey::authorAndUserStylesEnabledKey()));
</span><span class="cx"> settings.setPaginateDuringLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::paginateDuringLayoutEnabledKey()));
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212173. rdar://problem/29904368
+
+ 2017-02-10 Daniel Bates <dabates@apple.com>
+
+ Detach frame from document when entering page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166774
+ <rdar://problem/29904368>
+
+ Reviewed by Chris Dumez.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212167. rdar://problem/30428673
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -972,7 +972,6 @@
</span><span class="cx"> // The back/forward cache is causing problems due to layouts during transition from one page to another.
</span><span class="cx"> // So, turn it off for now, but we might want to turn it back on some day.
</span><span class="cx"> [preferences setUsesPageCache:NO];
</span><del>- [preferences setAllowsPageCacheWithWindowOpener:NO];
</del><span class="cx"> [preferences setAcceleratedCompositingEnabled:YES];
</span><span class="cx"> #if USE(CA)
</span><span class="cx"> [preferences setCanvasUsesAcceleratedDrawing:YES];
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -811,7 +811,6 @@
</span><span class="cx"> preferences->setPlugInsEnabled(TRUE);
</span><span class="cx"> preferences->setTextAreasAreResizable(TRUE);
</span><span class="cx"> preferences->setUsesPageCache(FALSE);
</span><del>- prefsPrivate->setAllowsPageCacheWithWindowOpener(FALSE);
</del><span class="cx">
</span><span class="cx"> preferences->setPrivateBrowsingEnabled(FALSE);
</span><span class="cx"> prefsPrivate->setAuthorAndUserStylesEnabled(TRUE);
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp (212499 => 212500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp 2017-02-17 00:56:33 UTC (rev 212499)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp 2017-02-17 00:56:44 UTC (rev 212500)
</span><span class="lines">@@ -655,7 +655,6 @@
</span><span class="cx"> WKPreferencesSetFullScreenEnabled(preferences, true);
</span><span class="cx"> #endif
</span><span class="cx"> WKPreferencesSetPageCacheEnabled(preferences, false);
</span><del>- WKPreferencesSetAllowsPageCacheWithWindowOpener(preferences, false);
</del><span class="cx"> WKPreferencesSetAsynchronousPluginInitializationEnabled(preferences, false);
</span><span class="cx"> WKPreferencesSetAsynchronousPluginInitializationEnabledForAllPlugins(preferences, false);
</span><span class="cx"> WKPreferencesSetArtificialPluginInitializationDelayEnabled(preferences, false);
</span></span></pre>
</div>
</div>
</body>
</html>