237927 2022-03-15 15:38:49 -0700 [iOS] Refactor some position information hit-testing logic related to data detectors in Live Text 2022-03-16 16:20:24 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi katherine_cheney megan_gardner thorton webkit-bug-importer oldest_to_newest 1851543 0 wenson_hsieh 2022-03-15 15:38:49 -0700 . 1851547 1 454766 wenson_hsieh 2022-03-15 15:46:38 -0700 Created attachment 454766 Patch 1851793 2 454766 wenson_hsieh 2022-03-16 07:47:54 -0700 Comment on attachment 454766 Patch Thanks for the review! 1851804 3 ews-feeder 2022-03-16 08:07:49 -0700 Committed r291347 (248486@main): <https://commits.webkit.org/248486@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454766. 1851805 4 webkit-bug-importer 2022-03-16 08:08:17 -0700 <rdar://problem/90370253> 1852046 5 ap 2022-03-16 16:20:24 -0700 *** Bug 237926 has been marked as a duplicate of this bug. *** 454766 2022-03-15 15:46:38 -0700 2022-03-16 08:07:51 -0700 Patch bug-237927-20220315154637.patch text/plain 7573 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUwMTQyMDY3NmU0NjRkZjIy OTA3NmQ5MGQwYzY5M2U3M2QyNGY5OTYuLjI2M2IxMTVlZjllNGJhMDA0NGQ3ZGZmMzFkZTVjOGJi NjRiMDU1MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDMtMTUgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVmYWN0b3Ig c29tZSBwb3NpdGlvbiBpbmZvcm1hdGlvbiBoaXQtdGVzdGluZyBsb2dpYyByZWxhdGVkIHRvIGRh dGEgZGV0ZWN0b3JzIGluIExpdmUgVGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUHVsbCB0aGUgY2FsbCB0byBgZGF0YURldGVjdG9ySW1hZ2VPdmVy bGF5UG9zaXRpb25JbmZvcm1hdGlvbigpYCBvdXQgZnJvbSBgZWxlbWVudFBvc2l0aW9uSW5mb3Jt YXRpb24oKWAsIGFuZAorICAgICAgICBpbnRvIHRoZSB0b3AgbGV2ZWwgaW4gYFdlYlBhZ2U6OnBv c2l0aW9uSW5mb3JtYXRpb24oKWAuIFNpbmNlIGBkYXRhRGV0ZWN0b3JJbWFnZU92ZXJsYXlQb3Np dGlvbkluZm9ybWF0aW9uYCBvbmx5CisgICAgICAgIGRlcGVuZHMgb24gdGhlIGhpdC10ZXN0ZWQg aW5uZXIgbm9kZSAocmF0aGVyIHRoYW4gdGhlIGVsZW1lbnQgcmVzcG9uZGluZyB0byBjbGljayBl dmVudHMpLCBpdCBkb2Vzbid0IG1ha2Ugc2Vuc2UKKyAgICAgICAgdG8gb25seSBwb3B1bGF0ZSB0 aGUgZGF0YSBkZXRlY3RvciByZXN1bHRzIGFycmF5IG9ubHkgd2hlbiB3ZSBmaW5kIGFuIGVsZW1l bnQgdGhhdCByZXNwb25kcyB0byBjbGlja3MuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbWFnZXMv dGV4dC1yZWNvZ25pdGlvbi9pb3Mvc2hvdy1kYXRhLWRldGVjdG9yLWNvbnRleHQtbWVudS5odG1s CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAg ICAgIChXZWJLaXQ6OmVsZW1lbnRQb3NpdGlvbkluZm9ybWF0aW9uKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6cG9zaXRpb25JbmZvcm1hdGlvbik6CisKIDIwMjItMDMtMTUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggbG9nZ2luZyBpbiBHUFVQcm9j ZXNzUHJveHk6OmRpZENyZWF0ZUNvbnRleHRGb3JWaXNpYmlsaXR5UHJvcGFnYXRpb24oKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpp bmRleCA3OWIyMmU3ODExZDM2N2RjMTk5YmNiZTZhM2E1OTA4ZjEyZGI1MTc1Li5iYzNhOGVjNmE0 Mzc0Y2M1Zjc3M2M3YjUwZDhjNDVkNmI5YWI1MWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjk2MywxMyArMjk2Myw2 IEBAIHN0YXRpYyB2b2lkIGVsZW1lbnRQb3NpdGlvbkluZm9ybWF0aW9uKFdlYlBhZ2UmIHBhZ2Us IEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEluCiAgICAgICAgIGJvdW5kc1Bvc2l0aW9uSW5mb3Jt YXRpb24oKnJlbmRlcmVyLCBpbmZvKTsKICAgICB9CiAKLSNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJ T04pCi0gICAgaWYgKGluZm8uaXNJbWFnZU92ZXJsYXlUZXh0ICYmIGlubmVyTm9uU2hhcmVkTm9k ZS0+c2hhZG93SG9zdCgpID09ICZlbGVtZW50ICYmIGlzPEhUTUxFbGVtZW50PihlbGVtZW50KSkg ewotICAgICAgICBpZiAoUmVmIGh0bWxFbGVtZW50ID0gZG93bmNhc3Q8SFRNTEVsZW1lbnQ+KGVs ZW1lbnQpOyBJbWFnZU92ZXJsYXk6Omhhc092ZXJsYXkoaHRtbEVsZW1lbnQuZ2V0KCkpKQotICAg ICAgICAgICAgZGF0YURldGVjdG9ySW1hZ2VPdmVybGF5UG9zaXRpb25JbmZvcm1hdGlvbihodG1s RWxlbWVudC5nZXQoKSwgcmVxdWVzdCwgaW5mbyk7Ci0gICAgfQotI2VuZGlmCi0KICAgICBpbmZv LmVsZW1lbnRDb250ZXh0ID0gcGFnZS5jb250ZXh0Rm9yRWxlbWVudChlbGVtZW50KTsKIH0KICAg ICAKQEAgLTMxOTgsNiArMzE5MSwyNiBAQCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv biBXZWJQYWdlOjpwb3NpdGlvbkluZm9ybWF0aW9uKGNvbnN0IEludGVyYWN0aW9uSQogICAgICAg ICAgICAgaW5mby5pbWFnZSA9IHNoYXJlYWJsZUJpdG1hcFNuYXBzaG90Rm9yTm9kZShlbGVtZW50 KTsKICAgICB9CiAKKyNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04pCisgICAgYXV0byBoaXRUZXN0 ZWRJbWFnZU92ZXJsYXlIb3N0ID0gKFsmXSgpIC0+IFJlZlB0cjxIVE1MRWxlbWVudD4geworICAg ICAgICBpZiAoIWhpdFRlc3ROb2RlIHx8ICFpbmZvLmlzSW1hZ2VPdmVybGF5VGV4dCkKKyAgICAg ICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgIFJlZlB0ciBzaGFkb3dIb3N0ID0gaGl0 VGVzdE5vZGUtPnNoYWRvd0hvc3QoKTsKKyAgICAgICAgaWYgKCFpczxIVE1MRWxlbWVudD4oc2hh ZG93SG9zdC5nZXQoKSkpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBS ZWZQdHIgaHRtbEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MRWxlbWVudD4oc2hhZG93SG9zdC5nZXQo KSk7CisgICAgICAgIGlmICghSW1hZ2VPdmVybGF5OjpoYXNPdmVybGF5KCpodG1sRWxlbWVudCkp CisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICByZXR1cm4gaHRtbEVsZW1l bnQ7CisgICAgfSkoKTsKKworICAgIGlmIChoaXRUZXN0ZWRJbWFnZU92ZXJsYXlIb3N0KQorICAg ICAgICBkYXRhRGV0ZWN0b3JJbWFnZU92ZXJsYXlQb3NpdGlvbkluZm9ybWF0aW9uKCpoaXRUZXN0 ZWRJbWFnZU92ZXJsYXlIb3N0LCByZXF1ZXN0LCBpbmZvKTsKKyNlbmRpZiAvLyBFTkFCTEUoREFU QV9ERVRFQ1RJT04pCisKICAgICBpZiAoIWluZm8uaXNJbWFnZSAmJiByZXF1ZXN0LmluY2x1ZGVJ bWFnZURhdGEgJiYgaGl0VGVzdE5vZGUpIHsKICAgICAgICAgaWYgKGF1dG8gdmlkZW8gPSBob3N0 VmlkZW9FbGVtZW50SWdub3JpbmdJbWFnZU92ZXJsYXkoKmhpdFRlc3ROb2RlKSkKICAgICAgICAg ICAgIHZpZGVvUG9zaXRpb25JbmZvcm1hdGlvbigqdGhpcywgKnZpZGVvLCByZXF1ZXN0LCBpbmZv KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAxZTU1MDhmNGM0MzIwM2JlODIzYTU3OTJmOGIyOWQ0NWI3MzY1NGFlLi5mMmNi YjMwMDdhOGFhZWU4MDQ0MTBiNjc2ZDQyNjU4ZWI0NWUyZmE2IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMjItMDMtMTUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gUmVmYWN0b3Igc29tZSBwb3NpdGlvbiBpbmZvcm1hdGlvbiBoaXQtdGVz dGluZyBsb2dpYyByZWxhdGVkIHRvIGRhdGEgZGV0ZWN0b3JzIGluIExpdmUgVGV4dAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTI3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgc2ltcGxlIGxh eW91dCB0ZXN0IHRoYXQgZXhlcmNpc2VzIGNvbnRleHQgbWVudSBwcmVzZW50YXRpb24gd2hlbiBs b25nIHByZXNzaW5nIGEgZGF0YSBkZXRlY3RvciByZXN1bHQKKyAgICAgICAgaW5zaWRlIExpdmUg VGV4dCBpbiBhbiBpbWFnZS4gV2hpbGUgdGhpcyBiZWhhdmlvciBpc24ndCBuZXcsIGl0J3MgY3Vy cmVudGx5IHVudGVzdGVkIGJlZm9yZSB0aGlzIHBhdGNoLgorCisgICAgICAgICogZmFzdC9pbWFn ZXMvdGV4dC1yZWNvZ25pdGlvbi9pb3Mvc2hvdy1kYXRhLWRldGVjdG9yLWNvbnRleHQtbWVudS1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRp b24vaW9zL3Nob3ctZGF0YS1kZXRlY3Rvci1jb250ZXh0LW1lbnUuaHRtbDoKKworICAgICAgICBB bHNvIGFkZCBgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTtgIHRvIHRlc3QgdGhhdCBkaXNhYmxp bmcgdGV4dCBzZWxlY3Rpb24gZG9lcyBub3QgYWxzbyBkaXNhYmxlIHRoZSBhYmlsaXR5IHRvCisg ICAgICAgIHByZXNlbnQgdGhlIGNvbnRleHQgbWVudSBvdmVyIGRhdGEgZGV0ZWN0b3JzIGJ5IGxv bmcgcHJlc3Npbmcgb24gaU9TLgorCiAyMDIyLTAzLTE1ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3Jp ZmZpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEFkZCBpbml0aWFsIGltcGxlbWVudGF0aW9uIG9m IEZldGNoIE1ldGFkYXRhCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0 LXJlY29nbml0aW9uL2lvcy9zaG93LWRhdGEtZGV0ZWN0b3ItY29udGV4dC1tZW51LWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW9zL3Nob3ct ZGF0YS1kZXRlY3Rvci1jb250ZXh0LW1lbnUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdjMjE0 MjNkY2IyZjBiY2UyZDIxYjdlMGEzOGI2NTJkYjZhZjIwZWMKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2lvcy9zaG93LWRhdGEtZGV0 ZWN0b3ItY29udGV4dC1tZW51LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1MgcmVz dWx0Py5jb250ZXh0TWVudT8uaXRlbXM/LmluY2x1ZGVzKCdPcGVuIExpbmsnKSBpcyB0cnVlCitQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pb3Mvc2hvdy1k YXRhLWRldGVjdG9yLWNvbnRleHQtbWVudS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbWFnZXMv dGV4dC1yZWNvZ25pdGlvbi9pb3Mvc2hvdy1kYXRhLWRldGVjdG9yLWNvbnRleHQtbWVudS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmNmMjU4NmE1NzRiYTQ4YTI3OGI4NGFiOTU0YmU0MTAzZTJiZTA1NDAKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9u L2lvcy9zaG93LWRhdGEtZGV0ZWN0b3ItY29udGV4dC1tZW51Lmh0bWwKQEAgLTAsMCArMSw2MCBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorYm9keSwgaHRtbCB7 CisgICAgbWFyZ2luOiAwOworfQorPC9zdHlsZT4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9y ZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4v cmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxpbWcg c3JjPSIuLi8uLi9yZXNvdXJjZXMvZ3JlZW4tNDAweDQwMC5wbmciIHN0eWxlPSItd2Via2l0LXVz ZXItc2VsZWN0OiBub25lOyI+PC9pbWc+Cis8c2NyaXB0PgoranNUZXN0SXNBc3luYyA9IHRydWU7 CisKK2FkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCBhc3luYyAoKSA9PiB7CisgICAgaW50ZXJuYWxz Lmluc3RhbGxJbWFnZU92ZXJsYXkoZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiaW1nIiksIFsKKyAg ICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDAp LAorICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwKSwKKyAg ICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwgMC41KSwKKyAg ICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwLjUpLAorICAg ICAgICAgICAgY2hpbGRyZW46IFt7CisgICAgICAgICAgICAgICAgdGV4dCA6ICJMaW5rIiwKKyAg ICAgICAgICAgICAgICB0b3BMZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMCksCisgICAg ICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwKSwKKyAgICAg ICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNSksCisg ICAgICAgICAgICAgICAgYm90dG9tTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDAuNSks CisgICAgICAgICAgICB9XSwKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdG9w TGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDAuNSksCisgICAgICAgICAgICB0b3BSaWdo dCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNSksCisgICAgICAgICAgICBib3R0b21SaWdo dCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDEpLAorICAgICAgICAgICAgYm90dG9tTGVmdCA6 IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDEpLAorICAgICAgICAgICAgY2hpbGRyZW46IFt7Cisg ICAgICAgICAgICAgICAgdGV4dCA6ICJ3ZWJraXQub3JnIiwKKyAgICAgICAgICAgICAgICB0b3BM ZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC41KSwKKyAgICAgICAgICAgICAgICB0b3BS aWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDAuNSksCisgICAgICAgICAgICAgICAgYm90 dG9tUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgxLCAxKSwKKyAgICAgICAgICAgICAgICBi b3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMSksCisgICAgICAgICAgICB9XSwK KyAgICAgICAgfQorICAgIF0sIFtdLCBbCisgICAgICAgIHsKKyAgICAgICAgICAgIHRvcExlZnQg OiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAwLjUpLAorICAgICAgICAgICAgdG9wUmlnaHQgOiBu ZXcgRE9NUG9pbnRSZWFkT25seSgxLCAwLjUpLAorICAgICAgICAgICAgYm90dG9tUmlnaHQgOiBu ZXcgRE9NUG9pbnRSZWFkT25seSgxLCAxKSwKKyAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcg RE9NUG9pbnRSZWFkT25seSgwLCAxKSwKKyAgICAgICAgfQorICAgIF0pOworCisgICAgcmVzdWx0 ID0gYXdhaXQgVUlIZWxwZXIubG9uZ1ByZXNzQW5kR2V0Q29udGV4dE1lbnVDb250ZW50QXQoMjAw LCAzMzApOworICAgIHNob3VsZEJlVHJ1ZSgicmVzdWx0Py5jb250ZXh0TWVudT8uaXRlbXM/Lmlu Y2x1ZGVzKCdPcGVuIExpbmsnKSIpOworICAgIGZpbmlzaEpTVGVzdCgpOworfSk7Cis8L3Njcmlw dD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==