142445 2015-03-07 18:41:44 -0800 Tidy up RenderLayerCompositor's CompositingState 2015-03-07 18:51:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1075324 0 simon.fraser 2015-03-07 18:41:44 -0800 Tidy up RenderLayerCompositor's CompositingState 1075325 1 248172 simon.fraser 2015-03-07 18:42:51 -0800 Created attachment 248172 Patch 1075326 2 simon.fraser 2015-03-07 18:51:33 -0800 https://trac.webkit.org/r181218 248172 2015-03-07 18:42:51 -0800 2015-03-07 18:44:03 -0800 Patch bug-142445-20150307184229.patch text/plain 14453 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThlYjFlZmU3NGRlMzU3 NzhkNDIyODM1ZGU2YjVkMmFkM2JjMzE4Ny4uMzk4NWE4M2Y3ODczZWI5MzMyNmI3ZTcwMTNhYjlj ZDdlNjIxYmZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAzLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFRpZHkgdXAgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yJ3MgQ29tcG9zaXRpbmdTdGF0ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDQ1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBNYWtlIENvbXBvc2l0aW5nU3Rh dGUgYSBwcml2YXRlIHN0cnVjdCBpbiBSZW5kZXJMYXllckNvbXBvc2l0b3IuCisgICAgICAgIFNp bmNlIGl0J3MgYSBzdHJ1Y3QsIHJlbW92ZSB0aGUgbV8gcHJlZml4IGZyb20gaXRzIGRhdGEgbWVt YmVycy4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6Q29tcG9zaXRpbmdTdGF0ZTo6Q29tcG9zaXRpbmdTdGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1Jl cXVpcmVtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGluZ1N0YXRlOjpDb21wb3Np dGluZ1N0YXRlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmg6CisKIDIwMTUtMDMtMDYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBbQ29udGVudCBFeHRlbnNpb25zXSBNb3ZlIGNvbXBpbGluZyBvZiBjb250ZW50IGV4 dGVuc2lvbnMgdG8gdGhlIFVJUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA0MTM3OTEzMzk2MTVjYzI4NzA1Nzg4 YmU4NmQyYmE3MGYxMmExNDIyLi5lOWNhMzE4NmRhNjgxMjFjZmEyNWQ3NzYwZWZhOWVlOTMyZDhl MTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcApAQCAtMjE3LDQ1ICsyMTcsNDQgQEAgcHJpdmF0ZToKICAgICBSZW5kZXJHZW9t ZXRyeU1hcCBtX2dlb21ldHJ5TWFwOwogfTsKIAotc3RydWN0IENvbXBvc2l0aW5nU3RhdGUgewor c3RydWN0IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Q29tcG9zaXRpbmdTdGF0ZSB7CiAgICAgQ29t cG9zaXRpbmdTdGF0ZShSZW5kZXJMYXllciogY29tcEFuY2VzdG9yLCBib29sIHRlc3RPdmVybGFw ID0gdHJ1ZSkKLSAgICAgICAgOiBtX2NvbXBvc2l0aW5nQW5jZXN0b3IoY29tcEFuY2VzdG9yKQot ICAgICAgICAsIG1fc3VidHJlZUlzQ29tcG9zaXRpbmcoZmFsc2UpCi0gICAgICAgICwgbV90ZXN0 aW5nT3ZlcmxhcCh0ZXN0T3ZlcmxhcCkKKyAgICAgICAgOiBjb21wb3NpdGluZ0FuY2VzdG9yKGNv bXBBbmNlc3RvcikKKyAgICAgICAgLCBzdWJ0cmVlSXNDb21wb3NpdGluZyhmYWxzZSkKKyAgICAg ICAgLCB0ZXN0aW5nT3ZlcmxhcCh0ZXN0T3ZlcmxhcCkKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lU SU5HKQotICAgICAgICAsIG1faGFzTm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdEZXNjZW5k YW50cyhmYWxzZSkKKyAgICAgICAgLCBoYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rl c2NlbmRhbnRzKGZhbHNlKQogI2VuZGlmCiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQotICAg ICAgICAsIG1fZGVwdGgoMCkKKyAgICAgICAgLCBkZXB0aCgwKQogI2VuZGlmCiAgICAgewogICAg IH0KICAgICAKICAgICBDb21wb3NpdGluZ1N0YXRlKGNvbnN0IENvbXBvc2l0aW5nU3RhdGUmIG90 aGVyKQotICAgICAgICA6IG1fY29tcG9zaXRpbmdBbmNlc3RvcihvdGhlci5tX2NvbXBvc2l0aW5n QW5jZXN0b3IpCi0gICAgICAgICwgbV9zdWJ0cmVlSXNDb21wb3NpdGluZyhvdGhlci5tX3N1YnRy ZWVJc0NvbXBvc2l0aW5nKQotICAgICAgICAsIG1fdGVzdGluZ092ZXJsYXAob3RoZXIubV90ZXN0 aW5nT3ZlcmxhcCkKKyAgICAgICAgOiBjb21wb3NpdGluZ0FuY2VzdG9yKG90aGVyLmNvbXBvc2l0 aW5nQW5jZXN0b3IpCisgICAgICAgICwgc3VidHJlZUlzQ29tcG9zaXRpbmcob3RoZXIuc3VidHJl ZUlzQ29tcG9zaXRpbmcpCisgICAgICAgICwgdGVzdGluZ092ZXJsYXAob3RoZXIudGVzdGluZ092 ZXJsYXApCiAjaWYgRU5BQkxFKENTU19DT01QT1NJVElORykKLSAgICAgICAgLCBtX2hhc05vdElz b2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2VuZGFudHMob3RoZXIubV9oYXNOb3RJc29sYXRl ZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKQorICAgICAgICAsIGhhc05vdElzb2xhdGVk Q29tcG9zaXRlZEJsZW5kaW5nRGVzY2VuZGFudHMob3RoZXIuaGFzTm90SXNvbGF0ZWRDb21wb3Np dGVkQmxlbmRpbmdEZXNjZW5kYW50cykKICNlbmRpZgogI2lmIEVOQUJMRShUUkVFX0RFQlVHR0lO RykKLSAgICAgICAgLCBtX2RlcHRoKG90aGVyLm1fZGVwdGggKyAxKQorICAgICAgICAsIGRlcHRo KG90aGVyLmRlcHRoICsgMSkKICNlbmRpZgogICAgIHsKICAgICB9CiAgICAgCi0gICAgUmVuZGVy TGF5ZXIqIG1fY29tcG9zaXRpbmdBbmNlc3RvcjsKLSAgICBib29sIG1fc3VidHJlZUlzQ29tcG9z aXRpbmc7Ci0gICAgYm9vbCBtX3Rlc3RpbmdPdmVybGFwOworICAgIFJlbmRlckxheWVyKiBjb21w b3NpdGluZ0FuY2VzdG9yOworICAgIGJvb2wgc3VidHJlZUlzQ29tcG9zaXRpbmc7CisgICAgYm9v bCB0ZXN0aW5nT3ZlcmxhcDsKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQotICAgIGJvb2wg bV9oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzOworICAgIGJvb2wg aGFzTm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdEZXNjZW5kYW50czsKICNlbmRpZgogI2lm IEVOQUJMRShUUkVFX0RFQlVHR0lORykKLSAgICBpbnQgbV9kZXB0aDsKKyAgICBpbnQgZGVwdGg7 CiAjZW5kaWYKIH07CiAKLQogI2lmICFMT0dfRElTQUJMRUQKIHN0YXRpYyBpbmxpbmUgYm9vbCBj b21wb3NpdGluZ0xvZ0VuYWJsZWQoKQogewpAQCAtMTIzOCwxMiArMTIzNywxMiBAQCB2b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRl ckxheWVyKiBhbmNlc3RvcgogICAgIC8vIGlzIGFscmVhZHkgZ29pbmcgdG8gYmUgY29tcG9zaXRl ZCBmb3Igb3RoZXIgcmVhc29ucy4KICAgICBib29sIHdpbGxCZUNvbXBvc2l0ZWQgPSBuZWVkc1Rv QmVDb21wb3NpdGVkKGxheWVyKTsKIAotICAgIFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0 aW5nUmVhc29uIGNvbXBvc2l0aW5nUmVhc29uID0gY29tcG9zaXRpbmdTdGF0ZS5tX3N1YnRyZWVJ c0NvbXBvc2l0aW5nID8gUmVuZGVyTGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246OlN0 YWNraW5nIDogUmVuZGVyTGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246Ok5vbmU7Cisg ICAgUmVuZGVyTGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb24gY29tcG9zaXRpbmdSZWFz b24gPSBjb21wb3NpdGluZ1N0YXRlLnN1YnRyZWVJc0NvbXBvc2l0aW5nID8gUmVuZGVyTGF5ZXI6 OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246OlN0YWNraW5nIDogUmVuZGVyTGF5ZXI6OkluZGly ZWN0Q29tcG9zaXRpbmdSZWFzb246Ok5vbmU7CiAgICAgYm9vbCBoYXZlQ29tcHV0ZWRCb3VuZHMg PSBmYWxzZTsKICAgICBMYXlvdXRSZWN0IGFic0JvdW5kczsKIAogICAgIC8vIElmIHdlIGtub3cg Zm9yIHN1cmUgdGhlIGxheWVyIGlzIGdvaW5nIHRvIGJlIGNvbXBvc2l0ZWQsIGRvbid0IGJvdGhl ciBsb29raW5nIGl0IHVwIGluIHRoZSBvdmVybGFwIG1hcAotICAgIGlmICghd2lsbEJlQ29tcG9z aXRlZCAmJiAhb3ZlcmxhcE1hcC5pc0VtcHR5KCkgJiYgY29tcG9zaXRpbmdTdGF0ZS5tX3Rlc3Rp bmdPdmVybGFwKSB7CisgICAgaWYgKCF3aWxsQmVDb21wb3NpdGVkICYmICFvdmVybGFwTWFwLmlz RW1wdHkoKSAmJiBjb21wb3NpdGluZ1N0YXRlLnRlc3RpbmdPdmVybGFwKSB7CiAgICAgICAgIC8v IElmIHdlJ3JlIHRlc3RpbmcgZm9yIG92ZXJsYXAsIHdlIG9ubHkgbmVlZCB0byBjb21wb3NpdGUg aWYgd2Ugb3ZlcmxhcCBzb21ldGhpbmcgdGhhdCBpcyBhbHJlYWR5IGNvbXBvc2l0ZWQuCiAgICAg ICAgIGFic0JvdW5kcyA9IGVuY2xvc2luZ0xheW91dFJlY3Qob3ZlcmxhcE1hcC5nZW9tZXRyeU1h cCgpLmFic29sdXRlUmVjdChsYXllci5vdmVybGFwQm91bmRzKCkpKTsKIApAQCAtMTI1OSw3ICsx MjU4LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1Jl cXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAvLyBSZW5kZXJMYXllciBjaGls ZHJlbiBhbmQgd2hvc2UgY2hpbGRyZW4gY2FuJ3QgdXNlIGl0cyBiYWNraW5nIHRvIHJlbmRlcgog ICAgIC8vIGludG8uIFRoZXNlIGNoaWxkcmVuICh0aGUgY29udHJvbHMpIGFsd2F5cyBuZWVkIHRv IGJlIHByb21vdGVkIGludG8gdGhlaXIKICAgICAvLyBvd24gbGF5ZXJzIHRvIGRyYXcgb24gdG9w IG9mIHRoZSBhY2NlbGVyYXRlZCB2aWRlby4KLSAgICBpZiAoY29tcG9zaXRpbmdTdGF0ZS5tX2Nv bXBvc2l0aW5nQW5jZXN0b3IgJiYgY29tcG9zaXRpbmdTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0 b3ItPnJlbmRlcmVyKCkuaXNWaWRlbygpKQorICAgIGlmIChjb21wb3NpdGluZ1N0YXRlLmNvbXBv c2l0aW5nQW5jZXN0b3IgJiYgY29tcG9zaXRpbmdTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yLT5y ZW5kZXJlcigpLmlzVmlkZW8oKSkKICAgICAgICAgY29tcG9zaXRpbmdSZWFzb24gPSBSZW5kZXJM YXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6T3ZlcmxhcDsKICNlbmRpZgogCkBAIC0x MjcyLDIzICsxMjcxLDIzIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29t cG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAKICAgICAvLyBUaGUg Y2hpbGRyZW4gb2YgdGhpcyBsYXllciBkb24ndCBuZWVkIHRvIGNvbXBvc2l0ZSwgdW5sZXNzIHRo ZXJlIGlzCiAgICAgLy8gYSBjb21wb3NpdGluZyBsYXllciBhbW9uZyB0aGVtLCBzbyBzdGFydCBi eSBpbmhlcml0aW5nIHRoZSBjb21wb3NpdGluZwotICAgIC8vIGFuY2VzdG9yIHdpdGggbV9zdWJ0 cmVlSXNDb21wb3NpdGluZyBzZXQgdG8gZmFsc2UuCisgICAgLy8gYW5jZXN0b3Igd2l0aCBzdWJ0 cmVlSXNDb21wb3NpdGluZyBzZXQgdG8gZmFsc2UuCiAgICAgQ29tcG9zaXRpbmdTdGF0ZSBjaGls ZFN0YXRlKGNvbXBvc2l0aW5nU3RhdGUpOwotICAgIGNoaWxkU3RhdGUubV9zdWJ0cmVlSXNDb21w b3NpdGluZyA9IGZhbHNlOworICAgIGNoaWxkU3RhdGUuc3VidHJlZUlzQ29tcG9zaXRpbmcgPSBm YWxzZTsKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQotICAgIGNoaWxkU3RhdGUubV9oYXNO b3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzID0gZmFsc2U7CisgICAgY2hp bGRTdGF0ZS5oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzID0gZmFs c2U7CiAjZW5kaWYKIAogICAgIGlmICh3aWxsQmVDb21wb3NpdGVkKSB7CiAgICAgICAgIC8vIFRl bGwgdGhlIHBhcmVudCBpdCBoYXMgY29tcG9zaXRpbmcgZGVzY2VuZGFudHMuCi0gICAgICAgIGNv bXBvc2l0aW5nU3RhdGUubV9zdWJ0cmVlSXNDb21wb3NpdGluZyA9IHRydWU7CisgICAgICAgIGNv bXBvc2l0aW5nU3RhdGUuc3VidHJlZUlzQ29tcG9zaXRpbmcgPSB0cnVlOwogICAgICAgICAvLyBU aGlzIGxheWVyIG5vdyBhY3RzIGFzIHRoZSBhbmNlc3RvciBmb3Iga2lkcy4KLSAgICAgICAgY2hp bGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgPSAmbGF5ZXI7CisgICAgICAgIGNoaWxkU3Rh dGUuY29tcG9zaXRpbmdBbmNlc3RvciA9ICZsYXllcjsKIAogICAgICAgICBvdmVybGFwTWFwLnB1 c2hDb21wb3NpdGluZ0NvbnRhaW5lcigpOwogICAgICAgICAvLyBUaGlzIGxheWVyIGlzIGdvaW5n IHRvIGJlIGNvbXBvc2l0ZWQsIHNvIGNoaWxkcmVuIGNhbiBzYWZlbHkgaWdub3JlIHRoZSBmYWN0 IHRoYXQgdGhlcmUncyBhbiAKICAgICAgICAgLy8gYW5pbWF0aW9uIHJ1bm5pbmcgYmVoaW5kIHRo aXMgbGF5ZXIsIG1lYW5pbmcgdGhleSBjYW4gcmVseSBvbiB0aGUgb3ZlcmxhcCBtYXAgdGVzdGlu ZyBhZ2Fpbi4KLSAgICAgICAgY2hpbGRTdGF0ZS5tX3Rlc3RpbmdPdmVybGFwID0gdHJ1ZTsKKyAg ICAgICAgY2hpbGRTdGF0ZS50ZXN0aW5nT3ZlcmxhcCA9IHRydWU7CiAgICAgfQogCiAjaWYgIUFT U0VSVF9ESVNBQkxFRApAQCAtMTMwNCwxNCArMTMwMywxNCBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNl c3RvcgogCiAgICAgICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSB0byBtYWtlIGEgbGF5ZXIgZm9y IHRoaXMgY2hpbGQsIG1ha2Ugb25lIG5vdyBzbyB3ZSBjYW4gaGF2ZSBhIGNvbnRlbnRzIGxheWVy CiAgICAgICAgICAgICAgICAgLy8gKHNpbmNlIHdlIG5lZWQgdG8gZW5zdXJlIHRoYXQgdGhlIC12 ZSB6LW9yZGVyIGNoaWxkIHJlbmRlcnMgdW5kZXJuZWF0aCBvdXIgY29udGVudHMpLgotICAgICAg ICAgICAgICAgIGlmICghd2lsbEJlQ29tcG9zaXRlZCAmJiBjaGlsZFN0YXRlLm1fc3VidHJlZUlz Q29tcG9zaXRpbmcpIHsKKyAgICAgICAgICAgICAgICBpZiAoIXdpbGxCZUNvbXBvc2l0ZWQgJiYg Y2hpbGRTdGF0ZS5zdWJ0cmVlSXNDb21wb3NpdGluZykgewogICAgICAgICAgICAgICAgICAgICAv LyBtYWtlIGxheWVyIGNvbXBvc2l0aW5nCiAgICAgICAgICAgICAgICAgICAgIGxheWVyLnNldElu ZGlyZWN0Q29tcG9zaXRpbmdSZWFzb24oUmVuZGVyTGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdS ZWFzb246OkJhY2tncm91bmRMYXllcik7Ci0gICAgICAgICAgICAgICAgICAgIGNoaWxkU3RhdGUu bV9jb21wb3NpdGluZ0FuY2VzdG9yID0gJmxheWVyOworICAgICAgICAgICAgICAgICAgICBjaGls ZFN0YXRlLmNvbXBvc2l0aW5nQW5jZXN0b3IgPSAmbGF5ZXI7CiAgICAgICAgICAgICAgICAgICAg IG92ZXJsYXBNYXAucHVzaENvbXBvc2l0aW5nQ29udGFpbmVyKCk7CiAgICAgICAgICAgICAgICAg ICAgIC8vIFRoaXMgbGF5ZXIgaXMgZ29pbmcgdG8gYmUgY29tcG9zaXRlZCwgc28gY2hpbGRyZW4g Y2FuIHNhZmVseSBpZ25vcmUgdGhlIGZhY3QgdGhhdCB0aGVyZSdzIGFuIAogICAgICAgICAgICAg ICAgICAgICAvLyBhbmltYXRpb24gcnVubmluZyBiZWhpbmQgdGhpcyBsYXllciwgbWVhbmluZyB0 aGV5IGNhbiByZWx5IG9uIHRoZSBvdmVybGFwIG1hcCB0ZXN0aW5nIGFnYWluCi0gICAgICAgICAg ICAgICAgICAgIGNoaWxkU3RhdGUubV90ZXN0aW5nT3ZlcmxhcCA9IHRydWU7CisgICAgICAgICAg ICAgICAgICAgIGNoaWxkU3RhdGUudGVzdGluZ092ZXJsYXAgPSB0cnVlOwogICAgICAgICAgICAg ICAgICAgICB3aWxsQmVDb21wb3NpdGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9CkBAIC0xMzUzLDE5ICsxMzUyLDE5IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9y CiAgICAgLy8gQWxsIGxheWVycyAoZXZlbiBvbmVzIHRoYXQgYXJlbid0IGJlaW5nIGNvbXBvc2l0 ZWQpIG5lZWQgdG8gZ2V0IGFkZGVkIHRvCiAgICAgLy8gdGhlIG92ZXJsYXAgbWFwLiBMYXllcnMg dGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwgZHJhdyBpbnRvIHRoZWlyCiAgICAgLy8gY29tcG9z aXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBhbmQgc28gYXJlIHN0aWxsIGNvbnNpZGVyZWQgZm9y IG92ZXJsYXAuCi0gICAgaWYgKGNoaWxkU3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yICYmICFj aGlsZFN0YXRlLm1fY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSb290TGF5ZXIoKSkKKyAgICBpZiAo Y2hpbGRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yICYmICFjaGlsZFN0YXRlLmNvbXBvc2l0aW5n QW5jZXN0b3ItPmlzUm9vdExheWVyKCkpCiAgICAgICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFw TWFwLCBsYXllciwgYWJzQm91bmRzLCBoYXZlQ29tcHV0ZWRCb3VuZHMpOwogCiAjaWYgRU5BQkxF KENTU19DT01QT1NJVElORykKLSAgICBsYXllci5zZXRIYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRC bGVuZGluZ0Rlc2NlbmRhbnRzKGNoaWxkU3RhdGUubV9oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRC bGVuZGluZ0Rlc2NlbmRhbnRzKTsKKyAgICBsYXllci5zZXRIYXNOb3RJc29sYXRlZENvbXBvc2l0 ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKGNoaWxkU3RhdGUuaGFzTm90SXNvbGF0ZWRDb21wb3NpdGVk QmxlbmRpbmdEZXNjZW5kYW50cyk7CiAgICAgQVNTRVJUKCFsYXllci5oYXNOb3RJc29sYXRlZENv bXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKCkgfHwgbGF5ZXIuaGFzTm90SXNvbGF0ZWRCbGVu ZGluZ0Rlc2NlbmRhbnRzKCkpOwogI2VuZGlmCiAgICAgLy8gTm93IGNoZWNrIGZvciByZWFzb25z IHRvIGJlY29tZSBjb21wb3NpdGVkIHRoYXQgZGVwZW5kIG9uIHRoZSBzdGF0ZSBvZiBkZXNjZW5k YW50IGxheWVycy4KICAgICBSZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbiBp bmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOwogICAgIGlmICghd2lsbEJlQ29tcG9zaXRlZCAmJiBj YW5CZUNvbXBvc2l0ZWQobGF5ZXIpCi0gICAgICAgICYmIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JJ bmRpcmVjdFJlYXNvbihsYXllci5yZW5kZXJlcigpLCBjaGlsZFN0YXRlLm1fc3VidHJlZUlzQ29t cG9zaXRpbmcsIGFueURlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSwgaW5kaXJlY3RDb21wb3NpdGlu Z1JlYXNvbikpIHsKKyAgICAgICAgJiYgcmVxdWlyZXNDb21wb3NpdGluZ0ZvckluZGlyZWN0UmVh c29uKGxheWVyLnJlbmRlcmVyKCksIGNoaWxkU3RhdGUuc3VidHJlZUlzQ29tcG9zaXRpbmcsIGFu eURlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSwgaW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbikpIHsK ICAgICAgICAgbGF5ZXIuc2V0SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbihpbmRpcmVjdENvbXBv c2l0aW5nUmVhc29uKTsKLSAgICAgICAgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3Ig PSAmbGF5ZXI7CisgICAgICAgIGNoaWxkU3RhdGUuY29tcG9zaXRpbmdBbmNlc3RvciA9ICZsYXll cjsKICAgICAgICAgb3ZlcmxhcE1hcC5wdXNoQ29tcG9zaXRpbmdDb250YWluZXIoKTsKICAgICAg ICAgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKG92ZXJsYXBNYXAsIGxheWVyKTsKICAgICAgICAg d2lsbEJlQ29tcG9zaXRlZCA9IHRydWU7CkBAIC0xMzc4LDExICsxMzc3LDExIEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVy TGF5ZXIqIGFuY2VzdG9yCiAgICAgfQogCiAgICAgLy8gU3Vic2VxdWVudCBsYXllcnMgaW4gdGhl IHBhcmVudCBzdGFja2luZyBjb250ZXh0IGFsc28gbmVlZCB0byBjb21wb3NpdGUuCi0gICAgaWYg KGNoaWxkU3RhdGUubV9zdWJ0cmVlSXNDb21wb3NpdGluZykKLSAgICAgICAgY29tcG9zaXRpbmdT dGF0ZS5tX3N1YnRyZWVJc0NvbXBvc2l0aW5nID0gdHJ1ZTsKKyAgICBpZiAoY2hpbGRTdGF0ZS5z dWJ0cmVlSXNDb21wb3NpdGluZykKKyAgICAgICAgY29tcG9zaXRpbmdTdGF0ZS5zdWJ0cmVlSXND b21wb3NpdGluZyA9IHRydWU7CiAKICAgICAvLyBTZXQgdGhlIGZsYWcgdG8gc2F5IHRoYXQgdGhp cyBTQyBoYXMgY29tcG9zaXRpbmcgY2hpbGRyZW4uCi0gICAgbGF5ZXIuc2V0SGFzQ29tcG9zaXRp bmdEZXNjZW5kYW50KGNoaWxkU3RhdGUubV9zdWJ0cmVlSXNDb21wb3NpdGluZyk7CisgICAgbGF5 ZXIuc2V0SGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KGNoaWxkU3RhdGUuc3VidHJlZUlzQ29tcG9z aXRpbmcpOwogCiAgICAgLy8gc2V0SGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KCkgbWF5IGhhdmUg Y2hhbmdlZCB0aGUgYW5zd2VyIHRvIG5lZWRzVG9CZUNvbXBvc2l0ZWQoKSB3aGVuIGNsaXBwaW5n LAogICAgIC8vIHNvIHRlc3QgdGhhdCBhZ2Fpbi4KQEAgLTEzOTEsMTIgKzEzOTAsMTIgQEAgdm9p ZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhS ZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAvLyBUdXJuIG92ZXJsYXAgdGVzdGluZyBvZmYgZm9y IGxhdGVyIGxheWVycyBpZiBpdCdzIGFscmVhZHkgb2ZmLCBvciBpZiB3ZSBoYXZlIGFuIGFuaW1h dGluZyB0cmFuc2Zvcm0uCiAgICAgLy8gTm90ZSB0aGF0IGlmIHRoZSBsYXllciBjbGlwcyBpdHMg ZGVzY2VuZGFudHMsIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIHByb3BhZ2F0ZSB0aGUgY2hpbGQgYW5p bWF0aW9uIHRvIHRoZSBwYXJlbnQgbGF5ZXJzLiBUaGF0J3MgYmVjYXVzZQogICAgIC8vIHdlIGtu b3cgZm9yIHN1cmUgdGhlIGFuaW1hdGlvbiBpcyBjb250YWluZWQgaW5zaWRlIHRoZSBjbGlwcGlu ZyByZWN0YW5nbGUsIHdoaWNoIGlzIGFscmVhZHkgYWRkZWQgdG8gdGhlIG92ZXJsYXAgbWFwLgot ICAgIGlmICgoIWNoaWxkU3RhdGUubV90ZXN0aW5nT3ZlcmxhcCAmJiAhaXNDb21wb3NpdGVkQ2xp cHBpbmdMYXllcikgfHwgaXNSdW5uaW5nQWNjZWxlcmF0ZWRUcmFuc2Zvcm1BbmltYXRpb24obGF5 ZXIucmVuZGVyZXIoKSkpCi0gICAgICAgIGNvbXBvc2l0aW5nU3RhdGUubV90ZXN0aW5nT3Zlcmxh cCA9IGZhbHNlOworICAgIGlmICgoIWNoaWxkU3RhdGUudGVzdGluZ092ZXJsYXAgJiYgIWlzQ29t cG9zaXRlZENsaXBwaW5nTGF5ZXIpIHx8IGlzUnVubmluZ0FjY2VsZXJhdGVkVHJhbnNmb3JtQW5p bWF0aW9uKGxheWVyLnJlbmRlcmVyKCkpKQorICAgICAgICBjb21wb3NpdGluZ1N0YXRlLnRlc3Rp bmdPdmVybGFwID0gZmFsc2U7CiAgICAgCiAgICAgaWYgKGlzQ29tcG9zaXRlZENsaXBwaW5nTGF5 ZXIpIHsKICAgICAgICAgaWYgKCF3aWxsQmVDb21wb3NpdGVkKSB7Ci0gICAgICAgICAgICBjaGls ZFN0YXRlLm1fY29tcG9zaXRpbmdBbmNlc3RvciA9ICZsYXllcjsKKyAgICAgICAgICAgIGNoaWxk U3RhdGUuY29tcG9zaXRpbmdBbmNlc3RvciA9ICZsYXllcjsKICAgICAgICAgICAgIG92ZXJsYXBN YXAucHVzaENvbXBvc2l0aW5nQ29udGFpbmVyKCk7CiAgICAgICAgICAgICBhZGRUb092ZXJsYXBN YXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgbGF5ZXIpOwogICAgICAgICAgICAgd2lsbEJlQ29tcG9z aXRlZCA9IHRydWU7CkBAIC0xNDA2LDE2ICsxNDA1LDE2IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2Vz dG9yCiAjaWYgRU5BQkxFKENTU19DT01QT1NJVElORykKICAgICBpZiAoKHdpbGxCZUNvbXBvc2l0 ZWQgJiYgbGF5ZXIuaGFzQmxlbmRNb2RlKCkpCiAgICAgICAgIHx8IChsYXllci5oYXNOb3RJc29s YXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKCkgJiYgIWxheWVyLmlzb2xhdGVzQ29t cG9zaXRlZEJsZW5kaW5nKCkpKQotICAgICAgICBjb21wb3NpdGluZ1N0YXRlLm1faGFzTm90SXNv bGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdEZXNjZW5kYW50cyA9IHRydWU7CisgICAgICAgIGNvbXBv c2l0aW5nU3RhdGUuaGFzTm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdEZXNjZW5kYW50cyA9 IHRydWU7CiAjZW5kaWYKIAotICAgIGlmIChjaGlsZFN0YXRlLm1fY29tcG9zaXRpbmdBbmNlc3Rv ciA9PSAmbGF5ZXIgJiYgIWxheWVyLmlzUm9vdExheWVyKCkpCisgICAgaWYgKGNoaWxkU3RhdGUu Y29tcG9zaXRpbmdBbmNlc3RvciA9PSAmbGF5ZXIgJiYgIWxheWVyLmlzUm9vdExheWVyKCkpCiAg ICAgICAgIG92ZXJsYXBNYXAucG9wQ29tcG9zaXRpbmdDb250YWluZXIoKTsKIAogICAgIC8vIElm IHdlJ3JlIGJhY2sgYXQgdGhlIHJvb3QsIGFuZCBubyBvdGhlciBsYXllcnMgbmVlZCB0byBiZSBj b21wb3NpdGVkLCBhbmQgdGhlIHJvb3QgbGF5ZXIgaXRzZWxmIGRvZXNuJ3QgbmVlZAogICAgIC8v IHRvIGJlIGNvbXBvc2l0ZWQsIHRoZW4gd2UgY2FuIGRyb3Agb3V0IG9mIGNvbXBvc2l0aW5nIG1v ZGUgYWx0b2dldGhlci4gSG93ZXZlciwgZG9uJ3QgZHJvcCBvdXQgb2YgY29tcG9zaXRpbmcgbW9k ZQogICAgIC8vIGlmIHRoZXJlIGFyZSBjb21wb3NpdGVkIGxheWVycyB0aGF0IHdlIGRpZG4ndCBo aXQgaW4gb3VyIHRyYXZlcnNhbCAoZS5nLiBiZWNhdXNlIG9mIHZpc2liaWxpdHk6aGlkZGVuKS4K LSAgICBpZiAobGF5ZXIuaXNSb290TGF5ZXIoKSAmJiAhY2hpbGRTdGF0ZS5tX3N1YnRyZWVJc0Nv bXBvc2l0aW5nICYmICFyZXF1aXJlc0NvbXBvc2l0aW5nTGF5ZXIobGF5ZXIpICYmICFtX2ZvcmNl Q29tcG9zaXRpbmdNb2RlICYmICFoYXNBbnlBZGRpdGlvbmFsQ29tcG9zaXRlZExheWVycyhsYXll cikpIHsKKyAgICBpZiAobGF5ZXIuaXNSb290TGF5ZXIoKSAmJiAhY2hpbGRTdGF0ZS5zdWJ0cmVl SXNDb21wb3NpdGluZyAmJiAhcmVxdWlyZXNDb21wb3NpdGluZ0xheWVyKGxheWVyKSAmJiAhbV9m b3JjZUNvbXBvc2l0aW5nTW9kZSAmJiAhaGFzQW55QWRkaXRpb25hbENvbXBvc2l0ZWRMYXllcnMo bGF5ZXIpKSB7CiAgICAgICAgIC8vIERvbid0IGRyb3Agb3V0IG9mIGNvbXBvc2l0aW5nIG9uIGlP UywgYmVjYXVzZSB3ZSBtYXkgZmxhc2guIFNlZSA8cmRhcjovL3Byb2JsZW0vODM0ODMzNz4uCiAj aWYgIVBMQVRGT1JNKElPUykKICAgICAgICAgZW5hYmxlQ29tcG9zaXRpbmdNb2RlKGZhbHNlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApp bmRleCBiNjA1NGFlMjliNGU2OGMyMDYwMGEzN2JhMDFhNDFkMjNkM2I4MTQxLi5lZDI3NTQyYzRi Nzg4YWVhYTM4ZmJiNjlhNTMyYjU5MGY2NzA3ZDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0zMDksNiArMzA5LDcgQEAgcHVi bGljOgogCiBwcml2YXRlOgogICAgIGNsYXNzIE92ZXJsYXBNYXA7CisgICAgc3RydWN0IENvbXBv c2l0aW5nU3RhdGU7CiAKICAgICAvLyBHcmFwaGljc0xheWVyQ2xpZW50IGltcGxlbWVudGF0aW9u CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUZsdXNoUmVxdWlyZWQoY29uc3QgR3JhcGhpY3NMYXll ciopIG92ZXJyaWRlOwpAQCAtMzQxLDcgKzM0Miw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRh dGVDb21wb3NpdGluZ0xheWVyc1RpbWVyRmlyZWQoKTsKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBp ZiBhbnkgbGF5ZXIncyBjb21wb3NpdGluZyBjaGFuZ2VkCi0gICAgdm9pZCBjb21wdXRlQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIsIFJlbmRlckxheWVy JiwgT3ZlcmxhcE1hcCYsIHN0cnVjdCBDb21wb3NpdGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hh bmdlZCwgYm9vbCYgZGVzY2VuZGFudEhhczNEVHJhbnNmb3JtKTsKKyAgICB2b2lkIGNvbXB1dGVD b21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgUmVuZGVy TGF5ZXImLCBPdmVybGFwTWFwJiwgQ29tcG9zaXRpbmdTdGF0ZSYsIGJvb2wmIGxheWVyc0NoYW5n ZWQsIGJvb2wmIGRlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSk7CiAKICAgICB2b2lkIGNvbXB1dGVS ZWdpb25Db21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCosIE92 ZXJsYXBNYXAmLCBDb21wb3NpdGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9vbCYg YW55RGVzY2VuZGFudEhhczNEVHJhbnNmb3JtKTsKIAo=