120285 revert 2013-08-26 00:05:55 -0700 TextureUnit code refactoring patch revert 2013-10-07 12:18:33 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 122369 P2 Normal --- 0 p.szymanski3 webkit-unassigned commit-queue dino esprehn+autocc kondapallykalyan oldest_to_newest 920900 0 p.szymanski3 2013-08-26 00:05:55 -0700 patch https://bugs.webkit.org/show_bug.cgi?id=117868 broke those tests: more/functions/copyTexSubImage2D.html more/functions/texSubImage2D.html more/functions/texSubImage2DHTML.html We need to revert those changes to fix tests 920901 1 209619 p.szymanski3 2013-08-26 00:21:34 -0700 Created attachment 209619 Texture unit code refactoring revert 937181 2 209619 dino 2013-10-07 12:18:12 -0700 Comment on attachment 209619 Texture unit code refactoring revert Already done in https://bugs.webkit.org/show_bug.cgi?id=122369 937182 3 dino 2013-10-07 12:18:33 -0700 *** This bug has been marked as a duplicate of bug 122369 *** 209619 2013-08-26 00:21:34 -0700 2013-10-07 12:18:12 -0700 Texture unit code refactoring revert textureUnit_revert.patch text/plain 11011 p.szymanski3 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NDg5MzI4Li5hOTAzMjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTMtMDgtMjYgIFByemVteXNsYXcgU3p5bWFuc2tpICA8cC5zenltYW5za2kzQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtXZWJHTF0gVGV4dHVyZVVuaXQgY29kZSByZWZhY3RvcmluZyBw YXRjaCByZXZlcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMDI4NQorCisgICAgICAgIFBhdGNoIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTc4NjggYnJva2UgdGhvc2UgdGVzdHM6CisgICAgICAgIG1vcmUvZnVuY3Rp b25zL2NvcHlUZXhTdWJJbWFnZTJELmh0bWwKKyAgICAgICAgbW9yZS9mdW5jdGlvbnMvdGV4U3Vi SW1hZ2UyRC5odG1sCisgICAgICAgIG1vcmUvZnVuY3Rpb25zL3RleFN1YkltYWdlMkRIVE1MLmh0 bWwKKyAgICAgICAgVGhpcyBwYXRjaCBzaG91bGQgYmUgcmV2ZXJ0ZWQgdG8gZml4IHRoZSB0ZXN0 cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHM6CisgICAgICAgIExheW91dFRlc3Rz L3dlYmdsL2NvbmZvcm1hbmNlL21vcmUvZnVuY3Rpb25zL2NvcHlUZXhTdWJJbWFnZTJELmh0bWwK KyAgICAgICAgTGF5b3V0VGVzdHMvd2ViZ2wvY29uZm9ybWFuY2UvbW9yZS9mdW5jdGlvbnMvdGV4 U3ViSW1hZ2UyRC5odG1sCisgICAgICAgIExheW91dFRlc3RzL3dlYmdsL2NvbmZvcm1hbmNlL21v cmUvZnVuY3Rpb25zL3RleFN1YkltYWdlMkRIVE1MLmh0bWwKKyAgICAgICAgTGF5b3V0VGVzdHMv d2ViZ2wvY29uZm9ybWFuY2UvdGV4dHVyZXMvdGV4dHVyZS1hY3RpdmUtYmluZC5odG1sCisgICAg ICAgIExheW91dFRlc3RzL3dlYmdsL2NvbmZvcm1hbmNlL3RleHR1cmVzL3RleHR1cmUtYWN0aXZl LWJpbmQtMi5odG1sCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp+V2ViR0xS ZW5kZXJpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4 dDo6cmVzaGFwZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmJp bmRUZXh0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6ZGVs ZXRlVGV4dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6Omdl dFBhcmFtZXRlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6Omhh bmRsZU5QT1RUZXh0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OnZhbGlkYXRlVGV4dHVyZUJpbmRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZXN0b3JlQ3VycmVudFRleHR1cmUyRCk6CisgICAgICAgICogaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0Lmg6CisKIDIwMTMtMDgtMjMgIFJlbmF0YSBIb2Rv dmFuICA8cmVuaUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1pc3NpbmcgbnVsbC1jaGVjayBpbiBI VE1MRm9ybUVsZW1lbnQ6OnJlbmRlcmVySXNOZWVkZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggOGRhYzc3ZC4u YjBjNTVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHQuY3BwCkBAIC02MDQsOCArNjA0LDEwIEBAIFdlYkdMUmVuZGVyaW5nQ29u dGV4dDo6fldlYkdMUmVuZGVyaW5nQ29udGV4dCgpCiAgICAgbV9mcmFtZWJ1ZmZlckJpbmRpbmcg PSAwOwogICAgIG1fcmVuZGVyYnVmZmVyQmluZGluZyA9IDA7CiAKLSAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IG1fdGV4dHVyZVVuaXRzLnNpemUoKTsgKytpKQotICAgICAgICBtX3RleHR1cmVV bml0c1tpXS5tX3RleHR1cmVCaW5kaW5nID0gMDsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG1fdGV4dHVyZVVuaXRzLnNpemUoKTsgKytpKSB7CisgICAgICAgIG1fdGV4dHVyZVVuaXRzW2ld Lm1fdGV4dHVyZTJEQmluZGluZyA9IDA7CisgICAgICAgIG1fdGV4dHVyZVVuaXRzW2ldLm1fdGV4 dHVyZUN1YmVNYXBCaW5kaW5nID0gMDsKKyAgICB9CiAKICAgICBtX2JsYWNrVGV4dHVyZTJEID0g MDsKICAgICBtX2JsYWNrVGV4dHVyZUN1YmVNYXAgPSAwOwpAQCAtODExLDcgKzgxMyw3IEBAIHZv aWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZXNoYXBlKGludCB3aWR0aCwgaW50IGhlaWdodCkK ICAgICB9IGVsc2UKICAgICAgICAgbV9jb250ZXh0LT5yZXNoYXBlKHdpZHRoLCBoZWlnaHQpOwog Ci0gICAgbV9jb250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8y RCwgb2JqZWN0T3JaZXJvKG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4 dHVyZUJpbmRpbmcuZ2V0KCkpKTsKKyAgICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNz Q29udGV4dDNEOjpURVhUVVJFXzJELCBvYmplY3RPclplcm8obV90ZXh0dXJlVW5pdHNbbV9hY3Rp dmVUZXh0dXJlVW5pdF0ubV90ZXh0dXJlMkRCaW5kaW5nLmdldCgpKSk7CiAgICAgbV9jb250ZXh0 LT5iaW5kUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG9iamVj dE9yWmVybyhtX3JlbmRlcmJ1ZmZlckJpbmRpbmcuZ2V0KCkpKTsKICAgICBpZiAobV9mcmFtZWJ1 ZmZlckJpbmRpbmcpCiAgICAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0Nv bnRleHQzRDo6RlJBTUVCVUZGRVIsIG9iamVjdE9yWmVybyhtX2ZyYW1lYnVmZmVyQmluZGluZy5n ZXQoKSkpOwpAQCAtMTAwOSwxNCArMTAxMSwxNCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4 dDo6YmluZFRleHR1cmUoR0MzRGVudW0gdGFyZ2V0LCBXZWJHTFRleHR1cmUqIHRleHR1cmUsCiAg ICAgfQogICAgIEdDM0RpbnQgbWF4TGV2ZWwgPSAwOwogICAgIGlmICh0YXJnZXQgPT0gR3JhcGhp Y3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQpIHsKLSAgICAgICAgbV90ZXh0dXJlVW5pdHNbbV9hY3Rp dmVUZXh0dXJlVW5pdF0ubV90ZXh0dXJlQmluZGluZyA9IHRleHR1cmU7CisgICAgICAgIG1fdGV4 dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGluZyA9IHRleHR1 cmU7CiAgICAgICAgIG1heExldmVsID0gbV9tYXhUZXh0dXJlTGV2ZWw7CiAKICAgICAgICAgaWYg KG1fZHJhd2luZ0J1ZmZlciAmJiAhbV9hY3RpdmVUZXh0dXJlVW5pdCkKICAgICAgICAgICAgIG1f ZHJhd2luZ0J1ZmZlci0+c2V0VGV4dHVyZTJEQmluZGluZyhvYmplY3RPclplcm8odGV4dHVyZSkp OwogCiAgICAgfSBlbHNlIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVf Q1VCRV9NQVApIHsKLSAgICAgICAgbV90ZXh0dXJlVW5pdHNbbV9hY3RpdmVUZXh0dXJlVW5pdF0u bV90ZXh0dXJlQmluZGluZyA9IHRleHR1cmU7CisgICAgICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0 aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZUN1YmVNYXBCaW5kaW5nID0gdGV4dHVyZTsKICAgICAg ICAgbWF4TGV2ZWwgPSBtX21heEN1YmVNYXBUZXh0dXJlTGV2ZWw7CiAgICAgfSBlbHNlIHsKICAg ICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfRU5VTSwg ImJpbmRUZXh0dXJlIiwgImludmFsaWQgdGFyZ2V0Iik7CkBAIC0xNjMwLDggKzE2MzIsMTAgQEAg dm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmRlbGV0ZVRleHR1cmUoV2ViR0xUZXh0dXJlKiB0 ZXh0dXJlKQogICAgIGlmICghZGVsZXRlT2JqZWN0KHRleHR1cmUpKQogICAgICAgICByZXR1cm47 CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3RleHR1cmVVbml0cy5zaXplKCk7ICsraSkg ewotICAgICAgICBpZiAodGV4dHVyZSA9PSBtX3RleHR1cmVVbml0c1tpXS5tX3RleHR1cmVCaW5k aW5nKQotICAgICAgICAgICAgbV90ZXh0dXJlVW5pdHNbaV0ubV90ZXh0dXJlQmluZGluZyA9IDA7 CisgICAgICAgIGlmICh0ZXh0dXJlID09IG1fdGV4dHVyZVVuaXRzW2ldLm1fdGV4dHVyZTJEQmlu ZGluZykKKyAgICAgICAgICAgIG1fdGV4dHVyZVVuaXRzW2ldLm1fdGV4dHVyZTJEQmluZGluZyA9 IDA7CisgICAgICAgIGlmICh0ZXh0dXJlID09IG1fdGV4dHVyZVVuaXRzW2ldLm1fdGV4dHVyZUN1 YmVNYXBCaW5kaW5nKQorICAgICAgICAgICAgbV90ZXh0dXJlVW5pdHNbaV0ubV90ZXh0dXJlQ3Vi ZU1hcEJpbmRpbmcgPSAwOwogICAgIH0KICAgICBpZiAobV9mcmFtZWJ1ZmZlckJpbmRpbmcpCiAg ICAgICAgIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5yZW1vdmVBdHRhY2htZW50RnJvbUJvdW5kRnJh bWVidWZmZXIodGV4dHVyZSk7CkBAIC0yNjc1LDkgKzI2NzksOSBAQCBXZWJHTEdldEluZm8gV2Vi R0xSZW5kZXJpbmdDb250ZXh0OjpnZXRQYXJhbWV0ZXIoR0MzRGVudW0gcG5hbWUsIEV4Y2VwdGlv bkNvZGUmCiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6U1VCUElYRUxfQklUUzoKICAgICAg ICAgcmV0dXJuIGdldEludFBhcmFtZXRlcihwbmFtZSk7CiAgICAgY2FzZSBHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRV9CSU5ESU5HXzJEOgotICAgICAgICByZXR1cm4gV2ViR0xHZXRJbmZvKFBh c3NSZWZQdHI8V2ViR0xUZXh0dXJlPihtX3RleHR1cmVVbml0c1ttX2FjdGl2ZVRleHR1cmVVbml0 XS5tX3RleHR1cmVCaW5kaW5nKSk7CisgICAgICAgIHJldHVybiBXZWJHTEdldEluZm8oUGFzc1Jl ZlB0cjxXZWJHTFRleHR1cmU+KG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1f dGV4dHVyZTJEQmluZGluZykpOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVf QklORElOR19DVUJFX01BUDoKLSAgICAgICAgcmV0dXJuIFdlYkdMR2V0SW5mbyhQYXNzUmVmUHRy PFdlYkdMVGV4dHVyZT4obV90ZXh0dXJlVW5pdHNbbV9hY3RpdmVUZXh0dXJlVW5pdF0ubV90ZXh0 dXJlQmluZGluZykpOworICAgICAgICByZXR1cm4gV2ViR0xHZXRJbmZvKFBhc3NSZWZQdHI8V2Vi R0xUZXh0dXJlPihtX3RleHR1cmVVbml0c1ttX2FjdGl2ZVRleHR1cmVVbml0XS5tX3RleHR1cmVD dWJlTWFwQmluZGluZykpOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlVOUEFDS19BTElH Tk1FTlQ6CiAgICAgICAgIHJldHVybiBnZXRJbnRQYXJhbWV0ZXIocG5hbWUpOwogICAgIGNhc2Ug R3JhcGhpY3NDb250ZXh0M0Q6OlVOUEFDS19GTElQX1lfV0VCR0w6CkBAIC00Nzg1LDcgKzQ3ODks OCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6aGFuZGxlTlBPVFRleHR1cmVzKGNvbnN0 IGNoYXIqIGZ1bmN0aW9uTmFtZSwgYm9vbCBwcgogewogICAgIGJvb2wgcmVzZXRBY3RpdmVVbml0 ID0gZmFsc2U7CiAgICAgZm9yICh1bnNpZ25lZCBpaSA9IDA7IGlpIDwgbV90ZXh0dXJlVW5pdHMu c2l6ZSgpOyArK2lpKSB7Ci0gICAgICAgIGlmIChtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJl QmluZGluZyAmJiBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlQmluZGluZy0+bmVlZFRvVXNl QmxhY2tUZXh0dXJlKCkpIHsKKyAgICAgICAgaWYgKChtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0 dXJlMkRCaW5kaW5nICYmIG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmUyREJpbmRpbmctPm5l ZWRUb1VzZUJsYWNrVGV4dHVyZSgpKQorICAgICAgICAgICAgfHwgKG1fdGV4dHVyZVVuaXRzW2lp XS5tX3RleHR1cmVDdWJlTWFwQmluZGluZyAmJiBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJl Q3ViZU1hcEJpbmRpbmctPm5lZWRUb1VzZUJsYWNrVGV4dHVyZSgpKSkgewogICAgICAgICAgICAg aWYgKGlpICE9IG1fYWN0aXZlVGV4dHVyZVVuaXQpIHsKICAgICAgICAgICAgICAgICBtX2NvbnRl eHQtPmFjdGl2ZVRleHR1cmUoaWkpOwogICAgICAgICAgICAgICAgIHJlc2V0QWN0aXZlVW5pdCA9 IHRydWU7CkBAIC00NzkzLDE5ICs0Nzk4LDIyIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpoYW5kbGVOUE9UVGV4dHVyZXMoY29uc3QgY2hhciogZnVuY3Rpb25OYW1lLCBib29sIHByCiAg ICAgICAgICAgICAgICAgbV9jb250ZXh0LT5hY3RpdmVUZXh0dXJlKGlpKTsKICAgICAgICAgICAg ICAgICByZXNldEFjdGl2ZVVuaXQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IFdlYkdMVGV4dHVyZSogdGV4dHVyZSA9IDA7Ci0gICAgICAgICAgICBHQzNEZW51bSB0YXJnZXQg PSBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlQmluZGluZy0+Z2V0VGFyZ2V0KCk7CisgICAg ICAgICAgICBXZWJHTFRleHR1cmUqIHRleDJEOworICAgICAgICAgICAgV2ViR0xUZXh0dXJlKiB0 ZXhDdWJlTWFwOwogICAgICAgICAgICAgaWYgKHByZXBhcmVUb0RyYXcpIHsKICAgICAgICAgICAg ICAgICBTdHJpbmcgbXNnKFN0cmluZygidGV4dHVyZSBib3VuZCB0byB0ZXh0dXJlIHVuaXQgIikg KyBTdHJpbmc6Om51bWJlcihpaSkKICAgICAgICAgICAgICAgICAgICAgKyAiIGlzIG5vdCByZW5k ZXJhYmxlLiBJdCBtYXliZSBub24tcG93ZXItb2YtMiBhbmQgaGF2ZSBpbmNvbXBhdGlibGUgdGV4 dHVyZSBmaWx0ZXJpbmcgb3IgaXMgbm90ICd0ZXh0dXJlIGNvbXBsZXRlJyIpOwogICAgICAgICAg ICAgICAgIHByaW50R0xXYXJuaW5nVG9Db25zb2xlKGZ1bmN0aW9uTmFtZSwgbXNnLnV0ZjgoKS5k YXRhKCkpOwotICAgICAgICAgICAgICAgIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6 OlRFWFRVUkVfMkQpCi0gICAgICAgICAgICAgICAgICAgIHRleHR1cmUgPSBtX2JsYWNrVGV4dHVy ZTJELmdldCgpOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKHRhcmdldCA9PSBHcmFwaGljc0Nv bnRleHQzRDo6VEVYVFVSRV9DVUJFX01BUCkKLSAgICAgICAgICAgICAgICAgICAgdGV4dHVyZSA9 IG1fYmxhY2tUZXh0dXJlQ3ViZU1hcC5nZXQoKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgICAgIHRleHR1cmUgPSBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlQmluZGluZy5n ZXQoKTsKLSAgICAgICAgICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUodGFyZ2V0LCBvYmplY3RP clplcm8odGV4dHVyZSkpOworICAgICAgICAgICAgICAgIHRleDJEID0gbV9ibGFja1RleHR1cmUy RC5nZXQoKTsKKyAgICAgICAgICAgICAgICB0ZXhDdWJlTWFwID0gbV9ibGFja1RleHR1cmVDdWJl TWFwLmdldCgpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICB0ZXgyRCA9 IG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmUyREJpbmRpbmcuZ2V0KCk7CisgICAgICAgICAg ICAgICAgdGV4Q3ViZU1hcCA9IG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmVDdWJlTWFwQmlu ZGluZy5nZXQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChtX3RleHR1cmVVbml0 c1tpaV0ubV90ZXh0dXJlMkRCaW5kaW5nICYmIG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmUy REJpbmRpbmctPm5lZWRUb1VzZUJsYWNrVGV4dHVyZSgpKQorICAgICAgICAgICAgICAgIG1fY29u dGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG9iamVjdE9y WmVybyh0ZXgyRCkpOworICAgICAgICAgICAgaWYgKG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1 cmVDdWJlTWFwQmluZGluZyAmJiBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlQ3ViZU1hcEJp bmRpbmctPm5lZWRUb1VzZUJsYWNrVGV4dHVyZSgpKQorICAgICAgICAgICAgICAgIG1fY29udGV4 dC0+YmluZFRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfQ1VCRV9NQVAsIG9iamVj dE9yWmVybyh0ZXhDdWJlTWFwKSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKHJlc2V0QWN0 aXZlVW5pdCkKQEAgLTQ4NzAsOCArNDg3OCwxMCBAQCBpbnQgV2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpnZXRCb3VuZEZyYW1lYnVmZmVySGVpZ2h0KCkKIAogV2ViR0xUZXh0dXJlKiBXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OnZhbGlkYXRlVGV4dHVyZUJpbmRpbmcoY29uc3QgY2hhciogZnVuY3Rpb25O YW1lLCBHQzNEZW51bSB0YXJnZXQsIGJvb2wgdXNlU2l4RW51bXNGb3JDdWJlTWFwKQogeworICAg IFdlYkdMVGV4dHVyZSogdGV4ID0gMDsKICAgICBzd2l0Y2ggKHRhcmdldCkgewogICAgIGNhc2Ug R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQ6CisgICAgICAgIHRleCA9IG1fdGV4dHVyZVVu aXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGluZy5nZXQoKTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9DVUJFX01BUF9Q T1NJVElWRV9YOgogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfQ1VCRV9NQVBf TkVHQVRJVkVfWDoKQEAgLTQ4ODMsMTggKzQ4OTMsMTkgQEAgV2ViR0xUZXh0dXJlKiBXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlVGV4dHVyZUJpbmRpbmcoY29uc3QgY2hhciogZnVuY3Rp b24KICAgICAgICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZB TElEX0VOVU0sIGZ1bmN0aW9uTmFtZSwgImludmFsaWQgdGV4dHVyZSB0YXJnZXQiKTsKICAgICAg ICAgICAgIHJldHVybiAwOwogICAgICAgICB9CisgICAgICAgIHRleCA9IG1fdGV4dHVyZVVuaXRz W21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZUN1YmVNYXBCaW5kaW5nLmdldCgpOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX0NVQkVfTUFQ OgogICAgICAgICBpZiAodXNlU2l4RW51bXNGb3JDdWJlTWFwKSB7CiAgICAgICAgICAgICBzeW50 aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9FTlVNLCBmdW5jdGlvbk5h bWUsICJpbnZhbGlkIHRleHR1cmUgdGFyZ2V0Iik7CiAgICAgICAgICAgICByZXR1cm4gMDsKICAg ICAgICAgfQorICAgICAgICB0ZXggPSBtX3RleHR1cmVVbml0c1ttX2FjdGl2ZVRleHR1cmVVbml0 XS5tX3RleHR1cmVDdWJlTWFwQmluZGluZy5nZXQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFM SURfRU5VTSwgZnVuY3Rpb25OYW1lLCAiaW52YWxpZCB0ZXh0dXJlIHRhcmdldCIpOwogICAgICAg ICByZXR1cm4gMDsKICAgICB9Ci0gICAgV2ViR0xUZXh0dXJlKiB0ZXggPSBtX3RleHR1cmVVbml0 c1ttX2FjdGl2ZVRleHR1cmVVbml0XS5tX3RleHR1cmVCaW5kaW5nLmdldCgpOwogICAgIGlmICgh dGV4KQogICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJ RF9PUEVSQVRJT04sIGZ1bmN0aW9uTmFtZSwgIm5vIHRleHR1cmUiKTsKICAgICByZXR1cm4gdGV4 OwpAQCAtNjAwNiw3ICs2MDE3LDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnJlc3Rv cmVDdXJyZW50RnJhbWVidWZmZXIoKQogdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnJlc3Rv cmVDdXJyZW50VGV4dHVyZTJEKCkKIHsKICAgICBFeGNlcHRpb25Db2RlIGVjOwotICAgIGJpbmRU ZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX3RleHR1cmVVbml0c1ttX2Fj dGl2ZVRleHR1cmVVbml0XS5tX3RleHR1cmVCaW5kaW5nLmdldCgpLCBlYyk7CisgICAgYmluZFRl eHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIG1fdGV4dHVyZVVuaXRzW21fYWN0 aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGluZy5nZXQoKSwgZWMpOwogfQogCiBib29s IFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6c3VwcG9ydHNEcmF3QnVmZmVycygpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oCmluZGV4IDU2 OTM0MTUuLjM0MjA5YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5oCkBAIC00NDksOCArNDQ5LDEwIEBAIHByaXZhdGU6CiAgICAg UmVmUHRyPFdlYkdMUHJvZ3JhbT4gbV9jdXJyZW50UHJvZ3JhbTsKICAgICBSZWZQdHI8V2ViR0xG cmFtZWJ1ZmZlcj4gbV9mcmFtZWJ1ZmZlckJpbmRpbmc7CiAgICAgUmVmUHRyPFdlYkdMUmVuZGVy YnVmZmVyPiBtX3JlbmRlcmJ1ZmZlckJpbmRpbmc7Ci0gICAgc3RydWN0IFRleHR1cmVVbml0U3Rh dGUgewotICAgICAgICBSZWZQdHI8V2ViR0xUZXh0dXJlPiBtX3RleHR1cmVCaW5kaW5nOworICAg IGNsYXNzIFRleHR1cmVVbml0U3RhdGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgUmVmUHRyPFdl YkdMVGV4dHVyZT4gbV90ZXh0dXJlMkRCaW5kaW5nOworICAgICAgICBSZWZQdHI8V2ViR0xUZXh0 dXJlPiBtX3RleHR1cmVDdWJlTWFwQmluZGluZzsKICAgICB9OwogICAgIFZlY3RvcjxUZXh0dXJl VW5pdFN0YXRlPiBtX3RleHR1cmVVbml0czsKICAgICB1bnNpZ25lZCBsb25nIG1fYWN0aXZlVGV4 dHVyZVVuaXQ7Cg==