169455 2017-03-09 16:16:18 -0800 Only consider autoplay interference in the first 10 seconds of playback 2017-03-09 16:46:42 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrajca webkit-unassigned oldest_to_newest 1285663 0 mrajca 2017-03-09 16:16:18 -0800 Only send autoplay interference events in the first 10 seconds of automatic media playback. 1285666 1 304006 mrajca 2017-03-09 16:24:43 -0800 Created attachment 304006 Patch 1285690 2 mrajca 2017-03-09 16:46:42 -0800 r213687 304006 2017-03-09 16:24:43 -0800 2017-03-09 16:29:43 -0800 Patch bug-169455-20170309162442.patch text/plain 9858 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM1YzE0YzlhYzMxZWIz NmQzYTg3MDgyZWU5NzE5YTI1ZDc4YzliMS4uNjdmMzg1OGEzZTZmYmJmMWI0Mzk0OTJhZjUyMGIz MjZjZjM3ODU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTAzLTA5ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBPbmx5IGNvbnNpZGVyIGF1dG9w bGF5IGludGVyZmVyZW5jZSBpbiB0aGUgZmlyc3QgMTAgc2Vjb25kcyBvZiBwbGF5YmFjay4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTQ1NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZSBtZWRp YSBkdXJhdGlvbiBpcyByZWxhdGl2ZWx5IGxvbmcsIHNheSwgMTAgbWludXRlcywgYW5kIHlvdSBw YXVzZSA1IG1pbnV0ZXMgaW4sIHRoYXQncworICAgICAgICBwcm9iYWJseSBub3QgYSBzdHJvbmcg aW5kaWNhdGlvbiB1c2VycyBtYXkgbm90IHdhbnQgYXV0by1wbGF5LiBUaGlzIHBhdGNoIGxpbWl0 cyBpbnRlcmZlcmVuY2UKKyAgICAgICAgZXZlbnRzIHRvIHRoZSBmaXJzdCAxMCBzZWNvbmRzIG9m IGF1dG9tYXRpYyBwbGF5YmFjay4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRSZWFkeVN0YXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBsYXkpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGxheUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OnBhdXNlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhRWxlbWVudDo6c2V0TXV0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJUaW1lQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50OjpzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRpYVBsYXllcik6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1c2VyRGlkSW50ZXJmZXJlV2l0aEF1dG9wbGF5KToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFBsYXliYWNrV2l0aG91dFVz ZXJHZXN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VNdXRl ZFN0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKwog MjAxNy0wMy0wOSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMjEzNjI4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggNTIzYzJlNWYzMDQ3ZTI1Mjk5NjRjNjdjNWJkMDc3 MjVmNTkzZmU3Yi4uNWRmOGI4ZGU0ZmYxYWFjNzNiZTYwMjQyNGFmMDkwMzlhNDY2YzgzYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0yNDQwLDEyICsyNDQw LDEyIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZShNZWRpYVBsYXllcjo6 UmVhZHlTdGF0ZSBzdGF0ZSkKICAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKICAgICAgICAgICAgIG1f cGF1c2VkID0gZmFsc2U7CiAgICAgICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkVGltZSgpOwotICAg ICAgICAgICAgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9IFBsYXliYWNrV2l0aG91dFVz ZXJHZXN0dXJlOjpTdGFydGVkOworICAgICAgICAgICAgc2V0UGxheWJhY2tXaXRob3V0VXNlckdl c3R1cmUoUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6OlN0YXJ0ZWQpOwogICAgICAgICAgICAg bV9wbGF5YmFja1N0YXJ0ZWRUaW1lID0gY3VycmVudE1lZGlhVGltZSgpLnRvRG91YmxlKCk7CiAg ICAgICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5wbGF5RXZlbnQpOwogICAgICAg ICAgICAgc2NoZWR1bGVOb3RpZnlBYm91dFBsYXlpbmcoKTsKICAgICAgICAgfSBlbHNlIGlmIChz dWNjZXNzLnZhbHVlKCkgPT0gTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVS ZXF1aXJlZCkgewotICAgICAgICAgICAgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9IFBs YXliYWNrV2l0aG91dFVzZXJHZXN0dXJlOjpQcmV2ZW50ZWQ7CisgICAgICAgICAgICBzZXRQbGF5 YmFja1dpdGhvdXRVc2VyR2VzdHVyZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6UHJldmVu dGVkKTsKICAgICAgICAgICAgIGRpc3BhdGNoUGxheVBhdXNlRXZlbnRzSWZOZWVkc1F1aXJrcygp OwogCiAgICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKQpAQCAt MzEzMCw3ICszMTMwLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwbGF5KERPTVByb21pc2U8 dm9pZD4mJiBwcm9taXNlKQogICAgIGF1dG8gc3VjY2VzcyA9IG1fbWVkaWFTZXNzaW9uLT5wbGF5 YmFja1Blcm1pdHRlZCgqdGhpcyk7CiAgICAgaWYgKCFzdWNjZXNzKSB7CiAgICAgICAgIGlmIChz dWNjZXNzLnZhbHVlKCkgPT0gTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1cmVS ZXF1aXJlZCkgewotICAgICAgICAgICAgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9IFBs YXliYWNrV2l0aG91dFVzZXJHZXN0dXJlOjpQcmV2ZW50ZWQ7CisgICAgICAgICAgICBzZXRQbGF5 YmFja1dpdGhvdXRVc2VyR2VzdHVyZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6UHJldmVu dGVkKTsKICAgICAgICAgICAgIGRpc3BhdGNoUGxheVBhdXNlRXZlbnRzSWZOZWVkc1F1aXJrcygp OwogCiAgICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKQpAQCAt MzE2Myw3ICszMTYzLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwbGF5KCkKICAgICBhdXRv IHN1Y2Nlc3MgPSBtX21lZGlhU2Vzc2lvbi0+cGxheWJhY2tQZXJtaXR0ZWQoKnRoaXMpOwogICAg IGlmICghc3VjY2VzcykgewogICAgICAgICBpZiAoc3VjY2Vzcy52YWx1ZSgpID09IE1lZGlhUGxh eWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJlUmVxdWlyZWQpIHsKLSAgICAgICAgICAgIG1f cGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUgPSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6 UHJldmVudGVkOworICAgICAgICAgICAgc2V0UGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUoUGxh eWJhY2tXaXRob3V0VXNlckdlc3R1cmU6OlByZXZlbnRlZCk7CiAgICAgICAgICAgICBkaXNwYXRj aFBsYXlQYXVzZUV2ZW50c0lmTmVlZHNRdWlya3MoKTsKIAogICAgICAgICAgICAgaWYgKFBhZ2Uq IHBhZ2UgPSBkb2N1bWVudCgpLnBhZ2UoKSkKQEAgLTMyMzksMTAgKzMyMzksMTAgQEAgYm9vbCBI VE1MTWVkaWFFbGVtZW50OjpwbGF5SW50ZXJuYWwoKQogICAgICAgICBpZiAobV9wbGF5YmFja1dp dGhvdXRVc2VyR2VzdHVyZSA9PSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6UHJldmVudGVk KSB7CiAgICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKQogICAg ICAgICAgICAgICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmhhbmRsZUF1dG9wbGF5RXZlbnQo QXV0b3BsYXlFdmVudDo6RGlkUGxheU1lZGlhUHJldmVudGVkRnJvbVBsYXlpbmcpOwotICAgICAg ICAgICAgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9IFBsYXliYWNrV2l0aG91dFVzZXJH ZXN0dXJlOjpOb25lOworICAgICAgICAgICAgc2V0UGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUo UGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6Ok5vbmUpOwogICAgICAgICB9CiAgICAgfSBlbHNl Ci0gICAgICAgIG1fcGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUgPSBQbGF5YmFja1dpdGhvdXRV c2VyR2VzdHVyZTo6U3RhcnRlZDsKKyAgICAgICAgc2V0UGxheWJhY2tXaXRob3V0VXNlckdlc3R1 cmUoUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6OlN0YXJ0ZWQpOwogCiAgICAgbV9hdXRvcGxh eWluZyA9IGZhbHNlOwogICAgIHVwZGF0ZVBsYXlTdGF0ZSgpOwpAQCAtMzI4NCwxMiArMzI4NCwx MCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnBhdXNlSW50ZXJuYWwoKQogCiAgICAgbV9hdXRv cGxheWluZyA9IGZhbHNlOwogCi0gICAgaWYgKFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdV c2VyR2VzdHVyZUZvck1lZGlhKCkgJiYgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9PSBQ bGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6U3RhcnRlZCkgewotICAgICAgICBpZiAoUGFnZSog cGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKQotICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xp ZW50KCkuaGFuZGxlQXV0b3BsYXlFdmVudChBdXRvcGxheUV2ZW50OjpVc2VyRGlkSW50ZXJmZXJl V2l0aFBsYXliYWNrKTsKLSAgICB9CisgICAgaWYgKFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3Np bmdVc2VyR2VzdHVyZUZvck1lZGlhKCkpCisgICAgICAgIHVzZXJEaWRJbnRlcmZlcmVXaXRoQXV0 b3BsYXkoKTsKIAotICAgIG1fcGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUgPSBQbGF5YmFja1dp dGhvdXRVc2VyR2VzdHVyZTo6Tm9uZTsKKyAgICBzZXRQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVy ZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6Tm9uZSk7CiAKICAgICBpZiAoIW1fcGF1c2Vk KSB7CiAgICAgICAgIG1fcGF1c2VkID0gdHJ1ZTsKQEAgLTMzODYsMTQgKzMzODQsOCBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnNldE11dGVkKGJvb2wgbXV0ZWQpCiAgICAgICAgIGlmIChTY3Jp cHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmVGb3JNZWRpYSgpKSB7CiAgICAgICAg ICAgICByZW1vdmVCZWhhdmlvcnNSZXN0cmljdGlvbnNBZnRlckZpcnN0VXNlckdlc3R1cmUoTWVk aWFFbGVtZW50U2Vzc2lvbjo6QWxsUmVzdHJpY3Rpb25zICYgfk1lZGlhRWxlbWVudFNlc3Npb246 OlJlcXVpcmVVc2VyR2VzdHVyZVRvQ29udHJvbENvbnRyb2xzTWFuYWdlcik7CiAKLSAgICAgICAg ICAgIGlmIChoYXNBdWRpbygpICYmIG1fbXV0ZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9w bGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9PSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6 U3RhcnRlZCkgewotICAgICAgICAgICAgICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50 KCkucGFnZSgpKQotICAgICAgICAgICAgICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50 KCkuaGFuZGxlQXV0b3BsYXlFdmVudChBdXRvcGxheUV2ZW50OjpVc2VyRGlkSW50ZXJmZXJlV2l0 aFBsYXliYWNrKTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBtX3BsYXli YWNrV2l0aG91dFVzZXJHZXN0dXJlID0gUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6Ok5vbmU7 Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoaGFzQXVkaW8oKSAmJiBtX211dGVkKQor ICAgICAgICAgICAgICAgIHVzZXJEaWRJbnRlcmZlcmVXaXRoQXV0b3BsYXkoKTsKICAgICAgICAg fQogCiAgICAgICAgIC8vIEF2b2lkIHJlY3Vyc2lvbiB3aGVuIHRoZSBwbGF5ZXIgcmVwb3J0cyB2 b2x1bWUgY2hhbmdlcy4KQEAgLTQ0NTQsNyArNDQ0Niw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6bWVkaWFQbGF5ZXJUaW1lQ2hhbmdlZChNZWRpYVBsYXllciopCiAgICAgICAgICAgICAgICAg ICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCkpCiAgICAgICAgICAgICAgICAg ICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5oYW5kbGVBdXRvcGxheUV2ZW50KEF1dG9w bGF5RXZlbnQ6OkRpZEVuZE1lZGlhUGxheWJhY2tXaXRob3V0VXNlckludGVyZmVyZW5jZSk7CiAg ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIG1fcGxheWJhY2tXaXRob3V0VXNlckdl c3R1cmUgPSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6Tm9uZTsKKyAgICAgICAgICAgICAg ICBzZXRQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVy ZTo6Tm9uZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBJZiB0aGUgbWVkaWEgZWxl bWVudCBoYXMgYSBjdXJyZW50IG1lZGlhIGNvbnRyb2xsZXIsIHRoZW4gcmVwb3J0IHRoZSBjb250 cm9sbGVyIHN0YXRlCiAgICAgICAgICAgICAvLyBmb3IgdGhlIG1lZGlhIGVsZW1lbnQncyBjdXJy ZW50IG1lZGlhIGNvbnRyb2xsZXIuCkBAIC01MjIzLDcgKzUyMTUsNyBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnN0b3BXaXRob3V0RGVzdHJveWluZ01lZGlhUGxheWVyKCkKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CiAgICAgfQotICAgIG1fcGxheWJhY2tXaXRob3V0VXNlckdlc3R1 cmUgPSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6Tm9uZTsKKyAgICBzZXRQbGF5YmFja1dp dGhvdXRVc2VyR2VzdHVyZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6Tm9uZSk7CiAKICAg ICB1c2VyQ2FuY2VsbGVkTG9hZCgpOwogCkBAIC03MTQ2LDE5ICs3MTM4LDQzIEBAIE1lZGlhUHJv ZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKCkgY29u c3QKICAgICByZXR1cm4gc3RhdGU7CiB9CiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXNlckRp ZEludGVyZmVyZVdpdGhBdXRvcGxheSgpCit7CisgICAgaWYgKG1fcGxheWJhY2tXaXRob3V0VXNl ckdlc3R1cmUgIT0gUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6OlN0YXJ0ZWQpCisgICAgICAg IHJldHVybjsKKworICAgIC8vIE9ubHkgY29uc2lkZXIgaW50ZXJmZXJlbmNlIGluIHRoZSBmaXJz dCAxMCBzZWNvbmRzIG9mIGF1dG9tYXRpYyBwbGF5YmFjay4KKyAgICBpZiAoY3VycmVudFRpbWUo KSAtIG1fcGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmVTdGFydGVkVGltZS0+dG9Eb3VibGUoKSA+ IDEwKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCku cGFnZSgpKQorICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5oYW5kbGVBdXRvcGxheUV2 ZW50KEF1dG9wbGF5RXZlbnQ6OlVzZXJEaWRJbnRlcmZlcmVXaXRoUGxheWJhY2spOworCisgICAg c2V0UGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUoUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmU6 Ok5vbmUpOworfQorCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFBsYXliYWNrV2l0aG91dFVz ZXJHZXN0dXJlKFBsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlIHBsYXliYWNrV2l0aG91dFVzZXJH ZXN0dXJlKQoreworICAgIG1fcGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUgPSBwbGF5YmFja1dp dGhvdXRVc2VyR2VzdHVyZTsKKworICAgIHN3aXRjaCAocGxheWJhY2tXaXRob3V0VXNlckdlc3R1 cmUpIHsKKyAgICBjYXNlIFBsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlOjpTdGFydGVkOgorICAg ICAgICBtX3BsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlU3RhcnRlZFRpbWUgPSBjdXJyZW50TWVk aWFUaW1lKCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUGxheWJhY2tXaXRob3V0VXNlckdl c3R1cmU6Ok5vbmU6CisgICAgY2FzZSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6UHJldmVu dGVkOgorICAgICAgICBtX3BsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlU3RhcnRlZFRpbWUgPSBz dGQ6Om51bGxvcHQ7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwogdm9pZCBIVE1MTWVkaWFF bGVtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpCiB7CiAgICAgdXBkYXRlVm9sdW1lKCk7 CiAKICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKSB7Ci0gICAgICAgIGlm IChoYXNBdWRpbygpICYmICFtdXRlZCgpICYmIHBhZ2UtPmlzQXVkaW9NdXRlZCgpKSB7Ci0gICAg ICAgICAgICBpZiAobV9wbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSA9PSBQbGF5YmFja1dpdGhv dXRVc2VyR2VzdHVyZTo6U3RhcnRlZCkgewotICAgICAgICAgICAgICAgIGlmIChQYWdlKiBwYWdl ID0gZG9jdW1lbnQoKS5wYWdlKCkpCi0gICAgICAgICAgICAgICAgICAgIHBhZ2UtPmNocm9tZSgp LmNsaWVudCgpLmhhbmRsZUF1dG9wbGF5RXZlbnQoQXV0b3BsYXlFdmVudDo6VXNlckRpZEludGVy ZmVyZVdpdGhQbGF5YmFjayk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1fcGxheWJh Y2tXaXRob3V0VXNlckdlc3R1cmUgPSBQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZTo6Tm9uZTsK LSAgICAgICAgfQorICAgICAgICBpZiAoaGFzQXVkaW8oKSAmJiAhbXV0ZWQoKSAmJiBwYWdlLT5p c0F1ZGlvTXV0ZWQoKSkKKyAgICAgICAgICAgIHVzZXJEaWRJbnRlcmZlcmVXaXRoQXV0b3BsYXko KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXgg NTQ4ZTk0MTMyYTBhOTVlY2Y0YjI4Nzk0ODQ0YjhiNTliYWIxYTMxMS4uNGY0ZWQxM2NlMjM2MWJj YTZiN2QxMTYyNTYwMmRjZTVlZmNlYzc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmgKQEAgLTczMyw2ICs3MzMsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNo UGxheVBhdXNlRXZlbnRzSWZOZWVkc1F1aXJrcygpOwogICAgIFN1Y2Nlc3NPcjxNZWRpYVBsYXli YWNrRGVuaWFsUmVhc29uPiBjYW5UcmFuc2l0aW9uRnJvbUF1dG9wbGF5VG9QbGF5KCkgY29uc3Q7 CiAKKyAgICBlbnVtIGNsYXNzIFBsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlIHsgTm9uZSwgU3Rh cnRlZCwgUHJldmVudGVkIH07CisgICAgdm9pZCBzZXRQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVy ZShQbGF5YmFja1dpdGhvdXRVc2VyR2VzdHVyZSk7CisgICAgdm9pZCB1c2VyRGlkSW50ZXJmZXJl V2l0aEF1dG9wbGF5KCk7CisKICAgICBNZWRpYVRpbWUgbWluVGltZVNlZWthYmxlKCkgY29uc3Q7 CiAgICAgTWVkaWFUaW1lIG1heFRpbWVTZWVrYWJsZSgpIGNvbnN0OwogCkBAIC05OTMsOCArOTk3 LDggQEAgcHJpdmF0ZToKICAgICBib29sIG1faGF2ZVZpc2libGVUZXh0VHJhY2sgOiAxOwogICAg IGJvb2wgbV9wcm9jZXNzaW5nUHJlZmVyZW5jZUNoYW5nZSA6IDE7CiAKLSAgICBlbnVtIGNsYXNz IFBsYXliYWNrV2l0aG91dFVzZXJHZXN0dXJlIHsgTm9uZSwgU3RhcnRlZCwgUHJldmVudGVkIH07 CiAgICAgUGxheWJhY2tXaXRob3V0VXNlckdlc3R1cmUgbV9wbGF5YmFja1dpdGhvdXRVc2VyR2Vz dHVyZTsKKyAgICBzdGQ6Om9wdGlvbmFsPE1lZGlhVGltZT4gbV9wbGF5YmFja1dpdGhvdXRVc2Vy R2VzdHVyZVN0YXJ0ZWRUaW1lOwogCiAgICAgU3RyaW5nIG1fc3VidGl0bGVUcmFja0xhbmd1YWdl OwogICAgIE1lZGlhVGltZSBtX2xhc3RUZXh0VHJhY2tVcGRhdGVUaW1lIHsgLTEsIDEgfTsK