232275 2021-10-25 14:51:51 -0700 Rename a few variable and parameter names in WKContentViewInteraction.mm 2021-10-25 16:11:20 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh thorton webkit-bug-importer oldest_to_newest 1808606 0 wenson_hsieh 2021-10-25 14:51:51 -0700 . 1808607 1 442422 wenson_hsieh 2021-10-25 14:54:45 -0700 Created attachment 442422 Patch 1808652 2 ews-feeder 2021-10-25 16:10:48 -0700 Committed r284843 (243520@main): <https://commits.webkit.org/243520@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442422. 1808654 3 webkit-bug-importer 2021-10-25 16:11:20 -0700 <rdar://problem/84636303> 442422 2021-10-25 14:54:45 -0700 2021-10-25 16:10:48 -0700 Patch bug-232275-20211025145444.patch text/plain 5054 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzOTczNmVkZDIzNzE2ZmY3 N2E3ZDQ2NTAyMjU5Mjk5NWNjOWY1NWMuLjZlMzRjY2ExMmNkN2VjOTgxNmIwZjI5YWZmZGZmYmY0 YjE0YmVkYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMTAtMjUgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIGEgZmV3IHZh cmlhYmxlIGFuZCBwYXJhbWV0ZXIgbmFtZXMgaW4gV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIyNzUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYFBy b2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2VgIGVudW0gZmxhZyB3YXMgYmVpbmcgc3RvcmVk IGluIGEgdmFyaWFibGUgbmFtZWQKKyAgICAgICAgYFByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbklu SW1hZ2VgIGluIGEgZmV3IHBsYWNlcywgbGlrZWx5IGR1ZSB0byBtYXNzIHJlbmFtaW5nIHdoZW4g dXBzdHJlYW1pbmcgV2ViS2l0IHN1cHBvcnQKKyAgICAgICAgZm9yIExpdmUgVGV4dC4gUmVuYW1l IHRoaXMgc28gdGhhdCB3ZSB1c2UgbG93ZXJjYXNlIGZvciB0aGVzZSB2YXJpYWJsZSBuYW1lcy4K KworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfZHJhZ0ludGVyYWN0aW9uOnByZXBhcmVGb3JTZXNzaW9uOmNvbXBsZXRpb246XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX2RvQWZ0ZXJQZW5kaW5nSW1hZ2VBbmFseXNpczpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfaW52b2tlQWxsQWN0aW9uc1RvUGVyZm9ybUFmdGVyUGVu ZGluZ0ltYWdlQW5hbHlzaXM6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NvbnRleHRN ZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOmNvbXBsZXRpb246 XSk6CisKIDIwMjEtMTAtMjUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI4NDA3OSk6IEF1ZGlvIGNvbnRpbnVlcyBwbGF5aW5n IG9uIGh1bHUuY29tIGluIHByaXZhdGUgYnJvd3NpbmcgbW9kZSBhZnRlciBjbG9zaW5nIHRoZSB0 YWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCmluZGV4IDU4MWZmYTIyMGUxNTI2MGQxMWQ5MWRiZGE1YWM2NTlkYzZj ZjU1NTYuLmVmMGExY2I0Njg1YzMyNjlhODNkOTdiY2MzYjNiZjBmNDIwYjE1YTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtODg2MCw5ICs4ODYwLDkgQEAgLSAodm9pZClfZHJhZ0ludGVyYWN0aW9uOihV SURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXBhcmVGb3JTZXNzaW9uOihpZAogCiAg ICAgW3NlbGYgY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3RhdGVdOwogCi0gICAgYXV0byBwcmVw YXJlRm9yU2Vzc2lvbiA9IFt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLQ29udGVudFZpZXc+KHNl bGYpLCBzZXNzaW9uID0gcmV0YWluUHRyKHNlc3Npb24pLCBjb21wbGV0aW9uID0gbWFrZUJsb2Nr UHRyKGNvbXBsZXRpb24pXSAoV2ViS2l0OjpQcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdl IFByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2UpIHsKKyAgICBhdXRvIHByZXBhcmVGb3JT ZXNzaW9uID0gW3dlYWtTZWxmID0gV2Vha09iakNQdHI8V0tDb250ZW50Vmlldz4oc2VsZiksIHNl c3Npb24gPSByZXRhaW5QdHIoc2Vzc2lvbiksIGNvbXBsZXRpb24gPSBtYWtlQmxvY2tQdHIoY29t cGxldGlvbildIChXZWJLaXQ6OlByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2UgcHJvY2Vl ZFdpdGhUZXh0U2VsZWN0aW9uSW5JbWFnZSkgewogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3 ZWFrU2VsZi5nZXQoKTsKLSAgICAgICAgaWYgKCFzdHJvbmdTZWxmIHx8IFByb2NlZWRXaXRoVGV4 dFNlbGVjdGlvbkluSW1hZ2UgPT0gV2ViS2l0OjpQcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25Jbklt YWdlOjpZZXMpCisgICAgICAgIGlmICghc3Ryb25nU2VsZiB8fCBwcm9jZWVkV2l0aFRleHRTZWxl Y3Rpb25JbkltYWdlID09IFdlYktpdDo6UHJvY2VlZFdpdGhUZXh0U2VsZWN0aW9uSW5JbWFnZTo6 WWVzKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGF1dG8gZHJhZ09yaWdpbiA9IFtz ZXNzaW9uIGxvY2F0aW9uSW5WaWV3OnN0cm9uZ1NlbGYuZ2V0KCldOwpAQCAtOTgyMSw3ICs5ODIx LDcgQEAgLSAodm9pZClfZW5kSW1hZ2VBbmFseXNpc0dlc3R1cmVEZWZlcnJhbDooV2ViS2l0OjpT aG91bGRQcmV2ZW50R2VzdHVyZXMpc2hvdWxkUHIKICAgICBbX2ltYWdlQW5hbHlzaXNEZWZlcnJp bmdHZXN0dXJlUmVjb2duaXplciBlbmREZWZlcnJhbDpzaG91bGRQcmV2ZW50R2VzdHVyZXNdOwog fQogCi0tICh2b2lkKV9kb0FmdGVyUGVuZGluZ0ltYWdlQW5hbHlzaXM6KHZvaWQoXikoV2ViS2l0 OjpQcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdlIFByb2NlZWRXaXRoVGV4dFNlbGVjdGlv bkluSW1hZ2UpKWJsb2NrCistICh2b2lkKV9kb0FmdGVyUGVuZGluZ0ltYWdlQW5hbHlzaXM6KHZv aWQoXikoV2ViS2l0OjpQcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdlKSlibG9jawogewog ICAgIGlmIChzZWxmLmhhc1BlbmRpbmdJbWFnZUFuYWx5c2lzUmVxdWVzdCkKICAgICAgICAgX2Fj dGlvbnNUb1BlcmZvcm1BZnRlclBlbmRpbmdJbWFnZUFuYWx5c2lzLmFwcGVuZChtYWtlQmxvY2tQ dHIoYmxvY2spKTsKQEAgLTk4MjksMTIgKzk4MjksMTIgQEAgLSAodm9pZClfZG9BZnRlclBlbmRp bmdJbWFnZUFuYWx5c2lzOih2b2lkKF4pKFdlYktpdDo6UHJvY2VlZFdpdGhUZXh0U2VsZWN0aW9u SW4KICAgICAgICAgYmxvY2soV2ViS2l0OjpQcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdl OjpObyk7CiB9CiAKLS0gKHZvaWQpX2ludm9rZUFsbEFjdGlvbnNUb1BlcmZvcm1BZnRlclBlbmRp bmdJbWFnZUFuYWx5c2lzOihXZWJLaXQ6OlByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2Up UHJvY2VlZFdpdGhUZXh0U2VsZWN0aW9uSW5JbWFnZQorLSAodm9pZClfaW52b2tlQWxsQWN0aW9u c1RvUGVyZm9ybUFmdGVyUGVuZGluZ0ltYWdlQW5hbHlzaXM6KFdlYktpdDo6UHJvY2VlZFdpdGhU ZXh0U2VsZWN0aW9uSW5JbWFnZSlwcm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdlCiB7CiAg ICAgX3BlbmRpbmdJbWFnZUFuYWx5c2lzUmVxdWVzdElkZW50aWZpZXIgPSBzdGQ6Om51bGxvcHQ7 CiAgICAgX2VsZW1lbnRQZW5kaW5nSW1hZ2VBbmFseXNpcyA9IHN0ZDo6bnVsbG9wdDsKICAgICBm b3IgKGF1dG8gYmxvY2sgOiBzdGQ6OmV4Y2hhbmdlKF9hY3Rpb25zVG9QZXJmb3JtQWZ0ZXJQZW5k aW5nSW1hZ2VBbmFseXNpcywgeyB9KSkKLSAgICAgICAgYmxvY2soUHJvY2VlZFdpdGhUZXh0U2Vs ZWN0aW9uSW5JbWFnZSk7CisgICAgICAgIGJsb2NrKHByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbklu SW1hZ2UpOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0FOQUxZU0lTKQpAQCAtMTA4NjAs OSArMTA4NjAsOSBAQCAtICh2b2lkKV9jb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRN ZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBjb25maWd1cgogICAgIGlmICghc2VsZi53ZWJW aWV3LmNvbmZpZ3VyYXRpb24uX2xvbmdQcmVzc0FjdGlvbnNFbmFibGVkKQogICAgICAgICByZXR1 cm4gY29tcGxldGlvbihuaWwpOwogCi0gICAgYXV0byBnZXRDb25maWd1cmF0aW9uQW5kQ29udGlu dWUgPSBbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0NvbnRlbnRWaWV3PihzZWxmKSwgaW50ZXJh Y3Rpb24gPSByZXRhaW5QdHIoaW50ZXJhY3Rpb24pLCBjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRy KGNvbXBsZXRpb24pLCB0cmlnZ2VyZWRCeUltYWdlQW5hbHlzaXNUaW1lb3V0XSAoV2ViS2l0OjpQ cm9jZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdlIFByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbklu SW1hZ2UpIHsKKyAgICBhdXRvIGdldENvbmZpZ3VyYXRpb25BbmRDb250aW51ZSA9IFt3ZWFrU2Vs ZiA9IFdlYWtPYmpDUHRyPFdLQ29udGVudFZpZXc+KHNlbGYpLCBpbnRlcmFjdGlvbiA9IHJldGFp blB0cihpbnRlcmFjdGlvbiksIGNvbXBsZXRpb24gPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbiks IHRyaWdnZXJlZEJ5SW1hZ2VBbmFseXNpc1RpbWVvdXRdIChXZWJLaXQ6OlByb2NlZWRXaXRoVGV4 dFNlbGVjdGlvbkluSW1hZ2UgcHJvY2VlZFdpdGhUZXh0U2VsZWN0aW9uSW5JbWFnZSkgewogICAg ICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsKLSAgICAgICAgaWYgKCFzdHJv bmdTZWxmIHx8IFByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2UgPT0gV2ViS2l0OjpQcm9j ZWVkV2l0aFRleHRTZWxlY3Rpb25JbkltYWdlOjpZZXMpIHsKKyAgICAgICAgaWYgKCFzdHJvbmdT ZWxmIHx8IHByb2NlZWRXaXRoVGV4dFNlbGVjdGlvbkluSW1hZ2UgPT0gV2ViS2l0OjpQcm9jZWVk V2l0aFRleHRTZWxlY3Rpb25JbkltYWdlOjpZZXMpIHsKICAgICAgICAgICAgIGNvbXBsZXRpb24o bmlsKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQo=