<!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>[210723] branches/safari-603-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210723">210723</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 23:05:15 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210474">r210474</a>. rdar://problem/29762809</pre>
<h3>Modified Paths</h3>
<ul>
<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="#branchessafari603branchSourceWebCorehtmlHTMLAnchorElementcpp">branches/safari-603-branch/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLLinkElementcpp">branches/safari-603-branch/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreloaderFrameLoadercpp">branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoremathmlMathMLElementcpp">branches/safari-603-branch/Source/WebCore/mathml/MathMLElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoresvgSVGAElementcpp">branches/safari-603-branch/Source/WebCore/svg/SVGAElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210474. rdar://problem/29762809
+
+ 2017-01-06 Daniel Bates <dabates@apple.com>
+
+ Ensure navigation only allowed for documents not in the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=166773
+ <rdar://problem/29762809>
+
+ Reviewed by Brent Fulgham.
+
+ It is wise to ensure that navigation is only allowed when initiated from a document that
+ is not in- or about to be put in- the page cache. Such a navigation would surprise a
+ person that had navigated away from the initiating document among other issues.
+
+ * dom/Document.cpp:
+ (WebCore::Document::canNavigate): Only allow navigation if the document is not in the
+ page cache.
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::handleClick): Ditto.
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::handleClick): Ditto.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::urlSelected): Assert triggering event's document is not in the
+ page cache.
+ (WebCore::FrameLoader::submitForm): Allow submission if the document is not in the
+ page cache.
+ (WebCore::FrameLoader::loadFrameRequest): Assert triggering event's document is not in
+ the page cache.
+ * mathml/MathMLElement.cpp:
+ (WebCore::MathMLElement::defaultEventHandler): Only allow navigation if the document is
+ not in the page cache.
+ * svg/SVGAElement.cpp:
+ (WebCore::SVGAElement::defaultEventHandler): Ditto.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210536. rdar://problem/29939970
</span><span class="cx">
</span><span class="cx"> 2017-01-09 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -2990,6 +2990,9 @@
</span><span class="cx"> if (!m_frame)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (pageCacheState() != Document::NotInPageCache)
+ return false;
+
</ins><span class="cx"> // FIXME: We shouldn't call this function without a target frame, but
</span><span class="cx"> // fast/forms/submit-to-blank-multiple-times.html depends on this function
</span><span class="cx"> // returning true when supplied with a 0 targetFrame.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLAnchorElement.cpp (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLAnchorElement.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLAnchorElement.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -369,6 +369,9 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (document().pageCacheState() != Document::NotInPageCache)
+ return;
+
</ins><span class="cx"> StringBuilder url;
</span><span class="cx"> url.append(stripLeadingAndTrailingHTMLSpaces(attributeWithoutSynchronization(hrefAttr)));
</span><span class="cx"> appendServerMapMousePosition(url, event);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLLinkElement.cpp (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLLinkElement.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLLinkElement.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -490,6 +490,8 @@
</span><span class="cx"> Frame* frame = document().frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><ins>+ if (document().pageCacheState() != Document::NotInPageCache)
+ return;
</ins><span class="cx"> frame->loader().urlSelected(url, target(), &event, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate());
</span><span class="cx"> }
</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 (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/loader/FrameLoader.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -346,6 +346,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, Event* triggeringEvent)
</span><span class="cx"> {
</span><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!triggeringEvent || !triggeringEvent->target() || !triggeringEvent->target()->toNode()
+ || triggeringEvent->target()->toNode()->document().pageCacheState() == Document::NotInPageCache);
+
</ins><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx"> FrameLoadRequest frameRequest(passedRequest);
</span><span class="cx">
</span><span class="lines">@@ -369,10 +372,13 @@
</span><span class="cx"> ASSERT(submission->data());
</span><span class="cx"> ASSERT(submission->state());
</span><span class="cx"> ASSERT(!submission->state()->sourceDocument()->frame() || submission->state()->sourceDocument()->frame() == &m_frame);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!m_frame.page())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ if (submission->state()->sourceDocument()->pageCacheState() != Document::NotInPageCache)
+ return;
+
</ins><span class="cx"> if (submission->action().isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1125,6 +1131,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, Event* event, PassRefPtr<FormState> formState)
</span><span class="cx"> {
</span><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(!event || !event->target() || !event->target()->toNode()
+ || event->target()->toNode()->document().pageCacheState() == Document::NotInPageCache);
+
</ins><span class="cx"> // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoremathmlMathMLElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/mathml/MathMLElement.cpp (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/mathml/MathMLElement.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/mathml/MathMLElement.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -149,6 +149,8 @@
</span><span class="cx"> auto& href = attributeWithoutSynchronization(hrefAttr);
</span><span class="cx"> const auto& url = stripLeadingAndTrailingHTMLSpaces(href);
</span><span class="cx"> event.setDefaultHandled();
</span><ins>+ if (document().pageCacheState() != Document::NotInPageCache)
+ return;
</ins><span class="cx"> if (auto* frame = document().frame())
</span><span class="cx"> frame->loader().urlSelected(document().completeURL(url), "_self", &event, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoresvgSVGAElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/svg/SVGAElement.cpp (210722 => 210723)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/svg/SVGAElement.cpp 2017-01-13 07:05:11 UTC (rev 210722)
+++ branches/safari-603-branch/Source/WebCore/svg/SVGAElement.cpp 2017-01-13 07:05:15 UTC (rev 210723)
</span><span class="lines">@@ -145,6 +145,8 @@
</span><span class="cx"> Frame* frame = document().frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><ins>+ if (document().pageCacheState() != Document::NotInPageCache)
+ return;
</ins><span class="cx"> frame->loader().urlSelected(document().completeURL(url), target, &event, LockHistory::No, LockBackForwardList::No, MaybeSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>