<!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>[207840] trunk</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/207840">207840</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 13:17:36 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement rel=noopener
https://bugs.webkit.org/show_bug.cgi?id=155166
<rdar://problem/25193787>
Reviewed by Brent Fulgham.
Source/WebCore:
Added support for rel=noopener to a and area elements.
Tests: fast/dom/Window/a-rel-noopener.html
fast/dom/Window/area-rel-noopener.html
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::HTMLAnchorElement): Stopped initializing m_linkRelations to 0.
(WebCore::HTMLAnchorElement::parseAttribute): Declared static AtomicStrings for "noreferrer"
and "noopener", and created a SpaceSplitString from the rel attribute value to test for these
two values.
(WebCore::HTMLAnchorElement::hasRel): Updated to use OptionSet::contains().
(WebCore::HTMLAnchorElement::relList): Added a check for "noopener".
(WebCore::HTMLAnchorElement::handleClick): Passed NewFrameOpenerPolicy::Suppress to
FrameLoader::urlSelected() if rel=noopener was specified.
* html/HTMLAnchorElement.h: Changed the Relation enum to an enum class, removed unused enum
values, and changed m_linkRelations from a 30-bit unsigned integer to an OptionSet<Relation>
(HTMLAnchorElement is still 128 bytes on 64-bit).
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::urlSelected): Changed to only compute a NewFrameOpenerPolicy from the
referrer policy if an explicit NewFrameOpenerPolicy isn't specified. Removed the version of
urlSelected() that did not take a downloadAttribute parameter.
* loader/FrameLoader.h: Added an Optional<NewFrameOpenerPolicy> parameter to urlSelected(),
and set a default argument for downloadAttribute instead of having a second version of
urlSelected().
LayoutTests:
* fast/dom/DOMTokenList-supports-expected.txt:
* fast/dom/DOMTokenList-supports.html:
* fast/dom/Window/a-rel-noopener-expected.txt: Added.
* fast/dom/Window/a-rel-noopener.html: Added.
* fast/dom/Window/area-rel-noopener-expected.txt: Added.
* fast/dom/Window/area-rel-noopener.html: Added.
* fast/dom/Window/resources/rel-noopener.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMTokenListsupportsexpectedtxt">trunk/LayoutTests/fast/dom/DOMTokenList-supports-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomDOMTokenListsupportshtml">trunk/LayoutTests/fast/dom/DOMTokenList-supports.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementh">trunk/Source/WebCore/html/HTMLAnchorElement.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomWindowarelnoopenerexpectedtxt">trunk/LayoutTests/fast/dom/Window/a-rel-noopener-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowarelnoopenerhtml">trunk/LayoutTests/fast/dom/Window/a-rel-noopener.html</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowarearelnoopenerexpectedtxt">trunk/LayoutTests/fast/dom/Window/area-rel-noopener-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowarearelnoopenerhtml">trunk/LayoutTests/fast/dom/Window/area-rel-noopener.html</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowresourcesrelnoopenerjs">trunk/LayoutTests/fast/dom/Window/resources/rel-noopener.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/LayoutTests/ChangeLog 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-25 Andy Estes <aestes@apple.com>
+
+ Implement rel=noopener
+ https://bugs.webkit.org/show_bug.cgi?id=155166
+ <rdar://problem/25193787>
+
+ Reviewed by Brent Fulgham.
+
+ * fast/dom/DOMTokenList-supports-expected.txt:
+ * fast/dom/DOMTokenList-supports.html:
+ * fast/dom/Window/a-rel-noopener-expected.txt: Added.
+ * fast/dom/Window/a-rel-noopener.html: Added.
+ * fast/dom/Window/area-rel-noopener-expected.txt: Added.
+ * fast/dom/Window/area-rel-noopener.html: Added.
+ * fast/dom/Window/resources/rel-noopener.js: Added.
+
</ins><span class="cx"> 2016-10-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Add "has capture device" bit to media state flags
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMTokenListsupportsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMTokenList-supports-expected.txt (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMTokenList-supports-expected.txt 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/LayoutTests/fast/dom/DOMTokenList-supports-expected.txt 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx"> PASS anchor.relList.__proto__ is DOMTokenList.prototype
</span><span class="cx"> PASS anchor.relList.supports(anchorRelSupportedValues[i]) is true
</span><span class="cx"> PASS anchor.relList.supports(anchorRelSupportedValues[i].toUpperCase()) is true
</span><ins>+PASS anchor.relList.supports(anchorRelSupportedValues[i]) is true
+PASS anchor.relList.supports(anchorRelSupportedValues[i].toUpperCase()) is true
</ins><span class="cx"> PASS anchor.relList.supports('unsupported') is false
</span><span class="cx">
</span><span class="cx"> * HTMLAreaElement.relList
</span><span class="lines">@@ -27,6 +29,8 @@
</span><span class="cx"> PASS area.relList.__proto__ is DOMTokenList.prototype
</span><span class="cx"> PASS area.relList.supports(areaRelSupportedValues[i]) is true
</span><span class="cx"> PASS area.relList.supports(areaRelSupportedValues[i].toUpperCase()) is true
</span><ins>+PASS area.relList.supports(areaRelSupportedValues[i]) is true
+PASS area.relList.supports(areaRelSupportedValues[i].toUpperCase()) is true
</ins><span class="cx"> PASS area.relList.supports('unsupported') is false
</span><span class="cx">
</span><span class="cx"> * HTMLIFrameElement.sandbox
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDOMTokenListsupportshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/DOMTokenList-supports.html (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/DOMTokenList-supports.html 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/LayoutTests/fast/dom/DOMTokenList-supports.html 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> debug("* HTMLAnchorElement.relList");
</span><span class="cx"> var anchor = document.createElement("a");
</span><span class="cx"> shouldBe("anchor.relList.__proto__", "DOMTokenList.prototype");
</span><del>-var anchorRelSupportedValues = ["noreferrer"];
</del><ins>+var anchorRelSupportedValues = ["noreferrer", "noopener"];
</ins><span class="cx"> for (var i = 0; i < anchorRelSupportedValues.length; i++) {
</span><span class="cx"> shouldBeTrue("anchor.relList.supports(anchorRelSupportedValues[i])");
</span><span class="cx"> shouldBeTrue("anchor.relList.supports(anchorRelSupportedValues[i].toUpperCase())");
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> debug("* HTMLAreaElement.relList");
</span><span class="cx"> var area = document.createElement("area");
</span><span class="cx"> shouldBe("area.relList.__proto__", "DOMTokenList.prototype");
</span><del>-var areaRelSupportedValues = ["noreferrer"];
</del><ins>+var areaRelSupportedValues = ["noreferrer", "noopener"];
</ins><span class="cx"> for (var i = 0; i < areaRelSupportedValues.length; i++) {
</span><span class="cx"> shouldBeTrue("area.relList.supports(areaRelSupportedValues[i])");
</span><span class="cx"> shouldBeTrue("area.relList.supports(areaRelSupportedValues[i].toUpperCase())");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowarelnoopenerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/a-rel-noopener-expected.txt (0 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/a-rel-noopener-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/a-rel-noopener-expected.txt 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test that window.opener is null when a new window is opened from an anchor element with rel='noopener'.
+
+PASS: window.opener is null
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowarelnoopenerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/a-rel-noopener.html (0 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/a-rel-noopener.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/a-rel-noopener.html 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test that window.opener is null when a new window is opened from an anchor element with rel='noopener'.</p>
+ <a id="link" href="a-rel-noopener.html#new-window" target="_blank" rel="noopener"></a>
+ <div id="console"></div>
+ <script src="resources/rel-noopener.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowarearelnoopenerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/area-rel-noopener-expected.txt (0 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/area-rel-noopener-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/area-rel-noopener-expected.txt 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Test that window.opener is null when a new window is opened from an area element with rel='noopener'.
+
+
+PASS: window.opener is null
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowarearelnoopenerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/area-rel-noopener.html (0 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/area-rel-noopener.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/area-rel-noopener.html 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test that window.opener is null when a new window is opened from an area element with rel='noopener'.</p>
+ <img src="non-existant.jpg" width="128" height="128" usemap="#map">
+ <map name="map">
+ <area id="link" shape="rect" coords="0,0,128,128" href="area-rel-noopener.html#new-window" target="_blank" rel="noopener">
+ </map>
+ <div id="console"></div>
+ <script src="resources/rel-noopener.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowresourcesrelnoopenerjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/resources/rel-noopener.js (0 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/resources/rel-noopener.js (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/resources/rel-noopener.js 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+if (window.testRunner) {
+ testRunner.setCanOpenWindows(true);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+if (document.location.hash === "#new-window") {
+ var console = window.open("", "originalWindow").document.getElementById("console");
+ if (window.opener)
+ console.innerText = "FAIL: window.opener is non-null";
+ else
+ console.innerText = "PASS: window.opener is null";
+ testRunner.notifyDone();
+} else {
+ window.name = "originalWindow";
+ document.getElementById("link").click();
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-10-25 Andy Estes <aestes@apple.com>
+
+ Implement rel=noopener
+ https://bugs.webkit.org/show_bug.cgi?id=155166
+ <rdar://problem/25193787>
+
+ Reviewed by Brent Fulgham.
+
+ Added support for rel=noopener to a and area elements.
+
+ Tests: fast/dom/Window/a-rel-noopener.html
+ fast/dom/Window/area-rel-noopener.html
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::HTMLAnchorElement): Stopped initializing m_linkRelations to 0.
+ (WebCore::HTMLAnchorElement::parseAttribute): Declared static AtomicStrings for "noreferrer"
+ and "noopener", and created a SpaceSplitString from the rel attribute value to test for these
+ two values.
+ (WebCore::HTMLAnchorElement::hasRel): Updated to use OptionSet::contains().
+ (WebCore::HTMLAnchorElement::relList): Added a check for "noopener".
+ (WebCore::HTMLAnchorElement::handleClick): Passed NewFrameOpenerPolicy::Suppress to
+ FrameLoader::urlSelected() if rel=noopener was specified.
+ * html/HTMLAnchorElement.h: Changed the Relation enum to an enum class, removed unused enum
+ values, and changed m_linkRelations from a 30-bit unsigned integer to an OptionSet<Relation>
+ (HTMLAnchorElement is still 128 bytes on 64-bit).
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::urlSelected): Changed to only compute a NewFrameOpenerPolicy from the
+ referrer policy if an explicit NewFrameOpenerPolicy isn't specified. Removed the version of
+ urlSelected() that did not take a downloadAttribute parameter.
+ * loader/FrameLoader.h: Added an Optional<NewFrameOpenerPolicy> parameter to urlSelected(),
+ and set a default argument for downloadAttribute instead of having a second version of
+ urlSelected().
+
</ins><span class="cx"> 2016-10-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Add "has capture device" bit to media state flags
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> : HTMLElement(tagName, document)
</span><span class="cx"> , m_hasRootEditableElementForSelectionOnMouseDown(false)
</span><span class="cx"> , m_wasShiftKeyDownOnMouseDown(false)
</span><del>- , m_linkRelations(0)
</del><span class="cx"> , m_cachedVisitedLinkHash(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -250,8 +249,14 @@
</span><span class="cx"> // Do nothing.
</span><span class="cx"> } else if (name == relAttr) {
</span><span class="cx"> // Update HTMLAnchorElement::relList() if more rel attributes values are supported.
</span><del>- if (SpaceSplitString::spaceSplitStringContainsValue(value, "noreferrer", true))
- m_linkRelations |= RelationNoReferrer;
</del><ins>+ static NeverDestroyed<AtomicString> noReferrer("noreferrer", AtomicString::ConstructFromLiteral);
+ static NeverDestroyed<AtomicString> noOpener("noopener", AtomicString::ConstructFromLiteral);
+ const bool shouldFoldCase = true;
+ SpaceSplitString relValue(value, shouldFoldCase);
+ if (relValue.contains(noReferrer))
+ m_linkRelations |= Relation::NoReferrer;
+ if (relValue.contains(noOpener))
+ m_linkRelations |= Relation::NoOpener;
</ins><span class="cx"> if (m_relList)
</span><span class="cx"> m_relList->associatedAttributeValueChanged(value);
</span><span class="cx"> }
</span><span class="lines">@@ -296,9 +301,9 @@
</span><span class="cx"> setAttributeWithoutSynchronization(hrefAttr, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLAnchorElement::hasRel(uint32_t relation) const
</del><ins>+bool HTMLAnchorElement::hasRel(Relation relation) const
</ins><span class="cx"> {
</span><del>- return m_linkRelations & relation;
</del><ins>+ return m_linkRelations.contains(relation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMTokenList& HTMLAnchorElement::relList()
</span><span class="lines">@@ -305,7 +310,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_relList)
</span><span class="cx"> m_relList = std::make_unique<DOMTokenList>(*this, HTMLNames::relAttr, [](StringView token) {
</span><del>- return equalIgnoringASCIICase(token, "noreferrer");
</del><ins>+ return equalIgnoringASCIICase(token, "noreferrer") || equalIgnoringASCIICase(token, "noopener");
</ins><span class="cx"> });
</span><span class="cx"> return *m_relList;
</span><span class="cx"> }
</span><span class="lines">@@ -389,7 +394,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- frame->loader().urlSelected(completedURL, target(), &event, LockHistory::No, LockBackForwardList::No, hasRel(RelationNoReferrer) ? NeverSendReferrer : MaybeSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate(), downloadAttribute);
</del><ins>+ ShouldSendReferrer shouldSendReferrer = hasRel(Relation::NoReferrer) ? NeverSendReferrer : MaybeSendReferrer;
+ auto newFrameOpenerPolicy = hasRel(Relation::NoOpener) ? makeOptional(NewFrameOpenerPolicy::Suppress) : Nullopt;
+ frame->loader().urlSelected(completedURL, target(), &event, LockHistory::No, LockBackForwardList::No, shouldSendReferrer, document().shouldOpenExternalURLsPolicyToPropagate(), newFrameOpenerPolicy, downloadAttribute);
</ins><span class="cx">
</span><span class="cx"> sendPings(completedURL);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.h (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.h 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.h 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2000 Simon Hausmann <hausmann@kde.org>
</span><del>- * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "LinkHash.h"
</span><span class="cx"> #include "URLUtils.h"
</span><ins>+#include <wtf/OptionSet.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -33,26 +34,9 @@
</span><span class="cx"> class DOMTokenList;
</span><span class="cx">
</span><span class="cx"> // Link relation bitmask values.
</span><del>-// FIXME: Uncomment as the various link relations are implemented.
-enum {
-// RelationAlternate = 0x00000001,
-// RelationArchives = 0x00000002,
-// RelationAuthor = 0x00000004,
-// RelationBoomark = 0x00000008,
-// RelationExternal = 0x00000010,
-// RelationFirst = 0x00000020,
-// RelationHelp = 0x00000040,
-// RelationIndex = 0x00000080,
-// RelationLast = 0x00000100,
-// RelationLicense = 0x00000200,
-// RelationNext = 0x00000400,
-// RelationNoFolow = 0x00000800,
- RelationNoReferrer = 0x00001000,
-// RelationPrev = 0x00002000,
-// RelationSearch = 0x00004000,
-// RelationSidebar = 0x00008000,
-// RelationTag = 0x00010000,
-// RelationUp = 0x00020000,
</del><ins>+enum class Relation {
+ NoReferrer = 1 << 0,
+ NoOpener = 1 << 1,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class HTMLAnchorElement : public HTMLElement, public URLUtils<HTMLAnchorElement> {
</span><span class="lines">@@ -76,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> bool willRespondToMouseClickEvents() final;
</span><span class="cx">
</span><del>- bool hasRel(uint32_t relation) const;
</del><ins>+ bool hasRel(Relation) const;
</ins><span class="cx">
</span><span class="cx"> LinkHash visitedLinkHash() const;
</span><span class="cx"> void invalidateCachedVisitedLinkHash() { m_cachedVisitedLinkHash = 0; }
</span><span class="lines">@@ -117,9 +101,9 @@
</span><span class="cx"> void setRootEditableElementForSelectionOnMouseDown(Element*);
</span><span class="cx"> void clearRootEditableElementForSelectionOnMouseDown();
</span><span class="cx">
</span><del>- bool m_hasRootEditableElementForSelectionOnMouseDown : 1;
- bool m_wasShiftKeyDownOnMouseDown : 1;
- uint32_t m_linkRelations : 30;
</del><ins>+ bool m_hasRootEditableElementForSelectionOnMouseDown;
+ bool m_wasShiftKeyDownOnMouseDown;
+ OptionSet<Relation> m_linkRelations;
</ins><span class="cx"> mutable LinkHash m_cachedVisitedLinkHash;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DOMTokenList> m_relList;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -345,20 +345,12 @@
</span><span class="cx"> urlSelected(request, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const AtomicString& downloadAttribute)
</del><ins>+void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomicString& downloadAttribute)
</ins><span class="cx"> {
</span><del>- NewFrameOpenerPolicy newFrameOpenerPolicy = shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow;
-
</del><ins>+ NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.valueOr(shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow);
</ins><span class="cx"> urlSelected(FrameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), passedTarget, lockHistory, lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, DoNotReplaceDocumentIfJavaScriptURL, shouldOpenExternalURLsPolicy, downloadAttribute), triggeringEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy)
-{
- NewFrameOpenerPolicy newFrameOpenerPolicy = shouldSendReferrer == NeverSendReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow;
-
- urlSelected(FrameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), passedTarget, lockHistory, lockBackForwardList, shouldSendReferrer, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, DoNotReplaceDocumentIfJavaScriptURL, shouldOpenExternalURLsPolicy, nullAtom), triggeringEvent);
-}
-
</del><span class="cx"> void FrameLoader::urlSelected(const FrameLoadRequest& passedRequest, Event* triggeringEvent)
</span><span class="cx"> {
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (207839 => 207840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h 2016-10-25 20:07:25 UTC (rev 207839)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2016-10-25 20:17:36 UTC (rev 207840)
</span><span class="lines">@@ -119,8 +119,7 @@
</span><span class="cx"> unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data);
</span><span class="cx">
</span><span class="cx"> void changeLocation(const FrameLoadRequest&);
</span><del>- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, const AtomicString& downloadAttribute);
- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy);
</del><ins>+ WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = Nullopt, const AtomicString& downloadAttribute = nullAtom);
</ins><span class="cx"> void submitForm(PassRefPtr<FormSubmission>);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void reload(bool endToEndReload = false, bool contentBlockersEnabled = true);
</span></span></pre>
</div>
</div>
</body>
</html>