<!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>[161663] 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/161663">161663</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 12:47:48 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove supportMultipleWindows setting
https://bugs.webkit.org/show_bug.cgi?id=126772
Reviewed by Beth Dakin.
Source/WebCore:
This setting was added in https://bugs.webkit.org/show_bug.cgi?id=99716 for the Chromium port
and is unused by everyone else so get rid of it.
* loader/FrameLoader.cpp:
(WebCore::createWindow):
* page/ContextMenuController.cpp:
(WebCore::openNewWindow):
* page/Settings.in:
LayoutTests:
* fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt: Removed.
* fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html: Removed.
* fast/dom/Window/window-open-no-multiple-windows-expected.txt: Removed.
* fast/dom/Window/window-open-no-multiple-windows.html: Removed.
* fast/forms/post-popup-no-multiple-windows-expected.txt: Removed.
* fast/forms/post-popup-no-multiple-windows.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchornomultiplewindowsexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchornomultiplewindowshtml">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowwindowopennomultiplewindowsexpectedtxt">trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowwindowopennomultiplewindowshtml">trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows.html</a></li>
<li><a href="#trunkLayoutTestsfastformspostpopupnomultiplewindowsexpectedtxt">trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformspostpopupnomultiplewindowshtml">trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Remove supportMultipleWindows setting
+ https://bugs.webkit.org/show_bug.cgi?id=126772
+
+ Reviewed by Beth Dakin.
+
+ * fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt: Removed.
+ * fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html: Removed.
+ * fast/dom/Window/window-open-no-multiple-windows-expected.txt: Removed.
+ * fast/dom/Window/window-open-no-multiple-windows.html: Removed.
+ * fast/forms/post-popup-no-multiple-windows-expected.txt: Removed.
+ * fast/forms/post-popup-no-multiple-windows.html: Removed.
+
</ins><span class="cx"> 2014-01-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry files outside WebCore
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchornomultiplewindowsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows-expected.txt 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-FAIL: Popup opened in a new window
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchornomultiplewindowshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-no-multiple-windows.html 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setCanOpenWindows(true);
- testRunner.overridePreference('WebKitSupportsMultipleWindows', false);
- testRunner.waitUntilDone();
-}
-
-function click(elmt)
-{
- var event = document.createEvent('MouseEvent');
- event.initEvent('click', true, true);
- elmt.dispatchEvent(event);
-}
-
-function runTest()
-{
- if (window.testRunner)
- var windowCount = testRunner.windowCount();
- var link = document.getElementById("link");
- click(link);
- if (window.testRunner) {
- if (windowCount != testRunner.windowCount())
- document.writeln('FAIL: Popup opened in a new window');
- else
- document.writeln('PASS: Popup opened in the same window');
- testRunner.notifyDone();
- }
-}
-
-window.addEventListener('load', runTest, true);
-</script>
-</head>
-<body>
-You need popups to be enabled to run this test.
-<a id="link" target="_blank" href="data:text/html;charset=utf-8,<html><body>The test passes if this page opens in the same window</body></html>">Click me!</a>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowwindowopennomultiplewindowsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows-expected.txt (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows-expected.txt 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows-expected.txt 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-FAIL: Popup opened in a new window
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowwindowopennomultiplewindowshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows.html (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows.html 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/dom/Window/window-open-no-multiple-windows.html 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setCanOpenWindows(true);
- testRunner.setPopupBlockingEnabled(false);
- testRunner.overridePreference('WebKitSupportsMultipleWindows', false);
- testRunner.waitUntilDone();
-}
-
-function runTest()
-{
- if (window.testRunner)
- var windowCount = testRunner.windowCount();
- var result = window.open('data:text/html;charset=utf-8,<html><body>The test passes if this page opens in the same window</body></html>');
- if (window.testRunner) {
- if (!result)
- document.writeln('FAIL: window.open failed. You need popups to be enabled to run this test.');
- else if (windowCount != testRunner.windowCount())
- document.writeln('FAIL: Popup opened in a new window');
- else
- document.writeln('PASS: Popup opened in the same window');
- testRunner.notifyDone();
- }
-}
-
-window.addEventListener('load', runTest, true);
-</script>
-</head>
-<body>
-You need popups to be enabled to run this test.
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastformspostpopupnomultiplewindowsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows-expected.txt (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows-expected.txt 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows-expected.txt 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-FAIL: Popup opened in a new window
</del></span></pre></div>
<a id="trunkLayoutTestsfastformspostpopupnomultiplewindowshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows.html (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows.html 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/LayoutTests/fast/forms/post-popup-no-multiple-windows.html 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.setCanOpenWindows(true);
- testRunner.overridePreference('WebKitSupportsMultipleWindows', false);
- testRunner.waitUntilDone();
-}
-
-function click(elmt)
-{
- var event = document.createEvent('MouseEvent');
- event.initEvent('click', true, true);
- elmt.dispatchEvent(event);
-}
-
-function runTest()
-{
- if (window.testRunner)
- testRunner.initialWindowCount = testRunner.windowCount();
- var button = document.getElementById("post-button");
- click(button);
- if (window.testRunner) {
- start = new Date();
- testInterval = setInterval(checkIfDone, 1);
- }
-}
-
-function checkIfDone ()
-{
- if (testRunner.globalFlag) {
- document.writeln('FAIL: Popup opened in a new window');
- clearInterval(testInterval);
- testRunner.notifyDone();
- } else if ((new Date() - start) > 10000) {
- document.writeln('FAIL: Popup did not open');
- clearInterval(testInterval);
- testRunner.notifyDone();
- }
-}
-
-window.addEventListener('load', runTest, true);
-</script>
-</head>
-<body>
- You need popups to be enabled to run this test.
- <form method="post" target="_blank" action="data:text/html;charset=utf-8,<html><head><script>function test() { if (!window.testRunner) return; testRunner.globalFlag=1; if (testRunner.initialWindowCount != testRunner.windowCount()) return; document.writeln('PASS: Popup opened in the same window'); testRunner.notifyDone(); }</script></head><body onload='test()'>The test passes if this page opens in the same window</body></html>">
- <input id="post-button" type="submit" value="Click me!" />
- </form>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Remove supportMultipleWindows setting
+ https://bugs.webkit.org/show_bug.cgi?id=126772
+
+ Reviewed by Beth Dakin.
+
+ This setting was added in https://bugs.webkit.org/show_bug.cgi?id=99716 for the Chromium port
+ and is unused by everyone else so get rid of it.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::createWindow):
+ * page/ContextMenuController.cpp:
+ (WebCore::openNewWindow):
+ * page/Settings.in:
+
</ins><span class="cx"> 2014-01-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry port from trunk
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -3528,11 +3528,6 @@
</span><span class="cx"> requestWithReferrer.resourceRequest().setHTTPReferrer(referrer);
</span><span class="cx"> FrameLoader::addHTTPOriginIfNeeded(requestWithReferrer.resourceRequest(), openerFrame->loader().outgoingOrigin());
</span><span class="cx">
</span><del>- if (!openerFrame->settings().supportsMultipleWindows()) {
- created = false;
- return openerFrame;
- }
-
</del><span class="cx"> Page* oldPage = openerFrame->page();
</span><span class="cx"> if (!oldPage)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -172,17 +172,18 @@
</span><span class="cx">
</span><span class="cx"> static void openNewWindow(const URL& urlToLoad, Frame* frame)
</span><span class="cx"> {
</span><del>- if (Page* oldPage = frame->page()) {
- FrameLoadRequest request(frame->document()->securityOrigin(), ResourceRequest(urlToLoad, frame->loader().outgoingReferrer()));
- Page* newPage = oldPage;
- if (frame->settings().supportsMultipleWindows()) {
- newPage = oldPage->chrome().createWindow(frame, request, WindowFeatures(), NavigationAction(request.resourceRequest()));
- if (!newPage)
- return;
- newPage->chrome().show();
- }
- newPage->mainFrame().loader().loadFrameRequest(request, false, false, 0, 0, MaybeSendReferrer);
- }
</del><ins>+ Page* oldPage = frame->page();
+ if (!oldPage)
+ return;
+
+ FrameLoadRequest request(frame->document()->securityOrigin(), ResourceRequest(urlToLoad, frame->loader().outgoingReferrer()));
+ Page* newPage = oldPage;
+
+ newPage = oldPage->chrome().createWindow(frame, request, WindowFeatures(), NavigationAction(request.resourceRequest()));
+ if (!newPage)
+ return;
+ newPage->chrome().show();
+ newPage->mainFrame().loader().loadFrameRequest(request, false, false, 0, 0, MaybeSendReferrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (161662 => 161663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2014-01-10 20:41:20 UTC (rev 161662)
+++ trunk/Source/WebCore/page/Settings.in 2014-01-10 20:47:48 UTC (rev 161663)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> allowUniversalAccessFromFileURLs initial=true
</span><span class="cx"> allowFileAccessFromFileURLs initial=true
</span><span class="cx"> javaScriptCanOpenWindowsAutomatically initial=false
</span><del>-supportsMultipleWindows initial=true
</del><span class="cx"> javaScriptCanAccessClipboard initial=false
</span><span class="cx"> shouldPrintBackgrounds initial=false
</span><span class="cx"> usesDashboardBackwardCompatibilityMode initial=false, conditional=DASHBOARD_SUPPORT
</span></span></pre>
</div>
</div>
</body>
</html>