Diff
Modified: trunk/LayoutTests/ChangeLog (204183 => 204184)
--- trunk/LayoutTests/ChangeLog 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/LayoutTests/ChangeLog 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,3 +1,16 @@
+2016-08-05 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r204174.
+
+ The test for this change is failing on WK1
+
+ Reverted changeset:
+
+ "Popups opened from a sandboxed iframe should themselves be
+ sandboxed"
+ https://bugs.webkit.org/show_bug.cgi?id=134850
+ http://trac.webkit.org/changeset/204174
+
2016-08-05 John Wilander <[email protected]>
Don't set document.domain to an IP address fragment
Deleted: trunk/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html (204183 => 204184)
--- trunk/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/LayoutTests/http/tests/security/resources/anchor-tag-with-blank-target.html 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
- <a id="theLink" target="_blank" href="" page that executes _javascript_</a>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/resources/page-executing-_javascript_.html (204183 => 204184)
--- trunk/LayoutTests/http/tests/security/resources/page-executing-_javascript_.html 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/LayoutTests/http/tests/security/resources/page-executing-_javascript_.html 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<noscript>Pass: _javascript_ was not allowed to execute.</noscript>
-<p id="output"></p>
-<script>
- document.getElementById("output").innerHTML = "Fail: _javascript_ was allowed to execute.";
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt (204183 => 204184)
--- trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: Blocked script execution in 'http://127.0.0.1:8000/security/resources/page-executing-_javascript_.html' because the document's frame is sandboxed and the 'allow-scripts' permission is not set.
-
Deleted: trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html (204183 => 204184)
--- trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/LayoutTests/http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="UTF-8">
- <title>Tests that windows created from a sandboxed context inherit the same sandbox</title>
- <script src=""
-</head>
-<body>
-<script>
- if (window.testRunner) {
- testRunner.setCanOpenWindows();
- testRunner.waitUntilDone();
- testRunner.setPopupBlockingEnabled(false);
- testRunner.dumpAsText();
- }
-
- function wrapUp () {
- finishJSTest();
- if (window.testRunner) {
- testRunner.notifyDone();
- }
- }
-
- function run() {
- var iframeContentDocument = document.getElementById("theIframe").contentDocument;
- if (!iframeContentDocument) {
- testFailed("Can't get iframeElement.contentDocument");
- finishJSTest();
- testRunner.notifyDone();
- } else {
- var theLink = iframeContentDocument.getElementById("theLink");
- if (!theLink) {
- testFailed("Can't get iframeElement.contentDocument.getElementById('theLink')");
- finishJSTest();
- testRunner.notifyDone();
- } else {
- var clickEvent = document.createEvent("HTMLEvents");
- clickEvent.initEvent("click", true, true);
- theLink.dispatchEvent(clickEvent);
-
- setTimeout(wrapUp, 500);
- }
- }
- }
-</script>
-<iframe _onload_="run()" id="theIframe" sandbox="allow-same-origin allow-popups" src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (204183 => 204184)
--- trunk/Source/WebCore/ChangeLog 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/Source/WebCore/ChangeLog 2016-08-05 19:16:55 UTC (rev 204184)
@@ -1,3 +1,16 @@
+2016-08-05 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r204174.
+
+ The test for this change is failing on WK1
+
+ Reverted changeset:
+
+ "Popups opened from a sandboxed iframe should themselves be
+ sandboxed"
+ https://bugs.webkit.org/show_bug.cgi?id=134850
+ http://trac.webkit.org/changeset/204174
+
2016-08-05 John Wilander <[email protected]>
Don't set document.domain to an IP address fragment
Modified: trunk/Source/WebCore/page/Chrome.cpp (204183 => 204184)
--- trunk/Source/WebCore/page/Chrome.cpp 2016-08-05 19:16:34 UTC (rev 204183)
+++ trunk/Source/WebCore/page/Chrome.cpp 2016-08-05 19:16:55 UTC (rev 204184)
@@ -195,13 +195,10 @@
Page* Chrome::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& features, const NavigationAction& action) const
{
- ASSERT(frame);
Page* newPage = m_client.createWindow(frame, request, features, action);
if (!newPage)
return 0;
- newPage->mainFrame().loader().forceSandboxFlags(frame->loader().effectiveSandboxFlags());
-
if (StorageNamespace* oldSessionStorage = m_page.sessionStorage(false))
newPage->setSessionStorage(oldSessionStorage->copy(newPage));
