<!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>[213105] trunk/Source/WebCore</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/213105">213105</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-02-27 17:13:58 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Rename FileMac.mm to FileCocoa.mm
https://bugs.webkit.org/show_bug.cgi?id=168947
Reviewed by Zalan Bujtas.
* PlatformMac.cmake:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/FileCocoa.mm: Renamed from Source/WebCore/fileapi/FileMac.mm.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorefileapiFileCocoamm">trunk/Source/WebCore/fileapi/FileCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorefileapiFileMacmm">trunk/Source/WebCore/fileapi/FileMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213104 => 213105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-28 01:10:39 UTC (rev 213104)
+++ trunk/Source/WebCore/ChangeLog 2017-02-28 01:13:58 UTC (rev 213105)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2017-02-27 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><ins>+ [Cocoa] Rename FileMac.mm to FileCocoa.mm
+ https://bugs.webkit.org/show_bug.cgi?id=168947
+
+ Reviewed by Zalan Bujtas.
+
+ * PlatformMac.cmake:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/FileCocoa.mm: Renamed from Source/WebCore/fileapi/FileMac.mm.
+
+2017-02-27 Andy Estes <aestes@apple.com>
+
</ins><span class="cx"> [iOS] Enable file replacement
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168907
</span><span class="cx"> <rdar://problem/22258242>
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (213104 => 213105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2017-02-28 01:10:39 UTC (rev 213104)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-02-28 01:13:58 UTC (rev 213105)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> editing/mac/TextAlternativeWithRange.mm
</span><span class="cx"> editing/mac/TextUndoInsertionMarkupMac.mm
</span><span class="cx">
</span><del>- fileapi/FileMac.mm
</del><ins>+ fileapi/FileCocoa.mm
</ins><span class="cx">
</span><span class="cx"> html/HTMLSlotElement.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (213104 => 213105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-28 01:10:39 UTC (rev 213104)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-02-28 01:13:58 UTC (rev 213105)
</span><span class="lines">@@ -6274,7 +6274,7 @@
</span><span class="cx"> E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */ = {isa = PBXBuildFile; fileRef = E15A36D61104572000B7B639 /* XMLNSNames.h */; };
</span><span class="cx"> E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15A36D81104572700B7B639 /* XMLNSNames.cpp */; };
</span><span class="cx"> E15FF7D518C9553800FE4C87 /* KeypressCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = E15FF7D418C9553800FE4C87 /* KeypressCommand.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- E164A2E9191AC5BB0010737D /* FileMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E164A2E7191AC5BB0010737D /* FileMac.mm */; };
</del><ins>+ E164A2E9191AC5BB0010737D /* FileCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E164A2E7191AC5BB0010737D /* FileCocoa.mm */; };
</ins><span class="cx"> E164A2ED191AE6350010737D /* BlobDataFileReferenceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E164A2EB191AE6350010737D /* BlobDataFileReferenceMac.mm */; };
</span><span class="cx"> E164FAA318315BF400DB4E61 /* CryptoKeyRSA.h in Headers */ = {isa = PBXBuildFile; fileRef = E164FAA218315BF400DB4E61 /* CryptoKeyRSA.h */; };
</span><span class="cx"> E164FAA518315E1A00DB4E61 /* CryptoKeyRSAMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E164FAA418315E1A00DB4E61 /* CryptoKeyRSAMac.cpp */; };
</span><span class="lines">@@ -14453,7 +14453,7 @@
</span><span class="cx"> E15A36D61104572000B7B639 /* XMLNSNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLNSNames.h; sourceTree = "<group>"; };
</span><span class="cx"> E15A36D81104572700B7B639 /* XMLNSNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLNSNames.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E15FF7D418C9553800FE4C87 /* KeypressCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeypressCommand.h; sourceTree = "<group>"; };
</span><del>- E164A2E7191AC5BB0010737D /* FileMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileMac.mm; sourceTree = "<group>"; };
</del><ins>+ E164A2E7191AC5BB0010737D /* FileCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> E164A2EB191AE6350010737D /* BlobDataFileReferenceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BlobDataFileReferenceMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> E164FAA218315BF400DB4E61 /* CryptoKeyRSA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyRSA.h; sourceTree = "<group>"; };
</span><span class="cx"> E164FAA418315E1A00DB4E61 /* CryptoKeyRSAMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyRSAMac.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -19867,6 +19867,7 @@
</span><span class="cx"> 976D6C61122B8A3D001FD1F7 /* File.cpp */,
</span><span class="cx"> 976D6C62122B8A3D001FD1F7 /* File.h */,
</span><span class="cx"> E1AB1EB714E9E35800449E13 /* File.idl */,
</span><ins>+ E164A2E7191AC5BB0010737D /* FileCocoa.mm */,
</ins><span class="cx"> 976D6C64122B8A3D001FD1F7 /* FileError.h */,
</span><span class="cx"> E1AB1EBB14E9E37A00449E13 /* FileError.idl */,
</span><span class="cx"> 978D07B5145A0F030096908D /* FileException.cpp */,
</span><span class="lines">@@ -19875,7 +19876,6 @@
</span><span class="cx"> 976D6C66122B8A3D001FD1F7 /* FileList.cpp */,
</span><span class="cx"> 976D6C67122B8A3D001FD1F7 /* FileList.h */,
</span><span class="cx"> E1AB1EA814E9E27D00449E13 /* FileList.idl */,
</span><del>- E164A2E7191AC5BB0010737D /* FileMac.mm */,
</del><span class="cx"> 976D6C69122B8A3D001FD1F7 /* FileReader.cpp */,
</span><span class="cx"> 976D6C6A122B8A3D001FD1F7 /* FileReader.h */,
</span><span class="cx"> 14BDF59A1365399100148393 /* FileReader.idl */,
</span><span class="lines">@@ -30018,7 +30018,7 @@
</span><span class="cx"> 1A88A90417553CD7000C74F9 /* FileIconLoader.cpp in Sources */,
</span><span class="cx"> F55B3DBD1251F12D003EF269 /* FileInputType.cpp in Sources */,
</span><span class="cx"> 976D6C85122B8A3D001FD1F7 /* FileList.cpp in Sources */,
</span><del>- E164A2E9191AC5BB0010737D /* FileMac.mm in Sources */,
</del><ins>+ E164A2E9191AC5BB0010737D /* FileCocoa.mm in Sources */,
</ins><span class="cx"> 976D6C88122B8A3D001FD1F7 /* FileReader.cpp in Sources */,
</span><span class="cx"> 2E75841D12779ADA0062628B /* FileReaderLoader.cpp in Sources */,
</span><span class="cx"> 2EDF369C122C94B4002F7D4E /* FileReaderSync.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileCocoammfromrev213104trunkSourceWebCorefileapiFileMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/fileapi/FileCocoa.mm (from rev 213104, trunk/Source/WebCore/fileapi/FileMac.mm) (0 => 213105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileCocoa.mm (rev 0)
+++ trunk/Source/WebCore/fileapi/FileCocoa.mm 2017-02-28 01:13:58 UTC (rev 213105)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2014-2017 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 "File.h"
+
+#if ENABLE(FILE_REPLACEMENT)
+
+#import "FileSystem.h"
+
+#if PLATFORM(IOS)
+#import <MobileCoreServices/MobileCoreServices.h>
+#endif
+
+namespace WebCore {
+
+bool File::shouldReplaceFile(const String& path)
+{
+ if (path.isEmpty())
+ return false;
+
+ 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;
+ }
+
+ 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;
+ }
+
+ return UTTypeConformsTo((CFStringRef)uti, kUTTypePackage);
+}
+
+void File::computeNameAndContentTypeForReplacedFile(const String& path, const String& nameOverride, String& effectiveName, String& effectiveContentType)
+{
+ ASSERT(!pathGetFileName(path).endsWith('/')); // Expecting to get a path without trailing slash, even for directories.
+ effectiveContentType = ASCIILiteral("application/zip");
+ effectiveName = (nameOverride.isNull() ? pathGetFileName(path) : nameOverride) + ASCIILiteral(".zip");
+}
+
+}
+
+#endif // ENABLE(FILE_REPLACEMENT)
</ins></span></pre></div>
<a id="trunkSourceWebCorefileapiFileMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/fileapi/FileMac.mm (213104 => 213105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileMac.mm 2017-02-28 01:10:39 UTC (rev 213104)
+++ trunk/Source/WebCore/fileapi/FileMac.mm 2017-02-28 01:13:58 UTC (rev 213105)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 "File.h"
-
-#if ENABLE(FILE_REPLACEMENT)
-
-#import "FileSystem.h"
-
-#if PLATFORM(IOS)
-#import <MobileCoreServices/MobileCoreServices.h>
-#endif
-
-namespace WebCore {
-
-bool File::shouldReplaceFile(const String& path)
-{
- if (path.isEmpty())
- return false;
-
- 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;
- }
-
- 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;
- }
-
- return UTTypeConformsTo((CFStringRef)uti, kUTTypePackage);
-}
-
-void File::computeNameAndContentTypeForReplacedFile(const String& path, const String& nameOverride, String& effectiveName, String& effectiveContentType)
-{
- ASSERT(!pathGetFileName(path).endsWith('/')); // Expecting to get a path without trailing slash, even for directories.
- effectiveContentType = ASCIILiteral("application/zip");
- effectiveName = (nameOverride.isNull() ? pathGetFileName(path) : nameOverride) + ASCIILiteral(".zip");
-}
-
-}
-
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>