<!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>[203695] 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/203695">203695</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-25 12:57:47 -0700 (Mon, 25 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow LocalStorage by default for file URLs.
https://bugs.webkit.org/show_bug.cgi?id=160169
Reviewed by Brent Fulgham.
Source/WebCore:
Test: storage/domstorage/localstorage/file-can-access.html
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canAccessStorage): Remove the m_universalAccess check for local URLs.
LayoutTests:
* storage/domstorage/localstorage/blocked-file-access-expected.txt: Removed.
* storage/domstorage/localstorage/file-can-access-expected.txt: Added.
* storage/domstorage/localstorage/file-can-access.html: Renamed from LayoutTests/storage/domstorage/localstorage/blocked-file-access.html.
* storage/domstorage/localstorage/resources/unblocked-example.html: Renamed from LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html.</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="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstoragefilecanaccessexpectedtxt">trunk/LayoutTests/storage/domstorage/localstorage/file-can-access-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstoragefilecanaccesshtml">trunk/LayoutTests/storage/domstorage/localstorage/file-can-access.html</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstorageresourcesunblockedexamplehtml">trunk/LayoutTests/storage/domstorage/localstorage/resources/unblocked-example.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstorageblockedfileaccessexpectedtxt">trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstorageblockedfileaccesshtml">trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access.html</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstorageresourcesblockedexamplehtml">trunk/LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/LayoutTests/ChangeLog        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-25 Brady Eidson <beidson@apple.com>
+
+ Allow LocalStorage by default for file URLs.
+ https://bugs.webkit.org/show_bug.cgi?id=160169
+
+ Reviewed by Brent Fulgham.
+
+ * storage/domstorage/localstorage/blocked-file-access-expected.txt: Removed.
+ * storage/domstorage/localstorage/file-can-access-expected.txt: Added.
+ * storage/domstorage/localstorage/file-can-access.html: Renamed from LayoutTests/storage/domstorage/localstorage/blocked-file-access.html.
+ * storage/domstorage/localstorage/resources/unblocked-example.html: Renamed from LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html.
+
</ins><span class="cx"> 2016-07-25 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AccessibilityRenderObject is adding duplicated children when CSS first-letter is being used.
</span></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstorageblockedfileaccessexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access-expected.txt (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access-expected.txt        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access-expected.txt        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 11: PASS: window.localStorage is NOT accessible
-CONSOLE MESSAGE: line 12: Exception: The operation is insecure.
-
-Test that we cannot access localStorage from a file URL if unversal access is turned off.
</del></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstorageblockedfileaccesshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access.html (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access.html        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access.html        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-<html>
-<head>
-<script>
-if (window.testRunner) {
- testRunner.setAllowUniversalAccessFromFileURLs(false);
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-</script>
-</head>
-<body>
-<iframe src="resources/blocked-example.html"></iframe>
-<div id="results"></div>
-Test that we cannot access localStorage from a file URL if unversal access is turned off.
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstoragefilecanaccessexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/localstorage/file-can-access-expected.txt (0 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/file-can-access-expected.txt         (rev 0)
+++ trunk/LayoutTests/storage/domstorage/localstorage/file-can-access-expected.txt        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: line 8: PASS: window.localStorage WAS accessible
+
+Test that we can access localStorage from a file URL even if universal access is turned off.
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstoragefilecanaccesshtmlfromrev203694trunkLayoutTestsstoragedomstoragelocalstorageblockedfileaccesshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/domstorage/localstorage/file-can-access.html (from rev 203694, trunk/LayoutTests/storage/domstorage/localstorage/blocked-file-access.html) (0 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/file-can-access.html         (rev 0)
+++ trunk/LayoutTests/storage/domstorage/localstorage/file-can-access.html        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.setAllowUniversalAccessFromFileURLs(false);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<iframe src="resources/unblocked-example.html"></iframe>
+<div id="results"></div>
+Test that we can access localStorage from a file URL even if universal access is turned off.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstorageresourcesblockedexamplehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-<html>
-<head>
-<script>
-function runTest()
-{
- try {
- if (window.localStorage) {
- console.log("FAIL: window.localStorage WAS accessible");
- }
- } catch(e) {
- console.log("PASS: window.localStorage is NOT accessible");
- console.log("Exception: " + e.message);
- }
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-</script>
-</head>
-<body onload="runTest()">
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstorageresourcesunblockedexamplehtmlfromrev203694trunkLayoutTestsstoragedomstoragelocalstorageresourcesblockedexamplehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/domstorage/localstorage/resources/unblocked-example.html (from rev 203694, trunk/LayoutTests/storage/domstorage/localstorage/resources/blocked-example.html) (0 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/resources/unblocked-example.html         (rev 0)
+++ trunk/LayoutTests/storage/domstorage/localstorage/resources/unblocked-example.html        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<html>
+<head>
+<script>
+function runTest()
+{
+ try {
+ if (window.localStorage) {
+ console.log("PASS: window.localStorage WAS accessible");
+ }
+ } catch(e) {
+ console.log("FAIL: window.localStorage is NOT accessible");
+ console.log("Exception: " + e.message);
+ }
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/Source/WebCore/ChangeLog        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-25 Brady Eidson <beidson@apple.com>
+
+ Allow LocalStorage by default for file URLs.
+ https://bugs.webkit.org/show_bug.cgi?id=160169
+
+ Reviewed by Brent Fulgham.
+
+ Test: storage/domstorage/localstorage/file-can-access.html
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canAccessStorage): Remove the m_universalAccess check for local URLs.
+
</ins><span class="cx"> 2016-07-25 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AccessibilityRenderObject is adding duplicated children when CSS first-letter is being used.
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (203694 => 203695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp        2016-07-25 19:15:05 UTC (rev 203694)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp        2016-07-25 19:57:47 UTC (rev 203695)
</span><span class="lines">@@ -375,9 +375,6 @@
</span><span class="cx"> if (m_storageBlockingPolicy == BlockAllStorage)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (isLocal() && !m_universalAccess && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
- return false;
-
</del><span class="cx"> // FIXME: This check should be replaced with an ASSERT once we can guarantee that topOrigin is not null.
</span><span class="cx"> if (!topOrigin)
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>