91670 2012-07-18 14:25:12 -0700 [chromium] Ubercomp: add id to SharedQuadState 2012-07-18 15:57:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aelias aelias abarth aelias cc-bugs danakj dglazkov enne fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 672753 0 aelias 2012-07-18 14:25:12 -0700 [chromium] Ubercomp: add id to SharedQuadState 672768 1 153090 aelias 2012-07-18 14:35:46 -0700 Created attachment 153090 Patch 672776 2 webkit.review.bot 2012-07-18 14:38:59 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 672781 3 153090 enne 2012-07-18 14:44:41 -0700 Comment on attachment 153090 Patch R=me for the compositor changes. Leaving CQ? until somebody chimes in with API approval. 672898 4 153090 webkit.review.bot 2012-07-18 15:57:16 -0700 Comment on attachment 153090 Patch Clearing flags on attachment: 153090 Committed r123038: <http://trac.webkit.org/changeset/123038> 672899 5 webkit.review.bot 2012-07-18 15:57:29 -0700 All reviewed patches have been landed. Closing bug. 153090 2012-07-18 14:35:46 -0700 2012-07-18 15:57:15 -0700 Patch bug-91670-20120718143545.patch text/plain 25915 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyODY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAxZmU5OWIxM2Q2ODkx ZTg2MzBkOTU2MWI0YTQ0NThmMzUzMzI0NzYxLi41YTMzNGI3ZjVjYWQ5YjJmZDMzZGVhNWNjYTRh YjVlMGExZjdhYzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wNy0xOCAg QWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVt XSBVYmVyY29tcDogYWRkIGlkIHRvIFNoYXJlZFF1YWRTdGF0ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFzc2lnbnMgYW4gaW50ZWdlciBJRCB0 byBTaGFyZWRRdWFkU3RhdGUgb2JqZWN0cyBhbmQgYQorICAgICAgICBjb3JyZXNwb25kaW5nIElE IHRvIHF1YWRzLiAgVGhpcyBJRCBpcyB1bmlxdWUgb25seSB3aXRoaW4gYQorICAgICAgICBSZW5k ZXJQYXNzIGFuZCBjdXJyZW50bHkgaXMganVzdCBzZXQgdG8gdGhlIGluZGV4IGluIHRoZSBzaGFy ZWQgcXVhZAorICAgICAgICBzdGF0ZSBsaXN0LiAgVGhpcyBpcyByZWR1bmRhbnQgd2l0aCB0aGUg cG9pbnRlciBhbmQgZXhpc3RzIHRvCisgICAgICAgIHNpbXBsaWZ5IHNlcmlhbGl6YXRpb24uCisK KyAgICAgICAgSSBmb3VuZCBvdXQgdGhhdCBwb2ludGVyIHJld3JpdGluZyB3aXRoaW4gYSBwaWNr bGVyIGlzIGJsb2NrZWQgYnkKKyAgICAgICAgcG9pbnRlcnMgdG8gbWVtb3J5IGJlaW5nIGNvbnN0 IHRoZXJlLCBzbyB0aGUgcmVhc3NpZ25tZW50IHdpbGwgaGF2ZSB0bworICAgICAgICBiZSBwZXJm b3JtZWQgaW4gdGhlIGFwcGxpY2F0aW9uIGxheWVyIGFueXdheS4gIEluIHRoYXQgY2FzZSwgaXQn cworICAgICAgICBzaW1wbGVzdCB0byBhZGQgc29tZSBJRCBpbnRlZ2Vycy4KKworICAgICAgICAq IGNocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yUXVhZC5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb21wb3NpdG9yUXVhZDo6c2hhcmVkUXVhZFN0YXRlSWQpOgorICAgICAgICAoV2ViQ29tcG9z aXRvclF1YWQpOgorICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU2hhcmVk UXVhZFN0YXRlLmg6CisgICAgICAgIChXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlKToKKwog MjAxMi0wNy0xMyAgVG9ueSBQYXluZSAgPHRwYXluZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmVtb3ZlIFdpZGdldCBmcm9tIHNjcmVlbkNvbG9yUHJvZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQ4NzE1 ZGNiMWFmMGM4NDcwZmY4ZDczMWE1ZDdjODIxZjMxNzYzZDAuLmJjZWIzMjIwMGMzZjI2N2QwNzY2 YTFjMWY4NjM4YjZlZmYzN2Y2NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NCBAQAorMjAxMi0w Ny0xOCAgQWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2No cm9taXVtXSBVYmVyY29tcDogYWRkIGlkIHRvIFNoYXJlZFF1YWRTdGF0ZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFzc2lnbnMgYW4gaW50ZWdl ciBJRCB0byBTaGFyZWRRdWFkU3RhdGUgb2JqZWN0cyBhbmQgYQorICAgICAgICBjb3JyZXNwb25k aW5nIElEIHRvIHF1YWRzLiAgVGhpcyBJRCBpcyB1bmlxdWUgb25seSB3aXRoaW4gYQorICAgICAg ICBSZW5kZXJQYXNzIGFuZCBjdXJyZW50bHkgaXMganVzdCBzZXQgdG8gdGhlIGluZGV4IGluIHRo ZSBzaGFyZWQgcXVhZAorICAgICAgICBzdGF0ZSBsaXN0LiAgVGhpcyBpcyByZWR1bmRhbnQgd2l0 aCB0aGUgcG9pbnRlciBhbmQgZXhpc3RzIHRvCisgICAgICAgIHNpbXBsaWZ5IHNlcmlhbGl6YXRp b24uCisKKyAgICAgICAgSSBmb3VuZCBvdXQgdGhhdCBwb2ludGVyIHJld3JpdGluZyB3aXRoaW4g YSBwaWNrbGVyIGlzIGJsb2NrZWQgYnkKKyAgICAgICAgcG9pbnRlcnMgdG8gbWVtb3J5IGJlaW5n IGNvbnN0IHRoZXJlLCBzbyB0aGUgcmVhc3NpZ25tZW50IHdpbGwgaGF2ZSB0bworICAgICAgICBi ZSBwZXJmb3JtZWQgaW4gdGhlIGFwcGxpY2F0aW9uIGxheWVyIGFueXdheS4gIEluIHRoYXQgY2Fz ZSwgaXQncworICAgICAgICBzaW1wbGVzdCB0byBhZGQgc29tZSBJRCBpbnRlZ2Vycy4KKworICAg ICAgICBObyBuZXcgdGVzdHMgKHdpbGwgaW50cm9kdWNlIHRoZW0gd2hlbiBtYWtpbmcgdXNlIG9m IHRoZSBJRCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBv c2l0b3JRdWFkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvclF1YWQ6OldlYkNv bXBvc2l0b3JRdWFkKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvclF1YWQ6OnNldFNo YXJlZFF1YWRTdGF0ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHBsYXRmb3JtL2No cm9taXVtL3N1cHBvcnQvV2ViQ29tcG9zaXRvclNoYXJlZFF1YWRTdGF0ZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGU6OldlYkNvbXBvc2l0b3JTaGFy ZWRRdWFkU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0 YXRlOjpjcmVhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpjcmVhdGVTaGFy ZWRRdWFkU3RhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJJbXBsLmg6CisgICAgICAgIChDQ0xheWVySW1wbCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJQYXNzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNDUmVuZGVyUGFzczo6YXBwZW5kUXVhZHNGb3JMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpD Q1JlbmRlclBhc3M6OmFwcGVuZFF1YWRzRm9yUmVuZGVyU3VyZmFjZUxheWVyKToKKyAgICAgICAg KFdlYkNvcmU6OkNDUmVuZGVyUGFzczo6YXBwZW5kUXVhZHNUb0ZpbGxTY3JlZW4pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDQ1JlbmRlclN1cmZhY2U6OmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSk6 CisgICAgICAgIChXZWJDb3JlOjpDQ1JlbmRlclN1cmZhY2U6OmNyZWF0ZVJlcGxpY2FTaGFyZWRR dWFkU3RhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVu ZGVyU3VyZmFjZS5oOgorICAgICAgICAoQ0NSZW5kZXJTdXJmYWNlKToKKwogMjAxMi0wNy0xNyAg RW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5jb3JyZWN0IG9m ZnNldCB1c2VkIGZvciBzY3JvbGxXaWR0aC9IZWlnaHQgY2FsY3VsYXRpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggZjExNTE5ODk5YjBjMmQ1MmRhYTUzYTcxMDhhNzc0NTc4OTc5YmIx Ni4uNWNkNTY4NjM5MWYzZTZhMDkzNDg2ZjEyYjUwNjZhYWVlMGM5MWVkOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0wNy0xOCAgQWxleGFuZHJlIEVs aWFzICA8YWVsaWFzQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBVYmVyY29tcDog YWRkIGlkIHRvIFNoYXJlZFF1YWRTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGFzc2lnbnMgYW4gaW50ZWdlciBJRCB0byBTaGFyZWRRdWFk U3RhdGUgb2JqZWN0cyBhbmQgYQorICAgICAgICBjb3JyZXNwb25kaW5nIElEIHRvIHF1YWRzLiAg VGhpcyBJRCBpcyB1bmlxdWUgb25seSB3aXRoaW4gYQorICAgICAgICBSZW5kZXJQYXNzIGFuZCBj dXJyZW50bHkgaXMganVzdCBzZXQgdG8gdGhlIGluZGV4IGluIHRoZSBzaGFyZWQgcXVhZAorICAg ICAgICBzdGF0ZSBsaXN0LiAgVGhpcyBpcyByZWR1bmRhbnQgd2l0aCB0aGUgcG9pbnRlciBhbmQg ZXhpc3RzIHRvCisgICAgICAgIHNpbXBsaWZ5IHNlcmlhbGl6YXRpb24uCisKKyAgICAgICAgSSBm b3VuZCBvdXQgdGhhdCBwb2ludGVyIHJld3JpdGluZyB3aXRoaW4gYSBwaWNrbGVyIGlzIGJsb2Nr ZWQgYnkKKyAgICAgICAgcG9pbnRlcnMgdG8gbWVtb3J5IGJlaW5nIGNvbnN0IHRoZXJlLCBzbyB0 aGUgcmVhc3NpZ25tZW50IHdpbGwgaGF2ZSB0bworICAgICAgICBiZSBwZXJmb3JtZWQgaW4gdGhl IGFwcGxpY2F0aW9uIGxheWVyIGFueXdheS4gIEluIHRoYXQgY2FzZSwgaXQncworICAgICAgICBz aW1wbGVzdCB0byBhZGQgc29tZSBJRCBpbnRlZ2Vycy4KKworICAgICAgICAqIHRlc3RzL0NDTGF5 ZXJUcmVlSG9zdEltcGxUZXN0LmNwcDoKKyAgICAgICAgKiB0ZXN0cy9DQ1F1YWRDdWxsZXJUZXN0 LmNwcDoKKyAgICAgICAgKiB0ZXN0cy9DQ1JlbmRlclN1cmZhY2VUZXN0LmNwcDoKKyAgICAgICAg KiB0ZXN0cy9DQ1NvbGlkQ29sb3JMYXllckltcGxUZXN0LmNwcDoKKyAgICAgICAgKENDTGF5ZXJU ZXN0Q29tbW9uOjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9DQ1RpbGVkTGF5ZXJJbXBsVGVzdC5j cHA6CisgICAgICAgIChDQ0xheWVyVGVzdENvbW1vbjo6VEVTVCk6CisgICAgICAgIChDQ0xheWVy VGVzdENvbW1vbjo6Z2V0UXVhZHMpOgorCiAyMDEyLTA3LTE3ICBUb255IENoYW5nICA8dG9ueUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZmIC0t Z2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yUXVhZC5o IGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yUXVhZC5oCmlu ZGV4IGUyYWQwYWRhYmQ4ZjE2OTM4OGJiYTMyMWY4YmFiYTQwMzcxN2Y3NTguLjY4MDI3ZmM1NTdk YzZiMTQxMTY2NjgxZWFjZGY0YmI4NmZlZTU2ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclF1YWQuaAorKysgYi9Tb3VyY2UvUGxhdGZv cm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JRdWFkLmgKQEAgLTg1LDcgKzg1LDggQEAg cHVibGljOgogICAgIHVuc2lnbmVkIHNpemUoKSBjb25zdDsKIAogICAgIGNvbnN0IFdlYkNvbXBv c2l0b3JTaGFyZWRRdWFkU3RhdGUqIHNoYXJlZFF1YWRTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1f c2hhcmVkUXVhZFN0YXRlOyB9Ci0gICAgdm9pZCBzZXRTaGFyZWRRdWFkU3RhdGUoY29uc3QgV2Vi Q29tcG9zaXRvclNoYXJlZFF1YWRTdGF0ZSogc2hhcmVkUXVhZFN0YXRlKSB7IG1fc2hhcmVkUXVh ZFN0YXRlID0gc2hhcmVkUXVhZFN0YXRlOyB9CisgICAgaW50IHNoYXJlZFF1YWRTdGF0ZUlkKCkg Y29uc3QgeyByZXR1cm4gbV9zaGFyZWRRdWFkU3RhdGVJZDsgfQorICAgIHZvaWQgc2V0U2hhcmVk UXVhZFN0YXRlKGNvbnN0IFdlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUqKTsKIAogcHJvdGVj dGVkOgogI2lmIFdFQktJVF9JTVBMRU1FTlRBVElPTgpAQCAtOTYsNiArOTcsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgLy8gZWZmaWNpZW5jeS4gVGhlcmUgaXMgc3BlY2lhbCB0cmVhdG1lbnQgdG8gcmVj b25zdHJ1Y3QgdGhlc2UgcG9pbnRlcnMKICAgICAvLyBkdXJpbmcgc2VyaWFsaXphdGlvbi4KICAg ICBjb25zdCBXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlKiBtX3NoYXJlZFF1YWRTdGF0ZTsK KyAgICBpbnQgbV9zaGFyZWRRdWFkU3RhdGVJZDsKIAogICAgIE1hdGVyaWFsIG1fbWF0ZXJpYWw7 CiAgICAgV2ViUmVjdCBtX3F1YWRSZWN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlLmggYi9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUuaAppbmRl eCAzN2M2ZDE4YWEyYTAwNzQ5YjUwZjQ3MjQ4ODhlZDVlZmJhM2YxOTdiLi4wNjNkNDA3M2VkNmRh M2Y1ZThhYzhjN2E3NTcyY2ZmYTQ1MzY1MDMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUuaAorKysgYi9Tb3Vy Y2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUu aApAQCAtMzksNiArMzksOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViQ29tcG9z aXRvclNoYXJlZFF1YWRTdGF0ZSB7CiBwdWJsaWM6CisgICAgaW50IGlkOworCiAgICAgLy8gVHJh bnNmb3JtcyBmcm9tIHF1YWQncyBvcmlnaW5hbCBjb250ZW50IHNwYWNlIHRvIGl0cyB0YXJnZXQg Y29udGVudCBzcGFjZS4KICAgICBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCBxdWFkVHJhbnNmb3Jt OwogICAgIC8vIFRoaXMgcmVjdCBsaXZlcyBpbiB0aGUgY29udGVudCBzcGFjZSBmb3IgdGhlIHF1 YWQncyBvcmlnaW5hdGluZyBsYXllci4KQEAgLTUxLDggKzUzLDggQEAgcHVibGljOgogICAgIFdl YkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUoKTsKIAogI2lmIFdFQktJVF9JTVBMRU1FTlRBVElP TgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFdlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGU+IGNy ZWF0ZShjb25zdCBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgcXVhZFRyYW5zZm9ybSwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiBzY2lzc29yUmVjdCwgZmxvYXQgb3BhY2l0eSwgYm9vbCBvcGFxdWUpOwotICAgIFdlYkNv bXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUoY29uc3QgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgmIHF1 YWRUcmFuc2Zvcm0sIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVDb250ZW50UmVjdCwg Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc2Npc3NvclJlY3QsIGZsb2F0IG9wYWNpdHksIGJvb2wg b3BhcXVlKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0 YXRlPiBjcmVhdGUoaW50IGlkLCBjb25zdCBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgcXVhZFRy YW5zZm9ybSwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBzY2lzc29yUmVjdCwgZmxvYXQgb3BhY2l0eSwgYm9vbCBvcGFx dWUpOworICAgIFdlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUoaW50IGlkLCBjb25zdCBXZWJU cmFuc2Zvcm1hdGlvbk1hdHJpeCYgcXVhZFRyYW5zZm9ybSwgY29uc3QgV2ViQ29yZTo6SW50UmVj dCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY2lzc29yUmVj dCwgZmxvYXQgb3BhY2l0eSwgYm9vbCBvcGFxdWUpOwogICAgIGJvb2wgaXNMYXllckF4aXNBbGln bmVkSW50UmVjdCgpIGNvbnN0OwogI2VuZGlmCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9yUXVhZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JRdWFkLmNw cAppbmRleCA3YTAyY2EwZWFmYzNmYTE3YmY4ODgzODczYjk4MGY0MGFkZmEzMGM2Li42ZDYxN2Nk ODQzMzFmMzNjYjdjN2ExMzJmZWMyOWM4N2E0OTg4NjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JRdWFkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JR dWFkLmNwcApAQCAtNDEsNiArNDEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogV2ViQ29tcG9z aXRvclF1YWQ6OldlYkNvbXBvc2l0b3JRdWFkKGNvbnN0IFdlYkNvbXBvc2l0b3JTaGFyZWRRdWFk U3RhdGUqIHNoYXJlZFF1YWRTdGF0ZSwgTWF0ZXJpYWwgbWF0ZXJpYWwsIGNvbnN0IEludFJlY3Qm IHF1YWRSZWN0KQogICAgIDogbV9zaGFyZWRRdWFkU3RhdGUoc2hhcmVkUXVhZFN0YXRlKQorICAg ICwgbV9zaGFyZWRRdWFkU3RhdGVJZChzaGFyZWRRdWFkU3RhdGUtPmlkKQogICAgICwgbV9tYXRl cmlhbChtYXRlcmlhbCkKICAgICAsIG1fcXVhZFJlY3QocXVhZFJlY3QpCiAgICAgLCBtX3F1YWRW aXNpYmxlUmVjdChxdWFkUmVjdCkKQEAgLTk0LDQgKzk1LDEwIEBAIHVuc2lnbmVkIFdlYkNvbXBv c2l0b3JRdWFkOjpzaXplKCkgY29uc3QKICAgICByZXR1cm4gc2l6ZW9mKFdlYkNvbXBvc2l0b3JR dWFkKTsKIH0KIAordm9pZCBXZWJDb21wb3NpdG9yUXVhZDo6c2V0U2hhcmVkUXVhZFN0YXRlKGNv bnN0IFdlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUqIHNoYXJlZFF1YWRTdGF0ZSkKK3sKKyAg ICBtX3NoYXJlZFF1YWRTdGF0ZSA9IHNoYXJlZFF1YWRTdGF0ZTsKKyAgICBtX3NoYXJlZFF1YWRT dGF0ZUlkID0gc2hhcmVkUXVhZFN0YXRlLT5pZDsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJDb21wb3NpdG9yU2hhcmVkUXVh ZFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2Vi Q29tcG9zaXRvclNoYXJlZFF1YWRTdGF0ZS5jcHAKaW5kZXggMzEzNTY0YzAwNzIxOTkxMDBjYjVh YTlmN2UxMTc4MDg4M2EyMDIwZC4uOTFlZjNlYWY5YWNjNWIxMDUxZjQ0MjEyMGJmMmQ0ZjhkZTBl MDIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9y dC9XZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUuY3Bw CkBAIC0zNiwxOCArMzYsMjAgQEAgdXNpbmcgV2ViQ29yZTo6SW50UmVjdDsKIG5hbWVzcGFjZSBX ZWJLaXQgewogCiBXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlOjpXZWJDb21wb3NpdG9yU2hh cmVkUXVhZFN0YXRlKCkKLSAgICA6IG9wYWNpdHkoMCkKKyAgICA6IGlkKDApCisgICAgLCBvcGFj aXR5KDApCiAgICAgLCBvcGFxdWUoZmFsc2UpCiB7CiB9CiAKLVBhc3NPd25QdHI8V2ViQ29tcG9z aXRvclNoYXJlZFF1YWRTdGF0ZT4gV2ViQ29tcG9zaXRvclNoYXJlZFF1YWRTdGF0ZTo6Y3JlYXRl KGNvbnN0IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4JiBxdWFkVHJhbnNmb3JtLCBjb25zdCBJbnRS ZWN0JiB2aXNpYmxlQ29udGVudFJlY3QsIGNvbnN0IEludFJlY3QmIHNjaXNzb3JSZWN0LCBmbG9h dCBvcGFjaXR5LCBib29sIG9wYXF1ZSkKK1Bhc3NPd25QdHI8V2ViQ29tcG9zaXRvclNoYXJlZFF1 YWRTdGF0ZT4gV2ViQ29tcG9zaXRvclNoYXJlZFF1YWRTdGF0ZTo6Y3JlYXRlKGludCBpZCwgY29u c3QgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgmIHF1YWRUcmFuc2Zvcm0sIGNvbnN0IEludFJlY3Qm IHZpc2libGVDb250ZW50UmVjdCwgY29uc3QgSW50UmVjdCYgc2Npc3NvclJlY3QsIGZsb2F0IG9w YWNpdHksIGJvb2wgb3BhcXVlKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgV2ViQ29tcG9z aXRvclNoYXJlZFF1YWRTdGF0ZShxdWFkVHJhbnNmb3JtLCB2aXNpYmxlQ29udGVudFJlY3QsIHNj aXNzb3JSZWN0LCBvcGFjaXR5LCBvcGFxdWUpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IFdl YkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUoaWQsIHF1YWRUcmFuc2Zvcm0sIHZpc2libGVDb250 ZW50UmVjdCwgc2Npc3NvclJlY3QsIG9wYWNpdHksIG9wYXF1ZSkpOwogfQogCi1XZWJDb21wb3Np dG9yU2hhcmVkUXVhZFN0YXRlOjpXZWJDb21wb3NpdG9yU2hhcmVkUXVhZFN0YXRlKGNvbnN0IFdl YlRyYW5zZm9ybWF0aW9uTWF0cml4JiBxdWFkVHJhbnNmb3JtLCBjb25zdCBJbnRSZWN0JiB2aXNp YmxlQ29udGVudFJlY3QsIGNvbnN0IEludFJlY3QmIHNjaXNzb3JSZWN0LCBmbG9hdCBvcGFjaXR5 LCBib29sIG9wYXF1ZSkKLSAgICA6IHF1YWRUcmFuc2Zvcm0ocXVhZFRyYW5zZm9ybSkKK1dlYkNv bXBvc2l0b3JTaGFyZWRRdWFkU3RhdGU6OldlYkNvbXBvc2l0b3JTaGFyZWRRdWFkU3RhdGUoaW50 IGlkLCBjb25zdCBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgcXVhZFRyYW5zZm9ybSwgY29uc3Qg SW50UmVjdCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25zdCBJbnRSZWN0JiBzY2lzc29yUmVjdCwg ZmxvYXQgb3BhY2l0eSwgYm9vbCBvcGFxdWUpCisgICAgOiBpZChpZCkKKyAgICAsIHF1YWRUcmFu c2Zvcm0ocXVhZFRyYW5zZm9ybSkKICAgICAsIHZpc2libGVDb250ZW50UmVjdCh2aXNpYmxlQ29u dGVudFJlY3QpCiAgICAgLCBzY2lzc29yUmVjdChzY2lzc29yUmVjdCkKICAgICAsIG9wYWNpdHko b3BhY2l0eSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcAppbmRleCA5NDM0ZGM1OWNkOGU5ZTU4NTYy ZjRmNmI2MGI0OWVkNmQwNmZmZjUyLi4zZmZmNDY4ZjA0ODk4MmJmN2I5MjMzZDM3ZGM5MTM3MzE3 MzE4Y2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3BwCkBAIC0xNDUsNyArMTQ1LDcgQEAgYm9v bCBDQ0xheWVySW1wbDo6ZGVzY2VuZGFudERyYXdzQ29udGVudCgpCiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1QYXNzT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBDQ0xheWVySW1wbDo6Y3JlYXRl U2hhcmVkUXVhZFN0YXRlKCkgY29uc3QKK1Bhc3NPd25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+IEND TGF5ZXJJbXBsOjpjcmVhdGVTaGFyZWRRdWFkU3RhdGUoaW50IGlkKSBjb25zdAogewogICAgIFdl YlRyYW5zZm9ybWF0aW9uTWF0cml4IHF1YWRUcmFuc2Zvcm1hdGlvbiA9IGRyYXdUcmFuc2Zvcm0o KTsKICAgICBpZiAoIWNvbnRlbnRCb3VuZHMoKS5pc0VtcHR5KCkgJiYgIWJvdW5kcygpLmlzRW1w dHkoKSkgewpAQCAtMTU0LDcgKzE1NCw3IEBAIFBhc3NPd25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+ IENDTGF5ZXJJbXBsOjpjcmVhdGVTaGFyZWRRdWFkU3RhdGUoKSBjb25zdAogICAgICAgICBxdWFk VHJhbnNmb3JtYXRpb24udHJhbnNsYXRlKC1jb250ZW50Qm91bmRzKCkud2lkdGgoKSAvIDIuMCwg LWNvbnRlbnRCb3VuZHMoKS5oZWlnaHQoKSAvIDIuMCk7CiAgICAgfQogCi0gICAgcmV0dXJuIEND U2hhcmVkUXVhZFN0YXRlOjpjcmVhdGUocXVhZFRyYW5zZm9ybWF0aW9uLCBtX3Zpc2libGVDb250 ZW50UmVjdCwgbV9zY2lzc29yUmVjdCwgbV9kcmF3T3BhY2l0eSwgbV9vcGFxdWUpOworICAgIHJl dHVybiBDQ1NoYXJlZFF1YWRTdGF0ZTo6Y3JlYXRlKGlkLCBxdWFkVHJhbnNmb3JtYXRpb24sIG1f dmlzaWJsZUNvbnRlbnRSZWN0LCBtX3NjaXNzb3JSZWN0LCBtX2RyYXdPcGFjaXR5LCBtX29wYXF1 ZSk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OndpbGxEcmF3KENDUmVuZGVyZXIqLCBDQ0dyYXBo aWNzQ29udGV4dCopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaAppbmRleCBhNWNhY2Q2NGJmZjRhNjE0YmMz NTExMDFiMDVkMGMyODcwZDExZmJjLi4wOGUzNTlkYWQ3ZDVkODExNjQ3MDM1ZmZlNDJiOGMzNThl ZmRjODNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmgKQEAgLTg3LDcgKzg3LDcgQEAgcHVibGljOgog ICAgIENDTGF5ZXJUcmVlSG9zdEltcGwqIGxheWVyVHJlZUhvc3RJbXBsKCkgY29uc3QgeyByZXR1 cm4gbV9sYXllclRyZWVIb3N0SW1wbDsgfQogICAgIHZvaWQgc2V0TGF5ZXJUcmVlSG9zdEltcGwo Q0NMYXllclRyZWVIb3N0SW1wbCogaG9zdEltcGwpIHsgbV9sYXllclRyZWVIb3N0SW1wbCA9IGhv c3RJbXBsOyB9CiAKLSAgICBQYXNzT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBjcmVhdGVTaGFy ZWRRdWFkU3RhdGUoKSBjb25zdDsKKyAgICBQYXNzT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBj cmVhdGVTaGFyZWRRdWFkU3RhdGUoaW50IGlkKSBjb25zdDsKICAgICAvLyB3aWxsRHJhdyBtdXN0 IGJlIGNhbGxlZCBiZWZvcmUgYXBwZW5kUXVhZHMuIElmIHdpbGxEcmF3IGlzIGNhbGxlZCwKICAg ICAvLyBkaWREcmF3IGlzIGd1YXJhbnRlZWQgdG8gYmUgY2FsbGVkIGJlZm9yZSBhbm90aGVyIHdp bGxEcmF3IG9yIGJlZm9yZQogICAgIC8vIHRoZSBsYXllciBpcyBkZXN0cm95ZWQuIFRvIGVuZm9y Y2UgdGhpcywgYW55IGNsYXNzIHRoYXQgb3ZlcnJpZGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclBhc3MuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJQYXNzLmNw cAppbmRleCA1MzI2NjVmYmU3OTliZjcxNGE2YzJhOTg0MTAxN2MyNTA4YThmODVkLi5kMzg5ZjJi MzI2ZWI2NjM2ZDUzYjgyOTBiY2Y5ZWExYzI5MjE0N2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclBhc3MuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyUGFz cy5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgdm9pZCBDQ1JlbmRlclBhc3M6OmFwcGVuZFF1YWRzRm9y TGF5ZXIoQ0NMYXllckltcGwqIGxheWVyLCBDQ09jY2x1c2lvblRyYWNrZXJJbXAKIHsKICAgICBD Q1F1YWRDdWxsZXIgcXVhZEN1bGxlcihtX3F1YWRMaXN0LCBsYXllciwgb2NjbHVzaW9uVHJhY2tl ciwgbGF5ZXItPmhhc0RlYnVnQm9yZGVycygpKTsKIAotICAgIE93blB0cjxDQ1NoYXJlZFF1YWRT dGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpOwor ICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNy ZWF0ZVNoYXJlZFF1YWRTdGF0ZShtX3NoYXJlZFF1YWRTdGF0ZUxpc3Quc2l6ZSgpKTsKICAgICBs YXllci0+YXBwZW5kRGVidWdCb3JkZXJRdWFkKHF1YWRDdWxsZXIsIHNoYXJlZFF1YWRTdGF0ZS5n ZXQoKSk7CiAgICAgbGF5ZXItPmFwcGVuZFF1YWRzKHF1YWRDdWxsZXIsIHNoYXJlZFF1YWRTdGF0 ZS5nZXQoKSwgaGFkTWlzc2luZ1RpbGVzKTsKICAgICBtX3NoYXJlZFF1YWRTdGF0ZUxpc3QuYXBw ZW5kKHNoYXJlZFF1YWRTdGF0ZS5yZWxlYXNlKCkpOwpAQCAtNzAsNyArNzAsNyBAQCB2b2lkIEND UmVuZGVyUGFzczo6YXBwZW5kUXVhZHNGb3JSZW5kZXJTdXJmYWNlTGF5ZXIoQ0NMYXllckltcGwq IGxheWVyLCBjb25zdCBDQwogCiAgICAgQ0NSZW5kZXJTdXJmYWNlKiBzdXJmYWNlID0gbGF5ZXIt PnJlbmRlclN1cmZhY2UoKTsKIAotICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVk UXVhZFN0YXRlID0gc3VyZmFjZS0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKCk7CisgICAgT3duUHRy PENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3RhdGUgPSBzdXJmYWNlLT5jcmVhdGVTaGFy ZWRRdWFkU3RhdGUobV9zaGFyZWRRdWFkU3RhdGVMaXN0LnNpemUoKSk7CiAgICAgYm9vbCBpc1Jl cGxpY2EgPSBmYWxzZTsKICAgICBzdXJmYWNlLT5hcHBlbmRRdWFkcyhxdWFkQ3VsbGVyLCBzaGFy ZWRRdWFkU3RhdGUuZ2V0KCksIGlzUmVwbGljYSwgY29udHJpYnV0aW5nUmVuZGVyUGFzcy0+aWQo KSk7CiAgICAgbV9zaGFyZWRRdWFkU3RhdGVMaXN0LmFwcGVuZChzaGFyZWRRdWFkU3RhdGUucmVs ZWFzZSgpKTsKQEAgLTc5LDcgKzc5LDcgQEAgdm9pZCBDQ1JlbmRlclBhc3M6OmFwcGVuZFF1YWRz Rm9yUmVuZGVyU3VyZmFjZUxheWVyKENDTGF5ZXJJbXBsKiBsYXllciwgY29uc3QgQ0MKICAgICAg ICAgcmV0dXJuOwogCiAgICAgLy8gQWRkIHJlcGxpY2EgYWZ0ZXIgdGhlIHN1cmZhY2Ugc28gdGhh dCBpdCBhcHBlYXJzIGJlbG93IHRoZSBzdXJmYWNlLgotICAgIE93blB0cjxDQ1NoYXJlZFF1YWRT dGF0ZT4gcmVwbGljYVNoYXJlZFF1YWRTdGF0ZSA9IHN1cmZhY2UtPmNyZWF0ZVJlcGxpY2FTaGFy ZWRRdWFkU3RhdGUoKTsKKyAgICBPd25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+IHJlcGxpY2FTaGFy ZWRRdWFkU3RhdGUgPSBzdXJmYWNlLT5jcmVhdGVSZXBsaWNhU2hhcmVkUXVhZFN0YXRlKG1fc2hh cmVkUXVhZFN0YXRlTGlzdC5zaXplKCkpOwogICAgIGlzUmVwbGljYSA9IHRydWU7CiAgICAgc3Vy ZmFjZS0+YXBwZW5kUXVhZHMocXVhZEN1bGxlciwgcmVwbGljYVNoYXJlZFF1YWRTdGF0ZS5nZXQo KSwgaXNSZXBsaWNhLCBjb250cmlidXRpbmdSZW5kZXJQYXNzLT5pZCgpKTsKICAgICBtX3NoYXJl ZFF1YWRTdGF0ZUxpc3QuYXBwZW5kKHJlcGxpY2FTaGFyZWRRdWFkU3RhdGUucmVsZWFzZSgpKTsK QEAgLTk2LDcgKzk2LDcgQEAgdm9pZCBDQ1JlbmRlclBhc3M6OmFwcGVuZFF1YWRzVG9GaWxsU2Ny ZWVuKENDTGF5ZXJJbXBsKiByb290TGF5ZXIsIFNrQ29sb3Igc2NyZWUKIAogICAgIC8vIE1hbnVh bGx5IGNyZWF0ZSB0aGUgcXVhZCBzdGF0ZSBmb3IgdGhlIGd1dHRlciBxdWFkcywgYXMgdGhlIHJv b3QgbGF5ZXIKICAgICAvLyBkb2Vzbid0IGhhdmUgYW55IGJvdW5kcyBhbmQgc28gY2FuJ3QgZ2Vu ZXJhdGUgdGhpcyBpdHNlbGYuCi0gICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRR dWFkU3RhdGUgPSByb290TGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpOworICAgIE93blB0 cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gcm9vdExheWVyLT5jcmVhdGVT aGFyZWRRdWFkU3RhdGUobV9zaGFyZWRRdWFkU3RhdGVMaXN0LnNpemUoKSk7CiAgICAgV2ViVHJh bnNmb3JtYXRpb25NYXRyaXggdHJhbnNmb3JtVG9MYXllclNwYWNlID0gcm9vdExheWVyLT5zY3Jl ZW5TcGFjZVRyYW5zZm9ybSgpLmludmVyc2UoKTsKICAgICBWZWN0b3I8SW50UmVjdD4gZmlsbFJl Y3RzID0gZmlsbFJlZ2lvbi5yZWN0cygpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZmls bFJlY3RzLnNpemUoKTsgKytpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmNwcAppbmRl eCBlNzI2MDk2NmEwNzA4YTAyZTE5ZTA4YzhlZWMyYTMwY2I5MzcxMTczLi44MmNiNTQ3NjA3MjI2 ODFhMzI5MGM3Nzk5ZThmZWNkYTcxMmJkNjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFj ZS5jcHAKQEAgLTE2MywxNiArMTYzLDE2IEBAIGJvb2wgQ0NSZW5kZXJTdXJmYWNlOjpzdXJmYWNl UHJvcGVydHlDaGFuZ2VkT25seUZyb21EZXNjZW5kYW50KCkgY29uc3QKICAgICByZXR1cm4gbV9z dXJmYWNlUHJvcGVydHlDaGFuZ2VkICYmICFtX293bmluZ0xheWVyLT5sYXllclByb3BlcnR5Q2hh bmdlZCgpOwogfQogCi1QYXNzT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBDQ1JlbmRlclN1cmZh Y2U6OmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpIGNvbnN0CitQYXNzT3duUHRyPENDU2hhcmVkUXVh ZFN0YXRlPiBDQ1JlbmRlclN1cmZhY2U6OmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZShpbnQgaWQpIGNv bnN0CiB7CiAgICAgYm9vbCBpc09wYXF1ZSA9IGZhbHNlOwotICAgIHJldHVybiBDQ1NoYXJlZFF1 YWRTdGF0ZTo6Y3JlYXRlKG1fb3JpZ2luVHJhbnNmb3JtLCBtX2NvbnRlbnRSZWN0LCBtX3NjaXNz b3JSZWN0LCBtX2RyYXdPcGFjaXR5LCBpc09wYXF1ZSk7CisgICAgcmV0dXJuIENDU2hhcmVkUXVh ZFN0YXRlOjpjcmVhdGUoaWQsIG1fb3JpZ2luVHJhbnNmb3JtLCBtX2NvbnRlbnRSZWN0LCBtX3Nj aXNzb3JSZWN0LCBtX2RyYXdPcGFjaXR5LCBpc09wYXF1ZSk7CiB9CiAKLVBhc3NPd25QdHI8Q0NT aGFyZWRRdWFkU3RhdGU+IENDUmVuZGVyU3VyZmFjZTo6Y3JlYXRlUmVwbGljYVNoYXJlZFF1YWRT dGF0ZSgpIGNvbnN0CitQYXNzT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBDQ1JlbmRlclN1cmZh Y2U6OmNyZWF0ZVJlcGxpY2FTaGFyZWRRdWFkU3RhdGUoaW50IGlkKSBjb25zdAogewogICAgIGJv b2wgaXNPcGFxdWUgPSBmYWxzZTsKLSAgICByZXR1cm4gQ0NTaGFyZWRRdWFkU3RhdGU6OmNyZWF0 ZShtX3JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0sIG1fY29udGVudFJlY3QsIG1fc2Npc3NvclJlY3Qs IG1fZHJhd09wYWNpdHksIGlzT3BhcXVlKTsKKyAgICByZXR1cm4gQ0NTaGFyZWRRdWFkU3RhdGU6 OmNyZWF0ZShpZCwgbV9yZXBsaWNhT3JpZ2luVHJhbnNmb3JtLCBtX2NvbnRlbnRSZWN0LCBtX3Nj aXNzb3JSZWN0LCBtX2RyYXdPcGFjaXR5LCBpc09wYXF1ZSk7CiB9CiAKIEZsb2F0UmVjdCBDQ1Jl bmRlclN1cmZhY2U6OmNvbXB1dGVSb290U2Npc3NvclJlY3RJbkN1cnJlbnRTdXJmYWNlKGNvbnN0 IEZsb2F0UmVjdCYgcm9vdFNjaXNzb3JSZWN0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZh Y2UuaAppbmRleCA5ZjdkODc2ZWVjZWY5ZDliZjYwMWE3OWNiMDZhY2JhNDA3ZWYzNjFmLi4xYWMz NDAwYWY1YzRjMGJjMjIxNTI2MGQ1Mzc1ODA3NTlhYzc0ODE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRl clN1cmZhY2UuaApAQCAtMTE0LDggKzExNCw4IEBAIHB1YmxpYzoKIAogICAgIENDRGFtYWdlVHJh Y2tlciogZGFtYWdlVHJhY2tlcigpIGNvbnN0IHsgcmV0dXJuIG1fZGFtYWdlVHJhY2tlci5nZXQo KTsgfQogCi0gICAgUGFzc093blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gY3JlYXRlU2hhcmVkUXVh ZFN0YXRlKCkgY29uc3Q7Ci0gICAgUGFzc093blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gY3JlYXRl UmVwbGljYVNoYXJlZFF1YWRTdGF0ZSgpIGNvbnN0OworICAgIFBhc3NPd25QdHI8Q0NTaGFyZWRR dWFkU3RhdGU+IGNyZWF0ZVNoYXJlZFF1YWRTdGF0ZShpbnQgaWQpIGNvbnN0OworICAgIFBhc3NP d25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+IGNyZWF0ZVJlcGxpY2FTaGFyZWRRdWFkU3RhdGUoaW50 IGlkKSBjb25zdDsKIAogICAgIHZvaWQgYXBwZW5kUXVhZHMoQ0NRdWFkQ3VsbGVyJiwgQ0NTaGFy ZWRRdWFkU3RhdGUqLCBib29sIGZvclJlcGxpY2EsIGludCByZW5kZXJQYXNzSWQpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxU ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1w bFRlc3QuY3BwCmluZGV4IGU5YjlmMDI4MTNjY2IzY2YzYTllNTE4YzIyYmJkYTQ3NmNiYzNmNjAu LjRhMDM0Nzc4NTBiNTQ2MGFiNmQ3MDY3OGRhNDU1YTIwMzdmZjY3ODAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3Qu Y3BwCkBAIC0zMDE3LDcgKzMwMTcsNyBAQCBzdGF0aWMgdm9pZCBjb25maWd1cmVSZW5kZXJQYXNz VGVzdERhdGEoY29uc3QgY2hhciogdGVzdFNjcmlwdCwgUmVuZGVyUGFzc1JlbW92YQogICAgIHJl bmRlcmVyLT5jbGVhckNhY2hlZFRleHR1cmVzKCk7CiAKICAgICAvLyBPbmUgc2hhcmVkIHN0YXRl IGZvciBhbGwgcXVhZHMgLSB3ZSBkb24ndCBuZWVkIHRoZSBjb3JyZWN0IGRldGFpbHMKLSAgICB0 ZXN0RGF0YS5zaGFyZWRRdWFkU3RhdGUgPSBDQ1NoYXJlZFF1YWRTdGF0ZTo6Y3JlYXRlKFdlYlRy YW5zZm9ybWF0aW9uTWF0cml4KCksIEludFJlY3QoKSwgSW50UmVjdCgpLCAxLjAsIHRydWUpOwor ICAgIHRlc3REYXRhLnNoYXJlZFF1YWRTdGF0ZSA9IENDU2hhcmVkUXVhZFN0YXRlOjpjcmVhdGUo MCwgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgSW50UmVjdCgpLCBJbnRSZWN0KCksIDEuMCwg dHJ1ZSk7CiAKICAgICBjb25zdCBjaGFyKiBjdXJyZW50Q2hhciA9IHRlc3RTY3JpcHQ7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NRdWFkQ3VsbGVyVGVzdC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDUXVhZEN1bGxlclRlc3QuY3BwCmlu ZGV4IGUxZDlmYjM2NzdmNjA1NzFiZTBiYmZkMzg0MmIzMTMwOTA3NzRmMGQuLjNmNDBjNTdhMDk0 NjRiMTU5YmQyMjMzMjA4MzUxYTg5MjhlODE3MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvQ0NRdWFkQ3VsbGVyVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ1F1YWRDdWxsZXJUZXN0LmNwcApAQCAtOTgsNyArOTgsNyBAQCBzdGF0 aWMgdm9pZCBhcHBlbmRRdWFkcyhDQ1F1YWRMaXN0JiBxdWFkTGlzdCwgVmVjdG9yPE93blB0cjxD Q1NoYXJlZFF1YWRTdGF0ZT4gPgogewogICAgIG9jY2x1c2lvblRyYWNrZXIuZW50ZXJMYXllcihp dCk7CiAgICAgQ0NRdWFkQ3VsbGVyIHF1YWRDdWxsZXIocXVhZExpc3QsIGxheWVyLCAmb2NjbHVz aW9uVHJhY2tlciwgZmFsc2UpOwotICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVk UXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpOworICAgIE93blB0cjxD Q1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1 YWRTdGF0ZSgwKTsKICAgICBib29sIGhhZE1pc3NpbmdUaWxlcyA9IGZhbHNlOwogICAgIGxheWVy LT5hcHBlbmRRdWFkcyhxdWFkQ3VsbGVyLCBzaGFyZWRRdWFkU3RhdGUuZ2V0KCksIGhhZE1pc3Np bmdUaWxlcyk7CiAgICAgc2hhcmVkU3RhdGVMaXN0LmFwcGVuZChzaGFyZWRRdWFkU3RhdGUucmVs ZWFzZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NSZW5k ZXJTdXJmYWNlVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDUmVuZGVy U3VyZmFjZVRlc3QuY3BwCmluZGV4IGU5ZTA0MTc0OWMzNmIyYTE2NWRlNTk0NGFlNWNkMDI1ZDNh YzRhZGQuLmE5ODljZDYwMmU4OGU2NzA3OWM0MTEwOWMxOTllOGMzYTBiNjBhZmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NSZW5kZXJTdXJmYWNlVGVzdC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1JlbmRlclN1cmZhY2VUZXN0LmNw cApAQCAtMTEyLDcgKzExMiw3IEBAIFRFU1QoQ0NSZW5kZXJTdXJmYWNlVGVzdCwgc2FuaXR5Q2hl Y2tTdXJmYWNlQ3JlYXRlc0NvcnJlY3RTaGFyZWRRdWFkU3RhdGUpCiAgICAgcmVuZGVyU3VyZmFj ZS0+c2V0U2Npc3NvclJlY3QoY2xpcFJlY3QpOwogICAgIHJlbmRlclN1cmZhY2UtPnNldERyYXdP cGFjaXR5KDEpOwogCi0gICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3Rh dGUgPSByZW5kZXJTdXJmYWNlLT5jcmVhdGVTaGFyZWRRdWFkU3RhdGUoKTsKKyAgICBPd25QdHI8 Q0NTaGFyZWRRdWFkU3RhdGU+IHNoYXJlZFF1YWRTdGF0ZSA9IHJlbmRlclN1cmZhY2UtPmNyZWF0 ZVNoYXJlZFF1YWRTdGF0ZSgwKTsKIAogICAgIEVYUEVDVF9FUSgzMCwgc2hhcmVkUXVhZFN0YXRl LT5xdWFkVHJhbnNmb3JtLm00MSgpKTsKICAgICBFWFBFQ1RfRVEoNDAsIHNoYXJlZFF1YWRTdGF0 ZS0+cXVhZFRyYW5zZm9ybS5tNDIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL0NDU29saWRDb2xvckxheWVySW1wbFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9DQ1NvbGlkQ29sb3JMYXllckltcGxUZXN0LmNwcAppbmRleCBmOWE5Mjky Yjc3ZDYwZGIzN2JlNzUxODkxNDM0NGQyOTAwMWRmYmViLi4xNzU0YTViMTIyYWI4ZGI4ZjZkZDNi ZTUyN2YwNDc5YjA4MjE1MzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL0NDU29saWRDb2xvckxheWVySW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NTb2xpZENvbG9yTGF5ZXJJbXBsVGVzdC5jcHAKQEAgLTUyLDcgKzUyLDcg QEAgVEVTVChDQ1NvbGlkQ29sb3JMYXllckltcGxUZXN0LCB2ZXJpZnlUaWxpbmdDb21wbGV0ZUFu ZE5vT3ZlcmxhcCkKICAgICBsYXllci0+c2V0Qm91bmRzKGxheWVyU2l6ZSk7CiAgICAgbGF5ZXIt PnNldENvbnRlbnRCb3VuZHMobGF5ZXJTaXplKTsKIAotICAgIE93blB0cjxDQ1NoYXJlZFF1YWRT dGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpOwor ICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNy ZWF0ZVNoYXJlZFF1YWRTdGF0ZSgwKTsKICAgICBib29sIGhhZE1pc3NpbmdUaWxlcyA9IGZhbHNl OwogICAgIGxheWVyLT5hcHBlbmRRdWFkcyhxdWFkQ3VsbGVyLCBzaGFyZWRRdWFkU3RhdGUuZ2V0 KCksIGhhZE1pc3NpbmdUaWxlcyk7CiAKQEAgLTc1LDcgKzc1LDcgQEAgVEVTVChDQ1NvbGlkQ29s b3JMYXllckltcGxUZXN0LCB2ZXJpZnlDb3JyZWN0QmFja2dyb3VuZENvbG9ySW5RdWFkKQogICAg IGxheWVyLT5zZXRDb250ZW50Qm91bmRzKGxheWVyU2l6ZSk7CiAgICAgbGF5ZXItPnNldEJhY2tn cm91bmRDb2xvcih0ZXN0Q29sb3IpOwogCi0gICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBz aGFyZWRRdWFkU3RhdGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKCk7CisgICAgT3du UHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3RhdGUgPSBsYXllci0+Y3JlYXRlU2hh cmVkUXVhZFN0YXRlKDApOwogICAgIGJvb2wgaGFkTWlzc2luZ1RpbGVzID0gZmFsc2U7CiAgICAg bGF5ZXItPmFwcGVuZFF1YWRzKHF1YWRDdWxsZXIsIHNoYXJlZFF1YWRTdGF0ZS5nZXQoKSwgaGFk TWlzc2luZ1RpbGVzKTsKIApAQCAtOTksNyArOTksNyBAQCBURVNUKENDU29saWRDb2xvckxheWVy SW1wbFRlc3QsIHZlcmlmeUNvcnJlY3RPcGFjaXR5SW5RdWFkKQogICAgIGxheWVyLT5zZXRDb250 ZW50Qm91bmRzKGxheWVyU2l6ZSk7CiAgICAgbGF5ZXItPnNldERyYXdPcGFjaXR5KG9wYWNpdHkp OwogCi0gICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3RhdGUgPSBsYXll ci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKCk7CisgICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRl PiBzaGFyZWRRdWFkU3RhdGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKDApOwogICAg IGJvb2wgaGFkTWlzc2luZ1RpbGVzID0gZmFsc2U7CiAgICAgbGF5ZXItPmFwcGVuZFF1YWRzKHF1 YWRDdWxsZXIsIHNoYXJlZFF1YWRTdGF0ZS5nZXQoKSwgaGFkTWlzc2luZ1RpbGVzKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1RpbGVkTGF5ZXJJbXBsVGVz dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDVGlsZWRMYXllckltcGxUZXN0 LmNwcAppbmRleCAwMGQzOGE3ZWM3ZjRiMjc1YmY5MWFiNjdkM2QxNDRiNWE3NGUwNzAxLi45MTAy ODE1ODhhNzM0Y2I4MzBlNzdlYzhjMDE5M2JmMzEwNmRiMzUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDVGlsZWRMYXllckltcGxUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDVGlsZWRMYXllckltcGxUZXN0LmNwcApAQCAtNzQs NyArNzQsNyBAQCBURVNUKENDVGlsZWRMYXllckltcGxUZXN0LCBlbXB0eVF1YWRMaXN0KQogICAg IHsKICAgICAgICAgT3duUHRyPENDVGlsZWRMYXllckltcGw+IGxheWVyID0gY3JlYXRlTGF5ZXIo dGlsZVNpemUsIGxheWVyU2l6ZSwgQ0NMYXllclRpbGluZ0RhdGE6Ok5vQm9yZGVyVGV4ZWxzKTsK ICAgICAgICAgTW9ja0NDUXVhZEN1bGxlciBxdWFkQ3VsbGVyOwotICAgICAgICBPd25QdHI8Q0NT aGFyZWRRdWFkU3RhdGU+IHNoYXJlZFF1YWRTdGF0ZSA9IGxheWVyLT5jcmVhdGVTaGFyZWRRdWFk U3RhdGUoKTsKKyAgICAgICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3Rh dGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKDApOwogICAgICAgICBib29sIGhhZE1p c3NpbmdUaWxlcyA9IGZhbHNlOwogICAgICAgICBsYXllci0+YXBwZW5kUXVhZHMocXVhZEN1bGxl ciwgc2hhcmVkUXVhZFN0YXRlLmdldCgpLCBoYWRNaXNzaW5nVGlsZXMpOwogICAgICAgICBjb25z dCB1bnNpZ25lZCBudW1UaWxlcyA9IG51bVRpbGVzWCAqIG51bVRpbGVzWTsKQEAgLTg3LDcgKzg3 LDcgQEAgVEVTVChDQ1RpbGVkTGF5ZXJJbXBsVGVzdCwgZW1wdHlRdWFkTGlzdCkKICAgICAgICAg bGF5ZXItPnNldFZpc2libGVDb250ZW50UmVjdChJbnRSZWN0KCkpOwogCiAgICAgICAgIE1vY2tD Q1F1YWRDdWxsZXIgcXVhZEN1bGxlcjsKLSAgICAgICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRl PiBzaGFyZWRRdWFkU3RhdGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKCk7CisgICAg ICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNy ZWF0ZVNoYXJlZFF1YWRTdGF0ZSgwKTsKICAgICAgICAgYm9vbCBoYWRNaXNzaW5nVGlsZXMgPSBm YWxzZTsKICAgICAgICAgbGF5ZXItPmFwcGVuZFF1YWRzKHF1YWRDdWxsZXIsIHNoYXJlZFF1YWRT dGF0ZS5nZXQoKSwgaGFkTWlzc2luZ1RpbGVzKTsKICAgICAgICAgRVhQRUNUX0VRKHF1YWRDdWxs ZXIucXVhZExpc3QoKS5zaXplKCksIDB1KTsKQEAgLTEwMSw3ICsxMDEsNyBAQCBURVNUKENDVGls ZWRMYXllckltcGxUZXN0LCBlbXB0eVF1YWRMaXN0KQogICAgICAgICBsYXllci0+c2V0VmlzaWJs ZUNvbnRlbnRSZWN0KG91dHNpZGVCb3VuZHMpOwogCiAgICAgICAgIE1vY2tDQ1F1YWRDdWxsZXIg cXVhZEN1bGxlcjsKLSAgICAgICAgT3duUHRyPENDU2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFk U3RhdGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVhZFN0YXRlKCk7CisgICAgICAgIE93blB0cjxD Q1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1 YWRTdGF0ZSgwKTsKICAgICAgICAgYm9vbCBoYWRNaXNzaW5nVGlsZXMgPSBmYWxzZTsKICAgICAg ICAgbGF5ZXItPmFwcGVuZFF1YWRzKHF1YWRDdWxsZXIsIHNoYXJlZFF1YWRTdGF0ZS5nZXQoKSwg aGFkTWlzc2luZ1RpbGVzKTsKICAgICAgICAgRVhQRUNUX0VRKHF1YWRDdWxsZXIucXVhZExpc3Qo KS5zaXplKCksIDB1KTsKQEAgLTExMyw3ICsxMTMsNyBAQCBURVNUKENDVGlsZWRMYXllckltcGxU ZXN0LCBlbXB0eVF1YWRMaXN0KQogICAgICAgICBsYXllci0+c2V0U2tpcHNEcmF3KHRydWUpOwog CiAgICAgICAgIE1vY2tDQ1F1YWRDdWxsZXIgcXVhZEN1bGxlcjsKLSAgICAgICAgT3duUHRyPEND U2hhcmVkUXVhZFN0YXRlPiBzaGFyZWRRdWFkU3RhdGUgPSBsYXllci0+Y3JlYXRlU2hhcmVkUXVh ZFN0YXRlKCk7CisgICAgICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0 YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgwKTsKICAgICAgICAgYm9vbCBoYWRN aXNzaW5nVGlsZXMgPSBmYWxzZTsKICAgICAgICAgbGF5ZXItPmFwcGVuZFF1YWRzKHF1YWRDdWxs ZXIsIHNoYXJlZFF1YWRTdGF0ZS5nZXQoKSwgaGFkTWlzc2luZ1RpbGVzKTsKICAgICAgICAgRVhQ RUNUX0VRKHF1YWRDdWxsZXIucXVhZExpc3QoKS5zaXplKCksIDB1KTsKQEAgLTEzMCw3ICsxMzAs NyBAQCBURVNUKENDVGlsZWRMYXllckltcGxUZXN0LCBjaGVja2VyYm9hcmRpbmcpCiAgICAgY29u c3QgSW50U2l6ZSBsYXllclNpemUodGlsZVNpemUud2lkdGgoKSAqIG51bVRpbGVzWCwgdGlsZVNp emUuaGVpZ2h0KCkgKiBudW1UaWxlc1kpOwogCiAgICAgT3duUHRyPENDVGlsZWRMYXllckltcGw+ IGxheWVyID0gY3JlYXRlTGF5ZXIodGlsZVNpemUsIGxheWVyU2l6ZSwgQ0NMYXllclRpbGluZ0Rh dGE6Ok5vQm9yZGVyVGV4ZWxzKTsKLSAgICBPd25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+IHNoYXJl ZFF1YWRTdGF0ZSA9IGxheWVyLT5jcmVhdGVTaGFyZWRRdWFkU3RhdGUoKTsKKyAgICBPd25QdHI8 Q0NTaGFyZWRRdWFkU3RhdGU+IHNoYXJlZFF1YWRTdGF0ZSA9IGxheWVyLT5jcmVhdGVTaGFyZWRR dWFkU3RhdGUoMCk7CiAKICAgICAvLyBObyBjaGVja2VyYm9hcmRpbmcKICAgICB7CkBAIC0xNjcs NyArMTY3LDcgQEAgc3RhdGljIFBhc3NPd25QdHI8Q0NTaGFyZWRRdWFkU3RhdGU+IGdldFF1YWRz KENDUXVhZExpc3QmIHF1YWRzLCBJbnRTaXplIHRpbGVTaXoKICAgICBsYXllci0+c2V0Qm91bmRz KGxheWVyU2l6ZSk7CiAKICAgICBNb2NrQ0NRdWFkQ3VsbGVyIHF1YWRDdWxsZXIocXVhZHMpOwot ICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hhcmVkUXVhZFN0YXRlID0gbGF5ZXItPmNy ZWF0ZVNoYXJlZFF1YWRTdGF0ZSgpOworICAgIE93blB0cjxDQ1NoYXJlZFF1YWRTdGF0ZT4gc2hh cmVkUXVhZFN0YXRlID0gbGF5ZXItPmNyZWF0ZVNoYXJlZFF1YWRTdGF0ZSgwKTsKICAgICBib29s IGhhZE1pc3NpbmdUaWxlcyA9IGZhbHNlOwogICAgIGxheWVyLT5hcHBlbmRRdWFkcyhxdWFkQ3Vs bGVyLCBzaGFyZWRRdWFkU3RhdGUuZ2V0KCksIGhhZE1pc3NpbmdUaWxlcyk7CiAgICAgcmV0dXJu IHNoYXJlZFF1YWRTdGF0ZS5yZWxlYXNlKCk7IC8vIFRoZSBzaGFyZWQgZGF0YSBtdXN0IGJlIG93 bmVkIGFzIGxvbmcgYXMgdGhlIHF1YWQgbGlzdCBleGlzdHMuCg==