133143 2014-05-20 21:09:47 -0700 Special handling of telephone number detection menu 2014-05-21 10:55:02 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson thorton oldest_to_newest 1010697 0 beidson 2014-05-20 21:09:47 -0700 Special handling of telephone number detection menu In radar as <rdar://problem/16967971> 1010699 1 231813 beidson 2014-05-20 21:31:12 -0700 Created attachment 231813 Patch v1 1010794 2 231813 ggaren 2014-05-21 10:31:46 -0700 Comment on attachment 231813 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=231813&action=review r=me > Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm:462 > + // In the future all other menus we should probably eiher use that API or the This comment confused me a little, because it seemed like you were saying that it's a FIXME that telephone number menus use this API. But I think you're actually saying that telephone menus are better than all other menus, and it's a FIXME to fix the other menus. So, maybe put the FIXME before the second sentence instead of the first? Also: Typos in "other menus we should probably eiher use". 1010796 3 beidson 2014-05-21 10:55:02 -0700 http://trac.webkit.org/changeset/169170 231813 2014-05-20 21:31:12 -0700 2014-05-21 10:31:46 -0700 Patch v1 patch text/plain 9598 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjYjQ3ZjM5Li41YmU3NTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTQtMDUtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFNwZWNpYWwgaGFuZGxpbmcgb2YgdGVsZXBob25lIG51bWJlciBkZXRlY3Rpb24gbWVudS4K KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2OTY3OTcxPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzE0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGJvb2wgdG8gQ29udGV4dE1lbnVDb250ZXh0RGF0 YSB0byByZXByZXNlbnQgdGVsZXBob25lIG51bWJlciBtZW51czoKKyAgICAgICAgKiBTaGFyZWQv Q29udGV4dE1lbnVDb250ZXh0RGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51 Q29udGV4dERhdGE6OkNvbnRleHRNZW51Q29udGV4dERhdGEpOgorICAgICAgICAoV2ViS2l0OjpD b250ZXh0TWVudUNvbnRleHREYXRhOjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViS2l0OjpDb250 ZXh0TWVudUNvbnRleHREYXRhOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0TWVu dUNvbnRleHREYXRhOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Db250ZXh0TWVudUNvbnRl eHREYXRhLmg6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERhdGE6OkNvbnRl eHRNZW51Q29udGV4dERhdGEpOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0TWVudUNvbnRleHRE YXRhOjppc1RlbGVwaG9uZU51bWJlckNvbnRleHQpOgorCisgICAgICAgICogVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUpOiBJZiB0aGUgbWVudSBpcyBhIHRlbGVwaG9u ZQorICAgICAgICAgIG51bWJlciBtZW51IHRoZW4gZGlzcGxheSBpdCB1c2luZyBhIHNwZWNpZmlj IEFwcEtpdCBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93VGVsZXBob25lTnVtYmVyTWVu dSk6IEZpbHRlciB0aGUgYXJyYXkgb2YgbWVudSBpdGVtcworICAgICAgICAgIHRocm91Z2ggYSBu ZXcgV0tTSSBjYWxsLCBhbmQgdGhlbiBzaG93IGl0IHVzaW5nIGEgdGVsZXBob25lIG51bWJlciBj b250ZXh0LgorCiAyMDE0LTA1LTIwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgRml4IGEgaGVhZGVyIGNvbW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmNwcAppbmRleCAyMDIwNzU5Li5lMWJiZjNj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0 YS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERhdGEu Y3BwCkBAIC0zOCwxNCArMzgsMjQgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogQ29udGV4dE1lbnVDb250ZXh0RGF0YTo6Q29udGV4dE1lbnVDb250ZXh0 RGF0YSgpCisgICAgOiBtX2lzVGVsZXBob25lTnVtYmVyQ29udGV4dChmYWxzZSkKICNpZiBFTkFC TEUoU0VSVklDRV9DT05UUk9MUykKLSAgICA6IG1fc2VsZWN0aW9uSXNFZGl0YWJsZShmYWxzZSkK KyAgICAsIG1fc2VsZWN0aW9uSXNFZGl0YWJsZShmYWxzZSkKKyNlbmRpZgoreworfQorCitDb250 ZXh0TWVudUNvbnRleHREYXRhOjpDb250ZXh0TWVudUNvbnRleHREYXRhKFRlbGVwaG9uZU51bWJl ckNvbnRleHRUYWcpCisgICAgOiBtX2lzVGVsZXBob25lTnVtYmVyQ29udGV4dCh0cnVlKQorI2lm IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQorICAgICwgbV9zZWxlY3Rpb25Jc0VkaXRhYmxlKGZh bHNlKQogI2VuZGlmCiB7CiB9CiAKIENvbnRleHRNZW51Q29udGV4dERhdGE6OkNvbnRleHRNZW51 Q29udGV4dERhdGEoY29uc3QgQ29udGV4dE1lbnVDb250ZXh0JiBjb250ZXh0KQogICAgIDogbV93 ZWJIaXRUZXN0UmVzdWx0RGF0YShXZWJIaXRUZXN0UmVzdWx0OjpEYXRhKGNvbnRleHQuaGl0VGVz dFJlc3VsdCgpKSkKKyAgICAsIG1faXNUZWxlcGhvbmVOdW1iZXJDb250ZXh0KGZhbHNlKQogI2lm IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgICwgbV9zZWxlY3Rpb25Jc0VkaXRhYmxlKGZh bHNlKQogI2VuZGlmCkBAIC02OSw2ICs3OSw4IEBAIENvbnRleHRNZW51Q29udGV4dERhdGE6OkNv bnRleHRNZW51Q29udGV4dERhdGEoY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgb3RoCiBD b250ZXh0TWVudUNvbnRleHREYXRhJiBDb250ZXh0TWVudUNvbnRleHREYXRhOjpvcGVyYXRvcj0o Y29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgb3RoZXIpCiB7CiAgICAgbV93ZWJIaXRUZXN0 UmVzdWx0RGF0YSA9IG90aGVyLm1fd2ViSGl0VGVzdFJlc3VsdERhdGE7CisgICAgbV9pc1RlbGVw aG9uZU51bWJlckNvbnRleHQgPSBvdGhlci5tX2lzVGVsZXBob25lTnVtYmVyQ29udGV4dDsKKwog I2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIG1fY29udHJvbGxlZEltYWdlSGFuZGxl LmNsZWFyKCk7CiAKQEAgLTc2LDYgKzg4LDggQEAgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgQ29u dGV4dE1lbnVDb250ZXh0RGF0YTo6b3BlcmF0b3I9KGNvbnN0IENvbnRleHRNZW51Q29udGUKICAg ICAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gYml0bWFwID0gU2hhcmVhYmxlQml0bWFwOjpj cmVhdGUob3RoZXIubV9jb250cm9sbGVkSW1hZ2VIYW5kbGUpOwogICAgICAgICBiaXRtYXAtPmNy ZWF0ZUhhbmRsZShtX2NvbnRyb2xsZWRJbWFnZUhhbmRsZSk7CiAgICAgfQorCisgICAgbV9zZWxl Y3Rpb25Jc0VkaXRhYmxlID0gb3RoZXIubV9zZWxlY3Rpb25Jc0VkaXRhYmxlOwogI2VuZGlmCiAK ICAgICByZXR1cm4gKnRoaXM7CkBAIC04NCw2ICs5OCwxMSBAQCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiBDb250ZXh0TWVudUNvbnRleHREYXRhOjpvcGVyYXRvcj0oY29uc3QgQ29udGV4dE1lbnVD b250ZQogdm9pZCBDb250ZXh0TWVudUNvbnRleHREYXRhOjplbmNvZGUoSVBDOjpBcmd1bWVudEVu Y29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2RlciA8PCBtX3dlYkhpdFRlc3RSZXN1 bHREYXRhOworCisjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQorICAgIGVu Y29kZXIgPDwgbV9pc1RlbGVwaG9uZU51bWJlckNvbnRleHQ7CisjZW5kaWYKKwogI2lmIEVOQUJM RShTRVJWSUNFX0NPTlRST0xTKQogICAgIGVuY29kZXIgPDwgbV9jb250cm9sbGVkSW1hZ2VIYW5k bGU7CiAjZW5kaWYKQEAgLTkzLDcgKzExMiwxMiBAQCBib29sIENvbnRleHRNZW51Q29udGV4dERh dGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgQ29udGV4dE1lbnVDbwog ewogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoY29udGV4dE1lbnVDb250ZXh0RGF0YS5tX3dlYkhp dFRlc3RSZXN1bHREYXRhKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAKKworI2lm IEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RFVEVDVElPTikKKyAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGNvbnRleHRNZW51Q29udGV4dERhdGEubV9pc1RlbGVwaG9uZU51bWJlckNvbnRleHQpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKwogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRS T0xTKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoY29udGV4dE1lbnVDb250ZXh0RGF0YS5tX2Nv bnRyb2xsZWRJbWFnZUhhbmRsZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5oCmluZGV4IDZmNjM1ZmIuLjg1 NzJkNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRl eHREYXRhLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERh dGEuaApAQCAtNDMsOSArNDMsMTIgQEAgY2xhc3MgQ29udGV4dE1lbnVDb250ZXh0OwogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAorZW51bSBUZWxlcGhvbmVOdW1iZXJDb250ZXh0VGFnIHsgVGVsZXBo b25lTnVtYmVyQ29udGV4dCB9OworCiBjbGFzcyBDb250ZXh0TWVudUNvbnRleHREYXRhIHsKIHB1 YmxpYzoKICAgICBDb250ZXh0TWVudUNvbnRleHREYXRhKCk7CisgICAgQ29udGV4dE1lbnVDb250 ZXh0RGF0YShUZWxlcGhvbmVOdW1iZXJDb250ZXh0VGFnKTsKICAgICBDb250ZXh0TWVudUNvbnRl eHREYXRhKGNvbnN0IFdlYkNvcmU6OkNvbnRleHRNZW51Q29udGV4dCYpOwogCiAgICAgQ29udGV4 dE1lbnVDb250ZXh0RGF0YShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJik7CkBAIC01NSw3 ICs1OCw4IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIENv bnRleHRNZW51Q29udGV4dERhdGEoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBzZWxlY3Rpb25EYXRh LCBib29sIGlzRWRpdGFibGUpCi0gICAgICAgIDogbV9jb250cm9sbGVkU2VsZWN0aW9uRGF0YShz ZWxlY3Rpb25EYXRhKQorICAgICAgICA6IG1faXNUZWxlcGhvbmVOdW1iZXJDb250ZXh0KGZhbHNl KQorICAgICAgICAsIG1fY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoc2VsZWN0aW9uRGF0YSkKICAg ICAgICAgLCBtX3NlbGVjdGlvbklzRWRpdGFibGUoaXNFZGl0YWJsZSkKICAgICB7IH0KIApAQCAt NjYsMTIgKzcwLDE3IEBAIHB1YmxpYzoKICAgICBib29sIG5lZWRzU2VydmljZXNNZW51KCkgY29u c3QgeyByZXR1cm4gIW1fY29udHJvbGxlZEltYWdlSGFuZGxlLmlzTnVsbCgpIHx8ICFtX2NvbnRy b2xsZWRTZWxlY3Rpb25EYXRhLmlzRW1wdHkoKTsgfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVEVM RVBIT05FX05VTUJFUl9ERVRFQ1RJT04pCisgICAgYm9vbCBpc1RlbGVwaG9uZU51bWJlckNvbnRl eHQoKSBjb25zdCB7IHJldHVybiBtX2lzVGVsZXBob25lTnVtYmVyQ29udGV4dDsgfQorI2VuZGlm CisKICAgICB2b2lkIGVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0 YXRpYyBib29sIGRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYsIENvbnRleHRNZW51Q29udGV4 dERhdGEmKTsKIAogcHJpdmF0ZToKIAogICAgIFdlYkhpdFRlc3RSZXN1bHQ6OkRhdGEgbV93ZWJI aXRUZXN0UmVzdWx0RGF0YTsKKyAgICBib29sIG1faXNUZWxlcGhvbmVOdW1iZXJDb250ZXh0Owog CiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5k bGUgbV9jb250cm9sbGVkSW1hZ2VIYW5kbGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5kZXggZDE4MmE0MS4uMjVm NTM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWVudVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29u dGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtNDU3LDYgKzQ1NywxNyBAQCB2b2lkIFdlYkNvbnRleHRN ZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVudUxvY2F0aW9u LCBjb25zdAogICAgICAgICBbbV9wb3B1cCBhdHRhY2hQb3BVcFdpdGhGcmFtZTptZW51UmVjdCBp blZpZXc6bV93ZWJWaWV3XTsKIAogICAgIE5TTWVudSAqbWVudSA9IG1fc2VydmljZXNNZW51ID8g bV9zZXJ2aWNlc01lbnUuZ2V0KCkgOiBbbV9wb3B1cCBtZW51XTsKKworICAgIC8vIEZJWE1FOiBU ZWxlcGhvbmUgbnVtYmVyIG1lbnVzIHJlcXVpcmUgdXNpbmcgdGhlIFtOU01lbnUgcG9wVXBNZW51 UG9zaXRpb25pbmdJdGVtOmF0TG9jYXRpb246aW5WaWV3Ol0gQVBJLgorICAgIC8vIEluIHRoZSBm dXR1cmUgYWxsIG90aGVyIG1lbnVzIHdlIHNob3VsZCBwcm9iYWJseSBlaWhlciB1c2UgdGhhdCBB UEkgb3IgdGhlCisgICAgLy8gW05TTWVudSBwb3BVcENvbnRleHRNZW51OndpdGhFdmVudDpmb3JW aWV3Ol0gQVBJLCBkZXBlbmRpbmcgb24gdGhlIG1lbnUgdHlwZS4KKyAgICAvLyBUaGVuIHdlIGNv dWxkIGdldCByaWQgb2YgTlNQb3BVcEJ1dHRvbkNlbGwsIGN1c3RvbSBtZXRyaWNzLCBhbmQgV0tQ b3B1cENvbnRleHRNZW51LgorICAgIGlmIChjb250ZXh0LmlzVGVsZXBob25lTnVtYmVyQ29udGV4 dCgpKSB7CisgICAgICAgIFttZW51IHBvcFVwTWVudVBvc2l0aW9uaW5nSXRlbTpuaWwgYXRMb2Nh dGlvbjptZW51TG9jYXRpb24gaW5WaWV3Om1fd2ViVmlld107CisgICAgICAgIGhpZGVDb250ZXh0 TWVudSgpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAjZWxzZQogICAgIFttX3BvcHVwIGF0 dGFjaFBvcFVwV2l0aEZyYW1lOm1lbnVSZWN0IGluVmlldzptX3dlYlZpZXddOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCmluZGV4IDM1ZDgw ZDIuLmE1ZmVkZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi UGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFn ZVByb3h5TWFjLm1tCkBAIC02Myw4ICs2Myw2IEBAIEBlbmQKIAogU09GVF9MSU5LX1BSSVZBVEVf RlJBTUVXT1JLX09QVElPTkFMKERhdGFEZXRlY3RvcnMpCiBTT0ZUX0xJTktfQ0xBU1MoRGF0YURl dGVjdG9ycywgRERBY3Rpb25zTWFuYWdlcikKLVNPRlRfTElOS19DTEFTUyhEYXRhRGV0ZWN0b3Jz LCBEREFjdGlvbikKLVNPRlRfTElOS19DTEFTUyhEYXRhRGV0ZWN0b3JzLCBERFNlcGFyYXRvckFj dGlvbikKIFNPRlRfTElOS19DT05TVEFOVChEYXRhRGV0ZWN0b3JzLCBEREJpbmRlclBob25lTnVt YmVyS2V5LCBDRlN0cmluZ1JlZikKIAogdHlwZWRlZiB2b2lkKiBEREFjdGlvbkNvbnRleHQ7CkBA IC03NCwxMCArNzIsNiBAQCArIChEREFjdGlvbnNNYW5hZ2VyICopIHNoYXJlZE1hbmFnZXI7CiAt IChOU0FycmF5ICopIG1lbnVJdGVtc0ZvclZhbHVlOihOU1N0cmluZyAqKXZhbHVlIHR5cGU6KENG U3RyaW5nUmVmKXR5cGUgc2VydmljZTooTlNTdHJpbmcgKilzZXJ2aWNlIGNvbnRleHQ6KEREQWN0 aW9uQ29udGV4dCAqKWNvbnRleHQ7CiBAZW5kCiAKLUBpbnRlcmZhY2UgRERBY3Rpb24gOiBOU09i amVjdAotQHByb3BlcnR5IChyZWFkb25seSkgTlNTdHJpbmcgKmFjdGlvblVUSTsKLUBlbmQKLQog I2RlZmluZSBNRVNTQUdFX0NIRUNLKGFzc2VydGlvbikgTUVTU0FHRV9DSEVDS19CQVNFKGFzc2Vy dGlvbiwgcHJvY2VzcygpLmNvbm5lY3Rpb24oKSkKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7 CkBAIC02NjMsMjUgKzY1NywxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6b3BlblBERkZyb21UZW1w b3JhcnlGb2xkZXJXaXRoTmF0aXZlQXBwbGljYXRpb24oY29uc3QgU3RyaW5nJgogdm9pZCBXZWJQ YWdlUHJveHk6OnNob3dUZWxlcGhvbmVOdW1iZXJNZW51KGNvbnN0IFN0cmluZyYgdGVsZXBob25l TnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQpCiB7CiAgICAgTlNBcnJheSAq bWVudUl0ZW1zID0gW1tnZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBt ZW51SXRlbXNGb3JWYWx1ZTooTlNTdHJpbmcgKil0ZWxlcGhvbmVOdW1iZXIgdHlwZTpnZXREREJp bmRlclBob25lTnVtYmVyS2V5KCkgc2VydmljZTpuaWwgY29udGV4dDpuaWxdOworICAgIG1lbnVJ dGVtcyA9IFdLVGVsZXBob25lTnVtYmVyTWVudUZyb21Qcm9wb3NlZE1lbnUobWVudUl0ZW1zLCB0 ZWxlcGhvbmVOdW1iZXIpOwogCiAgICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGl0 ZW1zOwogICAgIGZvciAoTlNNZW51SXRlbSAqaXRlbSBpbiBtZW51SXRlbXMpIHsKLSAgICAgICAg TlNEaWN0aW9uYXJ5ICpyZXByZXNlbnRlZE9iamVjdCA9IFtpdGVtIHJlcHJlc2VudGVkT2JqZWN0 XTsKLSAgICAgICAgaWYgKCFbcmVwcmVzZW50ZWRPYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNEaWN0 aW9uYXJ5IGNsYXNzXV0pCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBEREFjdGlv biAqYWN0aW9uT2JqZWN0ID0gW3JlcHJlc2VudGVkT2JqZWN0IG9iamVjdEZvcktleTpAIkREQWN0 aW9uIl07Ci0gICAgICAgIGlmICghW2FjdGlvbk9iamVjdCBpc0tpbmRPZkNsYXNzOmdldEREQWN0 aW9uQ2xhc3MoKV0pCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAvLyBTa2lwIG1l bnUgaXRlbXMgd2hvc2UgYWN0aW9ucyBoYXZlIGFueXRoaW5nIHRvIGRvIHdpdGggY29udGFjdHMu Ci0gICAgICAgIGlmIChbW2FjdGlvbk9iamVjdCBhY3Rpb25VVEldIGhhc1ByZWZpeDpAImNvbS5h cHBsZS5jb250YWN0LiJdKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgLy8gU2tp cCBzZXBlcmF0b3IgaXRlbXMuCi0gICAgICAgIGlmIChbYWN0aW9uT2JqZWN0IGlzS2luZE9mQ2xh c3M6Z2V0RERTZXBhcmF0b3JBY3Rpb25DbGFzcygpXSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwot CiAgICAgICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiByZXRhaW5lZEl0ZW0gPSBpdGVtOwogICAg ICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gaGFuZGxlciA9IFtyZXRhaW5lZEl0ZW1dKCkgewog ICAgICAgICAgICAgTlNNZW51SXRlbSAqaXRlbSA9IHJldGFpbmVkSXRlbS5nZXQoKTsKQEAgLTY5 MSw3ICs2NzAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd1RlbGVwaG9uZU51bWJlck1lbnUo Y29uc3QgU3RyaW5nJiB0ZWxlcGhvbmVOdW1iZXIsIGNvbnN0CiAgICAgICAgIGl0ZW1zLmFwcGVu ZChXZWJDb250ZXh0TWVudUl0ZW1EYXRhKENvbnRleHRNZW51SXRlbShpdGVtKSwgaGFuZGxlcikp OwogICAgIH0KICAgICAKLSAgICBDb250ZXh0TWVudUNvbnRleHREYXRhIGNvbnRleHREYXRhOwor ICAgIENvbnRleHRNZW51Q29udGV4dERhdGEgY29udGV4dERhdGEoVGVsZXBob25lTnVtYmVyQ29u dGV4dCk7CiAgICAgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUocG9pbnQsIGNvbnRleHREYXRhLCBp dGVtcywgQ29udGV4dE1lbnVDbGllbnRFbGlnaWJpbGl0eTo6Tm90RWxpZ2libGVGb3JDbGllbnQs IG51bGxwdHIpOwogfQogI2VuZGlmCg==