138602 2014-11-10 23:30:31 -0800 DataDetectors' menu items aren't presented in the telephone number menu 2014-11-11 12:12:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin buildbot conrad_shultz rniwa sam oldest_to_newest 1047776 0 thorton 2014-11-10 23:30:31 -0800 DataDetectors' menu items aren't presented in the telephone number menu 1047777 1 241338 thorton 2014-11-10 23:30:57 -0800 Created attachment 241338 Patch 1047778 2 thorton 2014-11-10 23:31:18 -0800 <rdar://problem/18866308> 1047780 3 241338 conrad_shultz 2014-11-10 23:38:26 -0800 Comment on attachment 241338 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241338&action=review > Source/WebKit2/Platform/mac/MenuUtilities.mm:117 > + return [menu numberOfItems] ? menu : nil; Did you test whether this check is actually needed? In many cases, an empty NSMenu will behave as if you had no menu at all. 1047782 4 thorton 2014-11-10 23:44:23 -0800 (In reply to comment #3) > Comment on attachment 241338 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241338&action=review > > > Source/WebKit2/Platform/mac/MenuUtilities.mm:117 > > + return [menu numberOfItems] ? menu : nil; > > Did you test whether this check is actually needed? In many cases, an empty > NSMenu will behave as if you had no menu at all. I did not, and you're probably right. I just translated. 1047924 5 thorton 2014-11-11 12:12:42 -0800 http://trac.webkit.org/changeset/175966 241338 2014-11-10 23:30:57 -0800 2014-11-11 09:38:44 -0800 Patch bug-138602-20141110233100.patch text/plain 9913 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk5MGFiZDRiY2VkYjNi ZTE0ZDFjOWRlYTJiMjc0MjJiMGM0NGQwMi4uNjU4YWUzYzkxMjg5M2U4NTQzMTY2NjQ2ZTZkNmZl MTc3MTEyNmQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTExLTEwICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIERhdGFEZXRlY3Rv cnMnIG1lbnUgaXRlbXMgYXJlbid0IHByZXNlbnRlZCBpbiB0aGUgdGVsZXBob25lIG51bWJlciBt ZW51CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg2 MDIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4ODY2MzA4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJs ZS5zdHJpbmdzOgorICAgICAgICBSZW1vdmUgYSBub3ctdW51c2VkIGxvY2FsaXplZCBzdHJpbmcu CisKIDIwMTQtMTEtMTAgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIHBhcnNpbmcgc3VwcG9ydCBmb3IgdGhlIGV4dGVuZGVkIDpudGgtbGFzdC1j aGlsZChBbitCIG9mIHNlbGVjdG9yLWxpc3QpIGRlZmluZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAxZjI3MTZj YTc5NjBiM2NmNThkYmY5MTU5N2RkZjgxYWVkMWNiYjA2Li44OTk3MmRjOWRiN2RhMjM0MWVjNDEy ZGQ2YzhlNjkyNDZiN2RjZjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTQtMTEt MTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGF0 YURldGVjdG9ycycgbWVudSBpdGVtcyBhcmVuJ3QgcHJlc2VudGVkIGluIHRoZSB0ZWxlcGhvbmUg bnVtYmVyIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzODYwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTg4NjYzMDg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY3VycmVudGx5IHJvdW5k LXRyaXAgdGhlIERhdGFEZXRlY3RvcnMgdGVsZXBob25lIG51bWJlciBOU01lbnVJdGVtcworICAg ICAgICB0aHJvdWdoIHRoZSB2ZXJ5LWxvc3N5IFdlYkNvbnRleHRNZW51SXRlbURhdGEsIGZvciBu byByZWFsIHJlYXNvbi4KKyAgICAgICAgV2Ugc2hvdWxkIGF2b2lkIHRoaXMgc28gdGhhdCBEYXRh RGV0ZWN0b3JzJyBhY3R1YWwgTlNNZW51SXRlbXMgYXJlCisgICAgICAgIHByZXNlbnRlZCBpbiB0 aGUgZmluYWwgbWVudSwgc28gdGhhdCB0aGV5IGNhbiBhZGp1c3QgdGhlaXIgaXRlbXMgYWZ0ZXIK KyAgICAgICAgcHJvdmlkaW5nIHRoZW0gdG8gdXMuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9tYWMv TWVudVV0aWxpdGllcy5oOgorICAgICAgICAqIFBsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLm1t OgorICAgICAgICAoV2ViS2l0OjptZW51SXRlbVRpdGxlRm9yVGVsZXBob25lTnVtYmVyKTogRGVs ZXRlZC4KKyAgICAgICAgU3RvcCBhZGp1c3RpbmcgdGhlIG1lbnUgaXRlbSB0aXRsZXMsIGFzIHRo ZXkgY29tZSBjb3JyZWN0IG5vdy4KKworICAgICAgICAoV2ViS2l0OjptZW51SXRlbXNGb3JUZWxl cGhvbmVOdW1iZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjptZW51Rm9yVGVsZXBob25l TnVtYmVyKToKKyAgICAgICAgUmV0dXJuIGEgZnVsbHktZm9ybWVkIG1lbnUgZm9yIHRoZSBzaW5n bGUgdGVsZXBob25lIG51bWJlciBjYXNlLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2hvd1RlbGVw aG9uZU51bWJlck1lbnUpOgorICAgICAgICBQcmVzZW50IHRoZSBmdWxseS1mb3JtZWQgbWVudSwg d2l0aG91dCByb3VuZC10cmlwcGluZyB0aHJvdWdoCisgICAgICAgIFdlYkNvbnRleHRNZW51SXRl bURhdGEsIGJlY2F1c2Ugd2UgZG8gbm90IG5lZWQgdG8gaGFuZCB0aGUgaXRlbXMgdG8KKyAgICAg ICAgdGhlIGNvbnRleHQgbWVudSBjbGllbnQgKGFuZCBpbmRlZWQsIHdlcmUgbm90KSwgYW5kIGJl Y2F1c2UgdGhpcworICAgICAgICBhbGxvd3MgdXMgdG8gdXNlIHRoZSBleGFjdCBpdGVtcyByZXR1 cm5lZCBieSBEYXRhRGV0ZWN0b3JzLCBzbyB0aGV5CisgICAgICAgIGNhbiBrZWVwIGFob2xkIG9m IHRoZSBpdGVtcyB0aGF0IHdlIGFjdHVhbGx5IHByZXNlbnQuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvUGFnZUNsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAo V2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2hvd1BsYXRmb3JtQ29udGV4dE1lbnUpOgorICAgICAg ICBBZGQgYSBNYWMtb25seSBQYWdlQ2xpZW50IGZ1bmN0aW9uIGZvciBwcmVzZW50aW5nIGEgTlNN ZW51IGF0IGEKKyAgICAgICAgV0tWaWV3LXJlbGF0aXZlIHBvaW50LgorCiAyMDE0LTExLTEwICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGl0ZXNwYWNlIGFjdGlv biBtZW51cyBhcmVuJ3Qgd29ya2luZyBwcm9wZXJseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IDc3ZGQ3MDcxNDdjNWNmMmVjMmJk NTAxMDIyMzIwNDVkOWFhYWJiNmYuLjRlYjNjNjBmMTI0MjgzOTU3NGI2MTBiMzI1ZmVkOGMyYjg1 YmRlOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFi bGUuc3RyaW5ncworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxl LnN0cmluZ3MKQEAgLTEyNCw5ICsxMjQsNiBAQAogLyogbWVudSBpdGVtIHRpdGxlIGZvciBwaG9u ZSBudW1iZXIgKi8KICJDYWxsIFVzaW5nIGlQaG9uZToiID0gIkNhbGwgVXNpbmcgaVBob25lOiI7 CiAKLS8qIG1lbnUgaXRlbSBmb3IgbWFraW5nIGEgdGVsZXBob25lIGNhbGwgdG8gYSB0ZWxlcGhv bmUgbnVtYmVyICovCi0iQ2FsbCDigJwlQOKAnSBVc2luZyBpUGhvbmUiID0gIkNhbGwg4oCcJUDi gJ0gVXNpbmcgaVBob25lIjsKLQogLyogRmlsZSBVcGxvYWQgYWxlcnQgc2hlZXQgYnV0dG9uIHN0 cmluZyB0byBjYW5jZWwgKi8KICJDYW5jZWwgKGZpbGUgdXBsb2FkIGFjdGlvbiBzaGVldCkiID0g IkNhbmNlbCI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL21hYy9NZW51 VXRpbGl0aWVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9tYWMvTWVudVV0aWxpdGllcy5o CmluZGV4IGQyZDQyYTcxZTAxOGVmYjU3NTc1NmFiZWQ3MmE4M2IzOTViZjhhZWUuLjA4MDVlYjQ1 MWJmZDJkNjI2MjdkMTE5OTk5YjkyYzQwNDY4NTQwN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vbWFjL01lbnVVdGlsaXRpZXMuaApAQCAtMzIsOCArMzIsOCBAQAogbmFtZXNwYWNlIFdl YktpdCB7CiAKICNpZiBFTkFCTEUoVEVMRVBIT05FX05VTUJFUl9ERVRFQ1RJT04pICYmIFBMQVRG T1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKLU5T TWVudUl0ZW0gKm1lbnVJdGVtRm9yVGVsZXBob25lTnVtYmVyKGNvbnN0IFN0cmluZyYgdGVsZXBo b25lTnVtYmVyU3RyaW5nKTsKLU5TQXJyYXkgKm1lbnVJdGVtc0ZvclRlbGVwaG9uZU51bWJlcihj b25zdCBTdHJpbmcmIHRlbGVwaG9uZU51bWJlcik7CitOU01lbnVJdGVtICptZW51SXRlbUZvclRl bGVwaG9uZU51bWJlcihjb25zdCBTdHJpbmcmIHRlbGVwaG9uZU51bWJlcik7CitSZXRhaW5QdHI8 TlNNZW51PiBtZW51Rm9yVGVsZXBob25lTnVtYmVyKGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVt YmVyKTsKIE5TU3RyaW5nICptZW51SXRlbVRpdGxlRm9yVGVsZXBob25lTnVtYmVyR3JvdXAoKTsK ICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9tYWMvTWVudVV0 aWxpdGllcy5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLm1t CmluZGV4IDNkYWJjNjhiZjUzMjlkYWViOGQxNWQ1ZjkzNDA2MmRhZWNkNDZiYzYuLjgyZTUxMWY2 ZmM0MTM1OTJhN2UyYmI5YTM0NmI5NjJjZWM5NDJjNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLm1tCkBAIC01MywxMSArNTMsNiBAQCBuYW1lc3BhY2Ug V2ViS2l0IHsKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RFVEVDVElPTikgJiYgUExB VEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAog Ci1zdGF0aWMgTlNTdHJpbmcgKm1lbnVJdGVtVGl0bGVGb3JUZWxlcGhvbmVOdW1iZXIoY29uc3Qg U3RyaW5nJiB0ZWxlcGhvbmVOdW1iZXIpCi17Ci0gICAgcmV0dXJuIFtOU1N0cmluZyBzdHJpbmdX aXRoRm9ybWF0OldFQl9VSV9TVFJJTkcoIkNhbGwg4oCcJUDigJ0gVXNpbmcgaVBob25lIiwgIm1l bnUgaXRlbSBmb3IgbWFraW5nIGEgdGVsZXBob25lIGNhbGwgdG8gYSB0ZWxlcGhvbmUgbnVtYmVy IiksIGZvcm1hdHRlZFBob25lTnVtYmVyU3RyaW5nKHRlbGVwaG9uZU51bWJlcildOwotfQotCiBO U1N0cmluZyAqbWVudUl0ZW1UaXRsZUZvclRlbGVwaG9uZU51bWJlckdyb3VwKCkKIHsKICAgICBy ZXR1cm4gV0VCX1VJX1NUUklORygiQ2FsbCBVc2luZyBpUGhvbmU6IiwgIm1lbnUgaXRlbSB0aXRs ZSBmb3IgcGhvbmUgbnVtYmVyIik7CkBAIC04NCw5ICs3OSw5IEBAIE5TTWVudUl0ZW0gKm1lbnVJ dGVtRm9yVGVsZXBob25lTnVtYmVyKGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyKQogICAg IHJldHVybiBuaWw7CiB9CiAKLU5TQXJyYXkgKm1lbnVJdGVtc0ZvclRlbGVwaG9uZU51bWJlcihj b25zdCBTdHJpbmcmIHRlbGVwaG9uZU51bWJlcikKK1JldGFpblB0cjxOU01lbnU+IG1lbnVGb3JU ZWxlcGhvbmVOdW1iZXIoY29uc3QgU3RyaW5nJiB0ZWxlcGhvbmVOdW1iZXIpCiB7Ci0gICAgTlNN dXRhYmxlQXJyYXkgKml0ZW1zID0gW05TTXV0YWJsZUFycmF5IGFycmF5XTsKKyAgICBSZXRhaW5Q dHI8TlNNZW51PiBtZW51ID0gYWRvcHROUyhbW05TTWVudSBhbGxvY10gaW5pdF0pOwogICAgIE5T TXV0YWJsZUFycmF5ICpmYWNlVGltZUl0ZW1zID0gW05TTXV0YWJsZUFycmF5IGFycmF5XTsKICAg ICBOU01lbnVJdGVtICpkaWFsSXRlbSA9IG5pbDsKIApAQCAtMTAxLDcgKzk2LDYgQEAgTlNBcnJh eSAqbWVudUl0ZW1zRm9yVGVsZXBob25lTnVtYmVyKGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVt YmVyKQogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgaWYgKFthY3Rpb25PYmplY3Qu YWN0aW9uVVRJIGhhc1ByZWZpeDpAImNvbS5hcHBsZS5kaWFsIl0pIHsKLSAgICAgICAgICAgIGl0 ZW0udGl0bGUgPSBtZW51SXRlbVRpdGxlRm9yVGVsZXBob25lTnVtYmVyKHRlbGVwaG9uZU51bWJl cik7CiAgICAgICAgICAgICBkaWFsSXRlbSA9IGl0ZW07CiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQpAQCAtMTExLDE1ICsxMDUsMTYgQEAgTlNBcnJheSAqbWVudUl0ZW1zRm9yVGVs ZXBob25lTnVtYmVyKGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyKQogICAgIH0KIAogICAg IGlmIChkaWFsSXRlbSkKLSAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDpkaWFsSXRlbV07CisgICAg ICAgIFttZW51IGFkZEl0ZW06ZGlhbEl0ZW1dOwogCiAgICAgaWYgKGZhY2VUaW1lSXRlbXMuY291 bnQpIHsKLSAgICAgICAgaWYgKGl0ZW1zLmNvdW50KQotICAgICAgICAgICAgW2l0ZW1zIGFkZE9i amVjdDpbTlNNZW51SXRlbSBzZXBhcmF0b3JJdGVtXV07Ci0gICAgICAgIFtpdGVtcyBhZGRPYmpl Y3RzRnJvbUFycmF5OmZhY2VUaW1lSXRlbXNdOworICAgICAgICBpZiAoW21lbnUgbnVtYmVyT2ZJ dGVtc10pCisgICAgICAgICAgICBbbWVudSBhZGRJdGVtOltOU01lbnVJdGVtIHNlcGFyYXRvckl0 ZW1dXTsKKyAgICAgICAgZm9yIChOU01lbnVJdGVtICppdGVtIGluIGZhY2VUaW1lSXRlbXMpCisg ICAgICAgICAgICBbbWVudSBhZGRJdGVtOml0ZW1dOwogICAgIH0KIAotICAgIHJldHVybiBpdGVt cy5jb3VudCA/IGl0ZW1zIDogbmlsOworICAgIHJldHVybiBbbWVudSBudW1iZXJPZkl0ZW1zXSA/ IG1lbnUgOiBuaWw7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50 LmgKaW5kZXggZjA5ZWVhZjM3OTY4ZDJlY2UyYTFmZjVmMDE4MmY5MTI4YjE5ZTZiNS4uZjdiMGJl NWZkMTFjYzA2Y2E4M2Y0NjI5NmRhMTQ2N2E4MmQyMGE3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUGFnZUNsaWVudC5oCkBAIC0yMzcsNiArMjM3LDggQEAgcHVibGljOgogCiAgICAgdmlydHVh bCBDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlKCkgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIHNo b3dQbGF0Zm9ybUNvbnRleHRNZW51KE5TTWVudSAqLCBXZWJDb3JlOjpJbnRQb2ludCkgPSAwOwor CiAjaWYgVVNFKEFQUEtJVCkKICAgICB2aXJ0dWFsIFdLVmlldyogd2tWaWV3KCkgY29uc3QgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBpbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25zdCBX ZWJDb3JlOjpJbnRTaXplJiBpbnRyaW5zaWNDb250ZW50U2l6ZSkgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IDMyY2RiNThlNjYyZTU2 YWY1ZWU2YzlhZDM3ZTQzYWY2MGI3YWNkOWUuLmQyNTgzOWI4MTBiYzdhMTYzMTg5NzAwNzA1ZmFl ZDJlNTQ3ODc4MGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFn ZUNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsLmgKQEAgLTE4OCw2ICsxODgsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBy ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KCkgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFs IHZvaWQgZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0 UmVzdWx0JiwgQVBJOjpPYmplY3QqKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd1Bs YXRmb3JtQ29udGV4dE1lbnUoTlNNZW51ICosIFdlYkNvcmU6OkludFBvaW50KSBvdmVycmlkZTsK IAogICAgIFdLVmlldyAqbV93a1ZpZXc7CiAgICAgV0tXZWJWaWV3ICptX3dlYlZpZXc7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCAwMWE3 NDc5ZWI1NTA4YmFhNGNlODE4OWM4ZjY1ZTQxNGM4ZTIwZTY5Li42OGJlZWJlOTk3N2M5ZDZkN2Q1 ZmEzYjEyYzkyMWExMmFkODE1ODA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvUGFnZUNsaWVudEltcGwubW0KQEAgLTc2Niw2ICs3NjYsMTIgQEAgdm9pZCBQYWdlQ2xpZW50 SW1wbDo6ZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0 UmVzdWx0JgogI2VuZGlmCiB9CiAKK3ZvaWQgUGFnZUNsaWVudEltcGw6OnNob3dQbGF0Zm9ybUNv bnRleHRNZW51KE5TTWVudSAqbWVudSwgSW50UG9pbnQgbG9jYXRpb24pCit7CisgICAgW21lbnUg cG9wVXBNZW51UG9zaXRpb25pbmdJdGVtOm5pbCBhdExvY2F0aW9uOmxvY2F0aW9uIGluVmlldzpt X3drVmlld107Cit9CisKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFU Rk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBh Z2VQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5 TWFjLm1tCmluZGV4IDFjM2ZlZDZkN2MyMjRiZjIwNjkwNzBjNjE2NTg3MjNjMjVmNjZkODMuLmUy OWVlNTY4MWIyMTI3ZGY3ZmU2MjZmZjQyZTIyYjYxNjM3N2UxNDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC02NDMsMjEgKzY0Myw4 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpvcGVuUERGRnJvbVRlbXBvcmFyeUZvbGRlcldpdGhOYXRp dmVBcHBsaWNhdGlvbihjb25zdCBTdHJpbmcmCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJf REVURUNUSU9OKQogdm9pZCBXZWJQYWdlUHJveHk6OnNob3dUZWxlcGhvbmVOdW1iZXJNZW51KGNv bnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9p bnQpCiB7Ci0gICAgTlNBcnJheSAqbWVudUl0ZW1zID0gbWVudUl0ZW1zRm9yVGVsZXBob25lTnVt YmVyKHRlbGVwaG9uZU51bWJlcik7Ci0KLSAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0 YT4gaXRlbXM7Ci0gICAgZm9yIChOU01lbnVJdGVtICppdGVtIGluIG1lbnVJdGVtcykgewotICAg ICAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcmV0YWluZWRJdGVtID0gaXRlbTsKLSAgICAgICAg c3RkOjpmdW5jdGlvbjx2b2lkKCk+IGhhbmRsZXIgPSBbcmV0YWluZWRJdGVtXSgpIHsKLSAgICAg ICAgICAgIE5TTWVudUl0ZW0gKml0ZW0gPSByZXRhaW5lZEl0ZW0uZ2V0KCk7Ci0gICAgICAgICAg ICBbW2l0ZW0gdGFyZ2V0XSBwZXJmb3JtU2VsZWN0b3I6W2l0ZW0gYWN0aW9uXSB3aXRoT2JqZWN0 Oml0ZW1dOwotICAgICAgICB9OwotICAgICAgICAKLSAgICAgICAgaXRlbXMuYXBwZW5kKFdlYkNv bnRleHRNZW51SXRlbURhdGEoQ29udGV4dE1lbnVJdGVtKGl0ZW0pLCBoYW5kbGVyKSk7Ci0gICAg fQotICAgIAotICAgIENvbnRleHRNZW51Q29udGV4dERhdGEgY29udGV4dERhdGEoVGVsZXBob25l TnVtYmVyQ29udGV4dCk7Ci0gICAgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUocG9pbnQsIGNvbnRl eHREYXRhLCBpdGVtcywgQ29udGV4dE1lbnVDbGllbnRFbGlnaWJpbGl0eTo6Tm90RWxpZ2libGVG b3JDbGllbnQsIG51bGxwdHIpOworICAgIFJldGFpblB0cjxOU01lbnU+IG1lbnUgPSBtZW51Rm9y VGVsZXBob25lTnVtYmVyKHRlbGVwaG9uZU51bWJlcik7CisgICAgbV9wYWdlQ2xpZW50LnNob3dQ bGF0Zm9ybUNvbnRleHRNZW51KG1lbnUuZ2V0KCksIHBvaW50KTsKIH0KICNlbmRpZgogCg==