214096 2020-07-08 13:21:32 -0700 Make a logging channel for ScrollSnap and improve its logging 2020-07-08 14:42:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang graouts jamesr luiz simon.fraser tonikitoo webkit-bug-importer wenson_hsieh oldest_to_newest 1669869 0 simon.fraser 2020-07-08 13:21:32 -0700 Make a logging channel for ScrollSnap and improve its logging 1669870 1 403805 simon.fraser 2020-07-08 13:22:41 -0700 Created attachment 403805 Patch 1669871 2 403805 wenson_hsieh 2020-07-08 13:24:25 -0700 Comment on attachment 403805 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403805&action=review > Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.mm:123 > + ts.dumpProperty("snap offsets ranges x", state.snapOffsetRangesForAxis(ScrollEventAxis::Vertical)); This should say “y" 1669898 3 simon.fraser 2020-07-08 14:41:07 -0700 https://trac.webkit.org/changeset/264134/webkit 1669899 4 webkit-bug-importer 2020-07-08 14:42:17 -0700 <rdar://problem/65241839> 403805 2020-07-08 13:22:41 -0700 2020-07-08 13:23:52 -0700 Patch bug-214096-20200708132240.patch text/plain 16192 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzRmN2M4ZWVhZWJhOTIx MjA4NmZjNDMxMzhlNzMzYTQ2NjUxZWI4Zi4uOTAzMjg4NTdkMGRkYThiMjRmNjk4Y2MxZmE1Y2Mx OTM3MDQ2NDJkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA3LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgYSBsb2dn aW5nIGNoYW5uZWwgZm9yIFNjcm9sbFNuYXAgYW5kIGltcHJvdmUgaXRzIGxvZ2dpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDA5NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFB1bGwgZXhpc3Rpbmcg c2Nyb2xsIHNuYXAgbG9nZ2luZyBvdXQgb2YgdGhlIFNjcm9sbGluZyBsb2cgY2hhbm5lbCBpbnRv IGEgbmV3IFNjcm9sbFNuYXAgY2hhbm5lbCwKKyAgICAgICAgYWRkIG1vcmUgbG9nZ2luZywgYW5k IG1ha2UgYmV0dGVyIHVzZSBvZiBUZXh0U3RyZWFtLWJhc2VkIGxvZ2dpbmcuCisKKyAgICAgICAg KiBwYWdlL3Njcm9sbGluZy9BeGlzU2Nyb2xsU25hcE9mZnNldHMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVTbmFwT2Zmc2V0c0Zv clNjcm9sbGFibGVBcmVhKToKKyAgICAgICAgKFdlYkNvcmU6OnNuYXBPZmZzZXRzVG9TdHJpbmcp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6c25hcE9mZnNldFJhbmdlc1RvU3RyaW5nKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnNuYXBQb3J0T3JBcmVhVG9TdHJpbmcpOiBEZWxl dGVkLgorICAgICAgICAqIHBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6dXBk YXRlU2Nyb2xsU25hcFN0YXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9TY3JvbGxDb250 cm9sbGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxDb250cm9sbGVyOjpwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9sbFNuYXApOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQ29udHJvbGxlcjo6c3RhcnRTY3JvbGxTbmFwVGltZXIp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQ29udHJvbGxlcjo6c3RvcFNjcm9sbFNuYXBUaW1l cik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxDb250cm9sbGVyOjpzY3JvbGxTbmFwVGltZXJG aXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxDb250cm9sbGVyOjp1cGRhdGVTY3JvbGxT bmFwU3RhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL1Njcm9sbFNuYXBBbmltYXRvclN0 YXRlLmg6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUu bW06CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcjw8KToKKwogMjAyMC0wNy0wNyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbmFibGUgdG8gc2Ny b2xsIGVsY29tZXJpY28ucGUgcGFnZSB1bnRpbCB0aGUgcGFnZSBmaW5pc2hlcyBsb2FkaW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9BeGlzU2Nyb2xsU25hcE9m ZnNldHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXhpc1Njcm9sbFNuYXBP ZmZzZXRzLmNwcAppbmRleCBmODBhMTg1NDg5OGNjODRmNWQwZTBmNjcwYmZhZjI1MzA2MGFmMTg1 Li45YTNkOWRlNjg2MTRkZjBkMTFlMmJhMzJkMGM2ZTE5MWYyYjkzN2RiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9BeGlzU2Nyb2xsU25hcE9mZnNldHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0F4aXNTY3JvbGxTbmFwT2Zmc2V0cy5j cHAKQEAgLTcxLDM1ICs3MSwxMyBAQCBzdGF0aWMgTGF5b3V0VW5pdCBjb21wdXRlU2Nyb2xsU25h cEFsaWduT2Zmc2V0KGNvbnN0IExheW91dFVuaXQmIGxlZnRPclRvcCwgY29ucwogICAgIH0KIH0K IAotI2lmICFMT0dfRElTQUJMRUQKLQotc3RhdGljIFN0cmluZyBzbmFwT2Zmc2V0c1RvU3RyaW5n KGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0PiYgc25hcE9mZnNldHMpCi17Ci0gICAgU3RyaW5nQnVp bGRlciBidWlsZGVyOwotICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiWyAiKTsKLSAgICBmb3Ig KGF1dG8mIG9mZnNldCA6IHNuYXBPZmZzZXRzKQotICAgICAgICBidWlsZGVyLmFwcGVuZChvZmZz ZXQudG9GbG9hdCgpLCAnICcpOwotICAgIGJ1aWxkZXIuYXBwZW5kKCddJyk7Ci0gICAgcmV0dXJu IGJ1aWxkZXIudG9TdHJpbmcoKTsKLX0KLQotc3RhdGljIFN0cmluZyBzbmFwT2Zmc2V0UmFuZ2Vz VG9TdHJpbmcoY29uc3QgVmVjdG9yPFNjcm9sbE9mZnNldFJhbmdlPExheW91dFVuaXQ+PiYgcmFu Z2VzKQordGVtcGxhdGU8dHlwZW5hbWUgVD4KK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0 cmVhbSYgdHMsIGNvbnN0IFNjcm9sbE9mZnNldFJhbmdlPFQ+JiByYW5nZSkKIHsKLSAgICBTdHJp bmdCdWlsZGVyIGJ1aWxkZXI7Ci0gICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCJbICIpOwotICAg IGZvciAoYXV0byYgcmFuZ2UgOiByYW5nZXMpCi0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKCcoJywg cmFuZ2Uuc3RhcnQudG9GbG9hdCgpLCAiLCAiLCByYW5nZS5lbmQudG9GbG9hdCgpLCAiKSAiKTsK LSAgICBidWlsZGVyLmFwcGVuZCgnXScpOwotICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7 CisgICAgdHMgPDwgInN0YXJ0OiAiIDw8IHJhbmdlLnN0YXJ0IDw8ICIgZW5kOiAiIDw8IHJhbmdl LmVuZDsKKyAgICByZXR1cm4gdHM7CiB9CiAKLXN0YXRpYyBTdHJpbmcgc25hcFBvcnRPckFyZWFU b1N0cmluZyhjb25zdCBMYXlvdXRSZWN0JiByZWN0KQotewotICAgIHJldHVybiBtYWtlU3RyaW5n KCJ7eyIsIHJlY3QueCgpLnRvRmxvYXQoKSwgIiwgIiwgcmVjdC55KCkudG9GbG9hdCgpLCAifSB7 IiwgcmVjdC53aWR0aCgpLnRvRmxvYXQoKSwgIiwgIiwgcmVjdC5oZWlnaHQoKS50b0Zsb2F0KCks ICJ9fSIpOwotfQotCi0jZW5kaWYKLQogdGVtcGxhdGUgPHR5cGVuYW1lIExheW91dFR5cGU+CiBz dGF0aWMgdm9pZCBpbmRpY2VzT2ZOZWFyZXN0U25hcE9mZnNldFJhbmdlcyhMYXlvdXRUeXBlIG9m ZnNldCwgY29uc3QgVmVjdG9yPFNjcm9sbE9mZnNldFJhbmdlPExheW91dFR5cGU+PiYgc25hcE9m ZnNldFJhbmdlcywgdW5zaWduZWQmIGxvd2VySW5kZXgsIHVuc2lnbmVkJiB1cHBlckluZGV4KQog ewpAQCAtMjE4LDkgKzE5Niw3IEBAIHZvaWQgdXBkYXRlU25hcE9mZnNldHNGb3JTY3JvbGxhYmxl QXJlYShTY3JvbGxhYmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEsIEhUTUxFbGVtCiAKICAgICAvLyBU aGUgYm91bmRzIG9mIHRoZSBzY3JvbGxpbmcgY29udGFpbmVyJ3Mgc25hcCBwb3J0LCB3aGVyZSB0 aGUgdG9wIGxlZnQgb2YgdGhlIHNjcm9sbGluZyBjb250YWluZXIncyBib3JkZXIgYm94IGlzIHRo ZSBvcmlnaW4uCiAgICAgYXV0byBzY3JvbGxTbmFwUG9ydCA9IGNvbXB1dGVTY3JvbGxTbmFwUG9y dE9yQXJlYVJlY3Qoc2Nyb2xsaW5nRWxlbWVudEJveC5wYWRkaW5nQm94UmVjdCgpLCBzY3JvbGxp bmdFbGVtZW50U3R5bGUuc2Nyb2xsUGFkZGluZygpLCBJbnNldE9yT3V0c2V0OjpJbnNldCk7Ci0j aWYgIUxPR19ESVNBQkxFRAotICAgIExPRyhTY3JvbGxpbmcsICJDb21wdXRpbmcgc2Nyb2xsIHNu YXAgb2Zmc2V0cyBpbiBzbmFwIHBvcnQ6ICVzIiwgc25hcFBvcnRPckFyZWFUb1N0cmluZyhzY3Jv bGxTbmFwUG9ydCkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICBMT0dfV0lUSF9TVFJFQU0o U2Nyb2xsU25hcCwgc3RyZWFtIDw8ICJDb21wdXRpbmcgc2Nyb2xsIHNuYXAgb2Zmc2V0cyBmb3Ig IiA8PCBzY3JvbGxhYmxlQXJlYSA8PCAiIGluIHNuYXAgcG9ydCAiIDw8IHNjcm9sbFNuYXBQb3J0 KTsKICAgICBmb3IgKGF1dG8qIGNoaWxkIDogc2Nyb2xsQ29udGFpbmVyLT52aWV3KCkuYm94ZXNX aXRoU2Nyb2xsU25hcFBvc2l0aW9ucygpKSB7CiAgICAgICAgIGlmIChjaGlsZC0+ZW5jbG9zaW5n U2Nyb2xsYWJsZUNvbnRhaW5lckZvclNuYXBwaW5nKCkgIT0gc2Nyb2xsQ29udGFpbmVyKQogICAg ICAgICAgICAgY29udGludWU7CkBAIC0yMzAsOSArMjA2LDcgQEAgdm9pZCB1cGRhdGVTbmFwT2Zm c2V0c0ZvclNjcm9sbGFibGVBcmVhKFNjcm9sbGFibGVBcmVhJiBzY3JvbGxhYmxlQXJlYSwgSFRN TEVsZW0KICAgICAgICAgYXV0byBzY3JvbGxTbmFwQXJlYSA9IExheW91dFJlY3QoY2hpbGQtPmxv Y2FsVG9Db250YWluZXJRdWFkKEZsb2F0UXVhZChjaGlsZC0+Ym9yZGVyQm91bmRpbmdCb3goKSks IHNjcm9sbGluZ0VsZW1lbnQucmVuZGVyQm94KCkpLmJvdW5kaW5nQm94KCkpOwogICAgICAgICBz Y3JvbGxTbmFwQXJlYS5tb3ZlQnkoY29udGFpbmVyU2Nyb2xsT2Zmc2V0KTsKICAgICAgICAgc2Ny b2xsU25hcEFyZWEgPSBjb21wdXRlU2Nyb2xsU25hcFBvcnRPckFyZWFSZWN0KHNjcm9sbFNuYXBB cmVhLCBjaGlsZC0+c3R5bGUoKS5zY3JvbGxTbmFwTWFyZ2luKCksIEluc2V0T3JPdXRzZXQ6Ok91 dHNldCk7Ci0jaWYgIUxPR19ESVNBQkxFRAotICAgICAgICBMT0coU2Nyb2xsaW5nLCAiICAgIENv bnNpZGVyaW5nIHNjcm9sbCBzbmFwIGFyZWE6ICVzIiwgc25hcFBvcnRPckFyZWFUb1N0cmluZyhz Y3JvbGxTbmFwQXJlYSkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgTE9HX1dJVEhf U1RSRUFNKFNjcm9sbFNuYXAsIHN0cmVhbSA8PCAiICAgIENvbnNpZGVyaW5nIHNjcm9sbCBzbmFw IHRhcmdldCBhcmVhICIgPDwgc2Nyb2xsU25hcEFyZWEpOwogICAgICAgICBhdXRvIGFsaWdubWVu dCA9IGNoaWxkLT5zdHlsZSgpLnNjcm9sbFNuYXBBbGlnbigpOwogICAgICAgICBpZiAoaGFzSG9y aXpvbnRhbFNuYXBPZmZzZXRzICYmIGFsaWdubWVudC54ICE9IFNjcm9sbFNuYXBBeGlzQWxpZ25U eXBlOjpOb25lKSB7CiAgICAgICAgICAgICBhdXRvIGFic29sdXRlU2Nyb2xsT2Zmc2V0ID0gY2xh bXBUbzxMYXlvdXRVbml0Pihjb21wdXRlU2Nyb2xsU25hcEFsaWduT2Zmc2V0KHNjcm9sbFNuYXBB cmVhLngoKSwgc2Nyb2xsU25hcEFyZWEud2lkdGgoKSwgYWxpZ25tZW50LngpIC0gY29tcHV0ZVNj cm9sbFNuYXBBbGlnbk9mZnNldChzY3JvbGxTbmFwUG9ydC54KCksIHNjcm9sbFNuYXBQb3J0Lndp ZHRoKCksIGFsaWdubWVudC54KSwgMCwgbWF4U2Nyb2xsTGVmdCk7CkBAIC0yNTIsMTAgKzIyNiw4 IEBAIHZvaWQgdXBkYXRlU25hcE9mZnNldHNGb3JTY3JvbGxhYmxlQXJlYShTY3JvbGxhYmxlQXJl YSYgc2Nyb2xsYWJsZUFyZWEsIEhUTUxFbGVtCiAKICAgICBpZiAoIWhvcml6b250YWxTbmFwT2Zm c2V0cy5pc0VtcHR5KCkpIHsKICAgICAgICAgYWRqdXN0QXhpc1NuYXBPZmZzZXRzRm9yU2Nyb2xs RXh0ZW50KGhvcml6b250YWxTbmFwT2Zmc2V0cywgbWF4U2Nyb2xsTGVmdCk7Ci0jaWYgIUxPR19E SVNBQkxFRAotICAgICAgICBMT0coU2Nyb2xsaW5nLCAiID0+IENvbXB1dGVkIGhvcml6b250YWwg c2Nyb2xsIHNuYXAgb2Zmc2V0czogJXMiLCBzbmFwT2Zmc2V0c1RvU3RyaW5nKGhvcml6b250YWxT bmFwT2Zmc2V0cykudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIExPRyhTY3JvbGxpbmcsICIgPT4g Q29tcHV0ZWQgaG9yaXpvbnRhbCBzY3JvbGwgc25hcCBvZmZzZXQgcmFuZ2VzOiAlcyIsIHNuYXBP ZmZzZXRSYW5nZXNUb1N0cmluZyhob3Jpem9udGFsU25hcE9mZnNldFJhbmdlcykudXRmOCgpLmRh dGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbFNuYXAsIHN0cmVh bSA8PCAiID0+IENvbXB1dGVkIGhvcml6b250YWwgc2Nyb2xsIHNuYXAgb2Zmc2V0czogIiA8PCBo b3Jpem9udGFsU25hcE9mZnNldHMpOworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsU25h cCwgc3RyZWFtIDw8ICIgPT4gQ29tcHV0ZWQgaG9yaXpvbnRhbCBzY3JvbGwgc25hcCBvZmZzZXQg cmFuZ2VzOiAiIDw8IGhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2VzKTsKICAgICAgICAgaWYgKHNj cm9sbFNuYXBUeXBlLnN0cmljdG5lc3MgPT0gU2Nyb2xsU25hcFN0cmljdG5lc3M6OlByb3hpbWl0 eSkKICAgICAgICAgICAgIGNvbXB1dGVBeGlzUHJveGltaXR5U25hcE9mZnNldFJhbmdlcyhob3Jp em9udGFsU25hcE9mZnNldHMsIGhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2VzLCBzY3JvbGxTbmFw UG9ydC53aWR0aCgpKTsKIApAQCAtMjY2LDEwICsyMzgsOCBAQCB2b2lkIHVwZGF0ZVNuYXBPZmZz ZXRzRm9yU2Nyb2xsYWJsZUFyZWEoU2Nyb2xsYWJsZUFyZWEmIHNjcm9sbGFibGVBcmVhLCBIVE1M RWxlbQogCiAgICAgaWYgKCF2ZXJ0aWNhbFNuYXBPZmZzZXRzLmlzRW1wdHkoKSkgewogICAgICAg ICBhZGp1c3RBeGlzU25hcE9mZnNldHNGb3JTY3JvbGxFeHRlbnQodmVydGljYWxTbmFwT2Zmc2V0 cywgbWF4U2Nyb2xsVG9wKTsKLSNpZiAhTE9HX0RJU0FCTEVECi0gICAgICAgIExPRyhTY3JvbGxp bmcsICIgPT4gQ29tcHV0ZWQgdmVydGljYWwgc2Nyb2xsIHNuYXAgb2Zmc2V0czogJXMiLCBzbmFw T2Zmc2V0c1RvU3RyaW5nKHZlcnRpY2FsU25hcE9mZnNldHMpLnV0ZjgoKS5kYXRhKCkpOwotICAg ICAgICBMT0coU2Nyb2xsaW5nLCAiID0+IENvbXB1dGVkIHZlcnRpY2FsIHNjcm9sbCBzbmFwIG9m ZnNldCByYW5nZXM6ICVzIiwgc25hcE9mZnNldFJhbmdlc1RvU3RyaW5nKHZlcnRpY2FsU25hcE9m ZnNldFJhbmdlcykudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgTE9HX1dJVEhfU1RS RUFNKFNjcm9sbFNuYXAsIHN0cmVhbSA8PCAiID0+IENvbXB1dGVkIHZlcnRpY2FsIHNjcm9sbCBz bmFwIG9mZnNldHM6ICIgPDwgdmVydGljYWxTbmFwT2Zmc2V0cyk7CisgICAgICAgIExPR19XSVRI X1NUUkVBTShTY3JvbGxTbmFwLCBzdHJlYW0gPDwgIiA9PiBDb21wdXRlZCB2ZXJ0aWNhbCBzY3Jv bGwgc25hcCBvZmZzZXQgcmFuZ2VzOiAiIDw8IHZlcnRpY2FsU25hcE9mZnNldFJhbmdlcyk7CiAg ICAgICAgIGlmIChzY3JvbGxTbmFwVHlwZS5zdHJpY3RuZXNzID09IFNjcm9sbFNuYXBTdHJpY3Ru ZXNzOjpQcm94aW1pdHkpCiAgICAgICAgICAgICBjb21wdXRlQXhpc1Byb3hpbWl0eVNuYXBPZmZz ZXRSYW5nZXModmVydGljYWxTbmFwT2Zmc2V0cywgdmVydGljYWxTbmFwT2Zmc2V0UmFuZ2VzLCBz Y3JvbGxTbmFwUG9ydC5oZWlnaHQoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaAppbmRl eCBkZmE3YWVhZWMxNzk2YzhmYTA0ZWMzOGM4ZjNmYmE0OTk2YzJlY2QwLi5lNjQ0MGEwNzVjYjky NTJkMzBhNDcwZWU4MTk3OWRlZTA0NjU2NTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5o CkBAIC05NCw2ICs5NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBNKFJlc291cmNlTG9h ZGluZykgXAogICAgIE0oUmVzb3VyY2VMb2FkT2JzZXJ2ZXIpIFwKICAgICBNKFJlc291cmNlTG9h ZFN0YXRpc3RpY3MpIFwKKyAgICBNKFNjcm9sbFNuYXApIFwKICAgICBNKFNjcm9sbGluZykgXAog ICAgIE0oU2Nyb2xsaW5nVHJlZSkgXAogICAgIE0oU2Nyb2xsTGF0Y2hpbmcpIFwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAppbmRleCAxM2E0YmQ5MGM5OTVkZDEz MmVlMGE1NjZiMjExMDNhMzc2YzA4NDE1Li40OTEyYWMzNjQ1NjE4MzljZTFkYzhlNmIxODA3Mjky ZWU0MjUwNjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxl QXJlYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3Bw CkBAIC01NzAsMTQgKzU3MCwxOCBAQCB2b2lkIFNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxT bmFwU3RhdGUoKQogICAgIGlmIChTY3JvbGxBbmltYXRvciogc2Nyb2xsQW5pbWF0b3IgPSBleGlz dGluZ1Njcm9sbEFuaW1hdG9yKCkpCiAgICAgICAgIHNjcm9sbEFuaW1hdG9yLT51cGRhdGVTY3Jv bGxTbmFwU3RhdGUoKTsKIAorICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxTbmFwLCBzdHJlYW0g PDwgKnRoaXMgPDwgIiB1cGRhdGVTY3JvbGxTbmFwU3RhdGU6IGlzU2Nyb2xsU25hcEluUHJvZ3Jl c3MgIiA8PCBpc1Njcm9sbFNuYXBJblByb2dyZXNzKCkpOworCiAgICAgaWYgKGlzU2Nyb2xsU25h cEluUHJvZ3Jlc3MoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgSW50UG9pbnQgY3VycmVudFBv c2l0aW9uID0gc2Nyb2xsUG9zaXRpb24oKTsKICAgICBJbnRQb2ludCBjb3JyZWN0ZWRQb3NpdGlv biA9IG5lYXJlc3RBY3RpdmVTbmFwUG9pbnQoY3VycmVudFBvc2l0aW9uKTsKLSAgICAKLSAgICBp ZiAoY29ycmVjdGVkUG9zaXRpb24gIT0gY3VycmVudFBvc2l0aW9uKQorCisgICAgaWYgKGNvcnJl Y3RlZFBvc2l0aW9uICE9IGN1cnJlbnRQb3NpdGlvbikgeworICAgICAgICBMT0dfV0lUSF9TVFJF QU0oU2Nyb2xsU25hcCwgc3RyZWFtIDw8ICIgYWRqdXN0aW5nIHBvc2l0aW9uIGZyb20gIiA8PCBj dXJyZW50UG9zaXRpb24gPDwgIiB0byAiIDw8IGNvcnJlY3RlZFBvc2l0aW9uKTsKICAgICAgICAg c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKGNvcnJlY3RlZFBvc2l0aW9uKTsKKyAgICB9 CiB9CiAjZWxzZQogdm9pZCBTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsU25hcFN0YXRlKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Njcm9sbENvbnRyb2xs ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9TY3JvbGxDb250cm9sbGVyLm1t CmluZGV4IDZmMmI0ZDlmZWFjOTBjMDU0MmEzMGQwZTUxNGViYWQxNjJlM2Q3YjMuLmQyNTVlZGFi MjljZDE5ODE0ZDNlYWQxNDIyOGVhZGNlMmQ1Y2Y5N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2NvY29hL1Njcm9sbENvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY29jb2EvU2Nyb2xsQ29udHJvbGxlci5tbQpAQCAtMjcsMTAgKzI3LDEyIEBA CiAjaW1wb3J0ICJTY3JvbGxDb250cm9sbGVyLmgiCiAKICNpbXBvcnQgIkxheW91dFNpemUuaCIK KyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2lt cG9ydCAiV2hlZWxFdmVudFRlc3RNb25pdG9yLmgiCiAjaW1wb3J0IDxzeXMvc3lzY3RsLmg+CiAj aW1wb3J0IDxzeXMvdGltZS5oPgorI2ltcG9ydCA8d3RmL3RleHQvVGV4dFN0cmVhbS5oPgogCiAj aWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKICNpbXBvcnQgIlNjcm9sbFNuYXBBbmltYXRvclN0 YXRlLmgiCkBAIC01NzcsNiArNTc5LDIzIEBAIHN0YXRpYyBpbmxpbmUgV2hlZWxFdmVudFN0YXR1 cyB0b1doZWVsRXZlbnRTdGF0dXMoUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2UgcGhhc2UsCiAgICAg cmV0dXJuIFdoZWVsRXZlbnRTdGF0dXM6OlVua25vd247CiB9CiAKKyNpZiAhTE9HX0RJU0FCTEVE CitzdGF0aWMgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgV2hlZWxFdmVu dFN0YXR1cyBzdGF0dXMpCit7CisgICAgc3dpdGNoIChzdGF0dXMpIHsKKyAgICBjYXNlIFdoZWVs RXZlbnRTdGF0dXM6OlVzZXJTY3JvbGxCZWdpbjogdHMgPDwgIlVzZXJTY3JvbGxCZWdpbiI7IGJy ZWFrOworICAgIGNhc2UgV2hlZWxFdmVudFN0YXR1czo6VXNlclNjcm9sbGluZzogdHMgPDwgIlVz ZXJTY3JvbGxpbmciOyBicmVhazsKKyAgICBjYXNlIFdoZWVsRXZlbnRTdGF0dXM6OlVzZXJTY3Jv bGxFbmQ6IHRzIDw8ICJVc2VyU2Nyb2xsRW5kIjsgYnJlYWs7CisgICAgY2FzZSBXaGVlbEV2ZW50 U3RhdHVzOjpJbmVydGlhbFNjcm9sbEJlZ2luOiB0cyA8PCAiSW5lcnRpYWxTY3JvbGxCZWdpbiI7 IGJyZWFrOworICAgIGNhc2UgV2hlZWxFdmVudFN0YXR1czo6SW5lcnRpYWxTY3JvbGxpbmc6IHRz IDw8ICJJbmVydGlhbFNjcm9sbGluZyI7IGJyZWFrOworICAgIGNhc2UgV2hlZWxFdmVudFN0YXR1 czo6SW5lcnRpYWxTY3JvbGxFbmQ6IHRzIDw8ICJJbmVydGlhbFNjcm9sbEVuZCI7IGJyZWFrOwor ICAgIGNhc2UgV2hlZWxFdmVudFN0YXR1czo6U3RhdGVsZXNzU2Nyb2xsRXZlbnQ6IHRzIDw8ICJT dGF0ZWxlc3NTY3JvbGxFdmVudCI7IGJyZWFrOworICAgIGNhc2UgV2hlZWxFdmVudFN0YXR1czo6 VW5rbm93bjogdHMgPDwgIlVua25vd24iOyBicmVhazsKKyAgICB9CisgICAgcmV0dXJuIHRzOwor fQorI2VuZGlmCisKIGJvb2wgU2Nyb2xsQ29udHJvbGxlcjo6c2hvdWxkT3ZlcnJpZGVJbmVydGlh bFNjcm9sbGluZygpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3Njcm9sbFNuYXBTdGF0ZSkKQEAgLTYz NCw2ICs2NTMsOSBAQCBib29sIFNjcm9sbENvbnRyb2xsZXI6OnByb2Nlc3NXaGVlbEV2ZW50Rm9y U2Nyb2xsU25hcChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmCiAgICAgICAgIHJldHVybiB0cnVl OwogCiAgICAgV2hlZWxFdmVudFN0YXR1cyBzdGF0dXMgPSB0b1doZWVsRXZlbnRTdGF0dXMod2hl ZWxFdmVudC5waGFzZSgpLCB3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKSk7CisKKyAgICBMT0df V0lUSF9TVFJFQU0oU2Nyb2xsU25hcCwgc3RyZWFtIDw8ICJTY3JvbGxDb250cm9sbGVyICIgPDwg dGhpcyA8PCAiIHByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsU25hcDogc3RhdHVzICIgPDwgc3Rh dHVzKTsKKwogICAgIGJvb2wgaXNJbmVydGlhbFNjcm9sbGluZyA9IGZhbHNlOwogICAgIHN3aXRj aCAoc3RhdHVzKSB7CiAgICAgY2FzZSBXaGVlbEV2ZW50U3RhdHVzOjpVc2VyU2Nyb2xsQmVnaW46 CkBAIC02NzIsNiArNjk0LDggQEAgdm9pZCBTY3JvbGxDb250cm9sbGVyOjpzdGFydFNjcm9sbFNu YXBUaW1lcigpCiAgICAgaWYgKG1fc2Nyb2xsU25hcFRpbWVyKQogICAgICAgICByZXR1cm47CiAK KyAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsU25hcCwgc3RyZWFtIDw8ICJTY3JvbGxDb250cm9s bGVyICIgPDwgdGhpcyA8PCAiIHN0YXJ0U2Nyb2xsU25hcFRpbWVyIChtYWluIHRocmVhZCAiIDw8 IGlzTWFpblRocmVhZCgpIDw8ICIpIik7CisKICAgICBzdGFydERlZmVycmluZ1doZWVsRXZlbnRU ZXN0Q29tcGxldGlvbkR1ZVRvU2Nyb2xsU25hcHBpbmcoKTsKICAgICBtX2NsaWVudC53aWxsU3Rh cnRTY3JvbGxTbmFwQW5pbWF0aW9uKCk7CiAgICAgbV9zY3JvbGxTbmFwVGltZXIgPSBtX2NsaWVu dC5jcmVhdGVUaW1lcihbdGhpc10gewpAQCAtNjg1LDYgKzcwOSw4IEBAIHZvaWQgU2Nyb2xsQ29u dHJvbGxlcjo6c3RvcFNjcm9sbFNuYXBUaW1lcigpCiAgICAgaWYgKCFtX3Njcm9sbFNuYXBUaW1l cikKICAgICAgICAgcmV0dXJuOwogCisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbFNuYXAsIHN0 cmVhbSA8PCAiU2Nyb2xsQ29udHJvbGxlciAiIDw8IHRoaXMgPDwgIiBzdG9wU2Nyb2xsU25hcFRp bWVyIChtYWluIHRocmVhZCAiIDw8IGlzTWFpblRocmVhZCgpIDw8ICIpIik7CisKICAgICBzdG9w RGVmZXJyaW5nV2hlZWxFdmVudFRlc3RDb21wbGV0aW9uRHVlVG9TY3JvbGxTbmFwcGluZygpOwog ICAgIG1fY2xpZW50LmRpZFN0b3BTY3JvbGxTbmFwQW5pbWF0aW9uKCk7CiAKQEAgLTcwMiw2ICs3 MjgsOSBAQCB2b2lkIFNjcm9sbENvbnRyb2xsZXI6OnNjcm9sbFNuYXBUaW1lckZpcmVkKCkKICAg ICBib29sIGlzQW5pbWF0aW9uQ29tcGxldGU7CiAgICAgYXV0byBhbmltYXRpb25PZmZzZXQgPSBt X3Njcm9sbFNuYXBTdGF0ZS0+Y3VycmVudEFuaW1hdGVkU2Nyb2xsT2Zmc2V0KGlzQW5pbWF0aW9u Q29tcGxldGUpOwogICAgIGF1dG8gY3VycmVudE9mZnNldCA9IG1fY2xpZW50LnNjcm9sbE9mZnNl dCgpOworCisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbFNuYXAsIHN0cmVhbSA8PCAiU2Nyb2xs Q29udHJvbGxlciAiIDw8IHRoaXMgPDwgIiBzY3JvbGxTbmFwVGltZXJGaXJlZCAtIGlzQW5pbWF0 aW9uQ29tcGxldGUgIiA8PCBpc0FuaW1hdGlvbkNvbXBsZXRlIDw8ICIgY3VycmVudE9mZnNldCAi IDw8IGN1cnJlbnRPZmZzZXQgPDwgIiAobWFpbiB0aHJlYWQgIiA8PCBpc01haW5UaHJlYWQoKSA8 PCAiKSIpOworCiAgICAgbV9jbGllbnQuaW1tZWRpYXRlU2Nyb2xsQnlXaXRob3V0Q29udGVudEVk Z2VDb25zdHJhaW50cyhGbG9hdFNpemUoYW5pbWF0aW9uT2Zmc2V0LngoKSAtIGN1cnJlbnRPZmZz ZXQueCgpLCBhbmltYXRpb25PZmZzZXQueSgpIC0gY3VycmVudE9mZnNldC55KCkpKTsKICAgICBp ZiAoaXNBbmltYXRpb25Db21wbGV0ZSkgewogICAgICAgICBtX3Njcm9sbFNuYXBTdGF0ZS0+dHJh bnNpdGlvblRvRGVzdGluYXRpb25SZWFjaGVkU3RhdGUoKTsKQEAgLTcyNyw2ICs3NTYsOCBAQCB2 b2lkIFNjcm9sbENvbnRyb2xsZXI6OnVwZGF0ZVNjcm9sbFNuYXBTdGF0ZShjb25zdCBTY3JvbGxh YmxlQXJlYSYgc2Nyb2xsYWJsZUFyZQogICAgICAgICAgICAgdXBkYXRlU2Nyb2xsU25hcFBvaW50 cyhTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsLCAqc25hcE9mZnNldHMsIHsgfSk7CiAgICAgfSBl bHNlCiAgICAgICAgIHVwZGF0ZVNjcm9sbFNuYXBQb2ludHMoU2Nyb2xsRXZlbnRBeGlzOjpWZXJ0 aWNhbCwgeyB9LCB7IH0pOworCisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbFNuYXAsIHN0cmVh bSA8PCAiU2Nyb2xsQ29udHJvbGxlciAiIDw8IHRoaXMgPDwgIiB1cGRhdGVTY3JvbGxTbmFwU3Rh dGUgZm9yICIgPDwgc2Nyb2xsYWJsZUFyZWEgPDwgIiBuZXcgc3RhdGUgIiA8PCBWYWx1ZU9yTnVs bChtX3Njcm9sbFNuYXBTdGF0ZS5nZXQoKSkpOwogfQogCiB2b2lkIFNjcm9sbENvbnRyb2xsZXI6 OnVwZGF0ZVNjcm9sbFNuYXBQb2ludHMoU2Nyb2xsRXZlbnRBeGlzIGF4aXMsIGNvbnN0IFZlY3Rv cjxMYXlvdXRVbml0PiYgc25hcFBvaW50cywgY29uc3QgVmVjdG9yPFNjcm9sbE9mZnNldFJhbmdl PExheW91dFVuaXQ+PiYgc25hcFJhbmdlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2NvY29hL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jb2NvYS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5oCmluZGV4IDFjMzhkZGE4ZGM0 ZDQyNWU4NDBkYjBkNDkzMzkyOTU0YTk1NmJiZDAuLjBiY2U2YjhjNDdhY2ZiMzFlZDc2NWJiOTg2 MDkxMGFjZGUyYWFkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29h L1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y29jb2EvU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuaApAQCAtMjMsOCArMjMsNyBAQAogICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgU2Nyb2xsU25hcEFu aW1hdG9yU3RhdGVfaAotI2RlZmluZSBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZV9oCisjcHJhZ21h IG9uY2UKIAogI2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCiAKQEAgLTM4LDYgKzM3LDEwIEBA CiAjaW5jbHVkZSAiU2Nyb2xsaW5nTW9tZW50dW1DYWxjdWxhdG9yLmgiCiAjaW5jbHVkZSA8d3Rm L01vbm90b25pY1RpbWUuaD4KIAorbmFtZXNwYWNlIFdURiB7CitjbGFzcyBUZXh0U3RyZWFtOwor fQorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGVudW0gY2xhc3MgU2Nyb2xsU25hcFN0YXRlIHsK QEAgLTExMiw4ICsxMTUsOCBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxTY3JvbGxp bmdNb21lbnR1bUNhbGN1bGF0b3I+IG1fbW9tZW50dW1DYWxjdWxhdG9yOwogfTsKIAorV1RGOjpU ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IFNjcm9sbFNuYXBB bmltYXRvclN0YXRlJik7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVO QUJMRShDU1NfU0NST0xMX1NOQVApCi0KLSNlbmRpZiAvLyBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0 ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9TY3JvbGxTbmFw QW5pbWF0b3JTdGF0ZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Njcm9sbFNu YXBBbmltYXRvclN0YXRlLm1tCmluZGV4IDc0YjQ5YzdhNWQ3NGYzMjBiZjg2ZmFjNDI3YzQ5MDVh N2E3MjFiNDEuLjlmNGQ2NGFmZmI0N2FkNTAyMzZlYTQyNWI5MzUwODU0ZDc2ZjA4MzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Njcm9sbFNuYXBBbmltYXRvclN0 YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Njcm9sbFNuYXBBbmlt YXRvclN0YXRlLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05B UCkKIAogI2ltcG9ydCA8d3RmL01hdGhFeHRyYXMuaD4KKyNpbXBvcnQgPHd0Zi90ZXh0L1RleHRT dHJlYW0uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMDMsNyArMTA0LDMwIEBAIGZs b2F0IFNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNldChj b25zdCBWZWN0b3I8TGF5b3V0VW5pCiAgICAgdGFyZ2V0T2Zmc2V0ID0gY2xhbXBUbzxmbG9hdD4o dGFyZ2V0T2Zmc2V0LCBtaW5pbXVtVGFyZ2V0T2Zmc2V0LCBtYXhpbXVtVGFyZ2V0T2Zmc2V0KTsK ICAgICByZXR1cm4gcGFnZVNjYWxlICogdGFyZ2V0T2Zmc2V0OwogfQotICAgIAorCit0ZW1wbGF0 ZTx0eXBlbmFtZSBUPgorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29u c3QgU2Nyb2xsT2Zmc2V0UmFuZ2U8VD4mIHJhbmdlKQoreworICAgIHRzIDw8ICJzdGFydDogIiA8 PCByYW5nZS5zdGFydCA8PCAiIGVuZDogIiA8PCByYW5nZS5lbmQ7CisgICAgcmV0dXJuIHRzOwor fQorCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBTY3JvbGxT bmFwQW5pbWF0b3JTdGF0ZSYgc3RhdGUpCit7CisgICAgdHMgPDwgIlNjcm9sbFNuYXBBbmltYXRv clN0YXRlIjsKKyAgICB0cy5kdW1wUHJvcGVydHkoInNuYXAgb2Zmc2V0cyB4Iiwgc3RhdGUuc25h cE9mZnNldHNGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCkpOworICAgIHRzLmR1 bXBQcm9wZXJ0eSgic25hcCBvZmZzZXRzIHkiLCBzdGF0ZS5zbmFwT2Zmc2V0c0ZvckF4aXMoU2Ny b2xsRXZlbnRBeGlzOjpWZXJ0aWNhbCkpOworICAgIGlmICghc3RhdGUuc25hcE9mZnNldFJhbmdl c0ZvckF4aXMoU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFsKS5pc0VtcHR5KCkpCisgICAgICAg IHRzLmR1bXBQcm9wZXJ0eSgic25hcCBvZmZzZXRzIHJhbmdlcyB4Iiwgc3RhdGUuc25hcE9mZnNl dFJhbmdlc0ZvckF4aXMoU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFsKSk7CisgICAgaWYgKCFz dGF0ZS5zbmFwT2Zmc2V0UmFuZ2VzRm9yQXhpcyhTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsKS5p c0VtcHR5KCkpCisgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgic25hcCBvZmZzZXRzIHJhbmdlcyB4 Iiwgc3RhdGUuc25hcE9mZnNldFJhbmdlc0ZvckF4aXMoU2Nyb2xsRXZlbnRBeGlzOjpWZXJ0aWNh bCkpOworCisgICAgdHMuZHVtcFByb3BlcnR5KCJhY3RpdmUgc25hcCBpbmRleCB4Iiwgc3RhdGUu YWN0aXZlU25hcEluZGV4Rm9yQXhpcyhTY3JvbGxFdmVudEF4aXM6Okhvcml6b250YWwpKTsKKyAg ICB0cy5kdW1wUHJvcGVydHkoImFjdGl2ZSBzbmFwIGluZGV4IHkiLCBzdGF0ZS5hY3RpdmVTbmFw SW5kZXhGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwpKTsKKworICAgIHJldHVybiB0 czsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gQ1NTX1NDUk9MTF9T TkFQCg==