180795 2017-12-13 19:07:41 -0800 Use BlockPtrs and lambdas instead of new/delete to pass parameters to blocks in WebViewImpl::performDragOperation 2018-02-26 15:18:55 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 183152 1 achristensen achristensen aestes bfulgham commit-queue webkit-bug-importer oldest_to_newest 1381466 0 achristensen 2017-12-13 19:07:41 -0800 Use BlockPtrs and lambdas instead of new/delete to pass parameters to blocks in WebViewImpl::performDragOperation 1381467 1 329311 achristensen 2017-12-13 19:08:01 -0800 Created attachment 329311 Patch 1384892 2 329311 bfulgham 2017-12-28 14:05:34 -0800 Comment on attachment 329311 Patch Nice! r=me. 1385186 3 achristensen 2018-01-02 12:03:02 -0800 http://trac.webkit.org/r226330 1385208 4 webkit-bug-importer 2018-01-02 12:57:55 -0800 <rdar://problem/36260853> 1401902 5 329311 aestes 2018-02-24 20:10:30 -0800 Comment on attachment 329311 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=329311&action=review > Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:3723 > + [item receivePromisedFilesAtDestination:dropLocation.get() options:options operationQueue:queue.get() reader:BlockPtr<void(NSURL *, NSError *)>::fromCallable([this, fileNames = WTFMove(fileNames), fileCount, dragData = WTFMove(dragData), pasteboardName](NSURL * _Nonnull fileURL, NSError * _Nullable errorOrNil) mutable { You can't move fileNames here. The outer lambda that captured fileNames is called multiple times by -enumerateDraggingItems..., and you'll end up moving from the same variable multiple times, which is illegal. > Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:3729 > + if (fileNames.size() == fileCount) { Because of how fileNames is being moved, this condition will never be true if fileCount is greater than 1. 1402194 6 commit-queue 2018-02-26 15:18:55 -0800 Re-opened since this is blocked by bug 183152 329311 2017-12-13 19:08:01 -0800 2017-12-28 14:05:34 -0800 Patch bug-180795-20171213190801.patch text/plain 6528 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjU4OTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTEyLTEzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIEJsb2NrUHRy cyBhbmQgbGFtYmRhcyBpbnN0ZWFkIG9mIG5ldy9kZWxldGUgdG8gcGFzcyBwYXJhbWV0ZXJzIHRv IGJsb2NrcyBpbiBXZWJWaWV3SW1wbDo6cGVyZm9ybURyYWdPcGVyYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDc5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cGVyZm9ybURyYWdP cGVyYXRpb24pOgorCiAyMDE3LTEyLTEzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgRml4IGNvcHkvcGFzdGUgZXJyb3IgaW4gUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uOjpjcmVhdGVXaXRoV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKQpJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHJldmlzaW9uIDIy NTgyNSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zNjg5LDcgKzM2ODksNyBAQCBib29sIFdlYlZpZXdJbXBsOjpwZXJm b3JtRHJhZ09wZXJhdGlvbihpCiB7CiAgICAgV2ViQ29yZTo6SW50UG9pbnQgY2xpZW50KFttX3Zp ZXcgY29udmVydFBvaW50OmRyYWdnaW5nSW5mby5kcmFnZ2luZ0xvY2F0aW9uIGZyb21WaWV3Om5p bF0pOwogICAgIFdlYkNvcmU6OkludFBvaW50IGdsb2JhbChXZWJDb3JlOjpnbG9iYWxQb2ludChk cmFnZ2luZ0luZm8uZHJhZ2dpbmdMb2NhdGlvbiwgW21fdmlldyB3aW5kb3ddKSk7Ci0gICAgV2Vi Q29yZTo6RHJhZ0RhdGEgKmRyYWdEYXRhID0gbmV3IFdlYkNvcmU6OkRyYWdEYXRhKGRyYWdnaW5n SW5mbywgY2xpZW50LCBnbG9iYWwsIHN0YXRpY19jYXN0PFdlYkNvcmU6OkRyYWdPcGVyYXRpb24+ KGRyYWdnaW5nSW5mby5kcmFnZ2luZ1NvdXJjZU9wZXJhdGlvbk1hc2spLCBhcHBsaWNhdGlvbkZs YWdzRm9yRHJhZyhtX3ZpZXcuZ2V0QXV0b3JlbGVhc2VkKCksIGRyYWdnaW5nSW5mbykpOworICAg IFdlYkNvcmU6OkRyYWdEYXRhIGRyYWdEYXRhKGRyYWdnaW5nSW5mbywgY2xpZW50LCBnbG9iYWws IHN0YXRpY19jYXN0PFdlYkNvcmU6OkRyYWdPcGVyYXRpb24+KGRyYWdnaW5nSW5mby5kcmFnZ2lu Z1NvdXJjZU9wZXJhdGlvbk1hc2spLCBhcHBsaWNhdGlvbkZsYWdzRm9yRHJhZyhtX3ZpZXcuZ2V0 QXV0b3JlbGVhc2VkKCksIGRyYWdnaW5nSW5mbykpOwogCiAgICAgTlNBcnJheSAqdHlwZXMgPSBk cmFnZ2luZ0luZm8uZHJhZ2dpbmdQYXN0ZWJvYXJkLnR5cGVzOwogICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwpAQCAtMzY5NywxMCArMzY5Nyw4IEBA IGJvb2wgV2ViVmlld0ltcGw6OnBlcmZvcm1EcmFnT3BlcmF0aW9uKGkKIAogICAgIGlmIChbdHlw ZXMgY29udGFpbnNPYmplY3Q6TlNGaWxlbmFtZXNQYm9hcmRUeXBlXSkgewogICAgICAgICBOU0Fy cmF5ICpmaWxlcyA9IFtkcmFnZ2luZ0luZm8uZHJhZ2dpbmdQYXN0ZWJvYXJkIHByb3BlcnR5TGlz dEZvclR5cGU6TlNGaWxlbmFtZXNQYm9hcmRUeXBlXTsKLSAgICAgICAgaWYgKCFbZmlsZXMgaXNL aW5kT2ZDbGFzczpbTlNBcnJheSBjbGFzc11dKSB7Ci0gICAgICAgICAgICBkZWxldGUgZHJhZ0Rh dGE7CisgICAgICAgIGlmICghW2ZpbGVzIGlzS2luZE9mQ2xhc3M6W05TQXJyYXkgY2xhc3NdXSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQogCiAgICAgICAgIFZlY3RvcjxT dHJpbmc+IGZpbGVOYW1lczsKIApAQCAtMzcxMSw0NSArMzcwOSw0MCBAQCBib29sIFdlYlZpZXdJ bXBsOjpwZXJmb3JtRHJhZ09wZXJhdGlvbihpCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDEyMDAKICAgICBlbHNlIGlmICghW3R5cGVzIGNvbnRhaW5zT2JqZWN0OlBh c3RlYm9hcmRUeXBlczo6V2ViQXJjaGl2ZVBib2FyZFR5cGVdICYmIFt0eXBlcyBjb250YWluc09i amVjdDpOU0ZpbGVzUHJvbWlzZVBib2FyZFR5cGVdKSB7CiAgICAgICAgIE5TQXJyYXkgKmZpbGVz ID0gW2RyYWdnaW5nSW5mby5kcmFnZ2luZ1Bhc3RlYm9hcmQgcHJvcGVydHlMaXN0Rm9yVHlwZTpO U0ZpbGVzUHJvbWlzZVBib2FyZFR5cGVdOwotICAgICAgICBpZiAoIVtmaWxlcyBpc0tpbmRPZkNs YXNzOltOU0FycmF5IGNsYXNzXV0pIHsKLSAgICAgICAgICAgIGRlbGV0ZSBkcmFnRGF0YTsKKyAg ICAgICAgaWYgKCFbZmlsZXMgaXNLaW5kT2ZDbGFzczpbTlNBcnJheSBjbGFzc11dKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9CiAgICAgICAgIHNpemVfdCBmaWxlQ291bnQg PSBmaWxlcy5jb3VudDsKLSAgICAgICAgVmVjdG9yPFN0cmluZz4gKmZpbGVOYW1lcyA9IG5ldyBW ZWN0b3I8U3RyaW5nPjsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZmlsZU5hbWVzOwogICAgICAg ICBOU1VSTCAqZHJvcExvY2F0aW9uID0gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpOU1RlbXBvcmFy eURpcmVjdG9yeSgpIGlzRGlyZWN0b3J5OllFU107CiAgICAgICAgIFN0cmluZyBwYXN0ZWJvYXJk TmFtZSA9IGRyYWdnaW5nSW5mby5kcmFnZ2luZ1Bhc3RlYm9hcmQubmFtZTsKLSAgICAgICAgW2Ry YWdnaW5nSW5mbyBlbnVtZXJhdGVEcmFnZ2luZ0l0ZW1zV2l0aE9wdGlvbnM6MCBmb3JWaWV3Om1f dmlldy5nZXRBdXRvcmVsZWFzZWQoKSBjbGFzc2VzOkBbW05TRmlsZVByb21pc2VSZWNlaXZlciBj bGFzc11dIHNlYXJjaE9wdGlvbnM6QHsgfSB1c2luZ0Jsb2NrOl4oTlNEcmFnZ2luZ0l0ZW0gKiBf X25vbm51bGwgZHJhZ2dpbmdJdGVtLCBOU0ludGVnZXIgaWR4LCBCT09MICogX19ub25udWxsIHN0 b3ApIHsKKyAgICAgICAgW2RyYWdnaW5nSW5mbyBlbnVtZXJhdGVEcmFnZ2luZ0l0ZW1zV2l0aE9w dGlvbnM6MCBmb3JWaWV3Om1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSBjbGFzc2VzOkBbW05TRmls ZVByb21pc2VSZWNlaXZlciBjbGFzc11dIHNlYXJjaE9wdGlvbnM6QHsgfSB1c2luZ0Jsb2NrOkJs b2NrUHRyPHZvaWQgKE5TRHJhZ2dpbmdJdGVtICosIE5TSW50ZWdlciwgQk9PTCAqKT46OmZyb21D YWxsYWJsZShbdGhpcywgZmlsZU5hbWVzID0gV1RGTW92ZShmaWxlTmFtZXMpLCBkcm9wTG9jYXRp b24gPSByZXRhaW5QdHIoZHJvcExvY2F0aW9uKSwgZmlsZUNvdW50LCBkcmFnRGF0YSA9IFdURk1v dmUoZHJhZ0RhdGEpLCBwYXN0ZWJvYXJkTmFtZV0gKE5TRHJhZ2dpbmdJdGVtICogX19ub25udWxs IGRyYWdnaW5nSXRlbSwgTlNJbnRlZ2VyIGlkeCwgQk9PTCAqIF9fbm9ubnVsbCBzdG9wKSBtdXRh YmxlIHsKICAgICAgICAgICAgIE5TRmlsZVByb21pc2VSZWNlaXZlciAqaXRlbSA9IGRyYWdnaW5n SXRlbS5pdGVtOwogICAgICAgICAgICAgTlNEaWN0aW9uYXJ5ICpvcHRpb25zID0gQHsgfTsKIAog ICAgICAgICAgICAgUmV0YWluUHRyPE5TT3BlcmF0aW9uUXVldWU+IHF1ZXVlID0gYWRvcHROUyhb TlNPcGVyYXRpb25RdWV1ZSBuZXddKTsKLSAgICAgICAgICAgIFtpdGVtIHJlY2VpdmVQcm9taXNl ZEZpbGVzQXREZXN0aW5hdGlvbjpkcm9wTG9jYXRpb24gb3B0aW9uczpvcHRpb25zIG9wZXJhdGlv blF1ZXVlOnF1ZXVlLmdldCgpIHJlYWRlcjpeKE5TVVJMICogX05vbm51bGwgZmlsZVVSTCwgTlNF cnJvciAqIF9OdWxsYWJsZSBlcnJvck9yTmlsKSB7CisgICAgICAgICAgICBbaXRlbSByZWNlaXZl UHJvbWlzZWRGaWxlc0F0RGVzdGluYXRpb246ZHJvcExvY2F0aW9uLmdldCgpIG9wdGlvbnM6b3B0 aW9ucyBvcGVyYXRpb25RdWV1ZTpxdWV1ZS5nZXQoKSByZWFkZXI6QmxvY2tQdHI8dm9pZChOU1VS TCAqLCBOU0Vycm9yICopPjo6ZnJvbUNhbGxhYmxlKFt0aGlzLCBmaWxlTmFtZXMgPSBXVEZNb3Zl KGZpbGVOYW1lcyksIGZpbGVDb3VudCwgZHJhZ0RhdGEgPSBXVEZNb3ZlKGRyYWdEYXRhKSwgcGFz dGVib2FyZE5hbWVdKE5TVVJMICogX05vbm51bGwgZmlsZVVSTCwgTlNFcnJvciAqIF9OdWxsYWJs ZSBlcnJvck9yTmlsKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBpZiAoZXJyb3JPck5pbCkK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICAgICAgZGlzcGF0Y2hf YXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3RoaXMsIHBhdGggPSBSZXRhaW5QdHI8 TlNTdHJpbmc+KGZpbGVVUkwucGF0aCksIGZpbGVOYW1lcywgZmlsZUNvdW50LCBkcmFnRGF0YSwg cGFzdGVib2FyZE5hbWVdIHsKLSAgICAgICAgICAgICAgICAgICAgZmlsZU5hbWVzLT5hcHBlbmQo cGF0aC5nZXQoKSk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChmaWxlTmFtZXMtPnNpemUoKSA9 PSBmaWxlQ291bnQpIHsKKyAgICAgICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBCbG9ja1B0cjx2b2lkKCk+Ojpmcm9tQ2FsbGFibGUoW3RoaXMsIHBh dGggPSByZXRhaW5QdHIoZmlsZVVSTC5wYXRoKSwgZmlsZU5hbWVzID0gV1RGTW92ZShmaWxlTmFt ZXMpLCBmaWxlQ291bnQsIGRyYWdEYXRhID0gV1RGTW92ZShkcmFnRGF0YSksIHBhc3RlYm9hcmRO YW1lXSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgICAgICBmaWxlTmFtZXMuYXBwZW5kKHBh dGguZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICBpZiAoZmlsZU5hbWVzLnNpemUoKSA9PSBm aWxlQ291bnQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIFNhbmRib3hFeHRlbnNpb246Okhh bmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwogICAgICAgICAgICAgICAgICAgICAgICAgU2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkgc2FuZGJveEV4dGVuc2lvbkZvclVwbG9hZDsKIAot ICAgICAgICAgICAgICAgICAgICAgICAgbV9wYWdlLT5jcmVhdGVTYW5kYm94RXh0ZW5zaW9uc0lm TmVlZGVkKCpmaWxlTmFtZXMsIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIHNhbmRib3hFeHRlbnNp b25Gb3JVcGxvYWQpOwotICAgICAgICAgICAgICAgICAgICAgICAgZHJhZ0RhdGEtPnNldEZpbGVO YW1lcygqZmlsZU5hbWVzKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fcGFnZS0+cGVyZm9y bURyYWdPcGVyYXRpb24oKmRyYWdEYXRhLCBwYXN0ZWJvYXJkTmFtZSwgc2FuZGJveEV4dGVuc2lv bkhhbmRsZSwgc2FuZGJveEV4dGVuc2lvbkZvclVwbG9hZCk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBkZWxldGUgZHJhZ0RhdGE7Ci0gICAgICAgICAgICAgICAgICAgICAgICBkZWxldGUgZmls ZU5hbWVzOworICAgICAgICAgICAgICAgICAgICAgICAgbV9wYWdlLT5jcmVhdGVTYW5kYm94RXh0 ZW5zaW9uc0lmTmVlZGVkKGZpbGVOYW1lcywgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJv eEV4dGVuc2lvbkZvclVwbG9hZCk7CisgICAgICAgICAgICAgICAgICAgICAgICBkcmFnRGF0YS5z ZXRGaWxlTmFtZXMoZmlsZU5hbWVzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fcGFnZS0+ cGVyZm9ybURyYWdPcGVyYXRpb24oZHJhZ0RhdGEsIHBhc3RlYm9hcmROYW1lLCBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlLCBzYW5kYm94RXh0ZW5zaW9uRm9yVXBsb2FkKTsKICAgICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgfV07Ci0gICAgICAgIH1d OworICAgICAgICAgICAgICAgIH0pLmdldCgpKTsKKyAgICAgICAgICAgIH0pLmdldCgpXTsKKyAg ICAgICAgfSkuZ2V0KCldOwogCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICNlbmRpZgog Ci0gICAgbV9wYWdlLT5wZXJmb3JtRHJhZ09wZXJhdGlvbigqZHJhZ0RhdGEsIGRyYWdnaW5nSW5m by5kcmFnZ2luZ1Bhc3RlYm9hcmQubmFtZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJv eEV4dGVuc2lvbkZvclVwbG9hZCk7Ci0gICAgZGVsZXRlIGRyYWdEYXRhOworICAgIG1fcGFnZS0+ cGVyZm9ybURyYWdPcGVyYXRpb24oZHJhZ0RhdGEsIGRyYWdnaW5nSW5mby5kcmFnZ2luZ1Bhc3Rl Ym9hcmQubmFtZSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgc2FuZGJveEV4dGVuc2lvbkZvclVw bG9hZCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K