<!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>[196237] trunk/LayoutTests</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/196237">196237</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-02-06 22:34:11 -0800 (Sat, 06 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, update several layout tests for WK1 after <a href="http://trac.webkit.org/projects/webkit/changeset/196227">r196227</a>.
* http/tests/security/cross-frame-access-enumeration-expected.txt:
* http/tests/security/cross-frame-access-enumeration.html:
* http/tests/security/cross-frame-access-get-expected.txt:
* http/tests/security/cross-frame-access-get.html:
* http/tests/security/cross-frame-access-history-get-expected.txt:
* http/tests/security/cross-frame-access-history-get-override-expected.txt:
* http/tests/security/cross-frame-access-history-get-override.html:
* http/tests/security/cross-frame-access-history-get.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccessenumerationexpectedtxt">trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccessenumerationhtml">trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccessgetexpectedtxt">trunk/LayoutTests/http/tests/security/cross-frame-access-get-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccessgethtml">trunk/LayoutTests/http/tests/security/cross-frame-access-get.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetexpectedtxt">trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetoverrideexpectedtxt">trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetoverridehtml">trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccesshistorygethtml">trunk/LayoutTests/http/tests/security/cross-frame-access-history-get.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/ChangeLog 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-06 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, update several layout tests for WK1 after r196227.
+
+ * http/tests/security/cross-frame-access-enumeration-expected.txt:
+ * http/tests/security/cross-frame-access-enumeration.html:
+ * http/tests/security/cross-frame-access-get-expected.txt:
+ * http/tests/security/cross-frame-access-get.html:
+ * http/tests/security/cross-frame-access-history-get-expected.txt:
+ * http/tests/security/cross-frame-access-history-get-override-expected.txt:
+ * http/tests/security/cross-frame-access-history-get-override.html:
+ * http/tests/security/cross-frame-access-history-get.html:
+
</ins><span class="cx"> 2016-02-06 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Rebaseline some tests and update expectations after r196222
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccessenumerationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -3,23 +3,14 @@
</span><span class="cx"> CONSOLE MESSAGE: line 48: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><del>-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</del><span class="cx"> CONSOLE MESSAGE: line 75: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 82: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><del>-CONSOLE MESSAGE: line 29: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 102: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 109: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</del><span class="cx"> This tests that variable names can't be enumerated cross domain (see http://bugs.webkit.org/show_bug.cgi?id=16387)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS: Cross frame access by enumerating the window object was denied.
</span><span class="cx"> PASS: Cross frame access by getting the keys of the window object was denied.
</span><span class="cx"> PASS: Cross frame access by getting the property names of the window object was denied.
</span><del>-PASS: Cross frame access by enumerating the History object was denied.
-PASS: Cross frame access by getting the keys of the History object was denied.
-PASS: Cross frame access by getting the property names of the History object was denied.
</del><span class="cx"> PASS: Cross frame access by enumerating the Location object was denied.
</span><span class="cx"> PASS: Cross frame access by getting the keys of the Location object was denied.
</span><span class="cx"> PASS: Cross frame access by getting the property names of the Location object was denied.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccessenumerationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -59,33 +59,6 @@
</span><span class="cx"> }
</span><span class="cx"> log("PASS: Cross frame access by getting the property names of the window object was denied.");
</span><span class="cx">
</span><del>- // Test enumerating the History object
- var b_win_history = b_win.history;
- try {
- for (var k in b_win_history) {
- if (k == "customHistoryProperty") {
- log("FAIL: Cross frame access by enumerating the History object was allowed.");
- return;
- }
- }
- } catch (e) {
- }
- log("PASS: Cross frame access by enumerating the History object was denied.");
-
- var b_winHistoryKeys = Object.keys(b_win_history);
- if (b_winHistoryKeys.indexOf("customHistoryProperty") != -1) {
- log("FAIL: Cross frame access by getting the keys of the History object was allowed.");
- return;
- }
- log("PASS: Cross frame access by getting the keys of the History object was denied.");
-
- var b_winHistoryPropertyNames = Object.getOwnPropertyNames(b_win_history);
- if (b_winHistoryPropertyNames.indexOf("customHistoryProperty") != -1) {
- log("FAIL: Cross frame access by getting the property names of the History object was allowed.");
- return;
- }
- log("PASS: Cross frame access by getting the property names of the History object was denied.");
-
</del><span class="cx"> // Test enumerating the Location object
</span><span class="cx"> var b_win_location = b_win.location;
</span><span class="cx"> try {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccessgetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-get-expected.txt (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-get-expected.txt 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-get-expected.txt 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -187,6 +187,7 @@
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><ins>+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</ins><span class="cx"> This test checks cross-frame access security (rdar://problem/5251309).
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -204,7 +205,6 @@
</span><span class="cx">
</span><span class="cx"> PASS: canGet('targetWindow.closed') should be 'true' and is.
</span><span class="cx"> PASS: canGet('targetWindow.frames') should be 'true' and is.
</span><del>-PASS: canGet('targetWindow.history') should be 'true' and is.
</del><span class="cx"> PASS: canGet('targetWindow.length') should be 'true' and is.
</span><span class="cx"> PASS: canGet('targetWindow.opener') should be 'true' and is.
</span><span class="cx"> PASS: canGet('targetWindow.parent') should be 'true' and is.
</span><span class="lines">@@ -363,6 +363,7 @@
</span><span class="cx"> PASS: canGet('targetWindow.eval') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.event') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.frameElement') should be 'false' and is.
</span><ins>+PASS: canGet('targetWindow.history') should be 'false' and is.
</ins><span class="cx"> PASS: canGet('targetWindow.images') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.innerHeight') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.innerWidth') should be 'false' and is.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccessgethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-get.html (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-get.html 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-get.html 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -147,7 +147,8 @@
</span><span class="cx"> "embeds",
</span><span class="cx"> "eval",
</span><span class="cx"> "event",
</span><del>- "frameElement",
</del><ins>+ "frameElement",
+ "history",
</ins><span class="cx"> "images",
</span><span class="cx"> "innerHeight",
</span><span class="cx"> "innerWidth",
</span><span class="lines">@@ -209,7 +210,6 @@
</span><span class="cx"> var windowAttributesPropertiesAllowed = [
</span><span class="cx"> "closed",
</span><span class="cx"> "frames",
</span><del>- "history",
</del><span class="cx"> "length",
</span><span class="cx"> "opener",
</span><span class="cx"> "parent",
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-expected.txt (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-expected.txt 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-expected.txt 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -1,9 +1,12 @@
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><del>-CONSOLE MESSAGE: line 107: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</del><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><ins>+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</ins><span class="cx"> CONSOLE MESSAGE: line 91: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: line 91: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx">
</span><span class="lines">@@ -11,11 +14,10 @@
</span><span class="cx"> ----- tests for getting window.history and its properties -----
</span><span class="cx">
</span><span class="cx"> PASS: canGet('targetWindow.history.length') should be 'false' and is.
</span><del>-PASS: canGet('targetWindow.history.back') should be 'true' and is.
-PASS: canGet('targetWindow.history.forward') should be 'true' and is.
-PASS: canGet('targetWindow.history.go') should be 'true' and is.
-PASS: canGet('targetWindow.history.toString') should be 'true' and is.
-PASS: toString('targetWindow.history') should be '[object History]' and is.
</del><ins>+PASS: canGet('targetWindow.history.back') should be 'false' and is.
+PASS: canGet('targetWindow.history.forward') should be 'false' and is.
+PASS: canGet('targetWindow.history.go') should be 'false' and is.
+PASS: canGet('targetWindow.history.toString') should be 'false' and is.
</ins><span class="cx"> PASS: canGet('targetWindow.__proto__') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.constructor') should be 'false' and is.
</span><span class="cx"> PASS: canGet('targetWindow.history.existingCustomProperty') should be 'false' and is.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetoverrideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override-expected.txt (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override-expected.txt 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override-expected.txt 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><ins>+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</ins><span class="cx">
</span><span class="cx"> ----- tests for getting a targetWindow's history object's functions which have custom overrides. The desired behavior is for the targetWindow to return the builtin function, not the override -----
</span><span class="cx">
</span><del>-PASS: canGet('targetWindow.history.back') should be 'true' and is.
-PASS: toString('targetWindow.history.back') should be 'function back() { [native code]}' and is.
-PASS: canGet('targetWindow.history.forward') should be 'true' and is.
-PASS: toString('targetWindow.history.forward') should be 'function forward() { [native code]}' and is.
-PASS: canGet('targetWindow.history.go') should be 'true' and is.
-PASS: toString('targetWindow.history.go') should be 'function go() { [native code]}' and is.
</del><ins>+PASS: canGet('targetWindow.history.back') should be 'false' and is.
+PASS: canGet('targetWindow.history.forward') should be 'false' and is.
+PASS: canGet('targetWindow.history.go') should be 'false' and is.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccesshistorygetoverridehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override.html (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override.html 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-history-get-override.html 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -38,16 +38,13 @@
</span><span class="cx"> " desired behavior is for the targetWindow to return the builtin function, not the override -----\n");
</span><span class="cx">
</span><span class="cx"> // Overriden using window.history.back = function() { return "new back" }
</span><del>- shouldBeTrue("canGet('targetWindow.history.back')");
- shouldBe("toString('targetWindow.history.back')", "toString('window.history.back')");
</del><ins>+ shouldBeFalse("canGet('targetWindow.history.back')");
</ins><span class="cx">
</span><span class="cx"> // Overriden using window.history.__proto__.forward = function() { return "new forward;" }
</span><del>- shouldBeTrue("canGet('targetWindow.history.forward')");
- shouldBe("toString('targetWindow.history.forward')", "toString('window.history.forward')");
</del><ins>+ shouldBeFalse("canGet('targetWindow.history.forward')");
</ins><span class="cx">
</span><span class="cx"> // Overriden using window.history.go = "new go"
</span><del>- shouldBeTrue("canGet('targetWindow.history.go')");
- shouldBe("toString('targetWindow.history.go')", "toString('window.history.go')");
</del><ins>+ shouldBeFalse("canGet('targetWindow.history.go')");
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccesshistorygethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-history-get.html (196236 => 196237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-history-get.html 2016-02-07 05:55:12 UTC (rev 196236)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-history-get.html 2016-02-07 06:34:11 UTC (rev 196237)
</span><span class="lines">@@ -39,19 +39,12 @@
</span><span class="cx"> // history object
</span><span class="cx"> shouldBeFalse("canGet('targetWindow.history.length')");
</span><span class="cx">
</span><del>- shouldBeTrue("canGet('targetWindow.history.back')");
- shouldBeTrue("canGet('targetWindow.history.forward')");
- shouldBeTrue("canGet('targetWindow.history.go')");
</del><ins>+ shouldBeFalse("canGet('targetWindow.history.back')");
+ shouldBeFalse("canGet('targetWindow.history.forward')");
+ shouldBeFalse("canGet('targetWindow.history.go')");
</ins><span class="cx">
</span><del>- // FIXME: Calling these currently cause the subsequent test to include a dump of this test's render tree.
- // (see http://bugs.webkit.org/show_bug.cgi?id=16510)
- // shouldBeTrue("canCall('targetWindow.history.back')");
- // shouldBeTrue("canCall('targetWindow.history.forward')");
- // shouldBeTrue("canCall('targetWindow.history.go', '-1')");
</del><ins>+ shouldBeFalse("canGet('targetWindow.history.toString')");
</ins><span class="cx">
</span><del>- shouldBeTrue("canGet('targetWindow.history.toString')");
- shouldBe("toString('targetWindow.history')", "'[object History]'");
-
</del><span class="cx"> shouldBeFalse("canGet('targetWindow.__proto__')");
</span><span class="cx"> shouldBeFalse("canGet('targetWindow.constructor')");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>