<!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>[213100] 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/213100">213100</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-02-27 16:13:24 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Enable file replacement
https://bugs.webkit.org/show_bug.cgi?id=168907
<rdar://problem/22258242>
Reviewed by David Kilzer.
Source/WebCore:
Covered by existing tests.
* fileapi/FileMac.mm:
(WebCore::File::shouldReplaceFile): Stop using Carbon and AppKit API for determining if a
file path is a file package. Use NSURL and CoreServices instead, which exist on Mac and iOS.
Source/WTF:
* wtf/FeatureDefines.h: Set ENABLE_FILE_REPLACEMENT to 1 on all Cocoa platforms.
LayoutTests:
* platform/ios-simulator/TestExpectations: Un-skipped file replacement tests on iOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiFileMacmm">trunk/Source/WebCore/fileapi/FileMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/LayoutTests/ChangeLog 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-27 Andy Estes <aestes@apple.com>
+
+ [iOS] Enable file replacement
+ https://bugs.webkit.org/show_bug.cgi?id=168907
+ <rdar://problem/22258242>
+
+ Reviewed by David Kilzer.
+
+ * platform/ios-simulator/TestExpectations: Un-skipped file replacement tests on iOS.
+
</ins><span class="cx"> 2017-02-27 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Use a solid background for <audio> controls on macOS
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -2887,7 +2887,3 @@
</span><span class="cx"> [ Debug ] fast/frames/exponential-frames.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/168053 pageoverlay/overlay-remove-reinsert-view.html [ Pass Failure ]
</span><del>-
-# Bundle upload is not supported on iOS
-fast/files/filereader-zip-bundle-using-open-panel.html [ Skip ]
-http/tests/local/fileapi/upload-zip-bundle-as-blob-using-open-panel.html [ Skip ]
</del></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/Source/WTF/ChangeLog 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-27 Andy Estes <aestes@apple.com>
+
+ [iOS] Enable file replacement
+ https://bugs.webkit.org/show_bug.cgi?id=168907
+ <rdar://problem/22258242>
+
+ Reviewed by David Kilzer.
+
+ * wtf/FeatureDefines.h: Set ENABLE_FILE_REPLACEMENT to 1 on all Cocoa platforms.
+
</ins><span class="cx"> 2017-02-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ICU cursor iterator to caret iterator
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -239,10 +239,6 @@
</span><span class="cx"> #define ENABLE_INPUT_TYPE_COLOR_POPOVER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_FILE_REPLACEMENT)
-#define ENABLE_FILE_REPLACEMENT 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx"> #define ENABLE_PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -259,6 +255,10 @@
</span><span class="cx"> #define ENABLE_DATA_DETECTION 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_FILE_REPLACEMENT)
+#define ENABLE_FILE_REPLACEMENT 1
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_KEYBOARD_KEY_ATTRIBUTE)
</span><span class="cx"> #define ENABLE_KEYBOARD_KEY_ATTRIBUTE 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/Source/WebCore/ChangeLog 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-27 Andy Estes <aestes@apple.com>
+
+ [iOS] Enable file replacement
+ https://bugs.webkit.org/show_bug.cgi?id=168907
+ <rdar://problem/22258242>
+
+ Reviewed by David Kilzer.
+
+ Covered by existing tests.
+
+ * fileapi/FileMac.mm:
+ (WebCore::File::shouldReplaceFile): Stop using Carbon and AppKit API for determining if a
+ file path is a file package. Use NSURL and CoreServices instead, which exist on Mac and iOS.
+
</ins><span class="cx"> 2017-02-27 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Use a solid background for <audio> controls on macOS
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileMac.mm (213099 => 213100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileMac.mm 2017-02-28 00:01:28 UTC (rev 213099)
+++ trunk/Source/WebCore/fileapi/FileMac.mm 2017-02-28 00:13:24 UTC (rev 213100)
</span><span class="lines">@@ -23,42 +23,39 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-#include "File.h"
</del><ins>+#import "config.h"
+#import "File.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FILE_REPLACEMENT)
</span><span class="cx">
</span><del>-#include "FileSystem.h"
</del><ins>+#import "FileSystem.h"
</ins><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <MobileCoreServices/MobileCoreServices.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> bool File::shouldReplaceFile(const String& path)
</span><span class="cx"> {
</span><span class="cx"> if (path.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- FSRef pathRef;
- Boolean targetIsFolder;
- Boolean wasAliased;
- NSString *aliasedPath = path;
</del><ins>+ NSError *error;
+ NSURL *pathURL = [NSURL URLByResolvingAliasFileAtURL:[NSURL fileURLWithPath:path isDirectory:NO] options:NSURLBookmarkResolutionWithoutUI error:&error];
+ if (!pathURL) {
+ LOG_ERROR("Failed to resolve alias at path %s with error %@.\n", path.utf8().data(), error);
+ return false;
+ }
</ins><span class="cx">
</span><del>- // Determine if the file is an alias, and if so, get the target path.
- if (FSPathMakeRef((UInt8 *)[path fileSystemRepresentation], &pathRef, NULL) == noErr) {
- if (FSResolveAliasFileWithMountFlags(&pathRef, TRUE, &targetIsFolder, &wasAliased, kResolveAliasFileNoUI) == noErr && wasAliased) {
- char pathFromPathRef[PATH_MAX + 1]; // +1 is for \0
- if (FSRefMakePath(&pathRef, (unsigned char *)pathFromPathRef, PATH_MAX) == noErr)
- aliasedPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:pathFromPathRef length:strlen(pathFromPathRef)];
- }
</del><ins>+ NSString *uti;
+ if (![pathURL getResourceValue:&uti forKey:NSURLTypeIdentifierKey error:&error]) {
+ LOG_ERROR("Failed to get type identifier of resource at URL %@ with error %@.\n", pathURL, error);
+ return false;
</ins><span class="cx"> }
</span><del>-
- if (!aliasedPath)
- return false;
</del><span class="cx">
</span><del>- return [[NSWorkspace sharedWorkspace] isFilePackageAtPath:aliasedPath];
</del><ins>+ return UTTypeConformsTo((CFStringRef)uti, kUTTypePackage);
</ins><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> void File::computeNameAndContentTypeForReplacedFile(const String& path, const String& nameOverride, String& effectiveName, String& effectiveContentType)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>