163402 2016-10-13 14:20:47 -0700 [Mac] Allow throttling of background tabs that have media elements with no audible audio 2016-10-14 07:58:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough commit-queue eric.carlson jer.noble jonlee oldest_to_newest 1239944 0 cdumez 2016-10-13 14:20:47 -0700 Allow throttling of background tabs that have media elements with no audible audio. We currently take an media assertion from the PageThrottler as soon as there is a media element playing on the page. This prevents throttling of background tabs even if those media elements have no audible audio, which is unfortunate. 1239945 1 cdumez 2016-10-13 14:20:57 -0700 <rdar://problem/28056151> 1239968 2 291523 cdumez 2016-10-13 15:04:05 -0700 Created attachment 291523 Patch 1239973 3 291525 cdumez 2016-10-13 15:12:39 -0700 Created attachment 291525 Patch 1240267 4 291525 commit-queue 2016-10-14 07:58:43 -0700 Comment on attachment 291525 Patch Clearing flags on attachment: 291525 Committed r207338: <http://trac.webkit.org/changeset/207338> 1240268 5 commit-queue 2016-10-14 07:58:47 -0700 All reviewed patches have been landed. Closing bug. 291523 2016-10-13 15:04:05 -0700 2016-10-13 15:12:35 -0700 Patch bug-163402-20161013150039.patch text/plain 5722 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQzZTlmZDQyMGE3Yjlh YWUzMjI4ZWRlMTA1MDUzMmQ2MDRmODcyNC4uNWQ3YWNkY2E4NjA2NTU3M2IyMzU4NzQ2ODZjZDBj NGFkNzk3YTNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE2LTEwLTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW01hY10gQWxsb3cgdGhyb3R0 bGluZyBvZiBiYWNrZ3JvdW5kIHRhYnMgdGhhdCBoYXZlIG1lZGlhIGVsZW1lbnRzIHdpdGggbm8g YXVkaWJsZSBhdWRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTYzNDAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODA1NjE1MT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aHJvdHRsaW5n IG9mIGJhY2tncm91bmQgdGFicyB0aGF0IGhhdmUgbWVkaWEgZWxlbWVudHMgd2l0aCBubyBhdWRp YmxlIGF1ZGlvLgorICAgICAgICBXZSB3ZXJlIHRha2luZyBhbiBtZWRpYSBhc3NlcnRpb24gZnJv bSB0aGUgUGFnZVRocm90dGxlciBhcyBzb29uIGFzIHRoZXJlIHdhcyBhCisgICAgICAgIG1lZGlh IGVsZW1lbnQgcGxheWluZyBvbiB0aGUgcGFnZS4gVGhpcyBwcmV2ZW50ZWQgdGhyb3R0bGluZyBv ZiBiYWNrZ3JvdW5kIHRhYnMKKyAgICAgICAgZXZlbiBpZiB0aG9zZSBtZWRpYSBlbGVtZW50cyBo YWQgbm8gYXVkaWJsZSBhdWRpbywgd2hpY2ggd2FzIHVuZm9ydHVuYXRlLgorCisgICAgICAgIFdl IG5vdyBoYXZlIG1vcmUgZmluZS1ncmFpbmVkIHJ1bGVzIGZvciB3aGVuIEhUTUxNZWRpYUVsZW1l bnQgc2hvdWxkIHRha2UgYW4KKyAgICAgICAgYXNzZXJ0aW9uLiBJIGFsc28gYWRkZWQgcmVsZWFz ZSBsb2dnaW5nIHRvIGhlbHAgZGVidWcgc3VjaCBpc3N1ZXMgaW4gdGhlCisgICAgICAgIGZ1dHVy ZS4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRNdXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVWb2x1bWUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OnVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhRWxlbWVudDo6ZWZmZWN0aXZlTXV0ZWQpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwv SFRNTE1lZGlhRWxlbWVudC5oOgorCisyMDE2LTEwLTEzICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKICAgICAgICAgUmVuYW1lIFtDb25zdHJ1Y3RvclRlbXBsYXRlPSpdIHRvIFtM ZWdhY3lDb25zdHJ1Y3RvclRlbXBsYXRlPSpdCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMzOTAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKaW5kZXggYzU1OWRjNGIzZWY1NGE4NmU3MDFiZjllZGJlOGVkNjk2Nzc4N2I1 NS4uNjkwNTUwNmM0MjBkNTFmMzQ2MDQ2NzYwYmUyNWYyZGM3NTE2NDUxYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0zMzMzLDYgKzMzMzMsNyBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnNldE11dGVkKGJvb2wgbXV0ZWQpCiAgICAgfQogCiAgICAgc2No ZWR1bGVVcGRhdGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigpOworICAgIHVwZGF0ZUF1ZGlvQXNz ZXJ0aW9uU3RhdGUoKTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp0b2dnbGVQbGF5U3Rh dGUoKQpAQCAtNDg1Miw2ICs0ODUzLDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVW b2x1bWUoKQogICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkpCiAgICAgICAgIG1lZGlhQ29udHJv bHMoKS0+Y2hhbmdlZFZvbHVtZSgpOwogI2VuZGlmCisKKyAgICB1cGRhdGVBdWRpb0Fzc2VydGlv blN0YXRlKCk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKFVw ZGF0ZVN0YXRlIHVwZGF0ZVN0YXRlKQpAQCAtNDg3MSw3ICs0ODc0LDcgQEAgdm9pZCBIVE1MTWVk aWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoVXBkYXRlU3RhdGUgdXBkYXRlU3RhdGUpCiAgICAg ICAgIG1fcGxheWJhY2tQcm9ncmVzc1RpbWVyLnN0b3AoKTsKICAgICAgICAgaWYgKGhhc01lZGlh Q29udHJvbHMoKSkKICAgICAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+cGxheWJhY2tTdG9wcGVk KCk7Ci0gICAgICAgIG1fYWN0aXZpdHlUb2tlbiA9IG51bGxwdHI7CisgICAgICAgIHVwZGF0ZUF1 ZGlvQXNzZXJ0aW9uU3RhdGUoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKQEAgLTQ5 MDksOCArNDkxMiw2IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKFVw ZGF0ZVN0YXRlIHVwZGF0ZVN0YXRlKQogCiAgICAgICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkp CiAgICAgICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnBsYXliYWNrU3RhcnRlZCgpOwotICAgICAg ICBpZiAoZG9jdW1lbnQoKS5wYWdlKCkpCi0gICAgICAgICAgICBtX2FjdGl2aXR5VG9rZW4gPSBk b2N1bWVudCgpLnBhZ2UoKS0+cGFnZVRocm90dGxlcigpLm1lZGlhQWN0aXZpdHlUb2tlbigpOwog CiAgICAgICAgIHN0YXJ0UGxheWJhY2tQcm9ncmVzc1RpbWVyKCk7CiAgICAgICAgIHNldFBsYXlp bmcodHJ1ZSk7CkBAIC00OTMyLDcgKzQ5MzMsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVw ZGF0ZVBsYXlTdGF0ZShVcGRhdGVTdGF0ZSB1cGRhdGVTdGF0ZSkKIAogICAgICAgICBpZiAoaGFz TWVkaWFDb250cm9scygpKQogICAgICAgICAgICAgbWVkaWFDb250cm9scygpLT5wbGF5YmFja1N0 b3BwZWQoKTsKLSAgICAgICAgbV9hY3Rpdml0eVRva2VuID0gbnVsbHB0cjsKICAgICB9CiAgICAg CiAgICAgdXBkYXRlTWVkaWFDb250cm9sbGVyKCk7CkBAIC00OTQwLDYgKzQ5NDAsOCBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZShVcGRhdGVTdGF0ZSB1cGRhdGVTdGF0 ZSkKIAogICAgIG1faGFzRXZlckhhZEF1ZGlvIHw9IGhhc0F1ZGlvKCk7CiAgICAgbV9oYXNFdmVy SGFkVmlkZW8gfD0gaGFzVmlkZW8oKTsKKworICAgIHVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUo KTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRQbGF5aW5nKGJvb2wgcGxheWluZykK QEAgLTcwMDAsNiArNzAwMiw0NCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmVmZmVjdGl2ZU11 dGVkKCkgY29uc3QKICAgICByZXR1cm4gbXV0ZWQoKSB8fCAoZG9jdW1lbnQoKS5wYWdlKCkgJiYg ZG9jdW1lbnQoKS5wYWdlKCktPmlzTXV0ZWQoKSk7CiB9CiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6dXBkYXRlQXVkaW9Bc3NlcnRpb25TdGF0ZSgpCit7CisgICAgYXV0byogcGFnZSA9IGRvY3Vt ZW50KCkucGFnZSgpOworICAgIGlmICghcGFnZSkgeworICAgICAgICBtX2F1ZGlvQWN0aXZpdHlU b2tlbiA9IG51bGxwdHI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBib29sIHNob3Vs ZExvZyA9IHBhZ2UtPmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpOworCisjZGVmaW5lIFJFTEVB U0VfQVVESU9fVE9LRU4oUkVBU09OKSBcCisgICAgUkVMRUFTRV9MT0dfSUYoc2hvdWxkTG9nICYm IG1fYXVkaW9BY3Rpdml0eVRva2VuLCBNZWRpYSwgIiVwIC0gSFRNTE1lZGlhRWxlbWVudCByZWxl YXNlcyBhdWRpbyBhY3Rpdml0eSB0b2tlbiwgcmVhc29uOiAiIFJFQVNPTiwgdGhpcyk7IFwKKyAg ICBtX2F1ZGlvQWN0aXZpdHlUb2tlbiA9IG51bGxwdHIKKworICAgIGlmICghaGFzQXVkaW8oKSkg eworICAgICAgICBSRUxFQVNFX0FVRElPX1RPS0VOKCJObyBhdWRpbyIpOworICAgICAgICByZXR1 cm47CisgICAgfQorICAgIGlmICghaXNQbGF5aW5nKCkpIHsKKyAgICAgICAgUkVMRUFTRV9BVURJ T19UT0tFTigiTm90IHBsYXlpbmciKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAo ZWZmZWN0aXZlTXV0ZWQoKSkgeworICAgICAgICBSRUxFQVNFX0FVRElPX1RPS0VOKCJBdWRpbyBp cyBtdXRlZCIpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlmICghdm9sdW1lKCkpIHsK KyAgICAgICAgUkVMRUFTRV9BVURJT19UT0tFTigiVm9sdW1lIGlzIDAiKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKyAgICBpZiAoIW1fYXVkaW9BY3Rpdml0eVRva2VuKSB7CisgICAgICAgIFJF TEVBU0VfTE9HX0lGKHNob3VsZExvZywgTWVkaWEsICIlcCAtIEhUTUxNZWRpYUVsZW1lbnQgdGFr ZXMgYXVkaW8gYWN0aXZpdHkgdG9rZW4gYmVjYXVzZSB0aGVyZSBpcyBhdWRpYmxlIGF1ZGlvIiwg dGhpcyk7CisgICAgICAgIG1fYXVkaW9BY3Rpdml0eVRva2VuID0gcGFnZS0+cGFnZVRocm90dGxl cigpLm1lZGlhQWN0aXZpdHlUb2tlbigpOworICAgIH0KKworI3VuZGVmIFJFTEVBU0VfQVVESU9f VE9LRU4KK30KKwogYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojpkb2VzSGF2ZUF0dHJpYnV0ZShjb25z dCBBdG9taWNTdHJpbmcmIGF0dHJpYnV0ZSwgQXRvbWljU3RyaW5nKiB2YWx1ZSkgY29uc3QKIHsK ICAgICBRdWFsaWZpZWROYW1lIGF0dHJpYnV0ZU5hbWUobnVsbEF0b20sIGF0dHJpYnV0ZSwgbnVs bEF0b20pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCAyZjRhODJl MjE5MmVkMmI1YWMzMTFjMzUzMjdiYzk1MGFlZjFjYTZkLi4xZTQ0NmUyZDkxMTYzYzMwMTIyODA3 YTllNmMzMDIzZDJlODcxMzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aApAQCAtNzY5LDYgKzc2OSw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIGVmZmVjdGl2ZU11dGVk KCkgY29uc3Q7CiAKKyAgICB2b2lkIHVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUoKTsKKwogICAg IHZvaWQgcmVnaXN0ZXJXaXRoRG9jdW1lbnQoRG9jdW1lbnQmKTsKICAgICB2b2lkIHVucmVnaXN0 ZXJXaXRoRG9jdW1lbnQoRG9jdW1lbnQmKTsKIApAQCAtMTAwNSw3ICsxMDA3LDcgQEAgcHJpdmF0 ZToKICNlbmRpZgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPE1lZGlhRWxlbWVudFNlc3Npb24+IG1f bWVkaWFTZXNzaW9uOwotICAgIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIG1fYWN0aXZpdHlU b2tlbjsKKyAgICBQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbiBtX2F1ZGlvQWN0aXZpdHlUb2tl bjsKICAgICBzaXplX3QgbV9yZXBvcnRlZEV4dHJhTWVtb3J5Q29zdDsKIAogI2lmIEVOQUJMRShN RURJQV9DT05UUk9MU19TQ1JJUFQpCg== 291525 2016-10-13 15:12:39 -0700 2016-10-14 07:58:43 -0700 Patch bug-163402-20161013150913.patch text/plain 5710 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQzZTlmZDQyMGE3Yjlh YWUzMjI4ZWRlMTA1MDUzMmQ2MDRmODcyNC4uNWQ3YWNkY2E4NjA2NTU3M2IyMzU4NzQ2ODZjZDBj NGFkNzk3YTNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE2LTEwLTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW01hY10gQWxsb3cgdGhyb3R0 bGluZyBvZiBiYWNrZ3JvdW5kIHRhYnMgdGhhdCBoYXZlIG1lZGlhIGVsZW1lbnRzIHdpdGggbm8g YXVkaWJsZSBhdWRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTYzNDAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODA1NjE1MT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aHJvdHRsaW5n IG9mIGJhY2tncm91bmQgdGFicyB0aGF0IGhhdmUgbWVkaWEgZWxlbWVudHMgd2l0aCBubyBhdWRp YmxlIGF1ZGlvLgorICAgICAgICBXZSB3ZXJlIHRha2luZyBhbiBtZWRpYSBhc3NlcnRpb24gZnJv bSB0aGUgUGFnZVRocm90dGxlciBhcyBzb29uIGFzIHRoZXJlIHdhcyBhCisgICAgICAgIG1lZGlh IGVsZW1lbnQgcGxheWluZyBvbiB0aGUgcGFnZS4gVGhpcyBwcmV2ZW50ZWQgdGhyb3R0bGluZyBv ZiBiYWNrZ3JvdW5kIHRhYnMKKyAgICAgICAgZXZlbiBpZiB0aG9zZSBtZWRpYSBlbGVtZW50cyBo YWQgbm8gYXVkaWJsZSBhdWRpbywgd2hpY2ggd2FzIHVuZm9ydHVuYXRlLgorCisgICAgICAgIFdl IG5vdyBoYXZlIG1vcmUgZmluZS1ncmFpbmVkIHJ1bGVzIGZvciB3aGVuIEhUTUxNZWRpYUVsZW1l bnQgc2hvdWxkIHRha2UgYW4KKyAgICAgICAgYXNzZXJ0aW9uLiBJIGFsc28gYWRkZWQgcmVsZWFz ZSBsb2dnaW5nIHRvIGhlbHAgZGVidWcgc3VjaCBpc3N1ZXMgaW4gdGhlCisgICAgICAgIGZ1dHVy ZS4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRNdXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVWb2x1bWUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OnVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhRWxlbWVudDo6ZWZmZWN0aXZlTXV0ZWQpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwv SFRNTE1lZGlhRWxlbWVudC5oOgorCisyMDE2LTEwLTEzICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKICAgICAgICAgUmVuYW1lIFtDb25zdHJ1Y3RvclRlbXBsYXRlPSpdIHRvIFtM ZWdhY3lDb25zdHJ1Y3RvclRlbXBsYXRlPSpdCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMzOTAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKaW5kZXggYzU1OWRjNGIzZWY1NGE4NmU3MDFiZjllZGJlOGVkNjk2Nzc4N2I1 NS4uYTJhMWJlMWY0NTExZmRkNjU4Nzc3MjMzY2RmNGVmNThmMzFlMmQ4YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0zMzMzLDYgKzMzMzMsNyBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnNldE11dGVkKGJvb2wgbXV0ZWQpCiAgICAgfQogCiAgICAgc2No ZWR1bGVVcGRhdGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigpOworICAgIHVwZGF0ZUF1ZGlvQXNz ZXJ0aW9uU3RhdGUoKTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp0b2dnbGVQbGF5U3Rh dGUoKQpAQCAtNDg1Miw2ICs0ODUzLDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVW b2x1bWUoKQogICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkpCiAgICAgICAgIG1lZGlhQ29udHJv bHMoKS0+Y2hhbmdlZFZvbHVtZSgpOwogI2VuZGlmCisKKyAgICB1cGRhdGVBdWRpb0Fzc2VydGlv blN0YXRlKCk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKFVw ZGF0ZVN0YXRlIHVwZGF0ZVN0YXRlKQpAQCAtNDg3MSw3ICs0ODc0LDcgQEAgdm9pZCBIVE1MTWVk aWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoVXBkYXRlU3RhdGUgdXBkYXRlU3RhdGUpCiAgICAg ICAgIG1fcGxheWJhY2tQcm9ncmVzc1RpbWVyLnN0b3AoKTsKICAgICAgICAgaWYgKGhhc01lZGlh Q29udHJvbHMoKSkKICAgICAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+cGxheWJhY2tTdG9wcGVk KCk7Ci0gICAgICAgIG1fYWN0aXZpdHlUb2tlbiA9IG51bGxwdHI7CisgICAgICAgIHVwZGF0ZUF1 ZGlvQXNzZXJ0aW9uU3RhdGUoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKQEAgLTQ5 MDksOCArNDkxMiw2IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKFVw ZGF0ZVN0YXRlIHVwZGF0ZVN0YXRlKQogCiAgICAgICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkp CiAgICAgICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnBsYXliYWNrU3RhcnRlZCgpOwotICAgICAg ICBpZiAoZG9jdW1lbnQoKS5wYWdlKCkpCi0gICAgICAgICAgICBtX2FjdGl2aXR5VG9rZW4gPSBk b2N1bWVudCgpLnBhZ2UoKS0+cGFnZVRocm90dGxlcigpLm1lZGlhQWN0aXZpdHlUb2tlbigpOwog CiAgICAgICAgIHN0YXJ0UGxheWJhY2tQcm9ncmVzc1RpbWVyKCk7CiAgICAgICAgIHNldFBsYXlp bmcodHJ1ZSk7CkBAIC00OTMyLDcgKzQ5MzMsNiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVw ZGF0ZVBsYXlTdGF0ZShVcGRhdGVTdGF0ZSB1cGRhdGVTdGF0ZSkKIAogICAgICAgICBpZiAoaGFz TWVkaWFDb250cm9scygpKQogICAgICAgICAgICAgbWVkaWFDb250cm9scygpLT5wbGF5YmFja1N0 b3BwZWQoKTsKLSAgICAgICAgbV9hY3Rpdml0eVRva2VuID0gbnVsbHB0cjsKICAgICB9CiAgICAg CiAgICAgdXBkYXRlTWVkaWFDb250cm9sbGVyKCk7CkBAIC00OTQwLDYgKzQ5NDAsOCBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZShVcGRhdGVTdGF0ZSB1cGRhdGVTdGF0 ZSkKIAogICAgIG1faGFzRXZlckhhZEF1ZGlvIHw9IGhhc0F1ZGlvKCk7CiAgICAgbV9oYXNFdmVy SGFkVmlkZW8gfD0gaGFzVmlkZW8oKTsKKworICAgIHVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUo KTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRQbGF5aW5nKGJvb2wgcGxheWluZykK QEAgLTcwMDAsNiArNzAwMiw0MiBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmVmZmVjdGl2ZU11 dGVkKCkgY29uc3QKICAgICByZXR1cm4gbXV0ZWQoKSB8fCAoZG9jdW1lbnQoKS5wYWdlKCkgJiYg ZG9jdW1lbnQoKS5wYWdlKCktPmlzTXV0ZWQoKSk7CiB9CiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6dXBkYXRlQXVkaW9Bc3NlcnRpb25TdGF0ZSgpCit7CisgICAgYXV0byogcGFnZSA9IGRvY3Vt ZW50KCkucGFnZSgpOworICAgIGlmICghcGFnZSkgeworICAgICAgICBtX2F1ZGlvQWN0aXZpdHlU b2tlbiA9IG51bGxwdHI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyNkZWZpbmUgUkVMRUFT RV9BVURJT19UT0tFTihSRUFTT04pIFwKKyAgICBSRUxFQVNFX0xPR19JRihwYWdlLT5pc0Fsd2F5 c09uTG9nZ2luZ0FsbG93ZWQoKSAmJiBtX2F1ZGlvQWN0aXZpdHlUb2tlbiwgTWVkaWEsICIlcCAt IEhUTUxNZWRpYUVsZW1lbnQgcmVsZWFzZXMgYXVkaW8gYWN0aXZpdHkgdG9rZW4sIHJlYXNvbjog IiBSRUFTT04sIHRoaXMpOyBcCisgICAgbV9hdWRpb0FjdGl2aXR5VG9rZW4gPSBudWxscHRyCisK KyAgICBpZiAoIWhhc0F1ZGlvKCkpIHsKKyAgICAgICAgUkVMRUFTRV9BVURJT19UT0tFTigiTm8g YXVkaW8iKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAoIWlzUGxheWluZygpKSB7 CisgICAgICAgIFJFTEVBU0VfQVVESU9fVE9LRU4oIk5vdCBwbGF5aW5nIik7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgaWYgKGVmZmVjdGl2ZU11dGVkKCkpIHsKKyAgICAgICAgUkVMRUFT RV9BVURJT19UT0tFTigiQXVkaW8gaXMgbXV0ZWQiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KyAgICBpZiAoIXZvbHVtZSgpKSB7CisgICAgICAgIFJFTEVBU0VfQVVESU9fVE9LRU4oIlZvbHVt ZSBpcyAwIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKCFtX2F1ZGlvQWN0aXZp dHlUb2tlbikgeworICAgICAgICBSRUxFQVNFX0xPR19JRihwYWdlLT5pc0Fsd2F5c09uTG9nZ2lu Z0FsbG93ZWQoKSwgTWVkaWEsICIlcCAtIEhUTUxNZWRpYUVsZW1lbnQgdGFrZXMgYXVkaW8gYWN0 aXZpdHkgdG9rZW4gYmVjYXVzZSB0aGVyZSBpcyBhdWRpYmxlIGF1ZGlvIiwgdGhpcyk7CisgICAg ICAgIG1fYXVkaW9BY3Rpdml0eVRva2VuID0gcGFnZS0+cGFnZVRocm90dGxlcigpLm1lZGlhQWN0 aXZpdHlUb2tlbigpOworICAgIH0KKworI3VuZGVmIFJFTEVBU0VfQVVESU9fVE9LRU4KK30KKwog Ym9vbCBIVE1MTWVkaWFFbGVtZW50Ojpkb2VzSGF2ZUF0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJp bmcmIGF0dHJpYnV0ZSwgQXRvbWljU3RyaW5nKiB2YWx1ZSkgY29uc3QKIHsKICAgICBRdWFsaWZp ZWROYW1lIGF0dHJpYnV0ZU5hbWUobnVsbEF0b20sIGF0dHJpYnV0ZSwgbnVsbEF0b20pOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCAyZjRhODJlMjE5MmVkMmI1YWMz MTFjMzUzMjdiYzk1MGFlZjFjYTZkLi4xZTQ0NmUyZDkxMTYzYzMwMTIyODA3YTllNmMzMDIzZDJl ODcxMzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtNzY5LDYg Kzc2OSw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIGVmZmVjdGl2ZU11dGVkKCkgY29uc3Q7CiAK KyAgICB2b2lkIHVwZGF0ZUF1ZGlvQXNzZXJ0aW9uU3RhdGUoKTsKKwogICAgIHZvaWQgcmVnaXN0 ZXJXaXRoRG9jdW1lbnQoRG9jdW1lbnQmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJXaXRoRG9jdW1l bnQoRG9jdW1lbnQmKTsKIApAQCAtMTAwNSw3ICsxMDA3LDcgQEAgcHJpdmF0ZToKICNlbmRpZgog CiAgICAgc3RkOjp1bmlxdWVfcHRyPE1lZGlhRWxlbWVudFNlc3Npb24+IG1fbWVkaWFTZXNzaW9u OwotICAgIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIG1fYWN0aXZpdHlUb2tlbjsKKyAgICBQ YWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbiBtX2F1ZGlvQWN0aXZpdHlUb2tlbjsKICAgICBzaXpl X3QgbV9yZXBvcnRlZEV4dHJhTWVtb3J5Q29zdDsKIAogI2lmIEVOQUJMRShNRURJQV9DT05UUk9M U19TQ1JJUFQpCg==