55157 2011-02-24 09:33:42 -0800 Simplify RenderTheme::volumeSliderOffsetFromMuteButton, unduplicate code. 2011-03-03 13:12:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED INVALID P2 Normal --- 55152 53020 1 dglazkov dglazkov abarth darin eric.carlson eric webkit.review.bot oldest_to_newest 357100 0 dglazkov 2011-02-24 09:33:42 -0800 Simplify RenderTheme::volumeSliderOffsetFromMuteButton, unduplicate code. 357109 1 83674 dglazkov 2011-02-24 09:41:12 -0800 Created attachment 83674 Patch 357111 2 dglazkov 2011-02-24 09:41:59 -0800 I'll give the bots to cook this patch once bug 55152 patch lands. 357159 3 83674 dglazkov 2011-02-24 10:55:34 -0800 Comment on attachment 83674 Patch Cook, bots, cook! 357223 4 83674 eric.carlson 2011-02-24 11:43:21 -0800 Comment on attachment 83674 Patch I like the code simplification here, but I don't so much like RenderTheme::volumeSliderOffsetFromMuteButton changing to RenderTheme:: volumeSliderOffset because the new name says nothing about what the offset is relative to. Please consider a more descriptive name: volumeSliderOffsetRelativeToMuteButton, volumeSliderOffsetFromMuteButton, ... 357266 5 83696 dglazkov 2011-02-24 12:21:16 -0800 Created attachment 83696 Uses volumeSliderOffsetRelativeToMuteButton. 357320 6 dglazkov 2011-02-24 13:10:12 -0800 Committed r79607: <http://trac.webkit.org/changeset/79607> 357348 7 dglazkov 2011-02-24 13:45:26 -0800 Reverted r79607 for reason: Broke Chromium layout tests. Committed r79613: <http://trac.webkit.org/changeset/79613> 357349 8 dglazkov 2011-02-24 13:46:31 -0800 (In reply to comment #7) > Reverted r79607 for reason: > > Broke Chromium layout tests. > > Committed r79613: <http://trac.webkit.org/changeset/79613> I messed up. The logic for calculating offsets wasn't the same. Need to think on this a bit more. 357517 9 webkit.review.bot 2011-02-24 15:59:55 -0800 http://trac.webkit.org/changeset/79613 might have broken Qt Linux Release 361879 10 dglazkov 2011-03-03 13:12:07 -0800 Went with a milder version of this refactoring instead. See bug 55099. 83674 2011-02-24 09:41:12 -0800 2011-02-24 12:25:53 -0800 Patch bug-55157-20110224094110.patch text/plain 12249 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogNzk1NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3Zjc4ODVlY2ZhNzdkMDRk MzllM2VjNGVjMDIxNzlmMjQ5OGEwMmVmLi5hMjhjY2QxY2U1YTA5NmY0M2QyOTk5YmNjZjA5MGI5 YTU3NDA1YWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsNDIgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBTaW1wbGlmeSBSZW5kZXJUaGVtZTo6dm9s dW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24sIHVuZHVwbGljYXRlIGNvZGUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTE1NworCisgICAgICAg IFJlZmFjdG9yaW5nLCBubyBmdW5jdGlvbmFsIGNoYW5nZXMuIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgUmVuZGVyVGhlbWU6OnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRl QnV0dG9uIGhhcyB0aGUgc2FtZSBkdXBsaWNhdGVkCisgICAgICAgIGxvZ2ljIGZvciBhbGwgcGxh dGZvcm1zLiBUaGlzIHBhdGNoOgorICAgICAgICBhKSBtb3ZlcyB0aGUgY29tbW9uIGxvZ2ljIG9m IGRldGVybWluaW5nIGFic29sdXRlIHBvc2l0aW9uaW5nIHRvIGEKKyAgICAgICAgICAgcGxhdGZv cm0tYWdub3N0aWMgcGxhY2U7CisgICAgICAgIGIpIHNpbXBsaWZpZXMgdGhlIG1ldGhvZCB0byBy ZXR1cm4gY29uc3RhbnQgb2Zmc2V0LgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9scy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1 dHRvbik6IEFkZGVkIG5ldyBoZWxwZXIgZnVuY3Rpb24sCisgICAgICAgICAgICBjYXB0dXJpbmcg Y29tbW9uIGxvZ2ljIG9mIGZpbmRpbmcgdGhlIGFic29sdXRlIHBvc2l0aW9uIG9mIHRoZSB2b2x1 bWUgc2xpZGVyLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sczo6dXBkYXRlVm9sdW1l U2xpZGVyQ29udGFpbmVyKTogQ2hhbmdlZCB0byB1c2UgdGhlCisgICAgICAgICAgICBuZXcgaGVs cGVyLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlck1lZGlhQ29udHJvbHM6OnZvbHVtZVNsaWRlck9mZnNldCk6IFNp bXBsaWZpZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuaDogRGl0 dG8sCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lOjp2b2x1bWVTbGlkZXJPZmZzZXQpOiBEaXR0by4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWUuaDogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lQ2hyb21pdW1NYWMuaDogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lQ2hyb21pdW1NYWMubW06IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVD aHJvbWl1bU1hYzo6dm9sdW1lU2xpZGVyT2Zmc2V0KTogRGl0dG8uCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLmg6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5tbTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6dm9s dW1lU2xpZGVyT2Zmc2V0KTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1l V2luLmNwcDogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6dm9sdW1l U2xpZGVyT2Zmc2V0KTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lV2lu Lmg6IERpdHRvLgorCisyMDExLTAyLTI0ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAg ICAgQWRkIFJlbmRlck1lZGlhQ29udHJvbHMgdG8gTWFjIGJ1aWxkLCB1bmR1cGxpY2F0ZSBvbmUg bWV0aG9kLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTUxNTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9scy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcApp bmRleCA3MzFhOTM0MGE4MGEyM2QyMTYwYmRmNWM1NWU4ZjhjYWEzMmZjYTQ3Li43ZTZjMWY1ZTM0 Y2Y3N2Q5NGE5ZWJlMTk0NThmNTU2NzNhZDhmMWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcApAQCAtNDU1LDYgKzQ1NSwxNiBAQCB2b2lkIE1lZGlh Q29udHJvbHM6Om9wYWNpdHlBbmltYXRpb25UaW1lckZpcmVkKFRpbWVyPE1lZGlhQ29udHJvbHM+ KikKICAgICBjaGFuZ2VPcGFjaXR5KG1fcGFuZWwuZ2V0KCksIG9wYWNpdHkpOwogfQogCitzdGF0 aWMgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oUmVuZGVyQm94KiBt dXRlQnV0dG9uQm94LCBjb25zdCBJbnRQb2ludCYgb2Zmc2V0LCBjb25zdCBJbnRTaXplJiBzaXpl KQoreworICAgIGZsb2F0IHpvb21MZXZlbCA9IG11dGVCdXR0b25Cb3gtPnN0eWxlKCktPmVmZmVj dGl2ZVpvb20oKTsKKyAgICBpbnQgeSA9IG9mZnNldC55KCkgKiB6b29tTGV2ZWwgKyBtdXRlQnV0 dG9uQm94LT5vZmZzZXRIZWlnaHQoKSAtIHNpemUuaGVpZ2h0KCk7CisgICAgRmxvYXRQb2ludCBh YnNQb2ludCA9IG11dGVCdXR0b25Cb3gtPmxvY2FsVG9BYnNvbHV0ZShGbG9hdFBvaW50KG11dGVC dXR0b25Cb3gtPm9mZnNldExlZnQoKSwgeSksIHRydWUsIHRydWUpOworICAgIGlmIChhYnNQb2lu dC55KCkgPCAwKQorICAgICAgICB5ID0gbXV0ZUJ1dHRvbkJveC0+aGVpZ2h0KCk7CisgICAgcmV0 dXJuIEludFBvaW50KG9mZnNldC54KCkgKiB6b29tTGV2ZWwsIHkpOworfQorCiB2b2lkIE1lZGlh Q29udHJvbHM6OnVwZGF0ZVZvbHVtZVNsaWRlckNvbnRhaW5lcihib29sIHZpc2libGUpCiB7CiAg ICAgaWYgKCFtX21lZGlhRWxlbWVudC0+aGFzQXVkaW8oKSB8fCAhbV92b2x1bWVTbGlkZXJDb250 YWluZXIgfHwgIW1fdm9sdW1lU2xpZGVyKQpAQCAtNDY3LDcgKzQ3Nyw3IEBAIHZvaWQgTWVkaWFD b250cm9sczo6dXBkYXRlVm9sdW1lU2xpZGVyQ29udGFpbmVyKGJvb2wgdmlzaWJsZSkKICAgICAg ICAgUmVmUHRyPFJlbmRlclN0eWxlPiBzID0gbV92b2x1bWVTbGlkZXJDb250YWluZXItPnN0eWxl Rm9yRWxlbWVudCgpOwogICAgICAgICBpbnQgaGVpZ2h0ID0gcy0+aGVpZ2h0KCkuaXNQZXJjZW50 KCkgPyAwIDogcy0+aGVpZ2h0KCkudmFsdWUoKTsKICAgICAgICAgaW50IHdpZHRoID0gcy0+d2lk dGgoKS5pc1BlcmNlbnQoKSA/IDAgOiBzLT53aWR0aCgpLnZhbHVlKCk7Ci0gICAgICAgIEludFBv aW50IG9mZnNldCA9IG1fbWVkaWFFbGVtZW50LT5kb2N1bWVudCgpLT5wYWdlKCktPnRoZW1lKCkt PnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9uKG1fbXV0ZUJ1dHRvbi0+cmVuZGVyZXIo KS0+bm9kZSgpLCBJbnRTaXplKHdpZHRoLCBoZWlnaHQpKTsKKyAgICAgICAgSW50UG9pbnQgb2Zm c2V0ID0gdm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24obV9tdXRlQnV0dG9uLT5yZW5k ZXJCb3goKSwgbV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCktPnBhZ2UoKS0+dGhlbWUoKS0+dm9s dW1lU2xpZGVyT2Zmc2V0KCksIEludFNpemUod2lkdGgsIGhlaWdodCkpOwogICAgICAgICBpbnQg eCA9IG9mZnNldC54KCkgKyBtX211dGVCdXR0b24tPnJlbmRlckJveCgpLT5vZmZzZXRMZWZ0KCk7 CiAgICAgICAgIGludCB5ID0gb2Zmc2V0LnkoKSArIG1fbXV0ZUJ1dHRvbi0+cmVuZGVyQm94KCkt Pm9mZnNldFRvcCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTWVkaWFDb250cm9scy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVk aWFDb250cm9scy5jcHAKaW5kZXggMGEzZjhmNzQ5YTZlZWJhZGZmZWUzNDMxMmE5M2FkNTU0Njhj MjZmYi4uZjUxOTA1MDdjZDA5ZTZjZjY2NzhjMDJlY2VhMGUzOTgxY2E2OWY2YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmNwcApAQCAtMTc5 LDE3ICsxNzksOSBAQCBib29sIFJlbmRlck1lZGlhQ29udHJvbHM6OnBhaW50TWVkaWFDb250cm9s c1BhcnQoTWVkaWFDb250cm9sRWxlbWVudFR5cGUgcGFydCwgUgogCiAjZW5kaWYKIAotSW50UG9p bnQgUmVuZGVyTWVkaWFDb250cm9sczo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24o Tm9kZSogbXV0ZUJ1dHRvbiwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKK0ludFBvaW50IFJlbmRlck1l ZGlhQ29udHJvbHM6OnZvbHVtZVNsaWRlck9mZnNldCgpCiB7Ci0gICAgc3RhdGljIGNvbnN0IGlu dCB4T2Zmc2V0ID0gLTQ7Ci0gICAgc3RhdGljIGNvbnN0IGludCB5T2Zmc2V0ID0gNTsKLQotICAg IGZsb2F0IHpvb21MZXZlbCA9IG11dGVCdXR0b24tPnJlbmRlcmVyKCktPnN0eWxlKCktPmVmZmVj dGl2ZVpvb20oKTsKLSAgICBpbnQgeSA9IHlPZmZzZXQgKiB6b29tTGV2ZWwgKyBtdXRlQnV0dG9u LT5yZW5kZXJCb3goKS0+b2Zmc2V0SGVpZ2h0KCkgLSBzaXplLmhlaWdodCgpOwotICAgIEZsb2F0 UG9pbnQgYWJzUG9pbnQgPSBtdXRlQnV0dG9uLT5yZW5kZXJlcigpLT5sb2NhbFRvQWJzb2x1dGUo RmxvYXRQb2ludChtdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+b2Zmc2V0TGVmdCgpLCB5KSwgdHJ1 ZSwgdHJ1ZSk7Ci0gICAgaWYgKGFic1BvaW50LnkoKSA8IDApCi0gICAgICAgIHkgPSBtdXRlQnV0 dG9uLT5yZW5kZXJCb3goKS0+aGVpZ2h0KCk7Ci0gICAgcmV0dXJuIEludFBvaW50KHhPZmZzZXQg KiB6b29tTGV2ZWwsIHkpOworICAgIHJldHVybiBJbnRQb2ludCgtNCwgNSk7CiB9CiAKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5oCmluZGV4IDRj NjYzYmNmYzk2N2I2OTVhODcxYTFiNzkxM2Y0MmYyYjg3ZGJlZTguLmRkNTVhMjk4YWI5MjE3YmIy ZmFjYmU1ODA3OTE0OTM4MmE3YjE3NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck1lZGlhQ29udHJvbHMuaApAQCAtNDIsNyArNDIsNyBAQCBwdWJsaWM6CiAgICAgc3Rh dGljIGJvb2wgcGFpbnRNZWRpYUNvbnRyb2xzUGFydChNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSwg UmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgIHN0 YXRpYyB2b2lkIGFkanVzdE1lZGlhU2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVjdCopOwogI2Vu ZGlmCi0gICAgc3RhdGljIEludFBvaW50IHZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9u KE5vZGUqLCBjb25zdCBJbnRTaXplJik7CisgICAgc3RhdGljIEludFBvaW50IHZvbHVtZVNsaWRl ck9mZnNldCgpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5kZXggYjBiNzczNTg1NmU3MTkxMzkxNDQ0OWUxY2Y4 YzI3NTE0NjU3ODc3Ny4uMzVhZDdmMDNhNjFiNDVmM2QxNzQ4Zjc4NTM4ZjgzNDFiMzZkMWY0YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCkBAIC01MzcsMTMgKzUz Nyw5IEBAIFN0cmluZyBSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFDb250cm9sc1JlbWFpbmluZ1Rp bWUoZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1CiAgICAgcmV0dXJuIGZvcm1hdE1lZGlhQ29u dHJvbHNUaW1lKGN1cnJlbnRUaW1lIC0gZHVyYXRpb24pOwogfQogCi1JbnRQb2ludCBSZW5kZXJU aGVtZTo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSogbXV0ZUJ1dHRvbiwg Y29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKK0ludFBvaW50IFJlbmRlclRoZW1lOjp2b2x1bWVT bGlkZXJPZmZzZXQoKSBjb25zdAogewotICAgIGludCB5ID0gLXNpemUuaGVpZ2h0KCk7Ci0gICAg RmxvYXRQb2ludCBhYnNQb2ludCA9IG11dGVCdXR0b24tPnJlbmRlcmVyKCktPmxvY2FsVG9BYnNv bHV0ZShGbG9hdFBvaW50KG11dGVCdXR0b24tPnJlbmRlckJveCgpLT5vZmZzZXRMZWZ0KCksIHkp LCB0cnVlLCB0cnVlKTsKLSAgICBpZiAoYWJzUG9pbnQueSgpIDwgMCkKLSAgICAgICAgeSA9IG11 dGVCdXR0b24tPnJlbmRlckJveCgpLT5oZWlnaHQoKTsKLSAgICByZXR1cm4gSW50UG9pbnQoMCwg eSk7CisgICAgcmV0dXJuIEludFBvaW50KDAsIDApOwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXggYmNlOGQ3ODU1YWU4OWMxNjU3MzA3ZTU1N2E5 M2VhN2IyMGQ5ZDgwOC4uMGQ5MTA0NzQ2MTQ1Y2E1Y2IxM2I1ODNhNWU0YjZiM2Q5NTY3Y2E3MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKQEAgLTE4OCw3ICsxODgsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBTdHJpbmcgZm9ybWF0TWVkaWFDb250cm9sc1JlbWFpbmlu Z1RpbWUoZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKSBjb25zdDsKICAgICAKICAg ICAvLyBSZXR1cm5zIHRoZSBtZWRpYSB2b2x1bWUgc2xpZGVyIGNvbnRhaW5lcidzIG9mZnNldCBm cm9tIHRoZSBtdXRlIGJ1dHRvbi4KLSAgICB2aXJ0dWFsIEludFBvaW50IHZvbHVtZVNsaWRlck9m ZnNldEZyb21NdXRlQnV0dG9uKE5vZGUqLCBjb25zdCBJbnRTaXplJikgY29uc3Q7CisgICAgdmly dHVhbCBJbnRQb2ludCB2b2x1bWVTbGlkZXJPZmZzZXQoKSBjb25zdDsKICNlbmRpZgogCiAjaWYg RU5BQkxFKE1FVEVSX1RBRykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUNocm9taXVtTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IDgwYmJhZTRmMzU2ZmQ0ZWYzNWI0ZjQwMzY0OWI0MjRm MGRkODAzYTMuLjNmZjMzZGZmMjk3NjA5NGM0ZTQ0NThjMDI3OTllNzdiYmMyZmUyOWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMuaApA QCAtNDUsNyArNDUsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVkaWFW b2x1bWVTbGlkZXJDb250YWluZXIoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29u c3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJh Y2soUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAg IHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0Kiwg Y29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwotICAgIHZpcnR1YWwgSW50UG9pbnQg dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSosIGNvbnN0IEludFNpemUmKSBj b25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IHZvbHVtZVNsaWRlck9mZnNldCgpIGNvbnN0Owog ICAgIHZpcnR1YWwgYm9vbCB1c2VzTWVkaWFDb250cm9sU3RhdHVzRGlzcGxheSgpIHsgcmV0dXJu IGZhbHNlOyB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lQ2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQppbmRleCAxMDI4NWFjMDEyYmQzODZlMmU3OGQyYTY1YTRi MDc0ZDcxMWE3MjdhLi5jYzdmZDNhM2UxM2IzNDBkZDMyMWE3MGNhYTRjZTZjZDMzYWRiZjNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1h Yy5tbQpAQCAtMTU1LDkgKzE1NSw5IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6cGFp bnRNZWRpYVNsaWRlclRodW1iKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQCiAgICAgcmV0 dXJuIFJlbmRlck1lZGlhQ29udHJvbHNDaHJvbWl1bTo6cGFpbnRNZWRpYUNvbnRyb2xzUGFydChN ZWRpYVNsaWRlclRodW1iLCBvYmplY3QsIHBhaW50SW5mbywgcmVjdCk7CiB9CiAKLUludFBvaW50 IFJlbmRlclRoZW1lQ2hyb21pdW1NYWM6OnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9u KE5vZGUqIG11dGVCdXR0b24sIGNvbnN0IEludFNpemUmIHNpemUpIGNvbnN0CitJbnRQb2ludCBS ZW5kZXJUaGVtZUNocm9taXVtTWFjOjp2b2x1bWVTbGlkZXJPZmZzZXQoKSBjb25zdAogewotICAg IHJldHVybiBSZW5kZXJUaGVtZTo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24obXV0 ZUJ1dHRvbiwgc2l6ZSk7CisgICAgcmV0dXJuIFJlbmRlclRoZW1lOjp2b2x1bWVTbGlkZXJPZmZz ZXQoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1h Yy5oCmluZGV4IDk4MzdjMmFkNzExNmU2MDAxYmQzZTI5MTg1MWJlMjRlOGQ1YjhmYjEuLjdjNDE0 YTEyZmU3ZGM1Yzg1NmY3MjU4MjIzNTM5Njg3NzE1NmUxM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCkBAIC0xNjYsNyArMTY2LDcgQEAgcHJvdGVjdGVkOgog ICAgIHZpcnR1YWwgYm9vbCBzaG91bGRSZW5kZXJNZWRpYUNvbnRyb2xQYXJ0KENvbnRyb2xQYXJ0 LCBFbGVtZW50Kik7CiAgICAgdmlydHVhbCBib29sIHVzZXNNZWRpYUNvbnRyb2xTdGF0dXNEaXNw bGF5KCk7CiAgICAgdmlydHVhbCB2b2lkIGFkanVzdE1lZGlhU2xpZGVyVGh1bWJTaXplKFJlbmRl ck9iamVjdCopIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0 RnJvbU11dGVCdXR0b24oTm9kZSosIGNvbnN0IEludFNpemUmKSBjb25zdDsKKyAgICB2aXJ0dWFs IEludFBvaW50IHZvbHVtZVNsaWRlck9mZnNldCgpIGNvbnN0OwogI2VuZGlmCiAgICAgCiAgICAg dmlydHVhbCBib29sIHNob3VsZFNob3dQbGFjZWhvbGRlcldoZW5Gb2N1c2VkKCkgY29uc3Q7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggMzUxMGE4MWFk ZTM0YTZhMWQ5MzgxOTYwNWQ2MmMyN2ViNWI0ZjIxZi4uZWQ1YjJjYTRkMzBmNTViMDk1MmU2ZjFh MzliZmJlYWRiMGUwOTA1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZU1hYy5tbQpAQCAtMTk4Nyw5ICsxOTg3LDkgQEAgYm9vbCBSZW5kZXJUaGVtZU1hYzo6dXNlc01l ZGlhQ29udHJvbFN0YXR1c0Rpc3BsYXkoKQogICAgIHJldHVybiBtZWRpYUNvbnRyb2xsZXJUaGVt ZSgpID09IE1lZGlhQ29udHJvbGxlclRoZW1lUXVpY2tUaW1lOwogfQogCi1JbnRQb2ludCBSZW5k ZXJUaGVtZU1hYzo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSogbXV0ZUJ1 dHRvbiwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKK0ludFBvaW50IFJlbmRlclRoZW1lTWFj Ojp2b2x1bWVTbGlkZXJPZmZzZXQoKSBjb25zdAogewotICAgIHJldHVybiBSZW5kZXJNZWRpYUNv bnRyb2xzOjp2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihtdXRlQnV0dG9uLCBzaXpl KTsKKyAgICByZXR1cm4gUmVuZGVyTWVkaWFDb250cm9sczo6dm9sdW1lU2xpZGVyT2Zmc2V0KCk7 CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVNYWM6OnNob3VsZFNob3dQbGFjZWhvbGRlcldoZW5Gb2N1 c2VkKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3Bw CmluZGV4IDU1ODFkYjgwZGRkYjQyMjcxZTRjNmY3NGM3OTBiNTcyOTQ0NDgwOWMuLmVmMjdkZGZi MWZkYzMyYzM2Njg0NTM3NjRiMThjZjYwMjJlZmNmMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcApAQCAtMTEwOCw5ICsxMTA4LDkgQEAgYm9vbCBSZW5k ZXJUaGVtZVdpbjo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywg Y29uc3QgUGFpbnRJbmYKICAgICByZXR1cm4gUmVuZGVyTWVkaWFDb250cm9sczo6cGFpbnRNZWRp YUNvbnRyb2xzUGFydChNZWRpYVZvbHVtZVNsaWRlclRodW1iLCBvLCBwYWludEluZm8sIHIpOwog fQogCi1JbnRQb2ludCBSZW5kZXJUaGVtZVdpbjo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVC dXR0b24oTm9kZSogbXV0ZUJ1dHRvbiwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKK0ludFBv aW50IFJlbmRlclRoZW1lV2luOjp2b2x1bWVTbGlkZXJPZmZzZXQoKSBjb25zdAogewotICAgIHJl dHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzOjp2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRv bihtdXRlQnV0dG9uLCBzaXplKTsKKyAgICByZXR1cm4gUmVuZGVyTWVkaWFDb250cm9sczo6dm9s dW1lU2xpZGVyT2Zmc2V0KCk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVXaW4uaAppbmRleCBjMDVkMmVlZDc2YWJkMzQyNDZiMmU1OTdkYzcwY2I0NTY2ZjlhNDM0 Li5lMDE2MWYxZjVjMzY3ZDYwMzk0MzA2N2ZlNDZhNzcwNzQ0NjhjY2IzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaApAQCAtMTM4LDcgKzEzOCw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lcihSZW5k ZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVh bCBib29sIHBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqLCBjb25zdCBQ YWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVkaWFW b2x1bWVTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJ bnRSZWN0Jik7Ci0gICAgdmlydHVhbCBJbnRQb2ludCB2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0 ZUJ1dHRvbihOb2RlKiwgY29uc3QgSW50U2l6ZSYpIGNvbnN0OworICAgIHZpcnR1YWwgSW50UG9p bnQgdm9sdW1lU2xpZGVyT2Zmc2V0KCkgY29uc3Q7CiAjZW5kaWYKIAogcHJpdmF0ZToK 83696 2011-02-24 12:21:16 -0800 2011-02-24 12:24:02 -0800 Uses volumeSliderOffsetRelativeToMuteButton. bug-55157-20110224122115.patch text/plain 12516 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogNzk1OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYjIzYWRmMWM4NmEyYjZj NmM2MGZjYzY3MGVlMjk3NzczNjZlMWNmLi4zNzU4YWU4YzJmYzZjYTgzN2UxZDY2ZTgyOGZhNjdh ODczZjM4NjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDItMjQgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSBSZW5kZXJUaGVtZTo6dm9sdW1l U2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24sIHVuZHVwbGljYXRlIGNvZGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTE1NworCisgICAgICAgIFJl ZmFjdG9yaW5nLCBubyBmdW5jdGlvbmFsIGNoYW5nZXMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMuCisKKyAgICAgICAgUmVuZGVyVGhlbWU6OnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0 dG9uIGhhcyB0aGUgc2FtZSBkdXBsaWNhdGVkCisgICAgICAgIGxvZ2ljIGZvciBhbGwgcGxhdGZv cm1zLiBUaGlzIHBhdGNoOgorICAgICAgICBhKSBtb3ZlcyB0aGUgY29tbW9uIGxvZ2ljIG9mIGRl dGVybWluaW5nIGFic29sdXRlIHBvc2l0aW9uaW5nIHRvIGEKKyAgICAgICAgICAgcGxhdGZvcm0t YWdub3N0aWMgcGxhY2U7CisgICAgICAgIGIpIHNpbXBsaWZpZXMgdGhlIG1ldGhvZCB0byByZXR1 cm4gY29uc3RhbnQgb2Zmc2V0LgorCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2b2x1bWVTbGlkZXJPZmZzZXQpOiBBZGRlZCBuZXcg aGVscGVyIGZ1bmN0aW9uLAorICAgICAgICAgICAgY2FwdHVyaW5nIGNvbW1vbiBsb2dpYyBvZiBm aW5kaW5nIHRoZSBhYnNvbHV0ZSBwb3NpdGlvbiBvZiB0aGUgdm9sdW1lIHNsaWRlci4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHM6OnVwZGF0ZVZvbHVtZVNsaWRlckNvbnRhaW5lcik6 IENoYW5nZWQgdG8gdXNlIHRoZQorICAgICAgICAgICAgbmV3IGhlbHBlci4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJNZWRpYUNvbnRyb2xzOjp2b2x1bWVTbGlkZXJPZmZzZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRvbik6 IFNpbXBsaWZpZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuaDog RGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lOjp2b2x1bWVTbGlkZXJPZmZzZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRv bik6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5oOiBEaXR0by4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5oOiBEaXR0by4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtTWFjOjp2b2x1bWVTbGlkZXJPZmZzZXRSZWxh dGl2ZVRvTXV0ZUJ1dHRvbik6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZU1hYy5oOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OnZvbHVtZVNsaWRlck9mZnNl dFJlbGF0aXZlVG9NdXRlQnV0dG9uKTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lV2luLmNwcDogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6 dm9sdW1lU2xpZGVyT2Zmc2V0UmVsYXRpdmVUb011dGVCdXR0b24pOiBEaXR0by4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaDogRGl0dG8uCisKIDIwMTEtMDItMjQgIE1pc2hh IFR5dXR5dW5payAgPG1pY2hhZWwudHl1dHl1bmlrQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9scy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xzLmNwcAppbmRleCA3MzFhOTM0MGE4MGEyM2QyMTYwYmRmNWM1NWU4ZjhjYWEzMmZj YTQ3Li5kYzIzYmNjMmE1NzhiOGUwNzUxOTQ0YjViNTQzMjlmOTBjZjBlMTU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcApAQCAtNDU1LDYgKzQ1NSwx NiBAQCB2b2lkIE1lZGlhQ29udHJvbHM6Om9wYWNpdHlBbmltYXRpb25UaW1lckZpcmVkKFRpbWVy PE1lZGlhQ29udHJvbHM+KikKICAgICBjaGFuZ2VPcGFjaXR5KG1fcGFuZWwuZ2V0KCksIG9wYWNp dHkpOwogfQogCitzdGF0aWMgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0KFJlbmRlckJveCog bXV0ZUJ1dHRvbkJveCwgY29uc3QgSW50UG9pbnQmIG9mZnNldCwgY29uc3QgSW50U2l6ZSYgc2l6 ZSkKK3sKKyAgICBmbG9hdCB6b29tTGV2ZWwgPSBtdXRlQnV0dG9uQm94LT5zdHlsZSgpLT5lZmZl Y3RpdmVab29tKCk7CisgICAgaW50IHkgPSBvZmZzZXQueSgpICogem9vbUxldmVsICsgbXV0ZUJ1 dHRvbkJveC0+b2Zmc2V0SGVpZ2h0KCkgLSBzaXplLmhlaWdodCgpOworICAgIEZsb2F0UG9pbnQg YWJzUG9pbnQgPSBtdXRlQnV0dG9uQm94LT5sb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludChtdXRl QnV0dG9uQm94LT5vZmZzZXRMZWZ0KCksIHkpLCB0cnVlLCB0cnVlKTsKKyAgICBpZiAoYWJzUG9p bnQueSgpIDwgMCkKKyAgICAgICAgeSA9IG11dGVCdXR0b25Cb3gtPmhlaWdodCgpOworICAgIHJl dHVybiBJbnRQb2ludChvZmZzZXQueCgpICogem9vbUxldmVsLCB5KTsKK30KKwogdm9pZCBNZWRp YUNvbnRyb2xzOjp1cGRhdGVWb2x1bWVTbGlkZXJDb250YWluZXIoYm9vbCB2aXNpYmxlKQogewog ICAgIGlmICghbV9tZWRpYUVsZW1lbnQtPmhhc0F1ZGlvKCkgfHwgIW1fdm9sdW1lU2xpZGVyQ29u dGFpbmVyIHx8ICFtX3ZvbHVtZVNsaWRlcikKQEAgLTQ2Nyw3ICs0NzcsNyBAQCB2b2lkIE1lZGlh Q29udHJvbHM6OnVwZGF0ZVZvbHVtZVNsaWRlckNvbnRhaW5lcihib29sIHZpc2libGUpCiAgICAg ICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcyA9IG1fdm9sdW1lU2xpZGVyQ29udGFpbmVyLT5zdHls ZUZvckVsZW1lbnQoKTsKICAgICAgICAgaW50IGhlaWdodCA9IHMtPmhlaWdodCgpLmlzUGVyY2Vu dCgpID8gMCA6IHMtPmhlaWdodCgpLnZhbHVlKCk7CiAgICAgICAgIGludCB3aWR0aCA9IHMtPndp ZHRoKCkuaXNQZXJjZW50KCkgPyAwIDogcy0+d2lkdGgoKS52YWx1ZSgpOwotICAgICAgICBJbnRQ b2ludCBvZmZzZXQgPSBtX21lZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpLT50aGVtZSgp LT52b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihtX211dGVCdXR0b24tPnJlbmRlcmVy KCktPm5vZGUoKSwgSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSk7CisgICAgICAgIEludFBvaW50IG9m ZnNldCA9IHZvbHVtZVNsaWRlck9mZnNldChtX211dGVCdXR0b24tPnJlbmRlckJveCgpLCBtX21l ZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpLT50aGVtZSgpLT52b2x1bWVTbGlkZXJPZmZz ZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRvbigpLCBJbnRTaXplKHdpZHRoLCBoZWlnaHQpKTsKICAgICAg ICAgaW50IHggPSBvZmZzZXQueCgpICsgbV9tdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+b2Zmc2V0 TGVmdCgpOwogICAgICAgICBpbnQgeSA9IG9mZnNldC55KCkgKyBtX211dGVCdXR0b24tPnJlbmRl ckJveCgpLT5vZmZzZXRUb3AoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lZGlhQ29udHJvbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck1lZGlhQ29udHJvbHMuY3BwCmluZGV4IDBhM2Y4Zjc0OWE2ZWViYWRmZmVlMzQzMTJhOTNh ZDU1NDY4YzI2ZmIuLmNlMTAwMzcyYjQ0OTY0MTYxZGZjMDcwNGU1ZjM2NzgzZTIwNDkwZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHAK QEAgLTE3OSwxNyArMTc5LDkgQEAgYm9vbCBSZW5kZXJNZWRpYUNvbnRyb2xzOjpwYWludE1lZGlh Q29udHJvbHNQYXJ0KE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlIHBhcnQsIFIKIAogI2VuZGlmCiAK LUludFBvaW50IFJlbmRlck1lZGlhQ29udHJvbHM6OnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRl QnV0dG9uKE5vZGUqIG11dGVCdXR0b24sIGNvbnN0IEludFNpemUmIHNpemUpCitJbnRQb2ludCBS ZW5kZXJNZWRpYUNvbnRyb2xzOjp2b2x1bWVTbGlkZXJPZmZzZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRv bigpCiB7Ci0gICAgc3RhdGljIGNvbnN0IGludCB4T2Zmc2V0ID0gLTQ7Ci0gICAgc3RhdGljIGNv bnN0IGludCB5T2Zmc2V0ID0gNTsKLQotICAgIGZsb2F0IHpvb21MZXZlbCA9IG11dGVCdXR0b24t PnJlbmRlcmVyKCktPnN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKTsKLSAgICBpbnQgeSA9IHlPZmZz ZXQgKiB6b29tTGV2ZWwgKyBtdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+b2Zmc2V0SGVpZ2h0KCkg LSBzaXplLmhlaWdodCgpOwotICAgIEZsb2F0UG9pbnQgYWJzUG9pbnQgPSBtdXRlQnV0dG9uLT5y ZW5kZXJlcigpLT5sb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludChtdXRlQnV0dG9uLT5yZW5kZXJC b3goKS0+b2Zmc2V0TGVmdCgpLCB5KSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAgaWYgKGFic1BvaW50Lnko KSA8IDApCi0gICAgICAgIHkgPSBtdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+aGVpZ2h0KCk7Ci0g ICAgcmV0dXJuIEludFBvaW50KHhPZmZzZXQgKiB6b29tTGV2ZWwsIHkpOworICAgIHJldHVybiBJ bnRQb2ludCgtNCwgNSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTWVkaWFDb250cm9scy5oCmluZGV4IDRjNjYzYmNmYzk2N2I2OTVhODcxYTFiNzkxM2Y0MmYy Yjg3ZGJlZTguLmM1ZjczMmQwMzc0ZTFmNGZmYzBkOGNlNmM3ZWIzOTc3NDVmODE5MzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuaApAQCAtNDIs NyArNDIsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgcGFpbnRNZWRpYUNvbnRyb2xzUGFy dChNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSwgUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZv JiwgY29uc3QgSW50UmVjdCYpOwogICAgIHN0YXRpYyB2b2lkIGFkanVzdE1lZGlhU2xpZGVyVGh1 bWJTaXplKFJlbmRlck9iamVjdCopOwogI2VuZGlmCi0gICAgc3RhdGljIEludFBvaW50IHZvbHVt ZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9uKE5vZGUqLCBjb25zdCBJbnRTaXplJik7CisgICAg c3RhdGljIEludFBvaW50IHZvbHVtZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCk7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lLmNwcAppbmRleCBiMGI3NzM1ODU2ZTcxOTEzOTE0NDQ5ZTFjZjhjMjc1MTQ2NTc4 Nzc3Li5lMTM1N2Q4NWY0NTY5ODRiYjBkOWYwNDcyMGYyNjQ5NjMyNzNkZjU3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTUzNywxMyArNTM3LDkgQEAgU3Ry aW5nIFJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5nVGltZShmbG9hdCBj dXJyZW50VGltZSwgZmxvYXQgZHUKICAgICByZXR1cm4gZm9ybWF0TWVkaWFDb250cm9sc1RpbWUo Y3VycmVudFRpbWUgLSBkdXJhdGlvbik7CiB9CiAKLUludFBvaW50IFJlbmRlclRoZW1lOjp2b2x1 bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihOb2RlKiBtdXRlQnV0dG9uLCBjb25zdCBJbnRT aXplJiBzaXplKSBjb25zdAorSW50UG9pbnQgUmVuZGVyVGhlbWU6OnZvbHVtZVNsaWRlck9mZnNl dFJlbGF0aXZlVG9NdXRlQnV0dG9uKCkgY29uc3QKIHsKLSAgICBpbnQgeSA9IC1zaXplLmhlaWdo dCgpOwotICAgIEZsb2F0UG9pbnQgYWJzUG9pbnQgPSBtdXRlQnV0dG9uLT5yZW5kZXJlcigpLT5s b2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludChtdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+b2Zmc2V0 TGVmdCgpLCB5KSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAgaWYgKGFic1BvaW50LnkoKSA8IDApCi0gICAg ICAgIHkgPSBtdXRlQnV0dG9uLT5yZW5kZXJCb3goKS0+aGVpZ2h0KCk7Ci0gICAgcmV0dXJuIElu dFBvaW50KDAsIHkpOworICAgIHJldHVybiBJbnRQb2ludCgwLCAwKTsKIH0KIAogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4IGJjZThkNzg1NWFlODljMTY1 NzMwN2U1NTdhOTNlYTdiMjBkOWQ4MDguLjQ1NzE0OGQ5NmMyZGJjYmJmYjE2ZWNmNmFmMzA2NjU3 MGNjYjUwNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCkBAIC0xODgs NyArMTg4LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIGZvcm1hdE1lZGlhQ29udHJv bHNSZW1haW5pbmdUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikgY29uc3Q7 CiAgICAgCiAgICAgLy8gUmV0dXJucyB0aGUgbWVkaWEgdm9sdW1lIHNsaWRlciBjb250YWluZXIn cyBvZmZzZXQgZnJvbSB0aGUgbXV0ZSBidXR0b24uCi0gICAgdmlydHVhbCBJbnRQb2ludCB2b2x1 bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihOb2RlKiwgY29uc3QgSW50U2l6ZSYpIGNvbnN0 OworICAgIHZpcnR1YWwgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0UmVsYXRpdmVUb011dGVC dXR0b24oKSBjb25zdDsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FVEVSX1RBRykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5oCmluZGV4IDgw YmJhZTRmMzU2ZmQ0ZWYzNWI0ZjQwMzY0OWI0MjRmMGRkODAzYTMuLmZjYzgzOWRjZDE4NTNiMjZm ZjBmZGI5NWZhNTJhOGMxNzY1NjczMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMuaApAQCAtNDUsNyArNDUsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVkaWFWb2x1bWVTbGlkZXJDb250YWluZXIoUmVuZGVy T2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwg Ym9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFp bnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9s dW1lU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpOwotICAgIHZpcnR1YWwgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVC dXR0b24oTm9kZSosIGNvbnN0IEludFNpemUmKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50 IHZvbHVtZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCkgY29uc3Q7CiAgICAgdmly dHVhbCBib29sIHVzZXNNZWRpYUNvbnRyb2xTdGF0dXNEaXNwbGF5KCkgeyByZXR1cm4gZmFsc2U7 IH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVDaHJvbWl1bU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZUNocm9taXVtTWFjLm1tCmluZGV4IDEwMjg1YWMwMTJiZDM4NmUyZTc4ZDJhNjVhNGIwNzRkNzEx YTcyN2EuLmQ1ZTM1MDFiYjQ0OTEwMTc3ZTFkY2ZlNWUxODMyYzU3MjQxZTFiMjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLm1tCkBA IC0xNTUsOSArMTU1LDkgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlh U2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFAKICAgICByZXR1cm4gUmVu ZGVyTWVkaWFDb250cm9sc0Nocm9taXVtOjpwYWludE1lZGlhQ29udHJvbHNQYXJ0KE1lZGlhU2xp ZGVyVGh1bWIsIG9iamVjdCwgcGFpbnRJbmZvLCByZWN0KTsKIH0KIAotSW50UG9pbnQgUmVuZGVy VGhlbWVDaHJvbWl1bU1hYzo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSog bXV0ZUJ1dHRvbiwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKK0ludFBvaW50IFJlbmRlclRo ZW1lQ2hyb21pdW1NYWM6OnZvbHVtZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCkg Y29uc3QKIHsKLSAgICByZXR1cm4gUmVuZGVyVGhlbWU6OnZvbHVtZVNsaWRlck9mZnNldEZyb21N dXRlQnV0dG9uKG11dGVCdXR0b24sIHNpemUpOworICAgIHJldHVybiBSZW5kZXJUaGVtZTo6dm9s dW1lU2xpZGVyT2Zmc2V0UmVsYXRpdmVUb011dGVCdXR0b24oKTsKIH0KICNlbmRpZgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCmluZGV4IDk4MzdjMmFkNzExNmU2 MDAxYmQzZTI5MTg1MWJlMjRlOGQ1YjhmYjEuLjg2M2E4YzFkMTQ4YmExZjc1YzllODY5Y2NlNDNm MDE0NDU1NWNmOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5o CkBAIC0xNjYsNyArMTY2LDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRS ZW5kZXJNZWRpYUNvbnRyb2xQYXJ0KENvbnRyb2xQYXJ0LCBFbGVtZW50Kik7CiAgICAgdmlydHVh bCBib29sIHVzZXNNZWRpYUNvbnRyb2xTdGF0dXNEaXNwbGF5KCk7CiAgICAgdmlydHVhbCB2b2lk IGFkanVzdE1lZGlhU2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVjdCopIGNvbnN0OwotICAgIHZp cnR1YWwgSW50UG9pbnQgdm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSosIGNv bnN0IEludFNpemUmKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IHZvbHVtZVNsaWRlck9m ZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCkgY29uc3Q7CiAjZW5kaWYKICAgICAKICAgICB2aXJ0 dWFsIGJvb2wgc2hvdWxkU2hvd1BsYWNlaG9sZGVyV2hlbkZvY3VzZWQoKSBjb25zdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbSBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQppbmRleCAzNTEwYTgxYWRlMzRh NmExZDkzODE5NjA1ZDYyYzI3ZWI1YjRmMjFmLi40MTUxZjJlMGY5NWY1MjY2MTJjODRhOTdjN2Ji ODI3NzE4MTA2MzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tCkBAIC0xOTg3LDkgKzE5ODcsOSBAQCBib29sIFJlbmRlclRoZW1lTWFjOjp1c2VzTWVkaWFD b250cm9sU3RhdHVzRGlzcGxheSgpCiAgICAgcmV0dXJuIG1lZGlhQ29udHJvbGxlclRoZW1lKCkg PT0gTWVkaWFDb250cm9sbGVyVGhlbWVRdWlja1RpbWU7CiB9CiAKLUludFBvaW50IFJlbmRlclRo ZW1lTWFjOjp2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihOb2RlKiBtdXRlQnV0dG9u LCBjb25zdCBJbnRTaXplJiBzaXplKSBjb25zdAorSW50UG9pbnQgUmVuZGVyVGhlbWVNYWM6OnZv bHVtZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gUmVuZGVyTWVkaWFDb250cm9sczo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24o bXV0ZUJ1dHRvbiwgc2l6ZSk7CisgICAgcmV0dXJuIFJlbmRlck1lZGlhQ29udHJvbHM6OnZvbHVt ZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0dG9uKCk7CiB9CiAKIGJvb2wgUmVuZGVyVGhl bWVNYWM6OnNob3VsZFNob3dQbGFjZWhvbGRlcldoZW5Gb2N1c2VkKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCmluZGV4IDU1ODFkYjgwZGRkYjQy MjcxZTRjNmY3NGM3OTBiNTcyOTQ0NDgwOWMuLjJjM2M1NDhhOTBiM2M3OTA4ZDJjMmYxMTA3ZThi NmQwYjEyOWM0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2lu LmNwcApAQCAtMTEwOCw5ICsxMTA4LDkgQEAgYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRNZWRp YVZvbHVtZVNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmYKICAgICBy ZXR1cm4gUmVuZGVyTWVkaWFDb250cm9sczo6cGFpbnRNZWRpYUNvbnRyb2xzUGFydChNZWRpYVZv bHVtZVNsaWRlclRodW1iLCBvLCBwYWludEluZm8sIHIpOwogfQogCi1JbnRQb2ludCBSZW5kZXJU aGVtZVdpbjo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSogbXV0ZUJ1dHRv biwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKK0ludFBvaW50IFJlbmRlclRoZW1lV2luOjp2 b2x1bWVTbGlkZXJPZmZzZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRvbigpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIFJlbmRlck1lZGlhQ29udHJvbHM6OnZvbHVtZVNsaWRlck9mZnNldEZyb21NdXRlQnV0dG9u KG11dGVCdXR0b24sIHNpemUpOworICAgIHJldHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzOjp2b2x1 bWVTbGlkZXJPZmZzZXRSZWxhdGl2ZVRvTXV0ZUJ1dHRvbigpOwogfQogCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgKaW5kZXggYzA1ZDJlZWQ3NmFiZDM0MjQ2YjJl NTk3ZGM3MGNiNDU2NmY5YTQzNC4uY2Q1MjcwZjlhZmMzMDVkODI1YWYxMzUwYzk4MGExMjFhODgw OTM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2lu LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgKQEAgLTEz OCw3ICsxMzgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHBhaW50TWVkaWFWb2x1bWVT bGlkZXJDb250YWluZXIoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpOwogICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJhY2soUmVu ZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1 YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiwgY29uc3Qg UGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwotICAgIHZpcnR1YWwgSW50UG9pbnQgdm9sdW1l U2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24oTm9kZSosIGNvbnN0IEludFNpemUmKSBjb25zdDsK KyAgICB2aXJ0dWFsIEludFBvaW50IHZvbHVtZVNsaWRlck9mZnNldFJlbGF0aXZlVG9NdXRlQnV0 dG9uKCkgY29uc3Q7CiAjZW5kaWYKIAogcHJpdmF0ZToK