143968 2015-04-20 15:12:16 -0700 moveFile should overwrite existing files 2015-04-20 16:40:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen andersca beidson oldest_to_newest 1086922 0 achristensen 2015-04-20 15:12:16 -0700 When compiling content extensions, the call to moveFile fails often because the file already exists. 1086925 1 251193 achristensen 2015-04-20 15:28:39 -0700 Created attachment 251193 Patch 1086935 2 251193 beidson 2015-04-20 16:01:14 -0700 Comment on attachment 251193 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251193&action=review > Source/WebCore/platform/mac/FileSystemMac.mm:44 > +@implementation WebFileManagerDelegate > +- (BOOL)fileManager:(NSFileManager *)fileManager shouldProceedAfterError:(NSError *)error movingItemAtURL:(NSURL *)srcURL toURL:(NSURL *)dstURL Add an empty line here please. 1086937 3 251193 andersca 2015-04-20 16:05:51 -0700 Comment on attachment 251193 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251193&action=review > Source/WebCore/platform/mac/FileSystemMac.mm:90 > + RetainPtr<WebFileManagerDelegate> delegate = adoptNS([[WebFileManagerDelegate alloc] init]); > + [[NSFileManager defaultManager] setDelegate:delegate.get()]; Don't set a custom delegate on the default manager, just create a new manager instead. 1086943 4 251201 achristensen 2015-04-20 16:23:34 -0700 Created attachment 251201 Patch 1086945 5 251201 andersca 2015-04-20 16:25:18 -0700 Comment on attachment 251201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251201&action=review > Source/WebCore/platform/mac/FileSystemMac.mm:50 > + return [error code] == NSFileWriteFileExistsError; Dot syntax. > Source/WebCore/platform/mac/FileSystemMac.mm:91 > + RetainPtr<NSFileManager> manager = adoptNS([[NSFileManager alloc] init]); > + RetainPtr<WebFileManagerDelegate> delegate = adoptNS([[WebFileManagerDelegate alloc] init]); Just use auto here. > Source/WebCore/platform/mac/FileSystemMac.mm:92 > + [manager.get() setDelegate:delegate.get()]; No need for .get() in manager.get(). > Source/WebCore/platform/mac/FileSystemMac.mm:94 > + return [manager.get() moveItemAtURL:[NSURL fileURLWithPath:oldPath] toURL:[NSURL fileURLWithPath:newPath] error:nil]; Same thing here. 1086947 6 achristensen 2015-04-20 16:40:22 -0700 http://trac.webkit.org/changeset/183035 251193 2015-04-20 15:28:39 -0700 2015-04-20 16:23:32 -0700 Patch bug-143968-20150420152737.patch text/plain 2311 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA0LTIwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgT3ZlcndyaXRl IGV4aXN0aW5nIGZpbGVzIHdpdGggbW92ZUZpbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9GaWxlU3lzdGVtTWFjLm1tOgor ICAgICAgICAoLVtXZWJGaWxlTWFuYWdlckRlbGVnYXRlIGZpbGVNYW5hZ2VyOnNob3VsZFByb2Nl ZWRBZnRlckVycm9yOm1vdmluZ0l0ZW1BdFVSTDp0b1VSTDpdKToKKyAgICAgICAgKFdlYkNvcmU6 Om1vdmVGaWxlKToKKyAgICAgICAgcjE4MjkzMiBpbnRyb2R1Y2VkIG1vdmVGaWxlIGluc3RlYWQg b2YgcmVuYW1lRmlsZS4gIEluIG9yZGVyIHRvIHByZXNlcnZlIGJlaGF2aW9yLCBpdCBzaG91bGQg b3ZlcndyaXRlIGV4aXN0aW5nIGZpbGVzLgorCiAyMDE1LTA0LTIwICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW51cCBzb21lIFN0cmluZ0J1aWxk ZXIgdXNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRmlsZVN5c3RlbU1hYy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRmlsZVN5c3RlbU1h Yy5tbQkocmV2aXNpb24gMTgzMDIxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Zp bGVTeXN0ZW1NYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5LDEyICsyOSwyOCBAQAogI2ltcG9y dCAiY29uZmlnLmgiCiAjaW1wb3J0ICJGaWxlU3lzdGVtLmgiCiAKKyNpbXBvcnQgPEZvdW5kYXRp b24vRm91bmRhdGlvbkVycm9ycy5oPgorI2ltcG9ydCA8Rm91bmRhdGlvbi9OU0ZpbGVNYW5hZ2Vy Lmg+CiAjaW1wb3J0ICJXZWJDb3JlTlNVUkxFeHRyYXMuaCIKICNpbXBvcnQgIldlYkNvcmVTeXN0 ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBvcnQgPHd0Zi90 ZXh0L0NTdHJpbmcuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCitAaW50ZXJm YWNlIFdlYkZpbGVNYW5hZ2VyRGVsZWdhdGUgOiBOU09iamVjdCA8TlNGaWxlTWFuYWdlckRlbGVn YXRlPgorQGVuZAorCitAaW1wbGVtZW50YXRpb24gV2ViRmlsZU1hbmFnZXJEZWxlZ2F0ZQorLSAo Qk9PTClmaWxlTWFuYWdlcjooTlNGaWxlTWFuYWdlciAqKWZpbGVNYW5hZ2VyIHNob3VsZFByb2Nl ZWRBZnRlckVycm9yOihOU0Vycm9yICopZXJyb3IgbW92aW5nSXRlbUF0VVJMOihOU1VSTCAqKXNy Y1VSTCB0b1VSTDooTlNVUkwgKilkc3RVUkwKK3sKKyAgICBVTlVTRURfUEFSQU0oZmlsZU1hbmFn ZXIpOworICAgIFVOVVNFRF9QQVJBTShzcmNVUkwpOworICAgIFVOVVNFRF9QQVJBTShkc3RVUkwp OyAgICAKKyAgICByZXR1cm4gW2Vycm9yIGNvZGVdID09IE5TRmlsZVdyaXRlRmlsZUV4aXN0c0Vy cm9yOworfQorCitAZW5kCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU3RyaW5nIGhvbWVEaXJl Y3RvcnlQYXRoKCkKQEAgLTY5LDYgKzg1LDEwIEBAIFN0cmluZyBvcGVuVGVtcG9yYXJ5RmlsZShj b25zdCBTdHJpbmcmIHAKIAogYm9vbCBtb3ZlRmlsZShjb25zdCBTdHJpbmcmIG9sZFBhdGgsIGNv bnN0IFN0cmluZyYgbmV3UGF0aCkKIHsKKyAgICAvLyBPdmVyd3JpdGUgZXhpc3RpbmcgZmlsZXMu CisgICAgUmV0YWluUHRyPFdlYkZpbGVNYW5hZ2VyRGVsZWdhdGU+IGRlbGVnYXRlID0gYWRvcHRO UyhbW1dlYkZpbGVNYW5hZ2VyRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIHNldERlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKyAgICAK ICAgICByZXR1cm4gW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBtb3ZlSXRlbUF0VVJM OltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6b2xkUGF0aF0gdG9VUkw6W05TVVJMIGZpbGVVUkxXaXRo UGF0aDpuZXdQYXRoXSBlcnJvcjpuaWxdOwogfQogCg== 251201 2015-04-20 16:23:34 -0700 2015-04-20 16:25:18 -0700 Patch bug-143968-20150420162232.patch text/plain 2472 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA0LTIwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgT3ZlcndyaXRl IGV4aXN0aW5nIGZpbGVzIHdpdGggbW92ZUZpbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBCcmFk eSBFaWRzb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvRmlsZVN5c3RlbU1hYy5tbToKKyAg ICAgICAgKC1bV2ViRmlsZU1hbmFnZXJEZWxlZ2F0ZSBmaWxlTWFuYWdlcjpzaG91bGRQcm9jZWVk QWZ0ZXJFcnJvcjptb3ZpbmdJdGVtQXRVUkw6dG9VUkw6XSk6CisgICAgICAgIChXZWJDb3JlOjpt b3ZlRmlsZSk6CisgICAgICAgIHIxODI5MzIgaW50cm9kdWNlZCBtb3ZlRmlsZSBpbnN0ZWFkIG9m IHJlbmFtZUZpbGUuICBJbiBvcmRlciB0byBwcmVzZXJ2ZSBiZWhhdmlvciwgaXQgc2hvdWxkIG92 ZXJ3cml0ZSBleGlzdGluZyBmaWxlcy4KKwogMjAxNS0wNC0yMCAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFudXAgc29tZSBTdHJpbmdCdWlsZGVy IHVzZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0ZpbGVTeXN0ZW1NYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0ZpbGVTeXN0ZW1NYWMu bW0JKHJldmlzaW9uIDE4MzAyMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9GaWxl U3lzdGVtTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMSwxMCArMzEsMjcgQEAKIAogI2ltcG9y dCAiV2ViQ29yZU5TVVJMRXh0cmFzLmgiCiAjaW1wb3J0ICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNl LmgiCisjaW1wb3J0IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb25FcnJvcnMuaD4KKyNpbXBvcnQgPEZv dW5kYXRpb24vTlNGaWxlTWFuYWdlci5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2lt cG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CiAKK0BpbnRlcmZhY2UgV2ViRmlsZU1hbmFnZXJEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxOU0ZpbGVN YW5hZ2VyRGVsZWdhdGU+CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXZWJGaWxlTWFuYWdlckRl bGVnYXRlCisKKy0gKEJPT0wpZmlsZU1hbmFnZXI6KE5TRmlsZU1hbmFnZXIgKilmaWxlTWFuYWdl ciBzaG91bGRQcm9jZWVkQWZ0ZXJFcnJvcjooTlNFcnJvciAqKWVycm9yIG1vdmluZ0l0ZW1BdFVS TDooTlNVUkwgKilzcmNVUkwgdG9VUkw6KE5TVVJMICopZHN0VVJMCit7CisgICAgVU5VU0VEX1BB UkFNKGZpbGVNYW5hZ2VyKTsKKyAgICBVTlVTRURfUEFSQU0oc3JjVVJMKTsKKyAgICBVTlVTRURf UEFSQU0oZHN0VVJMKTsgICAgCisgICAgcmV0dXJuIFtlcnJvciBjb2RlXSA9PSBOU0ZpbGVXcml0 ZUZpbGVFeGlzdHNFcnJvcjsKK30KKworQGVuZAorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFN0 cmluZyBob21lRGlyZWN0b3J5UGF0aCgpCkBAIC02OSw3ICs4NiwxMiBAQCBTdHJpbmcgb3BlblRl bXBvcmFyeUZpbGUoY29uc3QgU3RyaW5nJiBwCiAKIGJvb2wgbW92ZUZpbGUoY29uc3QgU3RyaW5n JiBvbGRQYXRoLCBjb25zdCBTdHJpbmcmIG5ld1BhdGgpCiB7Ci0gICAgcmV0dXJuIFtbTlNGaWxl TWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gbW92ZUl0ZW1BdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQ YXRoOm9sZFBhdGhdIHRvVVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6bmV3UGF0aF0gZXJyb3I6 bmlsXTsKKyAgICAvLyBPdmVyd3JpdGUgZXhpc3RpbmcgZmlsZXMuCisgICAgUmV0YWluUHRyPE5T RmlsZU1hbmFnZXI+IG1hbmFnZXIgPSBhZG9wdE5TKFtbTlNGaWxlTWFuYWdlciBhbGxvY10gaW5p dF0pOworICAgIFJldGFpblB0cjxXZWJGaWxlTWFuYWdlckRlbGVnYXRlPiBkZWxlZ2F0ZSA9IGFk b3B0TlMoW1tXZWJGaWxlTWFuYWdlckRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW21hbmFn ZXIuZ2V0KCkgc2V0RGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIAorICAgIHJldHVybiBb bWFuYWdlci5nZXQoKSBtb3ZlSXRlbUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6b2xkUGF0 aF0gdG9VUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpuZXdQYXRoXSBlcnJvcjpuaWxdOwogfQog CiAjaWYgIVBMQVRGT1JNKElPUykK