194876 2019-02-20 15:32:21 -0800 [Win] Remove CF when using Windows clipboard 2021-12-08 16:34:20 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175336 1 don.olmstead don.olmstead achristensen bfulgham pvollan webkit-bug-importer oldest_to_newest 1508307 0 don.olmstead 2019-02-20 15:32:21 -0800 ClipboardUtilitiesWin.cpp DragDataWin.cpp and PasteboardWin.cpp all have USE(CF) guards which have minimal requirements on CF. Need to replace urlFromPath within ClipboardUtilitiesWin and then all the guards can be removed completely. 1821773 1 446420 don.olmstead 2021-12-08 14:25:20 -0800 Created attachment 446420 Patch 1821786 2 446420 bfulgham 2021-12-08 14:43:03 -0800 Comment on attachment 446420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446420&action=review r=me > Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp:468 > + url = URL::fileURLWithFileSystemPath(String(data)).fileSystemPath(); Very nice! 1821853 3 ews-feeder 2021-12-08 16:33:23 -0800 Committed r286752 (244995@main): <https://commits.webkit.org/244995@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446420. 1821854 4 webkit-bug-importer 2021-12-08 16:34:20 -0800 <rdar://problem/86240474> 446420 2021-12-08 14:25:20 -0800 2021-12-08 16:33:25 -0800 Patch bug-194876.diff text/plain 4778 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZGZkOGZmYTBlNjcuLjVjNzNmYjI4MzA0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDIxLTEyLTA4ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CisKKyAgICAgICAgW1dpbl0gUmVtb3ZlIENGIHdoZW4gdXNpbmcgV2luZG93cyBjbGlw Ym9hcmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSBhbnkgQ0YgY29kZSBmcm9tIENsaXBib2FyZFV0aWxpdGllc1dpbiBhbmQgcmVwbGFjZSBp dCB3aXRoIFdURiBjb2RlLiBUaGUKKyAgICAgICAgdXJsRnJvbVBhdGggZnVuY3Rpb24gaXMgZGVs ZXRlZCBzaW5jZSBpdCBpcyBubyBsb25nZXIgcmVsZXZhbnQuCisKKyAgICAgICAgKiBwbGF0Zm9y bS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFVS TCk6CisgICAgICAgIChXZWJDb3JlOjp1cmxGcm9tUGF0aCk6IERlbGV0ZWQuCisKIDIwMjEtMTIt MDggIFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByZXZlcnRpbmcgcjI4NjU5Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd2luL0NsaXBib2FyZFV0aWxpdGllc1dpbi5jcHAKaW5kZXggMjZkMzkyNjQxZjY4Li5lYThj NTAwODE0NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9h cmRVdGlsaXRpZXNXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlw Ym9hcmRVdGlsaXRpZXNXaW4uY3BwCkBAIC0zOSwxMSArMzksNiBAQAogI2luY2x1ZGUgPHd0Zi90 ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC93aW4vV0NoYXJTdHJpbmdF eHRyYXMuaD4KIAotI2lmIFVTRShDRikKLSNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91 bmRhdGlvbi5oPgotI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KLSNlbmRpZgotCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIEZPUk1BVEVUQyogY2ZIRHJvcEZvcm1hdCgpCkBAIC01MiwyNyArNDcs NiBAQCBGT1JNQVRFVEMqIGNmSERyb3BGb3JtYXQoKQogICAgIHJldHVybiAmdXJsRm9ybWF0Owog fQogCi0jaWYgVVNFKENGKQotCi1zdGF0aWMgYm9vbCB1cmxGcm9tUGF0aChDRlN0cmluZ1JlZiBw YXRoLCBTdHJpbmcmIHVybCkKLXsKLSAgICBpZiAoIXBhdGgpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIFJldGFpblB0cjxDRlVSTFJlZj4gY2ZVUkwgPSBhZG9wdENGKENGVVJMQ3JlYXRl V2l0aEZpbGVTeXN0ZW1QYXRoKDAsIHBhdGgsIGtDRlVSTFdpbmRvd3NQYXRoU3R5bGUsIGZhbHNl KSk7Ci0gICAgaWYgKCFjZlVSTCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgdXJsID0g Q0ZVUkxHZXRTdHJpbmcoY2ZVUkwuZ2V0KCkpOwotCi0gICAgLy8gV29yayBhcm91bmQgPHJkYXI6 Ly9wcm9ibGVtLzY3MDgzMDA+LCB3aGVyZSBDRlVSTENyZWF0ZVdpdGhGaWxlU3lzdGVtUGF0aCBt YWtlcyBVUkxzIHdpdGggImxvY2FsaG9zdCIuCi0gICAgaWYgKHVybC5zdGFydHNXaXRoKCJmaWxl Oi8vbG9jYWxob3N0LyIpKQotICAgICAgICB1cmwucmVtb3ZlKDcsIDkpOwotCi0gICAgcmV0dXJu IHRydWU7Ci19Ci0jZW5kaWYKLQogc3RhdGljIGJvb2wgZ2V0RGF0YU1hcEl0ZW0oY29uc3QgRHJh Z0RhdGFNYXAqIGRhdGFPYmplY3QsIEZPUk1BVEVUQyogZm9ybWF0LCBTdHJpbmcmIGl0ZW0pCiB7 CiAgICAgRHJhZ0RhdGFNYXA6OmNvbnN0X2l0ZXJhdG9yIGZvdW5kID0gZGF0YU9iamVjdC0+Zmlu ZChmb3JtYXQtPmNmRm9ybWF0KTsKQEAgLTQ4NiwxNCArNDYwLDEzIEBAIFN0cmluZyBnZXRVUkwo SURhdGFPYmplY3QqIGRhdGFPYmplY3QsIERyYWdEYXRhOjpGaWxlbmFtZUNvbnZlcnNpb25Qb2xp Y3kgZmlsZW5hCiAgICAgICAgIEdsb2JhbFVubG9jayhzdG9yZS5oR2xvYmFsKTsKICAgICAgICAg UmVsZWFzZVN0Z01lZGl1bSgmc3RvcmUpOwogICAgIH0KLSNpZiBVU0UoQ0YpCiAgICAgZWxzZSBp ZiAoZmlsZW5hbWVQb2xpY3kgPT0gRHJhZ0RhdGE6OkNvbnZlcnRGaWxlbmFtZXMpIHsKICAgICAg ICAgaWYgKFNVQ0NFRURFRChkYXRhT2JqZWN0LT5HZXREYXRhKGZpbGVuYW1lV0Zvcm1hdCgpLCAm c3RvcmUpKSkgewogICAgICAgICAgICAgLy8gZmlsZSB1c2luZyB1bmljb2RlCiAgICAgICAgICAg ICB3Y2hhcl90KiBkYXRhID0gc3RhdGljX2Nhc3Q8d2NoYXJfdCo+KEdsb2JhbExvY2soc3RvcmUu aEdsb2JhbCkpOwogICAgICAgICAgICAgaWYgKGRhdGEgJiYgZGF0YVswXSAmJiAoUGF0aEZpbGVF eGlzdHMoZGF0YSkgfHwgUGF0aElzVU5DKGRhdGEpKSkgewotICAgICAgICAgICAgICAgIFJldGFp blB0cjxDRlN0cmluZ1JlZj4gcGF0aEFzQ0ZTdHJpbmcgPSBhZG9wdENGKENGU3RyaW5nQ3JlYXRl V2l0aENoYXJhY3RlcnMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgKGNvbnN0IFVuaUNoYXIqKWRhdGEs IHdjc2xlbihkYXRhKSkpOwotICAgICAgICAgICAgICAgIGlmICh1cmxGcm9tUGF0aChwYXRoQXND RlN0cmluZy5nZXQoKSwgdXJsKSAmJiB0aXRsZSkKKyAgICAgICAgICAgICAgICB1cmwgPSBVUkw6 OmZpbGVVUkxXaXRoRmlsZVN5c3RlbVBhdGgoU3RyaW5nKGRhdGEpKS5maWxlU3lzdGVtUGF0aCgp OworICAgICAgICAgICAgICAgIGlmICh0aXRsZSkKICAgICAgICAgICAgICAgICAgICAgKnRpdGxl ID0gdXJsOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgR2xvYmFsVW5sb2NrKHN0b3JlLmhH bG9iYWwpOwpAQCAtNTAyLDE1ICs0NzUsMTQgQEAgU3RyaW5nIGdldFVSTChJRGF0YU9iamVjdCog ZGF0YU9iamVjdCwgRHJhZ0RhdGE6OkZpbGVuYW1lQ29udmVyc2lvblBvbGljeSBmaWxlbmEKICAg ICAgICAgICAgIC8vIGZpbGVuYW1lIHVzaW5nIGFzY2lpCiAgICAgICAgICAgICBjaGFyKiBkYXRh ID0gc3RhdGljX2Nhc3Q8Y2hhcio+KEdsb2JhbExvY2soc3RvcmUuaEdsb2JhbCkpOwogICAgICAg ICAgICAgaWYgKGRhdGEgJiYgZGF0YVswXSAmJiAoUGF0aEZpbGVFeGlzdHNBKGRhdGEpIHx8IFBh dGhJc1VOQ0EoZGF0YSkpKSB7Ci0gICAgICAgICAgICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVm PiBwYXRoQXNDRlN0cmluZyA9IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVXaXRoQ1N0cmluZyhrQ0ZB bGxvY2F0b3JEZWZhdWx0LCBkYXRhLCBrQ0ZTdHJpbmdFbmNvZGluZ0FTQ0lJKSk7Ci0gICAgICAg ICAgICAgICAgaWYgKHVybEZyb21QYXRoKHBhdGhBc0NGU3RyaW5nLmdldCgpLCB1cmwpICYmIHRp dGxlKQorICAgICAgICAgICAgICAgIHVybCA9IFVSTDo6ZmlsZVVSTFdpdGhGaWxlU3lzdGVtUGF0 aChTdHJpbmcoZGF0YSkpLmZpbGVTeXN0ZW1QYXRoKCk7CisgICAgICAgICAgICAgICAgaWYgKHRp dGxlKQogICAgICAgICAgICAgICAgICAgICAqdGl0bGUgPSB1cmw7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBHbG9iYWxVbmxvY2soc3RvcmUuaEdsb2JhbCk7CiAgICAgICAgICAgICBSZWxl YXNlU3RnTWVkaXVtKCZzdG9yZSk7CiAgICAgICAgIH0KICAgICB9Ci0jZW5kaWYKICAgICByZXR1 cm4gdXJsOwogfQogCkBAIC01MjQsNyArNDk2LDYgQEAgU3RyaW5nIGdldFVSTChjb25zdCBEcmFn RGF0YU1hcCogZGF0YSwgRHJhZ0RhdGE6OkZpbGVuYW1lQ29udmVyc2lvblBvbGljeSBmaWxlbmEK ICAgICAgICAgcmV0dXJuIGV4dHJhY3RVUkwodXJsLCB0aXRsZSk7CiAgICAgaWYgKGdldERhdGFN YXBJdGVtKGRhdGEsIHVybEZvcm1hdCgpLCB1cmwpKQogICAgICAgICByZXR1cm4gZXh0cmFjdFVS TCh1cmwsIHRpdGxlKTsKLSNpZiBVU0UoQ0YpCiAgICAgaWYgKGZpbGVuYW1lUG9saWN5ICE9IERy YWdEYXRhOjpDb252ZXJ0RmlsZW5hbWVzKQogICAgICAgICByZXR1cm4gdXJsOwogCkBAIC01MzUs MTAgKzUwNiwxMSBAQCBTdHJpbmcgZ2V0VVJMKGNvbnN0IERyYWdEYXRhTWFwKiBkYXRhLCBEcmFn RGF0YTo6RmlsZW5hbWVDb252ZXJzaW9uUG9saWN5IGZpbGVuYQogICAgIGF1dG8gd2NoYXJEYXRh ID0gc3RyaW5nRGF0YS53aWRlQ2hhcmFjdGVycygpLmRhdGEoKTsKICAgICBpZiAoc3RyaW5nRGF0 YS5pc0VtcHR5KCkgfHwgKCFQYXRoRmlsZUV4aXN0cyh3Y2hhckRhdGEpICYmICFQYXRoSXNVTkMo d2NoYXJEYXRhKSkpCiAgICAgICAgIHJldHVybiB1cmw7Ci0gICAgUmV0YWluUHRyPENGU3RyaW5n UmVmPiBwYXRoQXNDRlN0cmluZyA9IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVy cyhrQ0ZBbGxvY2F0b3JEZWZhdWx0LCAoY29uc3QgVW5pQ2hhciAqKXdjaGFyRGF0YSwgd2NzbGVu KHdjaGFyRGF0YSkpKTsKLSAgICBpZiAodXJsRnJvbVBhdGgocGF0aEFzQ0ZTdHJpbmcuZ2V0KCks IHVybCkgJiYgdGl0bGUpCisKKyAgICB1cmwgPSBVUkw6OmZpbGVVUkxXaXRoRmlsZVN5c3RlbVBh dGgoc3RyaW5nRGF0YSkuZmlsZVN5c3RlbVBhdGgoKTsKKyAgICBpZiAodGl0bGUpCiAgICAgICAg ICp0aXRsZSA9IHVybDsKLSNlbmRpZgorCiAgICAgcmV0dXJuIHVybDsKIH0KIAo=