226704 2021-06-06 18:20:48 -0700 [Cocoa] Find-in-page should match text inside image overlays 2021-06-07 06:46:15 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin ews-watchlist hi megan_gardner mifenton thorton webkit-bug-importer oldest_to_newest 1767270 0 wenson_hsieh 2021-06-06 18:20:48 -0700 . 1767293 1 430709 wenson_hsieh 2021-06-06 20:58:08 -0700 Created attachment 430709 Patch 1767330 2 430709 thorton 2021-06-07 00:15:32 -0700 Comment on attachment 430709 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430709&action=review > Source/WebKit/WebProcess/WebPage/FindController.cpp:379 > + textIndicatorOptions.add({ TextIndicatorOption::PaintAllContent, TextIndicatorOption::PaintBackgrounds }); I wonder (separately) if we can infer some of these options in TI and remove some complexity from the clients. Like, give it more reasonable/intelligent defaults and delete some of the TextIndicatorOption values. Would need a careful pass over all the clients, though. 1767431 3 430709 wenson_hsieh 2021-06-07 06:37:22 -0700 Comment on attachment 430709 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430709&action=review Thanks for the review! >> Source/WebKit/WebProcess/WebPage/FindController.cpp:379 >> + textIndicatorOptions.add({ TextIndicatorOption::PaintAllContent, TextIndicatorOption::PaintBackgrounds }); > > I wonder (separately) if we can infer some of these options in TI and remove some complexity from the clients. Like, give it more reasonable/intelligent defaults and delete some of the TextIndicatorOption values. Would need a careful pass over all the clients, though. That’s a good point. I think in the case of look up and find in image overlays, this would help to alleviate some duplicate code, but (as you mentioned) it would require some careful vetting to make this change for all textindicators. A halfway point might be something like a helper function in TextIndicator that adjusts a given set of TI options, given a range. 1767433 4 ews-feeder 2021-06-07 06:45:54 -0700 Committed r278560 (238558@main): <https://commits.webkit.org/238558@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430709. 1767434 5 webkit-bug-importer 2021-06-07 06:46:15 -0700 <rdar://problem/78945509> 430709 2021-06-06 20:58:08 -0700 2021-06-07 06:45:54 -0700 Patch bug-226704-20210606205808.patch text/plain 12561 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZhYzYxYzljMmFkZjVi ZTcxNzRiMjlhYzE4MWU4N2VhMmNhZjQ3Zi4uNDk3ODQyNGU3ZWQ4Njk3ZjI3ZDE2ODk4ODM1MzQ2 MzI5YzI1NzA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTA2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRmlu ZC1pbi1wYWdlIHNob3VsZCBtYXRjaCB0ZXh0IGluc2lkZSBpbWFnZSBvdmVybGF5cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NzA0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IFRleHRJ dGVyYXRvckJlaGF2aW9yIHRvIGFsbG93IFRleHRJdGVyYXRvciB0byBkZXNjZW5kIGludG8gaW1h Z2Ugb3ZlcmxheSBjb250ZW50LCBhbmQgdXNlIHRoaXMgb3B0aW9uCisgICAgICAgIHdoZW4gY3Jl YXRpbmcgVGV4dEl0ZXJhdG9ycyBmb3IgZmluZC1pbi1wYWdlLiBTZWUgV2ViS2l0L0NoYW5nZUxv ZyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgIFRlc3Q6IFdlYktpdC5GaW5kVGV4dEluSW1h Z2VPdmVybGF5CisKKyAgICAgICAgKiBlZGl0aW5nL1RleHRJdGVyYXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpUZXh0SXRlcmF0b3I6OmhhbmRsZVJlcGxhY2VkRWxlbWVudCk6CisgICAgICAg IChXZWJDb3JlOjpmaW5kSXRlcmF0b3JPcHRpb25zKToKKyAgICAgICAgKiBlZGl0aW5nL1RleHRJ dGVyYXRvckJlaGF2aW9yLmg6CisKIDIwMjEtMDYtMDYgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9o c2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgVHVybiBUZXh0SXRlcmF0b3JCZWhhdmlvckZsYWcg aW50byBhbiBlbnVtIGNsYXNzIGFuZCB3cmFwIGl0IGluIE9wdGlvblNldApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5 NDJhNTJkNGFjMDcwNTBlMzNjMzNiZTgxYTg0MDJjNGY4OTYyYmVjLi5iMmIwYTRmNmMwMWE5Njlh OWY4MTIwYmEzNjM2NTk5Y2M1M2I0Mzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIx LTA2LTA2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAg IFtDb2NvYV0gRmluZC1pbi1wYWdlIHNob3VsZCBtYXRjaCB0ZXh0IGluc2lkZSBpbWFnZSBvdmVy bGF5cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 NzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IHRoZSBgUGFpbnRBbGxDb250ZW50YCBhbmQgYFBhaW50QmFja2dyb3VuZHNgIHRleHQgaW5kaWNh dG9yIG9wdGlvbnMgd2hlbiBnZW5lcmF0aW5nIGEgVGV4dEluZGljYXRvciBmb3IKKyAgICAgICAg c2VsZWN0ZWQgY29udGVudCBpbnNpZGUgYW4gaW1hZ2Ugb3ZlcmxheS4gU2VlIFdlYkNvcmUvQ2hh bmdlTG9nIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6dXBk YXRlRmluZEluZGljYXRvcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5k Q29udHJvbGxlcklPUy5tbToKKyAgICAgICAgKFdlYktpdDo6ZmluZFRleHRJbmRpY2F0b3JPcHRp b25zKToKKyAgICAgICAgKFdlYktpdDo6RmluZEluZGljYXRvck92ZXJsYXlDbGllbnRJT1M6OmRy YXdSZWN0KToKKyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRp Y2F0b3IpOgorCiAyMDIxLTA2LTA2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFR1cm4gVGV4dEl0ZXJhdG9yQmVoYXZpb3JGbGFnIGludG8gYW4gZW51 bSBjbGFzcyBhbmQgd3JhcCBpdCBpbiBPcHRpb25TZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4 dEl0ZXJhdG9yLmNwcAppbmRleCAwMjlkZjlkOGQ0MjUzMjFhMGRiZDBjODkxOTI4MTU1MmYyOTI5 ZDQ3Li5jMmZhYTk0MjY0ZWIwODU1OWQ2YzlmZjJiMGYzZTViMTAyZWRhZjkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCkBAIC03MzEsNiArNzMxLDE2IEBAIGJvb2wg VGV4dEl0ZXJhdG9yOjpoYW5kbGVSZXBsYWNlZEVsZW1lbnQoKQogICAgICAgICB9CiAgICAgfQog CisgICAgaWYgKG1fYmVoYXZpb3JzLmNvbnRhaW5zKFRleHRJdGVyYXRvckJlaGF2aW9yOjpFbnRl cnNJbWFnZU92ZXJsYXlzKSAmJiBpczxIVE1MRWxlbWVudD4obV9ub2RlKSAmJiBkb3duY2FzdDxI VE1MRWxlbWVudD4oKm1fbm9kZSkuaGFzSW1hZ2VPdmVybGF5KCkpIHsKKyAgICAgICAgaWYgKGF1 dG8gc2hhZG93Um9vdCA9IG1ha2VSZWZQdHIobV9ub2RlLT5zaGFkb3dSb290KCkpKSB7CisgICAg ICAgICAgICBtX25vZGUgPSBzaGFkb3dSb290LmdldCgpOworICAgICAgICAgICAgcHVzaEZ1bGx5 Q2xpcHBlZFN0YXRlKG1fZnVsbHlDbGlwcGVkU3RhY2ssICptX25vZGUpOworICAgICAgICAgICAg bV9vZmZzZXQgPSAwOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKwogICAgIG1faGFzRW1pdHRlZCA9IHRy dWU7CiAKICAgICBpZiAobV9iZWhhdmlvcnMuY29udGFpbnMoVGV4dEl0ZXJhdG9yQmVoYXZpb3I6 OkVtaXRzT2JqZWN0UmVwbGFjZW1lbnRDaGFyYWN0ZXJzKSAmJiByZW5kZXJlci5pc1JlcGxhY2Vk KCkpIHsKQEAgLTI0NTQsOSArMjQ2NCw5IEBAIFN0cmluZyBwbGFpblRleHRSZXBsYWNpbmdOb0Jy ZWFrU3BhY2UoY29uc3QgU2ltcGxlUmFuZ2UmIHJhbmdlLCBUZXh0SXRlcmF0b3JCZWhhCiAgICAg cmV0dXJuIHBsYWluVGV4dChyYW5nZSwgZGVmYXVsdEJlaGF2aW9ycywgaXNEaXNwbGF5U3RyaW5n KS5yZXBsYWNlKG5vQnJlYWtTcGFjZSwgJyAnKTsKIH0KIAotc3RhdGljIFRleHRJdGVyYXRvckJl aGF2aW9ycyBmaW5kSXRlcmF0b3JPcHRpb25zKEZpbmRPcHRpb25zIG9wdGlvbnMpCitzdGF0aWMg Y29uc3RleHByIFRleHRJdGVyYXRvckJlaGF2aW9ycyBmaW5kSXRlcmF0b3JPcHRpb25zKEZpbmRP cHRpb25zIG9wdGlvbnMpCiB7Ci0gICAgVGV4dEl0ZXJhdG9yQmVoYXZpb3JzIGl0ZXJhdG9yT3B0 aW9ucyB7IFRleHRJdGVyYXRvckJlaGF2aW9yOjpFbnRlcnNUZXh0Q29udHJvbHMsIFRleHRJdGVy YXRvckJlaGF2aW9yOjpDbGlwc1RvRnJhbWVBbmNlc3RvcnMgfTsKKyAgICBUZXh0SXRlcmF0b3JC ZWhhdmlvcnMgaXRlcmF0b3JPcHRpb25zIHsgVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkVudGVyc1Rl eHRDb250cm9scywgVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkNsaXBzVG9GcmFtZUFuY2VzdG9ycywg VGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkVudGVyc0ltYWdlT3ZlcmxheXMgfTsKICAgICBpZiAoIW9w dGlvbnMuY29udGFpbnMoRG9Ob3RUcmF2ZXJzZUZsYXRUcmVlKSkKICAgICAgICAgaXRlcmF0b3JP cHRpb25zLmFkZChUZXh0SXRlcmF0b3JCZWhhdmlvcjo6VHJhdmVyc2VzRmxhdFRyZWUpOwogICAg IHJldHVybiBpdGVyYXRvck9wdGlvbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1RleHRJdGVyYXRvckJlaGF2aW9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJ dGVyYXRvckJlaGF2aW9yLmgKaW5kZXggZDZhOTVmZjdlMGQyYWMzZjliYTk5ZDM0MTRjZDI2ODdj M2Y2ZDY1Ny4uNmNjYmFkMDhhMzkzODU0Yzk0MWZkM2JmOTRhODg5ZmE4MTVhZTYxOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3JCZWhhdmlvci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yQmVoYXZpb3IuaApAQCAtNTksNiAr NTksOCBAQCBlbnVtIGNsYXNzIFRleHRJdGVyYXRvckJlaGF2aW9yIDogdWludDE2X3QgewogICAg IENsaXBzVG9GcmFtZUFuY2VzdG9ycyA9IDEgPDwgOCwKIAogICAgIFRyYXZlcnNlc0ZsYXRUcmVl ID0gMSA8PCA5LAorCisgICAgRW50ZXJzSW1hZ2VPdmVybGF5cyA9IDEgPDwgMTAsCiB9OwogCiB1 c2luZyBUZXh0SXRlcmF0b3JCZWhhdmlvcnMgPSBPcHRpb25TZXQ8VGV4dEl0ZXJhdG9yQmVoYXZp b3I+OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENv bnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRy b2xsZXIuY3BwCmluZGV4IGNlMjFkNjdjNDhiOTYwOWVmYTM5NTY2YWYwMjkzYjkzYWNjZWRkY2Mu LmQ3N2FiNTQzM2JmNjg4YzkxOWJjOGNjNTZiY2ZhMjhiZGEyNTU3YjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTM3 NCw3ICszNzQsMTEgQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6aGlkZUZpbmRVSSgpCiAKIGJvb2wg RmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IoRnJhbWUmIHNlbGVjdGVkRnJhbWUs IGJvb2wgaXNTaG93aW5nT3ZlcmxheSwgYm9vbCBzaG91bGRBbmltYXRlKQogewotICAgIGF1dG8g aW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUoc2Vs ZWN0ZWRGcmFtZSwgeyBUZXh0SW5kaWNhdG9yT3B0aW9uOjpJbmNsdWRlTWFyZ2luSWZSYW5nZU1h dGNoZXNTZWxlY3Rpb24gfSwgc2hvdWxkQW5pbWF0ZSA/IFRleHRJbmRpY2F0b3JQcmVzZW50YXRp b25UcmFuc2l0aW9uOjpCb3VuY2UgOiBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlv bjo6Tm9uZSk7CisgICAgT3B0aW9uU2V0PFRleHRJbmRpY2F0b3JPcHRpb24+IHRleHRJbmRpY2F0 b3JPcHRpb25zIHsgVGV4dEluZGljYXRvck9wdGlvbjo6SW5jbHVkZU1hcmdpbklmUmFuZ2VNYXRj aGVzU2VsZWN0aW9uIH07CisgICAgaWYgKGF1dG8gc2VsZWN0ZWRSYW5nZSA9IHNlbGVjdGVkRnJh bWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkucmFuZ2UoKTsgc2VsZWN0ZWRSYW5nZSAmJiBIVE1M RWxlbWVudDo6aXNJbnNpZGVJbWFnZU92ZXJsYXkoKnNlbGVjdGVkUmFuZ2UpKQorICAgICAgICB0 ZXh0SW5kaWNhdG9yT3B0aW9ucy5hZGQoeyBUZXh0SW5kaWNhdG9yT3B0aW9uOjpQYWludEFsbENv bnRlbnQsIFRleHRJbmRpY2F0b3JPcHRpb246OlBhaW50QmFja2dyb3VuZHMgfSk7CisKKyAgICBh dXRvIGluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1l KHNlbGVjdGVkRnJhbWUsIHRleHRJbmRpY2F0b3JPcHRpb25zLCBzaG91bGRBbmltYXRlID8gVGV4 dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkJvdW5jZSA6IFRleHRJbmRpY2F0b3JQ cmVzZW50YXRpb25UcmFuc2l0aW9uOjpOb25lKTsKICAgICBpZiAoIWluZGljYXRvcikKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KaW5kZXggOWMyODRmODViYzg1ZjA0 NDZlMTM2YjhkM2Q0ZTY2ZTAxZDJhMjgxYS4uMmFmNDM3NTU3YzIxOTJkY2M1MmU0NmJkN2Y3NzM2 MTBmZWEyNTFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL0ZpbmRDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbQpAQCAtNTEsNyArNTEsMTMgQEAgY29uc3Qg aW50IGNvcm5lclJhZGl1cyA9IDM7CiBjb25zdCBpbnQgdG90YWxIb3Jpem9udGFsTWFyZ2luID0g MTsKIGNvbnN0IGludCB0b3RhbFZlcnRpY2FsTWFyZ2luID0gMTsKIAotY29uc3RleHByIE9wdGlv blNldDxUZXh0SW5kaWNhdG9yT3B0aW9uPiBmaW5kVGV4dEluZGljYXRvck9wdGlvbnMgeyBUZXh0 SW5kaWNhdG9yT3B0aW9uOjpJbmNsdWRlTWFyZ2luSWZSYW5nZU1hdGNoZXNTZWxlY3Rpb24sIFRl eHRJbmRpY2F0b3JPcHRpb246OkRvTm90Q2xpcFRvVmlzaWJsZVJlY3QgfTsKK3N0YXRpYyBPcHRp b25TZXQ8VGV4dEluZGljYXRvck9wdGlvbj4gZmluZFRleHRJbmRpY2F0b3JPcHRpb25zKGNvbnN0 IEZyYW1lJiBmcmFtZSkKK3sKKyAgICBPcHRpb25TZXQ8VGV4dEluZGljYXRvck9wdGlvbj4gb3B0 aW9ucyB7IFRleHRJbmRpY2F0b3JPcHRpb246OkluY2x1ZGVNYXJnaW5JZlJhbmdlTWF0Y2hlc1Nl bGVjdGlvbiwgVGV4dEluZGljYXRvck9wdGlvbjo6RG9Ob3RDbGlwVG9WaXNpYmxlUmVjdCB9Owor ICAgIGlmIChhdXRvIHNlbGVjdGVkUmFuZ2UgPSBmcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24o KS5yYW5nZSgpOyBzZWxlY3RlZFJhbmdlICYmIEhUTUxFbGVtZW50Ojppc0luc2lkZUltYWdlT3Zl cmxheSgqc2VsZWN0ZWRSYW5nZSkpCisgICAgICAgIG9wdGlvbnMuYWRkKHsgVGV4dEluZGljYXRv ck9wdGlvbjo6UGFpbnRBbGxDb250ZW50LCBUZXh0SW5kaWNhdG9yT3B0aW9uOjpQYWludEJhY2tn cm91bmRzIH0pOworICAgIHJldHVybiBvcHRpb25zOworfTsKIAogc3RhdGljIGNvbnN0ZXhwciBh dXRvIGhpZ2hsaWdodENvbG9yID0gU1JHQkE8dWludDhfdD4geyAyNTUsIDIyOCwgNTYgfTsKIApA QCAtNjQsNyArNzAsNyBAQCB2b2lkIEZpbmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50SU9TOjpkcmF3 UmVjdChQYWdlT3ZlcmxheSYgb3ZlcmxheSwgR3JhcGhpY3NDb250ZQogCiAgICAgLy8gSWYgdGhl IHBhZ2Ugc2NhbGUgY2hhbmdlZCwgd2UgbmVlZCB0byBwYWludCBhIG5ldyBUZXh0SW5kaWNhdG9y LgogICAgIGlmIChtX3RleHRJbmRpY2F0b3ItPmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yKCkgIT0g c2NhbGVGYWN0b3IpCi0gICAgICAgIG1fdGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNy ZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKG1fZnJhbWUsIGZpbmRUZXh0SW5kaWNhdG9yT3B0aW9u cywgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246Ok5vbmUsIEZsb2F0U2l6ZSh0 b3RhbEhvcml6b250YWxNYXJnaW4sIHRvdGFsVmVydGljYWxNYXJnaW4pKTsKKyAgICAgICAgbV90 ZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUo bV9mcmFtZSwgZmluZFRleHRJbmRpY2F0b3JPcHRpb25zKG1fZnJhbWUpLCBUZXh0SW5kaWNhdG9y UHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Tm9uZSwgRmxvYXRTaXplKHRvdGFsSG9yaXpvbnRhbE1h cmdpbiwgdG90YWxWZXJ0aWNhbE1hcmdpbikpOwogCiAgICAgaWYgKCFtX3RleHRJbmRpY2F0b3Ip CiAgICAgICAgIHJldHVybjsKQEAgLTkxLDcgKzk3LDcgQEAgYm9vbCBGaW5kQ29udHJvbGxlcjo6 dXBkYXRlRmluZEluZGljYXRvcihGcmFtZSYgc2VsZWN0ZWRGcmFtZSwgYm9vbCBpc1Nob3dpbmdP dmUKICAgICAgICAgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yID0gZmFsc2U7CiAgICAgfQogCi0g ICAgYXV0byB0ZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlv bkluRnJhbWUoc2VsZWN0ZWRGcmFtZSwgZmluZFRleHRJbmRpY2F0b3JPcHRpb25zLCBUZXh0SW5k aWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Tm9uZSwgRmxvYXRTaXplKHRvdGFsSG9yaXpv bnRhbE1hcmdpbiwgdG90YWxWZXJ0aWNhbE1hcmdpbikpOworICAgIGF1dG8gdGV4dEluZGljYXRv ciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKHNlbGVjdGVkRnJh bWUsIGZpbmRUZXh0SW5kaWNhdG9yT3B0aW9ucyhzZWxlY3RlZEZyYW1lKSwgVGV4dEluZGljYXRv clByZXNlbnRhdGlvblRyYW5zaXRpb246Ok5vbmUsIEZsb2F0U2l6ZSh0b3RhbEhvcml6b250YWxN YXJnaW4sIHRvdGFsVmVydGljYWxNYXJnaW4pKTsKICAgICBpZiAoIXRleHRJbmRpY2F0b3IpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDg4NDVkZDRkNTdjY2E2M2MyYTkzNmE1NGQ4MjIxZjM0OGRiNTI3 NzAuLjY1MWYxODRmZjk2ZGI5M2RkNjRlOGJmMGUzYzc2NDM1ZmI0YmM4MmMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAyMS0wNi0wNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ29jb2FdIEZpbmQtaW4tcGFnZSBzaG91bGQgbWF0Y2ggdGV4dCBpbnNpZGUgaW1hZ2Ug b3ZlcmxheXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNjcwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBhbiBBUEkgdGVzdCB0byB2ZXJpZnkgdGhhdCB0ZXh0IGluc2lkZSBpbWFnZSBvdmVybGF5 cyBpcyB2aXNpYmxlIHRvIGZpbmQtaW4tcGFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRmluZEluUGFnZS5tbToKKwogMjAyMS0wNi0wNCAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEZpbGVTeXN0ZW06OnJlYWRGcm9tRmls ZSgpIHNob3VsZCByZXR1cm4gZGF0YSBhcyBgdm9pZCpgCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpbmRJblBhZ2UubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpbmRJblBhZ2UubW0KaW5kZXggZTkxZjYzYjI2M2Ex MTk0MmJjNzFmNDI4MjU4YWIwZmM4ZDZlZWE1Yi4uMjhmOThiOTE3ZGYxNTY1NGIwZjcxNTU3MWQ4 YzIwYmVhMjg1NWU2ZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9GaW5kSW5QYWdlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvRmluZEluUGFnZS5tbQpAQCAtMjgsNiArMjgsNyBAQAogI2ltcG9ydCAiUGxhdGZv cm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaCIKICNpbXBv cnQgIlRlc3RXS1dlYlZpZXcuaCIKKyNpbXBvcnQgIldLV2ViVmlld0NvbmZpZ3VyYXRpb25FeHRy YXMuaCIKICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDx3dGYv UmV0YWluUHRyLmg+CiAKQEAgLTM4LDEwICszOSwxMCBAQCB0eXBlZGVmIGVudW0gOiBOU1VJbnRl Z2VyIHsKICAgICBOU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25zV3Jh cCA9IDEgPDwgMSwKIH0gTlNUZXh0RmluZGVyQXN5bmNocm9ub3VzRG9jdW1lbnRGaW5kT3B0aW9u czsKIAotTlNUZXh0RmluZGVyQXN5bmNocm9ub3VzRG9jdW1lbnRGaW5kT3B0aW9ucyBub0ZpbmRP cHRpb25zID0gKE5TVGV4dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnMpMDsK LU5TVGV4dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnMgYmFja3dhcmRzRmlu ZE9wdGlvbnMgPU5TVGV4dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnNCYWNr d2FyZHM7Ci1OU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25zIHdyYXBG aW5kT3B0aW9ucyA9TlNUZXh0RmluZGVyQXN5bmNocm9ub3VzRG9jdW1lbnRGaW5kT3B0aW9uc1dy YXA7Ci1OU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25zIHdyYXBCYWNr d2FyZHNGaW5kT3B0aW9ucyA9IChOU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRP cHRpb25zKShOU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25zV3JhcCB8 IE5TVGV4dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnNCYWNrd2FyZHMpOwor Y29uc3RleHByIGF1dG8gbm9GaW5kT3B0aW9ucyA9IChOU1RleHRGaW5kZXJBc3luY2hyb25vdXNE b2N1bWVudEZpbmRPcHRpb25zKTA7Citjb25zdGV4cHIgYXV0byBiYWNrd2FyZHNGaW5kT3B0aW9u cyA9IE5TVGV4dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnNCYWNrd2FyZHM7 Citjb25zdGV4cHIgYXV0byB3cmFwRmluZE9wdGlvbnMgPSBOU1RleHRGaW5kZXJBc3luY2hyb25v dXNEb2N1bWVudEZpbmRPcHRpb25zV3JhcDsKK2NvbnN0ZXhwciBhdXRvIHdyYXBCYWNrd2FyZHNG aW5kT3B0aW9ucyA9IChOU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25z KShOU1RleHRGaW5kZXJBc3luY2hyb25vdXNEb2N1bWVudEZpbmRPcHRpb25zV3JhcCB8IE5TVGV4 dEZpbmRlckFzeW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnNCYWNrd2FyZHMpOwogCiBAcHJv dG9jb2wgTlNUZXh0RmluZGVyQXN5bmNocm9ub3VzRG9jdW1lbnRGaW5kTWF0Y2ggPE5TT2JqZWN0 PgogQHByb3BlcnR5IChyZXRhaW4sIG5vbmF0b21pYywgcmVhZG9ubHkpIE5TQXJyYXkgKnRleHRS ZWN0czsKQEAgLTU3LDEwICs1OCwxMCBAQCAtICh2b2lkKXJlcGxhY2VNYXRjaGVzOihOU0FycmF5 PEZpbmRNYXRjaD4gKiltYXRjaGVzIHdpdGhTdHJpbmc6KE5TU3RyaW5nICopcmVwbAogCiBAZW5k CiAKLXR5cGVkZWYgc3RydWN0IHsKK3N0cnVjdCBGaW5kUmVzdWx0IHsKICAgICBSZXRhaW5QdHI8 TlNBcnJheT4gbWF0Y2hlczsKLSAgICBCT09MIGRpZFdyYXA7Ci19IEZpbmRSZXN1bHQ7CisgICAg Qk9PTCBkaWRXcmFwIHsgTk8gfTsKK307CiAKIHN0YXRpYyBGaW5kUmVzdWx0IGZpbmRNYXRjaGVz KFdLV2ViVmlldyAqd2ViVmlldywgTlNTdHJpbmcgKmZpbmRTdHJpbmcsIE5TVGV4dEZpbmRlckFz eW5jaHJvbm91c0RvY3VtZW50RmluZE9wdGlvbnMgZmluZE9wdGlvbnMgPSBub0ZpbmRPcHRpb25z LCBOU1VJbnRlZ2VyIG1heFJlc3VsdHMgPSBOU1VJbnRlZ2VyTWF4KQogewpAQCAtMjk1LDQgKzI5 NiwyOCBAQCBURVNUKFdlYktpdCwgRmluZEFuZFJlcGxhY2UpCiAgICAgRVhQRUNUX1dLX1NUUkVR KCJoaSBoaSIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVu dC5ib2R5LnRleHRDb250ZW50Il0pOwogfQogCisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04p CisKK1RFU1QoV2ViS2l0LCBGaW5kVGV4dEluSW1hZ2VPdmVybGF5KQoreworICAgIGF1dG8gY29u ZmlndXJhdGlvbiA9IHJldGFpblB0cihbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBfdGVzdF9jb25m aWd1cmF0aW9uV2l0aFRlc3RQbHVnSW5DbGFzc05hbWU6QCJXZWJQcm9jZXNzUGx1Z0luV2l0aElu dGVybmFscyIgY29uZmlndXJlSlNDRm9yVGVzdGluZzpZRVNdKTsKKyAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0 KDAsIDAsIDQwMCwgNDAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAg ICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJzaW1wbGUtaW1hZ2Ut b3ZlcmxheSJdOworICAgIHsKKyAgICAgICAgYXV0byBbbWF0Y2hlcywgZGlkV3JhcF0gPSBmaW5k TWF0Y2hlcyh3ZWJWaWV3LmdldCgpLCBAImZvb2JhciIpOworICAgICAgICBFWFBFQ1RfRVEoMVUs IFttYXRjaGVzIGNvdW50XSk7CisgICAgICAgIEVYUEVDVF9GQUxTRShkaWRXcmFwKTsKKyAgICB9 CisKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCdmb29iYXInKSkiIGNvbXBsZXRpb25IYW5k bGVyOm5pbF07CisKKyAgICB7CisgICAgICAgIGF1dG8gW21hdGNoZXMsIGRpZFdyYXBdID0gZmlu ZE1hdGNoZXMod2ViVmlldy5nZXQoKSwgQCJmb29iYXIiKTsKKyAgICAgICAgRVhQRUNUX0VRKDJV LCBbbWF0Y2hlcyBjb3VudF0pOworICAgICAgICBFWFBFQ1RfRkFMU0UoZGlkV3JhcCk7CisgICAg fQorfQorCisjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisKICNlbmRpZiAvLyAh UExBVEZPUk0oSU9TX0ZBTUlMWSkK