Unreviewed, rolling out r142734.

http://trac.webkit.org/changeset/142734
https://bugs.webkit.org/show_bug.cgi?id=110018

"Triggered crashes on lots of websites" (Requested by ggaren
on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-16

Source/WebCore:

* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::getOwnPropertySlotDelegate):

LayoutTests:

* http/tests/plugins/resources/cross-frame-object-access.html:
* http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt:
* http/tests/security/cross-frame-access-location-get-expected.txt:
* http/tests/security/cross-frame-access-location-get.html:
* http/tests/security/resources/cross-frame-access.js:
* http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html:
* http/tests/security/resources/cross-frame-iframe-for-location-get-test.html:
* http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt:
* platform/chromium/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt: Removed.
* platform/chromium/http/tests/security/cross-frame-access-location-get-expected.txt: Removed.
* platform/chromium/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ed51669ed26cf380e70fd172f98b1436b6bbeb3e..e070ed6e4842fd0dee7534f95dbbadf31b69a33b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2013-02-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142734.
+        http://trac.webkit.org/changeset/142734
+        https://bugs.webkit.org/show_bug.cgi?id=110018
+
+        "Triggered crashes on lots of websites" (Requested by ggaren
+        on #webkit).
+
+        * http/tests/plugins/resources/cross-frame-object-access.html:
+        * http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt:
+        * http/tests/security/cross-frame-access-location-get-expected.txt:
+        * http/tests/security/cross-frame-access-location-get.html:
+        * http/tests/security/resources/cross-frame-access.js:
+        * http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html:
+        * http/tests/security/resources/cross-frame-iframe-for-location-get-test.html:
+        * http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt:
+        * platform/chromium/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt: Removed.
+        * platform/chromium/http/tests/security/cross-frame-access-location-get-expected.txt: Removed.
+        * platform/chromium/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt: Removed.
+
 2013-02-16  Takashi Toyoshima  <toyoshim@chromium.org>
 
         Rebaseline for Win7.

diff --git a/LayoutTests/http/tests/plugins/resources/cross-frame-object-access.html b/LayoutTests/http/tests/plugins/resources/cross-frame-object-access.html
index e223c4207632176927019836325633a84effdbd4..f03f2eb11f90eaec03e14fa499f35a72b6cdb240 100644 (file)
--- a/LayoutTests/http/tests/plugins/resources/cross-frame-object-access.html
+++ b/LayoutTests/http/tests/plugins/resources/cross-frame-object-access.html
@@ -14,14 +14,11 @@ function checkLocationObject(l)
         return false;
     }
 
-    try {
-        if (l.href) {
-            debug('could access top.location.href');
-            return false;
-        }
-    } catch (e) {
-        return true;
+    if (l.href) {
+        debug('could access top.location.href');
+        return false;
     }
+    
     return true;
 }
 

diff --git a/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt
index a317526555393888b5212444a40369b98da0f85b..916a6a94adf9852335b767f80537d2a8142f56c3 100644 (file)
--- a/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt
+++ b/LayoutTests/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt
@@ -1,7 +1,5 @@
 CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-callback-explicit-domain-DENY.html from frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html. The frame requesting access set 'document.domain' to '127.0.0.1', but the frame being accessed did not. Both must set 'document.domain' to the same value to allow access.
 
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-callback-explicit-domain-DENY.html from frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html. The frame requesting access set 'document.domain' to '127.0.0.1', but the frame being accessed did not. Both must set 'document.domain' to the same value to allow access.
-
 Test that a child frame can't define a function and the use it to access parent properties after document.domain write blocks the access.  
 
 
@@ -10,5 +8,3 @@ Test that a child frame can't define a function and the use it to access parent
 Frame: '<!--framePath //<!--frame0-->-->'
 --------
 PASS: canGet('parentWindow.location.href') should be 'false' and is.
-PASS: accessThrowsException('parentWindow.location.href') should be 'true' and is.
-

diff --git a/LayoutTests/http/tests/security/cross-frame-access-location-get-expected.txt b/LayoutTests/http/tests/security/cross-frame-access-location-get-expected.txt
index c67f821a766b17b1a53dd98c691a85d354a46366..95cd4ff029c37a4e2f9ab212cc2439f16b6c40a4 100644 (file)
--- a/LayoutTests/http/tests/security/cross-frame-access-location-get-expected.txt
+++ b/LayoutTests/http/tests/security/cross-frame-access-location-get-expected.txt
@@ -22,28 +22,6 @@ CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://local
 
 CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
 
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
 
 
 ----- tests for getting window.location's properties -----
@@ -52,7 +30,6 @@ PASS: canGet('targetWindow.location') should be 'true' and is.
 PASS: toString('targetWindow.location', '') should be '' and is.
 Firefox allows access to 'location.toString' but throws an exception when you call it.
 PASS: canGet('targetWindow.location.toString') should be 'false' and is.
-PASS: accessThrowsException('targetWindow.location.toString') should be 'true' and is.
 PASS: canGet('targetWindow.location.href') should be 'false' and is.
 PASS: canGet('targetWindow.location.hash') should be 'false' and is.
 PASS: canGet('targetWindow.location.host') should be 'false' and is.
@@ -61,19 +38,8 @@ PASS: canGet('targetWindow.location.pathname') should be 'false' and is.
 PASS: canGet('targetWindow.location.port') should be 'false' and is.
 PASS: canGet('targetWindow.location.protocol') should be 'false' and is.
 PASS: canGet('targetWindow.location.search') should be 'false' and is.
-PASS: canGet('targetWindow.location.existingCustomProperty') should be 'false' and is.
-PASS: canGet('targetWindow.location[1]') should be 'false' and is.
-PASS: accessThrowsException('targetWindow.location.href') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.hash') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.host') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.hostname') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.pathname') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.port') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.protocol') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.search') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location.existingCustomProperty') should be 'true' and is.
-PASS: accessThrowsException('targetWindow.location[1]') should be 'true' and is.
 PASS: canGet('targetWindow.location.assign') should be 'true' and is.
 PASS: canGet('targetWindow.location.reload') should be 'true' and is.
 PASS: canGet('targetWindow.location.replace') should be 'true' and is.
+PASS: canGet('targetWindow.location.existingCustomProperty') should be 'false' and is.
 

diff --git a/LayoutTests/http/tests/security/cross-frame-access-location-get.html b/LayoutTests/http/tests/security/cross-frame-access-location-get.html
index f4a4e455df110ba906baa77e1c99c91746a17be2..f01f76106123f686b711fd22fe11ce1cd5ddf7e6 100644 (file)
--- a/LayoutTests/http/tests/security/cross-frame-access-location-get.html
+++ b/LayoutTests/http/tests/security/cross-frame-access-location-get.html
@@ -41,7 +41,6 @@
 
             log("Firefox allows access to 'location.toString' but throws an exception when you call it.");
             shouldBeFalse("canGet('targetWindow.location.toString')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.toString')");
 
             shouldBeFalse("canGet('targetWindow.location.href')");
             shouldBeFalse("canGet('targetWindow.location.hash')");
@@ -51,24 +50,12 @@
             shouldBeFalse("canGet('targetWindow.location.port')");
             shouldBeFalse("canGet('targetWindow.location.protocol')");
             shouldBeFalse("canGet('targetWindow.location.search')");
-            shouldBeFalse("canGet('targetWindow.location.existingCustomProperty')");
-            shouldBeFalse("canGet('targetWindow.location[1]')");
-
-            shouldBeTrue("accessThrowsException('targetWindow.location.href')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.hash')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.host')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.hostname')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.pathname')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.port')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.protocol')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.search')");
-            shouldBeTrue("accessThrowsException('targetWindow.location.existingCustomProperty')");
-            shouldBeTrue("accessThrowsException('targetWindow.location[1]')");
 
             shouldBeTrue("canGet('targetWindow.location.assign')");
             shouldBeTrue("canGet('targetWindow.location.reload')");
             shouldBeTrue("canGet('targetWindow.location.replace')");
 
+            shouldBeFalse("canGet('targetWindow.location.existingCustomProperty')");
         }
     </script>
 </head>

diff --git a/LayoutTests/http/tests/security/resources/cross-frame-access.js b/LayoutTests/http/tests/security/resources/cross-frame-access.js
index 3be185981d2e8710fa491548db52d0bc43e4475c..fd524b53786598a7234ae97693c9998ce471c571 100644 (file)
--- a/LayoutTests/http/tests/security/resources/cross-frame-access.js
+++ b/LayoutTests/http/tests/security/resources/cross-frame-access.js
@@ -58,15 +58,6 @@ function canGet(keyPath)
     }
 }
 
-function accessThrowsException(keyPath) {
-    try {
-        eval("window." + keyPath);
-        return false;
-    } catch (e) {
-        return true;
-    }
-}
-
 function canGetDescriptor(target, property)
 {
     try {

diff --git a/LayoutTests/http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html b/LayoutTests/http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html
index 6e919b76435b06ecd71ca1ca1023d350b19f98a3..52ee51f31287e67c8679c0792c710f1bd06a5969 100644 (file)
--- a/LayoutTests/http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html
+++ b/LayoutTests/http/tests/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html
@@ -1,12 +1,11 @@
 <script src="cross-frame-access.js"></script>
 <body>
-<pre id=console></pre>
+<div id=console></div>
 <script>
 var parentWindow = window.parent;
 parentWindow.testFunction = function()
 {
     shouldBeFalse("canGet('parentWindow.location.href')");
-    shouldBeTrue("accessThrowsException('parentWindow.location.href')");
     if (window.testRunner)
         testRunner.notifyDone();
 }

diff --git a/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-location-get-test.html b/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-location-get-test.html
index fa118271472ea33f914244708aaf589f77214348..af9f86dc24dc16fd060e7e2a9b521852e8c48a96 100644 (file)
--- a/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-location-get-test.html
+++ b/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-location-get-test.html
@@ -1,8 +1,7 @@
 <html>
 <head>
     <script>
-        window.location.existingCustomProperty = 1;
-        window.location[1] = 1;
+        window.location.existingCustomProperty = 1; 
 
         window.onload = function()
         {

diff --git a/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt b/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt
index cd29808524754eb5bf0931bf3fb065d4d9287950..9cd5bcd5bce82386121176fcc640114e7e4a1a50 100644 (file)
--- a/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt
+++ b/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt
@@ -1,6 +1,5 @@
 CONSOLE MESSAGE: Sandbox access violation: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/resources/blank.html from frame with URL http://127.0.0.1:8000/security/sandboxed-iframe-blocks-access-from-parent.html. The frame being accessed is sandboxed into a unique origin.
 
-CONSOLE MESSAGE: line 12: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
 Sandboxing a frame puts it into a unique origin by default, which the containing document shouldn't have script access to. This test passes if a console warning is generated, noting the access violation.
 
 

diff --git a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt
deleted file mode 100644 (file)
index 1f7fdd3..0000000
--- a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-callback-explicit-domain-DENY-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-callback-explicit-domain-DENY.html from frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html. The frame requesting access set 'document.domain' to '127.0.0.1', but the frame being accessed did not. Both must set 'document.domain' to the same value to allow access.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/cross-frame-access-callback-explicit-domain-DENY.html from frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe-callback-explicit-domain-DENY.html. The frame requesting access set 'document.domain' to '127.0.0.1', but the frame being accessed did not. Both must set 'document.domain' to the same value to allow access.
-
-Test that a child frame can't define a function and the use it to access parent properties after document.domain write blocks the access.  
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS: canGet('parentWindow.location.href') should be 'false' and is.
-*** FAIL: accessThrowsException('parentWindow.location.href') should be 'true' but instead is false. ***
-

diff --git a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-location-get-expected.txt b/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-location-get-expected.txt
deleted file mode 100644 (file)
index d0593c6..0000000
--- a/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-location-get-expected.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-location-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-location-get.html. Domains, protocols and ports must match.
-
-
-
------ tests for getting window.location's properties -----
-
-PASS: canGet('targetWindow.location') should be 'true' and is.
-PASS: toString('targetWindow.location', '') should be '' and is.
-Firefox allows access to 'location.toString' but throws an exception when you call it.
-PASS: canGet('targetWindow.location.toString') should be 'false' and is.
-*** FAIL: accessThrowsException('targetWindow.location.toString') should be 'true' but instead is false. ***
-PASS: canGet('targetWindow.location.href') should be 'false' and is.
-PASS: canGet('targetWindow.location.hash') should be 'false' and is.
-PASS: canGet('targetWindow.location.host') should be 'false' and is.
-PASS: canGet('targetWindow.location.hostname') should be 'false' and is.
-PASS: canGet('targetWindow.location.pathname') should be 'false' and is.
-PASS: canGet('targetWindow.location.port') should be 'false' and is.
-PASS: canGet('targetWindow.location.protocol') should be 'false' and is.
-PASS: canGet('targetWindow.location.search') should be 'false' and is.
-PASS: canGet('targetWindow.location.existingCustomProperty') should be 'false' and is.
-PASS: canGet('targetWindow.location[1]') should be 'false' and is.
-*** FAIL: accessThrowsException('targetWindow.location.href') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.hash') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.host') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.hostname') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.pathname') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.port') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.protocol') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.search') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location.existingCustomProperty') should be 'true' but instead is false. ***
-*** FAIL: accessThrowsException('targetWindow.location[1]') should be 'true' but instead is false. ***
-PASS: canGet('targetWindow.location.assign') should be 'true' and is.
-PASS: canGet('targetWindow.location.reload') should be 'true' and is.
-PASS: canGet('targetWindow.location.replace') should be 'true' and is.
-

diff --git a/LayoutTests/platform/chromium/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt b/LayoutTests/platform/chromium/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt
deleted file mode 100644 (file)
index 9cd5bcd..0000000
--- a/LayoutTests/platform/chromium/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CONSOLE MESSAGE: Sandbox access violation: Unsafe JavaScript attempt to access frame with URL http://127.0.0.1:8000/security/resources/blank.html from frame with URL http://127.0.0.1:8000/security/sandboxed-iframe-blocks-access-from-parent.html. The frame being accessed is sandboxed into a unique origin.
-
-Sandboxing a frame puts it into a unique origin by default, which the containing document shouldn't have script access to. This test passes if a console warning is generated, noting the access violation.
-
-
-
---------
-Frame: 'testframe'
---------
-

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cd204ba571cbc6893c2e107519d1f8b47d52571a..d36722a87507a23604a095c73af9b7bb1bd875e3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-02-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142734.
+        http://trac.webkit.org/changeset/142734
+        https://bugs.webkit.org/show_bug.cgi?id=110018
+
+        "Triggered crashes on lots of websites" (Requested by ggaren
+        on #webkit).
+
+        * bindings/js/JSLocationCustom.cpp:
+        (WebCore::JSLocation::getOwnPropertySlotDelegate):
+
 2013-02-16  Robert Hogan  <robert@webkit.org>
 
         percentage top value of position:relative element not calculated using parent's min-height unless height set

diff --git a/Source/WebCore/bindings/js/JSLocationCustom.cpp b/Source/WebCore/bindings/js/JSLocationCustom.cpp
index 9f5fb4a2a826baf08397c9ba7ea6c2f9b95c745e..0e81d67b120507b5a3d9fb741142d7951148f475 100644 (file)
--- a/Source/WebCore/bindings/js/JSLocationCustom.cpp
+++ b/Source/WebCore/bindings/js/JSLocationCustom.cpp
@@ -81,9 +81,7 @@ bool JSLocation::getOwnPropertySlotDelegate(ExecState* exec, PropertyName proper
     // but for now we have decided not to, partly because it seems silly to return "[Object Location]" in
     // such cases when normally the string form of Location would be the URL.
 
-    // FIXME: Move this message into the exception once http://wkbug.com/98050 is fixed.
     printErrorMessageForFrame(frame, message);
-    setDOMException(exec, SECURITY_ERR);
     slot.setUndefined();
     return true;
 }