226686 2021-06-05 14:36:54 -0700 [macOS] Dictionary lookup highlights in image overlays should include background content 2021-06-05 20:22:15 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1767151 0 wenson_hsieh 2021-06-05 14:36:54 -0700 . 1767152 1 430660 wenson_hsieh 2021-06-05 14:44:39 -0700 Created attachment 430660 Patch 1767182 2 430660 wenson_hsieh 2021-06-05 20:10:57 -0700 Comment on attachment 430660 Patch Thanks for the review! 1767183 3 ews-feeder 2021-06-05 20:21:20 -0700 Committed r278531 (238529@main): <https://commits.webkit.org/238529@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430660. 1767184 4 webkit-bug-importer 2021-06-05 20:22:15 -0700 <rdar://problem/78914345> 430660 2021-06-05 14:44:39 -0700 2021-06-05 20:21:20 -0700 Patch bug-226686-20210605144438.patch text/plain 5756 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyMWMzZDNmZmM3ZWNkYzk2 Nzc2MjJjOTgyMmQ1ZTVjNWNlMGJlNTQuLjE2NDljMjI4ZTc5Yzc1ODM1YjQ1MWI2OWExMmM1Y2Rh MzJlN2JkYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDYtMDUgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBEaWN0aW9u YXJ5IGxvb2t1cCBoaWdobGlnaHRzIGluIGltYWdlIG92ZXJsYXlzIHNob3VsZCBpbmNsdWRlIGJh Y2tncm91bmQgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2Njg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTWFrZSBhIGZldyBtaW5vciBhZGp1c3RtZW50cyB0byB0ZXh0IGluZGljYXRvciBv cHRpb25zIG9uIG1hY09TIHdoZW4gdHJpZ2dlcmluZyBMb29rIFVwLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdlKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OnBlcmZvcm1JbW1lZGlhdGVBY3Rpb25IaXRUZXN0QXRMb2NhdGlvbik6CisKKyAgICAgICAgQWRk IGJvdGggYFBhaW50QWxsQ29udGVudGAgYW5kIGBQYWludEJhY2tncm91bmRzYCBvcHRpb25zIHdo ZW4gY3JlYXRpbmcgdGV4dCBpbmRpY2F0b3JzLCBpbiB0aGUgY2FzZSB3aGVyZSB0aGUKKyAgICAg ICAgaW5kaWNhdGVkIHJhbmdlIGlzIGluc2lkZSBhbiBpbWFnZSBvdmVybGF5LgorCiAyMDIxLTA2 LTA0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdIE1lYW5pbmdmdWwgY2xpY2sgaGV1cmlzdGljIHNob3VsZCBhY2NvdW50IGZvciBtZWRpYSBz dGF0ZSBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0KaW5kZXggNjNkYjkxMTBkNDVlMjA1YjRhYzk5YTUzZmU1 ZWI1ZjFkMmNjMjgyMi4uNDQ5MDc1NWZmZjc2OGQ0MTBiNTM1N2ZjNjEwMjIyNmVmN2ViNTZlZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFn ZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dl YlBhZ2VDb2NvYS5tbQpAQCAtMjAwLDYgKzIwMCw5IEBAIERpY3Rpb25hcnlQb3B1cEluZm8gV2Vi UGFnZTo6ZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdlKEZyYW1lJiBmcmFtZSwgY29uc3QgU2lt CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAgICAgT3B0aW9uU2V0PFRleHRJbmRpY2F0b3JP cHRpb24+IGluZGljYXRvck9wdGlvbnMgeyBUZXh0SW5kaWNhdG9yT3B0aW9uOjpVc2VCb3VuZGlu Z1JlY3RBbmRQYWludEFsbENvbnRlbnRGb3JDb21wbGV4UmFuZ2VzIH07CisgICAgaWYgKEhUTUxF bGVtZW50Ojppc0luc2lkZUltYWdlT3ZlcmxheShyYW5nZSkpCisgICAgICAgIGluZGljYXRvck9w dGlvbnMuYWRkKHsgVGV4dEluZGljYXRvck9wdGlvbjo6UGFpbnRBbGxDb250ZW50LCBUZXh0SW5k aWNhdG9yT3B0aW9uOjpQYWludEJhY2tncm91bmRzIH0pOworCiAgICAgaWYgKHByZXNlbnRhdGlv blRyYW5zaXRpb24gPT0gVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkJvdW5j ZUFuZENyb3NzZmFkZSkKICAgICAgICAgaW5kaWNhdG9yT3B0aW9ucy5hZGQoVGV4dEluZGljYXRv ck9wdGlvbjo6SW5jbHVkZVNuYXBzaG90V2l0aFNlbGVjdGlvbkhpZ2hsaWdodCk7CiAgICAgCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1h Yy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1t CmluZGV4IGEyYjc4ZmJmNWJhNzMzZjRiZGVjN2ZmODM4YmY5Y2UxMmZhMzdjZDguLjJhYjEwODRj NWNkYzRiM2ZhOGU0ZWI3MjU1NDFiNjg2MDUwMjQ4NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCkBAIC04NzcsMTAgKzg3Nywx OCBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1JbW1lZGlhdGVBY3Rpb25IaXRUZXN0QXRMb2NhdGlv bihXZWJDb3JlOjpGbG9hdFBvaW50IGxvY2F0aQogCiAgICAgYXV0byBzZWxlY3Rpb25SYW5nZSA9 IGNvcmVQYWdlKCktPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVj dGlvbigpLnNlbGVjdGlvbigpLmZpcnN0UmFuZ2UoKTsKIAorICAgIGF1dG8gaW5kaWNhdG9yT3B0 aW9ucyA9IFsmXShjb25zdCBTaW1wbGVSYW5nZSYgcmFuZ2UpIHsKKyAgICAgICAgT3B0aW9uU2V0 PFRleHRJbmRpY2F0b3JPcHRpb24+IG9wdGlvbnMgeyBUZXh0SW5kaWNhdG9yT3B0aW9uOjpVc2VC b3VuZGluZ1JlY3RBbmRQYWludEFsbENvbnRlbnRGb3JDb21wbGV4UmFuZ2VzIH07CisgICAgICAg IGlmIChIVE1MRWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJsYXkocmFuZ2UpKQorICAgICAgICAg ICAgb3B0aW9ucy5hZGQoeyBUZXh0SW5kaWNhdG9yT3B0aW9uOjpQYWludEFsbENvbnRlbnQsIFRl eHRJbmRpY2F0b3JPcHRpb246OlBhaW50QmFja2dyb3VuZHMgfSk7CisgICAgICAgIHJldHVybiBv cHRpb25zOworICAgIH07CisKICAgICBVUkwgYWJzb2x1dGVMaW5rVVJMID0gaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZUxpbmtVUkwoKTsKLSAgICBFbGVtZW50KiBVUkxFbGVtZW50ID0gaGl0VGVzdFJl c3VsdC5VUkxFbGVtZW50KCk7Ci0gICAgaWYgKCFhYnNvbHV0ZUxpbmtVUkwuaXNFbXB0eSgpICYm IFVSTEVsZW1lbnQpCi0gICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5saW5rVGV4dEluZGlj YXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZShtYWtlUmFuZ2VTZWxlY3RpbmdO b2RlQ29udGVudHMoKlVSTEVsZW1lbnQpLCB7IFRleHRJbmRpY2F0b3JPcHRpb246OlVzZUJvdW5k aW5nUmVjdEFuZFBhaW50QWxsQ29udGVudEZvckNvbXBsZXhSYW5nZXMgfSwgVGV4dEluZGljYXRv clByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7CisgICAgaWYgKGF1dG8gdXJsRWxlbWVu dCA9IG1ha2VSZWZQdHIoaGl0VGVzdFJlc3VsdC5VUkxFbGVtZW50KCkpOyAhYWJzb2x1dGVMaW5r VVJMLmlzRW1wdHkoKSAmJiB1cmxFbGVtZW50KSB7CisgICAgICAgIGF1dG8gZWxlbWVudFJhbmdl ID0gbWFrZVJhbmdlU2VsZWN0aW5nTm9kZUNvbnRlbnRzKCp1cmxFbGVtZW50KTsKKyAgICAgICAg aW1tZWRpYXRlQWN0aW9uUmVzdWx0LmxpbmtUZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6 Y3JlYXRlV2l0aFJhbmdlKGVsZW1lbnRSYW5nZSwgaW5kaWNhdG9yT3B0aW9ucyhlbGVtZW50UmFu Z2UpLCBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluKTsKKyAgICB9 CiAKICAgICBpZiAoYXV0byBsb29rdXBSZXN1bHQgPSBsb29rdXBUZXh0QXRMb2NhdGlvbihsb2Nh dGlvbkluVmlld0Nvb3JkaW5hdGVzKSkgewogICAgICAgICBhdXRvIFtsb29rdXBSYW5nZSwgb3B0 aW9uc10gPSBXVEZNb3ZlKCpsb29rdXBSZXN1bHQpOwpAQCAtOTA4LDcgKzkxNiw3IEBAIHZvaWQg V2ViUGFnZTo6cGVyZm9ybUltbWVkaWF0ZUFjdGlvbkhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6 OkZsb2F0UG9pbnQgbG9jYXRpCiAgICAgICAgIHBhZ2VPdmVybGF5RGlkT3ZlcnJpZGVEYXRhRGV0 ZWN0b3JzID0gdHJ1ZTsKICAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0 YUFjdGlvbkNvbnRleHQgPSBhY3Rpb25Db250ZXh0LT5jb250ZXh0LmdldCgpOwogICAgICAgICBp bW1lZGlhdGVBY3Rpb25SZXN1bHQuZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3ggPSB2aWV3LT5jb250 ZW50c1RvV2luZG93KGVuY2xvc2luZ0ludFJlY3QodW5pdGVkQm91bmRpbmdCb3hlcyhSZW5kZXJP YmplY3Q6OmFic29sdXRlVGV4dFF1YWRzKGFjdGlvbkNvbnRleHQtPnJhbmdlKSkpKTsKLSAgICAg ICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0YVRleHRJbmRpY2F0b3IgPSBUZXh0 SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UoYWN0aW9uQ29udGV4dC0+cmFuZ2UsIHsgVGV4dElu ZGljYXRvck9wdGlvbjo6VXNlQm91bmRpbmdSZWN0QW5kUGFpbnRBbGxDb250ZW50Rm9yQ29tcGxl eFJhbmdlcyB9LCBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluKTsK KyAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0YVRleHRJbmRpY2F0b3Ig PSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UoYWN0aW9uQ29udGV4dC0+cmFuZ2UsIGlu ZGljYXRvck9wdGlvbnMoYWN0aW9uQ29udGV4dC0+cmFuZ2UpLCBUZXh0SW5kaWNhdG9yUHJlc2Vu dGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluKTsKICAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0 LmRldGVjdGVkRGF0YU9yaWdpbmF0aW5nUGFnZU92ZXJsYXkgPSBvdmVybGF5LT5wYWdlT3Zlcmxh eUlEKCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTkxOCw4ICs5MjYsNyBAQCB2b2lkIFdl YlBhZ2U6OnBlcmZvcm1JbW1lZGlhdGVBY3Rpb25IaXRUZXN0QXRMb2NhdGlvbihXZWJDb3JlOjpG bG9hdFBvaW50IGxvY2F0aQogICAgICAgICBpZiAoYXV0byByZXN1bHQgPSBEYXRhRGV0ZWN0aW9u OjpkZXRlY3RJdGVtQXJvdW5kSGl0VGVzdFJlc3VsdChoaXRUZXN0UmVzdWx0KSkgewogICAgICAg ICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0YUFjdGlvbkNvbnRleHQgPSBX VEZNb3ZlKHJlc3VsdC0+YWN0aW9uQ29udGV4dCk7CiAgICAgICAgICAgICBpbW1lZGlhdGVBY3Rp b25SZXN1bHQuZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3ggPSByZXN1bHQtPmJvdW5kaW5nQm94Owot ICAgICAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0YVRleHRJbmRpY2F0 b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UocmVzdWx0LT5yYW5nZSwKLSAgICAg ICAgICAgICAgICB7IFRleHRJbmRpY2F0b3JPcHRpb246OlVzZUJvdW5kaW5nUmVjdEFuZFBhaW50 QWxsQ29udGVudEZvckNvbXBsZXhSYW5nZXMgfSwgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRy YW5zaXRpb246OkZhZGVJbik7CisgICAgICAgICAgICBpbW1lZGlhdGVBY3Rpb25SZXN1bHQuZGV0 ZWN0ZWREYXRhVGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZShy ZXN1bHQtPnJhbmdlLCBpbmRpY2F0b3JPcHRpb25zKHJlc3VsdC0+cmFuZ2UpLCBUZXh0SW5kaWNh dG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluKTsKICAgICAgICAgfQogICAgIH0KIAo=