<!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>[202190] 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/202190">202190</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-17 18:03:35 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202186">r202186</a>.
Broke the Apple Windows, Apple Yosemite, GTK, and WinCairo
builds.
Reverted changeset:
"File scheme should not allow access of a resource on a
different volume."
https://bugs.webkit.org/show_bug.cgi?id=158552
http://trac.webkit.org/changeset/202186</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemcpp">trunk/Source/WebCore/platform/FileSystem.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemh">trunk/Source/WebCore/platform/FileSystem.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsmacCrossPartitionFileSchemeAccesshtml">trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacCrossPartitionFileSchemeAccessmm">trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-06-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r202186.
+
+ Broke the Apple Windows, Apple Yosemite, GTK, and WinCairo
+ builds.
+
+ Reverted changeset:
+
+ "File scheme should not allow access of a resource on a
+ different volume."
+ https://bugs.webkit.org/show_bug.cgi?id=158552
+ http://trac.webkit.org/changeset/202186
+
+2016-06-17 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Unreviewed, rolling out r202187.
</span><span class="cx">
</span><span class="cx"> 202186
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -349,11 +349,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_universalAccess)
</span><span class="cx"> return true;
</span><del>-
- if (isLocal() && url.isLocalFile()) {
- if (!filesHaveSameVolume(m_filePath, url.path()))
- return false;
- }
</del><span class="cx">
</span><span class="cx"> if (isFeedWithNestedProtocolInHTTPFamily(url))
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.cpp (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -319,40 +319,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int platformFileStat(PlatformFileHandle handle, PlatformStat* buffer)
-{
-#if OS(WINDOW)
- return _fstat(handle, buffer);
-#else
- return fstat(handle, buffer);
-#endif
-}
-
-bool filesHaveSameVolume(const String& sourceFile, const String& destFile)
-{
- CString fsRepSourceFile, fsRepDestFile;
- PlatformStat sourceFileStat, destFileStat;
- PlatformFileHandle sourceHandle = -1, destHandle = -1;
- bool result = true;
-
- fsRepSourceFile = fileSystemRepresentation(sourceFile);
- fsRepDestFile = fileSystemRepresentation(destFile);
-
- if (!fsRepSourceFile.isNull() && !fsRepDestFile.isNull()) {
- sourceHandle = openFile(fsRepSourceFile.data(), OpenForRead);
- destHandle = openFile(fsRepDestFile.data(), OpenForRead);
- }
-
- if (sourceHandle > -1 && destHandle > -1) {
- if (platformFileStat(sourceHandle, &sourceFileStat) > -1 && platformFileStat(destHandle, &destFileStat) > -1) {
- if (sourceFileStat.st_dev != destFileStat.st_dev)
- result = false;
- }
- }
-
- close(sourceHandle);
- close(destHandle);
- return result;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.h (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FileSystem.h 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Source/WebCore/platform/FileSystem.h 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #ifndef FileSystem_h
</span><span class="cx"> #define FileSystem_h
</span><span class="cx">
</span><del>-#include <sys/stat.h>
</del><span class="cx"> #include <time.h>
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -48,7 +47,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><del>-#include <io.h>
</del><span class="cx"> // These are to avoid including <winbase.h> in a header for Chromium
</span><span class="cx"> typedef void *HANDLE;
</span><span class="cx"> // Assuming STRICT
</span><span class="lines">@@ -112,12 +110,6 @@
</span><span class="cx"> typedef int PlatformFileHandle;
</span><span class="cx"> const PlatformFileHandle invalidPlatformFileHandle = -1;
</span><span class="cx"> #endif
</span><del>-
-#if OS(WINDOWS)
-typedef struct _stat PlatformStat;
-#else
-typedef struct stat PlatformStat;
-#endif
</del><span class="cx">
</span><span class="cx"> enum FileOpenMode {
</span><span class="cx"> OpenForRead = 0,
</span><span class="lines">@@ -180,8 +172,6 @@
</span><span class="cx"> WEBCORE_EXPORT int writeToFile(PlatformFileHandle, const char* data, int length);
</span><span class="cx"> // Returns number of bytes actually written if successful, -1 otherwise.
</span><span class="cx"> int readFromFile(PlatformFileHandle, char* data, int length);
</span><del>-bool filesHaveSameVolume(const String&, const String&);
-int platformFileStat(PlatformFileHandle, PlatformStat*);
</del><span class="cx">
</span><span class="cx"> // Appends the contents of the file found at 'path' to the open PlatformFileHandle.
</span><span class="cx"> // Returns true if the write was successful, false if it was not.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Tools/ChangeLog 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-06-17 Daniel Bates <dabates@apple.com>
+
+ Unreviewed, rolling out r202186.
+
+ Broke the Apple Windows, Apple Yosemite, GTK, and WinCairo
+ builds.
+
+ Reverted changeset:
+
+ "File scheme should not allow access of a resource on a
+ different volume."
+ https://bugs.webkit.org/show_bug.cgi?id=158552
+ http://trac.webkit.org/changeset/202186
+
</ins><span class="cx"> 2016-06-17 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> File scheme should not allow access of a resource on a different volume.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -62,8 +62,6 @@
</span><span class="cx"> 37D36ED71AF42ECD00BAF5D9 /* LoadAlternateHTMLString.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37D36ED61AF42ECD00BAF5D9 /* LoadAlternateHTMLString.mm */; };
</span><span class="cx"> 37DC6791140D7D7600ABCCDB /* DOMRangeOfString.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 37DC678F140D7D3A00ABCCDB /* DOMRangeOfString.html */; };
</span><span class="cx"> 37E1064C1697681800B78BD0 /* DOMHTMLTableCellElementCellAbove.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 37E1064B169767F700B78BD0 /* DOMHTMLTableCellElementCellAbove.html */; };
</span><del>- 400B2EA51D1328DD00393CDC /* CrossPartitionFileSchemeAccess.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 400B2EA41D1328B900393CDC /* CrossPartitionFileSchemeAccess.html */; };
- 407F29D01D10ED4D00DA63FF /* CrossPartitionFileSchemeAccess.mm in Sources */ = {isa = PBXBuildFile; fileRef = 407F29CE1D10ED4D00DA63FF /* CrossPartitionFileSchemeAccess.mm */; };
</del><span class="cx"> 4BFDFFA71314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFDFFA61314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp */; };
</span><span class="cx"> 51393E221523952D005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51393E1D1523944A005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp */; };
</span><span class="cx"> 5142B2731517C8C800C32B19 /* ContextMenuCanCopyURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */; };
</span><span class="lines">@@ -464,11 +462,10 @@
</span><span class="cx"> };
</span><span class="cx"> BCB9F4FB112384C000A137E0 /* Copy Resources */ = {
</span><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><del>- buildActionMask = 12;
</del><ins>+ buildActionMask = 2147483647;
</ins><span class="cx"> dstPath = TestWebKitAPI.resources;
</span><span class="cx"> dstSubfolderSpec = 7;
</span><span class="cx"> files = (
</span><del>- 400B2EA51D1328DD00393CDC /* CrossPartitionFileSchemeAccess.html in Copy Resources */,
</del><span class="cx"> 9984FACE1CFFB090008D198C /* editable-body.html in Copy Resources */,
</span><span class="cx"> 51714EB41CF8C78C004723C4 /* WebProcessKillIDBCleanup-1.html in Copy Resources */,
</span><span class="cx"> 51714EB51CF8C78C004723C4 /* WebProcessKillIDBCleanup-2.html in Copy Resources */,
</span><span class="lines">@@ -675,8 +672,6 @@
</span><span class="cx"> 37E1064A1697676400B78BD0 /* DOMHTMLTableCellCellAbove.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLTableCellCellAbove.mm; sourceTree = "<group>"; };
</span><span class="cx"> 37E1064B169767F700B78BD0 /* DOMHTMLTableCellElementCellAbove.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DOMHTMLTableCellElementCellAbove.html; sourceTree = "<group>"; };
</span><span class="cx"> 37E38C33169B7D010084C28C /* WebViewDidRemoveFrameFromHierarchy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewDidRemoveFrameFromHierarchy.mm; sourceTree = "<group>"; };
</span><del>- 400B2EA41D1328B900393CDC /* CrossPartitionFileSchemeAccess.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CrossPartitionFileSchemeAccess.html; sourceTree = "<group>"; };
- 407F29CE1D10ED4D00DA63FF /* CrossPartitionFileSchemeAccess.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CrossPartitionFileSchemeAccess.mm; sourceTree = "<group>"; };
</del><span class="cx"> 41973B5A1AF2286A006C7B36 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41973B5C1AF22875006C7B36 /* SharedBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBuffer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 440A1D3814A0103A008A66F2 /* URL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URL.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1634,7 +1629,6 @@
</span><span class="cx"> A5E2027215B2181900C13E14 /* WindowlessWebViewWithMedia.mm */,
</span><span class="cx"> 764322D51B61CCA40024F801 /* WordBoundaryTypingAttributes.mm */,
</span><span class="cx"> 536770331CC8022800D425B1 /* WebScriptObjectDescription.mm */,
</span><del>- 407F29CE1D10ED4D00DA63FF /* CrossPartitionFileSchemeAccess.mm */,
</del><span class="cx"> );
</span><span class="cx"> path = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -1642,7 +1636,6 @@
</span><span class="cx"> C07E6CB013FD737C0038B22B /* Resources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 400B2EA41D1328B900393CDC /* CrossPartitionFileSchemeAccess.html */,
</del><span class="cx"> 379028B814FABE49007E6B43 /* acceptsFirstMouse.html */,
</span><span class="cx"> B55F11B9151916E600915916 /* Ahem.ttf */,
</span><span class="cx"> B55F11B01517A2C400915916 /* attributedStringCustomFont.html */,
</span><span class="lines">@@ -2193,7 +2186,6 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
</span><del>- 407F29D01D10ED4D00DA63FF /* CrossPartitionFileSchemeAccess.mm in Sources */,
</del><span class="cx"> 2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacCrossPartitionFileSchemeAccesshtml"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.html (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.html 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.html 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<script>
- var check = 0;
- function iframeLoaded() {
- check = 1;
- }
- function documentLoaded() {
- if (check == 1)
- document.write("Fail: A cross partition resource was loaded");
- else
- document.write("Pass: A cross partition resource was blocked from loading");
- }
-</script>
-<body onload="documentLoaded()">
-<iframe src="file:///Volumes/resources/CrossPartitionFileSchemeAccess.html" onload="iframeLoaded();"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacCrossPartitionFileSchemeAccessmm"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm (202189 => 202190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm 2016-06-18 01:02:43 UTC (rev 202189)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm 2016-06-18 01:03:35 UTC (rev 202190)
</span><span class="lines">@@ -1,104 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#import "PlatformUtilities.h"
-#import "WKWebViewConfigurationExtras.h"
-#import <WebKit/WKFoundation.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WebKit.h>
-#import <wtf/RetainPtr.h>
-
-#define PASS "Pass: A cross partition resource was blocked from loading"
-
-@interface CrossPartitionFileSchemeAccessNavigationDelegate : NSObject <WKNavigationDelegate>
-@end
-
-@implementation CrossPartitionFileSchemeAccessNavigationDelegate
-
-static bool navigationComplete = false;
-
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
-{
- [webView evaluateJavaScript: @"document.body.innerHTML" completionHandler:^(NSString *result, NSError *error)
- {
- EXPECT_STREQ(PASS, [result UTF8String]);
- navigationComplete = true;
- }];
-}
-
-@end
-
-void createPartition(const char *filePath)
-{
- const char* fileContent = " \"<!DOCTYPE html><html><body>Hello</body></html>\" > ";
- const char* targetFile = "resources/CrossPartitionFileSchemeAccess.html";
-
- const char* createDirCmd = "mkdir resources";
- const char* createDiskImage = "hdiutil create otherVolume.dmg -srcfolder resources/ -ov > /dev/null";
- const char* attachDiskImage = "hdiutil attach otherVolume.dmg > /dev/null";
-
- std::string createFileCmd = "echo ";
- createFileCmd.append(fileContent);
- createFileCmd.append(targetFile);
-
- system(createDirCmd);
- system(createFileCmd.c_str());
- system(createDiskImage);
- system(attachDiskImage);
-}
-
-void cleanUp()
-{
- const char* detachDiskImage = "hdiutil detach /Volumes/resources > /dev/null";
- const char* deleteFolder = "rm -rf resources/";
- const char* deleteDiskImage = "rm -rf otherVolume.dmg";
- system(detachDiskImage);
- system(deleteFolder);
- system(deleteDiskImage);
-}
-
-
-namespace TestWebKitAPI {
-
-TEST(WebKit1, CrossPartitionFileSchemeAccess)
-{
- NSURL *url = [[NSBundle mainBundle] URLForResource:@"CrossPartitionFileSchemeAccess" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
- const char *filePath = [url fileSystemRepresentation];
- createPartition(filePath);
-
- RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
- RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
-
- CrossPartitionFileSchemeAccessNavigationDelegate *delegate = [[CrossPartitionFileSchemeAccessNavigationDelegate alloc] init];
- [webView setNavigationDelegate:delegate];
-
- NSURLRequest *request = [NSURLRequest requestWithURL:url];
- [webView loadRequest:request];
- Util::run(&navigationComplete);
- cleanUp();
-}
-}
</del></span></pre>
</div>
</div>
</body>
</html>