<!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>[211522] branches/safari-603-branch</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/211522">211522</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 13:26:55 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211502">r211502</a>. rdar://problem/30298722</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformFileSystemcpp">branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformFileSystemh">branches/safari-603-branch/Source/WebCore/platform/FileSystem.h</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsTestWebKitAPITestsWebCoreFileSystemcpp">branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211521 => 211522)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:51 UTC (rev 211521)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:55 UTC (rev 211522)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-02-01 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211502. rdar://problem/30298722
+
+ 2017-02-01 Brent Fulgham <bfulgham@apple.com>
+
+ Correct "filesHaveSameVolume" predicate
+ https://bugs.webkit.org/show_bug.cgi?id=167696
+ <rdar://problem/30298722>
+
+ Reviewed by David Kilzer.
+
+ We are passing %-encoded strings to the underlying operating system's file system APIs.
+ This doesn't work. Instead, we need to present a decoded version of the file path
+ that matches what the system APIs expect.
+
+ Tested by new TestWebKitAPI Test.
+
+ * platform/FileSystem.cpp:
+ (WebCore::filesHaveSameVolume): Make sure the file paths we give to the underlying
+ operating system are not percent encoded.
+ * platform/FileSystem.h: Export 'filesHaveSameVolume' for use by testing system.
+
</ins><span class="cx"> 2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211387. rdar://problem/29500273
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformFileSystemcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp (211521 => 211522)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp 2017-02-01 21:26:51 UTC (rev 211521)
+++ branches/safari-603-branch/Source/WebCore/platform/FileSystem.cpp 2017-02-01 21:26:55 UTC (rev 211522)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx">
</span><span class="cx"> #include "ScopeGuard.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -236,8 +237,8 @@
</span><span class="cx">
</span><span class="cx"> bool filesHaveSameVolume(const String& fileA, const String& fileB)
</span><span class="cx"> {
</span><del>- auto fsRepFileA = fileSystemRepresentation(fileA);
- auto fsRepFileB = fileSystemRepresentation(fileB);
</del><ins>+ auto fsRepFileA = fileSystemRepresentation(decodeURLEscapeSequences(fileA));
+ auto fsRepFileB = fileSystemRepresentation(decodeURLEscapeSequences(fileB));
</ins><span class="cx">
</span><span class="cx"> if (fsRepFileA.isNull() || fsRepFileB.isNull())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformFileSystemh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/FileSystem.h (211521 => 211522)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/FileSystem.h 2017-02-01 21:26:51 UTC (rev 211521)
+++ branches/safari-603-branch/Source/WebCore/platform/FileSystem.h 2017-02-01 21:26:55 UTC (rev 211522)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> WEBCORE_EXPORT String encodeForFileName(const String&);
</span><span class="cx"> String decodeFromFilename(const String&);
</span><span class="cx">
</span><del>-bool filesHaveSameVolume(const String&, const String&);
</del><ins>+WEBCORE_EXPORT bool filesHaveSameVolume(const String&, const String&);
</ins><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> RetainPtr<CFURLRef> pathAsURL(const String&);
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (211521 => 211522)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-01 21:26:51 UTC (rev 211521)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-01 21:26:55 UTC (rev 211522)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-01 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211502. rdar://problem/30298722
+
+ 2017-02-01 Brent Fulgham <bfulgham@apple.com>
+
+ Correct "filesHaveSameVolume" predicate
+ https://bugs.webkit.org/show_bug.cgi?id=167696
+ <rdar://problem/30298722>
+
+ Reviewed by David Kilzer.
+
+ Add new tests that confirm that the 'filesHaveSamePath' predicate properly handles
+ percent-escaped path inputs.
+
+ * TestWebKitAPI/Tests/WebCore/FileSystem.cpp:
+ (TestWebKitAPI::FileSystemTest::spaceContainingFilePath):
+ (TestWebKitAPI::FileSystemTest::bangContainingFilePath):
+ (TestWebKitAPI::FileSystemTest::quoteContainingFilePath):
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211240. rdar://problem/30247467b
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPITestsWebCoreFileSystemcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp (211521 => 211522)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp 2017-02-01 21:26:51 UTC (rev 211521)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp 2017-02-01 21:26:55 UTC (rev 211522)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2015 Canon Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Test.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><ins>+#include <WebCore/URL.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -50,21 +52,39 @@
</span><span class="cx"> closeFile(handle);
</span><span class="cx">
</span><span class="cx"> m_tempEmptyFilePath = openTemporaryFile("tempEmptyTestFile", handle);
</span><del>- closeFile(handle);
- }
</del><ins>+ closeFile(handle);
</ins><span class="cx">
</span><ins>+ m_spaceContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp Empty Test File", handle));
+ closeFile(handle);
+
+ m_bangContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp!Empty!Test!File", handle));
+ closeFile(handle);
+
+ m_quoteContainingFilePath = encodeWithURLEscapeSequences(openTemporaryFile("temp\"Empty\"TestFile", handle));
+ closeFile(handle);
+}
+
</ins><span class="cx"> void TearDown() override
</span><span class="cx"> {
</span><span class="cx"> deleteFile(m_tempFilePath);
</span><span class="cx"> deleteFile(m_tempEmptyFilePath);
</span><ins>+ deleteFile(m_spaceContainingFilePath);
+ deleteFile(m_bangContainingFilePath);
+ deleteFile(m_quoteContainingFilePath);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& tempFilePath() { return m_tempFilePath; }
</span><span class="cx"> const String& tempEmptyFilePath() { return m_tempEmptyFilePath; }
</span><ins>+ const String& spaceContainingFilePath() { return m_spaceContainingFilePath; }
+ const String& bangContainingFilePath() { return m_bangContainingFilePath; }
+ const String& quoteContainingFilePath() { return m_quoteContainingFilePath; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_tempFilePath;
</span><span class="cx"> String m_tempEmptyFilePath;
</span><ins>+ String m_spaceContainingFilePath;
+ String m_bangContainingFilePath;
+ String m_quoteContainingFilePath;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TEST_F(FileSystemTest, MappingMissingFile)
</span><span class="lines">@@ -93,4 +113,11 @@
</span><span class="cx"> EXPECT_TRUE(!mappedFileData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(FileSystemTest, FilesHaveSameVolume)
+{
+ EXPECT_TRUE(filesHaveSameVolume(tempFilePath(), spaceContainingFilePath()));
+ EXPECT_TRUE(filesHaveSameVolume(spaceContainingFilePath(), bangContainingFilePath()));
+ EXPECT_TRUE(filesHaveSameVolume(bangContainingFilePath(), quoteContainingFilePath()));
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>