127154 2014-01-16 17:28:07 -0800 Since MidpointState is a class, it should behave like a class 2014-01-21 13:29:01 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 969006 0 zoltan 2014-01-16 17:28:07 -0800 Since MidpointState is a class, it should behave like a class. 969010 1 221433 zoltan 2014-01-16 17:31:10 -0800 Created attachment 221433 Patch 970393 2 221433 hyatt 2014-01-21 12:59:28 -0800 Comment on attachment 221433 Patch r=me 970402 3 221433 commit-queue 2014-01-21 13:28:59 -0800 Comment on attachment 221433 Patch Clearing flags on attachment: 221433 Committed r162472: <http://trac.webkit.org/changeset/162472> 970403 4 commit-queue 2014-01-21 13:29:01 -0800 All reviewed patches have been landed. Closing bug. 221433 2014-01-16 17:31:10 -0800 2014-01-21 13:28:59 -0800 Patch MPS.patch text/plain 13105 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZjA3NWIxLi42YzY5MWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTQtMDEtMTYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgU2luY2UgTWlkcG9pbnRTdGF0ZSBpcyBhIGNsYXNzLCBpdCBzaG91bGQgYmVoYXZlIGxp a2UgYSBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI3MTU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSSBtb2RpZmllZCBNaWRwb2ludFN0YXRlIHRvIGJlaGF2ZSBsaWtlIGEgY2xhc3MsIHVwZGF0 ZWQgdGhlIGNhbGwgc2l0ZXMgYWxzby4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2 aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpNaWRwb2ludFN0YXRlOjpyZXNldCk6CisgICAgICAgIChXZWJDb3Jl OjpNaWRwb2ludFN0YXRlOjpzdGFydElnbm9yaW5nU3BhY2VzKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1pZHBvaW50U3RhdGU6OnN0b3BJZ25vcmluZ1NwYWNlcyk6CisgICAgICAgIChXZWJDb3JlOjpN aWRwb2ludFN0YXRlOjptaWRwb2ludHMpOgorICAgICAgICAoV2ViQ29yZTo6TWlkcG9pbnRTdGF0 ZTo6bnVtTWlkcG9pbnRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1pZHBvaW50U3RhdGU6OmN1cnJl bnRNaWRwb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpNaWRwb2ludFN0YXRlOjppbmNyZW1lbnRD dXJyZW50TWlkcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWlkcG9pbnRTdGF0ZTo6ZGVjcmVh c2VOdW1NaWRwb2ludHMpOgorICAgICAgICAoV2ViQ29yZTo6TWlkcG9pbnRTdGF0ZTo6YmV0d2Vl bk1pZHBvaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpNaWRwb2ludFN0YXRlOjpzZXRCZXR3ZWVu TWlkcG9pbnRzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1pZHBvaW50U3RhdGU6OmFkZE1pZHBvaW50 KTogUmVuYW1lZCBmcm9tIGRlcHJlY2F0ZWRBZGRNaWRwb2ludCwgc2luY2Ugbm93CisgICAgICAg IGl0cyBwcml2YXRlLCB3ZSBubyBsb25nZXIgbmVlZCB0byBkaXNjb3VyYWdlIGNhbGxlcnMgZnJv bSB1c2luZyBpdC4KKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaDoKKyAgICAg ICAgKFdlYkNvcmU6Oklzb2xhdGVUcmFja2VyOjphZGRGYWtlUnVuSWZOZWNlc3NhcnkpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93OjphcHBlbmRSdW5zRm9yT2JqZWN0KToKKyAgICAgICAgKFdl YkNvcmU6OmNvbnN0cnVjdEJpZGlSdW5zRm9yTGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL2xp bmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oOgorICAgICAgICAoV2ViQ29yZTo6Y2hl Y2tNaWRwb2ludHMpOgorICAgICAgICAqIHJlbmRlcmluZy9saW5lL1RyYWlsaW5nT2JqZWN0cy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUcmFpbGluZ09iamVjdHM6OnVwZGF0ZU1pZHBvaW50c0Zv clRyYWlsaW5nQm94ZXMpOgorCiAyMDE0LTAxLTE2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L0JpZGlSZXNvbHZlci5oCmluZGV4IGJjZDYyMjEuLmRiOGZkMGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaApAQCAtNDIsMjkgKzQyLDIxIEBA IHB1YmxpYzoKICAgICAKICAgICB2b2lkIHJlc2V0KCkKICAgICB7Ci0gICAgICAgIG51bU1pZHBv aW50cyA9IDA7Ci0gICAgICAgIGN1cnJlbnRNaWRwb2ludCA9IDA7Ci0gICAgICAgIGJldHdlZW5N aWRwb2ludHMgPSBmYWxzZTsKKyAgICAgICAgbV9udW1NaWRwb2ludHMgPSAwOworICAgICAgICBt X2N1cnJlbnRNaWRwb2ludCA9IDA7CisgICAgICAgIG1fYmV0d2Vlbk1pZHBvaW50cyA9IGZhbHNl OwogICAgIH0KICAgICAKLSAgICAvLyBUaGUgZ29hbCBpcyB0byByZXVzZSB0aGUgbGluZSBzdGF0 ZSBhY3Jvc3MgbXVsdGlwbGUKLSAgICAvLyBsaW5lcyBzbyB3ZSBqdXN0IGtlZXAgYW4gYXJyYXkg YXJvdW5kIGZvciBtaWRwb2ludHMgYW5kIG5ldmVyIGNsZWFyIGl0IGFjcm9zcyBtdWx0aXBsZQot ICAgIC8vIGxpbmVzLiAgV2UgdHJhY2sgdGhlIG51bWJlciBvZiBpdGVtcyBhbmQgcG9zaXRpb24g dXNpbmcgdGhlIHR3byBvdGhlciB2YXJpYWJsZXMuCi0gICAgVmVjdG9yPEl0ZXJhdG9yPiBtaWRw b2ludHM7Ci0gICAgdW5zaWduZWQgbnVtTWlkcG9pbnRzOwotICAgIHVuc2lnbmVkIGN1cnJlbnRN aWRwb2ludDsKLSAgICBib29sIGJldHdlZW5NaWRwb2ludHM7Ci0KICAgICB2b2lkIHN0YXJ0SWdu b3JpbmdTcGFjZXMoY29uc3QgSXRlcmF0b3ImIG1pZHBvaW50KQogICAgIHsKLSAgICAgICAgQVNT RVJUKCEobnVtTWlkcG9pbnRzICUgMikpOwotICAgICAgICBkZXByZWNhdGVkQWRkTWlkcG9pbnQo bWlkcG9pbnQpOworICAgICAgICBBU1NFUlQoIShtX251bU1pZHBvaW50cyAlIDIpKTsKKyAgICAg ICAgYWRkTWlkcG9pbnQobWlkcG9pbnQpOwogICAgIH0KIAogICAgIHZvaWQgc3RvcElnbm9yaW5n U3BhY2VzKGNvbnN0IEl0ZXJhdG9yJiBtaWRwb2ludCkKICAgICB7Ci0gICAgICAgIEFTU0VSVChu dW1NaWRwb2ludHMgJSAyKTsKLSAgICAgICAgZGVwcmVjYXRlZEFkZE1pZHBvaW50KG1pZHBvaW50 KTsKKyAgICAgICAgQVNTRVJUKG1fbnVtTWlkcG9pbnRzICUgMik7CisgICAgICAgIGFkZE1pZHBv aW50KG1pZHBvaW50KTsKICAgICB9CiAKICAgICAvLyBXaGVuIGlnbm9yaW5nIHNwYWNlcywgdGhp cyBuZWVkcyB0byBiZSBjYWxsZWQgZm9yIG9iamVjdHMgdGhhdCBuZWVkIGxpbmUgYm94ZXMgc3Vj aCBhcyBSZW5kZXJJbmxpbmVzIG9yCkBAIC03NSwxNCArNjcsMzAgQEAgcHVibGljOgogICAgICAg ICBzdG9wSWdub3JpbmdTcGFjZXMobWlkcG9pbnQpOwogICAgICAgICBzdGFydElnbm9yaW5nU3Bh Y2VzKG1pZHBvaW50KTsKICAgICB9CisKKyAgICBWZWN0b3I8SXRlcmF0b3I+JiBtaWRwb2ludHMo KSB7IHJldHVybiBtX21pZHBvaW50czsgfQorICAgIGNvbnN0IHVuc2lnbmVkJiBudW1NaWRwb2lu dHMoKSBjb25zdCB7IHJldHVybiBtX251bU1pZHBvaW50czsgfQorICAgIGNvbnN0IHVuc2lnbmVk JiBjdXJyZW50TWlkcG9pbnQoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRNaWRwb2ludDsgfQor ICAgIHZvaWQgaW5jcmVtZW50Q3VycmVudE1pZHBvaW50KCkgeyArK21fY3VycmVudE1pZHBvaW50 OyB9CisgICAgdm9pZCBkZWNyZWFzZU51bU1pZHBvaW50cygpIHsgLS1tX251bU1pZHBvaW50czsg fQorICAgIGNvbnN0IGJvb2wmIGJldHdlZW5NaWRwb2ludHMoKSBjb25zdCB7IHJldHVybiBtX2Jl dHdlZW5NaWRwb2ludHM7IH0KKyAgICB2b2lkIHNldEJldHdlZW5NaWRwb2ludHMoYm9vbCBiZXR3 ZWVuTWlkcG9pbnQpIHsgbV9iZXR3ZWVuTWlkcG9pbnRzID0gYmV0d2Vlbk1pZHBvaW50OyB9CiBw cml2YXRlOgotICAgIHZvaWQgZGVwcmVjYXRlZEFkZE1pZHBvaW50KGNvbnN0IEl0ZXJhdG9yJiBt aWRwb2ludCkKKyAgICAvLyBUaGUgZ29hbCBpcyB0byByZXVzZSB0aGUgbGluZSBzdGF0ZSBhY3Jv c3MgbXVsdGlwbGUKKyAgICAvLyBsaW5lcyBzbyB3ZSBqdXN0IGtlZXAgYW4gYXJyYXkgYXJvdW5k IGZvciBtaWRwb2ludHMgYW5kIG5ldmVyIGNsZWFyIGl0IGFjcm9zcyBtdWx0aXBsZQorICAgIC8v IGxpbmVzLiBXZSB0cmFjayB0aGUgbnVtYmVyIG9mIGl0ZW1zIGFuZCBwb3NpdGlvbiB1c2luZyB0 aGUgdHdvIG90aGVyIHZhcmlhYmxlcy4KKyAgICBWZWN0b3I8SXRlcmF0b3I+IG1fbWlkcG9pbnRz OworICAgIHVuc2lnbmVkIG1fbnVtTWlkcG9pbnRzOworICAgIHVuc2lnbmVkIG1fY3VycmVudE1p ZHBvaW50OworICAgIGJvb2wgbV9iZXR3ZWVuTWlkcG9pbnRzOworCisgICAgdm9pZCBhZGRNaWRw b2ludChjb25zdCBJdGVyYXRvciYgbWlkcG9pbnQpCiAgICAgewotICAgICAgICBpZiAobWlkcG9p bnRzLnNpemUoKSA8PSBudW1NaWRwb2ludHMpCi0gICAgICAgICAgICBtaWRwb2ludHMuZ3Jvdyhu dW1NaWRwb2ludHMgKyAxMCk7CisgICAgICAgIGlmIChtX21pZHBvaW50cy5zaXplKCkgPD0gbV9u dW1NaWRwb2ludHMpCisgICAgICAgICAgICBtX21pZHBvaW50cy5ncm93KG1fbnVtTWlkcG9pbnRz ICsgMTApOwogCi0gICAgICAgIEl0ZXJhdG9yKiBtaWRwb2ludHNJdGVyYXRvciA9IG1pZHBvaW50 cy5kYXRhKCk7Ci0gICAgICAgIG1pZHBvaW50c0l0ZXJhdG9yW251bU1pZHBvaW50cysrXSA9IG1p ZHBvaW50OworICAgICAgICBJdGVyYXRvciogbWlkcG9pbnRzSXRlcmF0b3IgPSBtX21pZHBvaW50 cy5kYXRhKCk7CisgICAgICAgIG1pZHBvaW50c0l0ZXJhdG9yW21fbnVtTWlkcG9pbnRzKytdID0g bWlkcG9pbnQ7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0lubGluZUl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lSXRl cmF0b3IuaAppbmRleCBiNWYyYTFlLi4xOThjZjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lSXRlcmF0b3IuaApAQCAtNDk3LDkgKzQ5Nyw5IEBAIHB1YmxpYzoKICAgICAgICAg Ly8gRm9yIG5vdywgaWYgd2UgZW50ZXIgYW4gaXNvbGF0ZSBiZXR3ZWVuIG1pZHBvaW50cywgd2Ug aW5jcmVtZW50IG91ciBjdXJyZW50IG1pZHBvaW50IG9yIGVsc2UKICAgICAgICAgLy8gd2UnbGwg bGVhdmUgdGhlIGlzb2xhdGUgYW5kIGlnbm9yZSB0aGUgY29udGVudCB0aGF0IGZvbGxvd3MuCiAg ICAgICAgIE1pZHBvaW50U3RhdGU8SW5saW5lSXRlcmF0b3I+JiBtaWRwb2ludFN0YXRlID0gcmVz b2x2ZXIubWlkcG9pbnRTdGF0ZSgpOwotICAgICAgICBpZiAobWlkcG9pbnRTdGF0ZS5iZXR3ZWVu TWlkcG9pbnRzICYmIG1pZHBvaW50U3RhdGUubWlkcG9pbnRzW21pZHBvaW50U3RhdGUuY3VycmVu dE1pZHBvaW50XS5yZW5kZXJlcigpID09ICZvYmopIHsKLSAgICAgICAgICAgIG1pZHBvaW50U3Rh dGUuYmV0d2Vlbk1pZHBvaW50cyA9IGZhbHNlOwotICAgICAgICAgICAgKyttaWRwb2ludFN0YXRl LmN1cnJlbnRNaWRwb2ludDsKKyAgICAgICAgaWYgKG1pZHBvaW50U3RhdGUuYmV0d2Vlbk1pZHBv aW50cygpICYmIG1pZHBvaW50U3RhdGUubWlkcG9pbnRzKClbbWlkcG9pbnRTdGF0ZS5jdXJyZW50 TWlkcG9pbnQoKV0ucmVuZGVyZXIoKSA9PSAmb2JqKSB7CisgICAgICAgICAgICBtaWRwb2ludFN0 YXRlLnNldEJldHdlZW5NaWRwb2ludHMoZmFsc2UpOworICAgICAgICAgICAgbWlkcG9pbnRTdGF0 ZS5pbmNyZW1lbnRDdXJyZW50TWlkcG9pbnQoKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRl eCA2NWVjNzY3Li41ZDY2MWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtODMsMTggKzgzLDE4IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93OjphcHBlbmRSdW5zRm9yT2JqZWN0KEJpZGlSdW5MaXN0PEJpZGlSdW4+JiBydW5z LCBpbnQgc3RhcnQsCiAgICAgICAgIHJldHVybjsKIAogICAgIExpbmVNaWRwb2ludFN0YXRlJiBs aW5lTWlkcG9pbnRTdGF0ZSA9IHJlc29sdmVyLm1pZHBvaW50U3RhdGUoKTsKLSAgICBib29sIGhh dmVOZXh0TWlkcG9pbnQgPSAobGluZU1pZHBvaW50U3RhdGUuY3VycmVudE1pZHBvaW50IDwgbGlu ZU1pZHBvaW50U3RhdGUubnVtTWlkcG9pbnRzKTsKKyAgICBib29sIGhhdmVOZXh0TWlkcG9pbnQg PSAobGluZU1pZHBvaW50U3RhdGUuY3VycmVudE1pZHBvaW50KCkgPCBsaW5lTWlkcG9pbnRTdGF0 ZS5udW1NaWRwb2ludHMoKSk7CiAgICAgSW5saW5lSXRlcmF0b3IgbmV4dE1pZHBvaW50OwogICAg IGlmIChoYXZlTmV4dE1pZHBvaW50KQotICAgICAgICBuZXh0TWlkcG9pbnQgPSBsaW5lTWlkcG9p bnRTdGF0ZS5taWRwb2ludHNbbGluZU1pZHBvaW50U3RhdGUuY3VycmVudE1pZHBvaW50XTsKLSAg ICBpZiAobGluZU1pZHBvaW50U3RhdGUuYmV0d2Vlbk1pZHBvaW50cykgeworICAgICAgICBuZXh0 TWlkcG9pbnQgPSBsaW5lTWlkcG9pbnRTdGF0ZS5taWRwb2ludHMoKVtsaW5lTWlkcG9pbnRTdGF0 ZS5jdXJyZW50TWlkcG9pbnQoKV07CisgICAgaWYgKGxpbmVNaWRwb2ludFN0YXRlLmJldHdlZW5N aWRwb2ludHMoKSkgewogICAgICAgICBpZiAoIShoYXZlTmV4dE1pZHBvaW50ICYmIG5leHRNaWRw b2ludC5yZW5kZXJlcigpID09IG9iaikpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIC8v IFRoaXMgaXMgYSBuZXcgc3RhcnQgcG9pbnQuIFN0b3AgaWdub3Jpbmcgb2JqZWN0cyBhbmQKICAg ICAgICAgLy8gYWRqdXN0IG91ciBzdGFydC4KLSAgICAgICAgbGluZU1pZHBvaW50U3RhdGUuYmV0 d2Vlbk1pZHBvaW50cyA9IGZhbHNlOworICAgICAgICBsaW5lTWlkcG9pbnRTdGF0ZS5zZXRCZXR3 ZWVuTWlkcG9pbnRzKGZhbHNlKTsKICAgICAgICAgc3RhcnQgPSBuZXh0TWlkcG9pbnQub2Zmc2V0 KCk7Ci0gICAgICAgIGxpbmVNaWRwb2ludFN0YXRlLmN1cnJlbnRNaWRwb2ludCsrOworICAgICAg ICBsaW5lTWlkcG9pbnRTdGF0ZS5pbmNyZW1lbnRDdXJyZW50TWlkcG9pbnQoKTsKICAgICAgICAg aWYgKHN0YXJ0IDwgZW5kKQogICAgICAgICAgICAgcmV0dXJuIGFwcGVuZFJ1bnNGb3JPYmplY3Qo cnVucywgc3RhcnQsIGVuZCwgb2JqLCByZXNvbHZlcik7CiAgICAgfSBlbHNlIHsKQEAgLTEwNiw4 ICsxMDYsOCBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6YXBwZW5kUnVuc0Zvck9iamVjdChCaWRp UnVuTGlzdDxCaWRpUnVuPiYgcnVucywgaW50IHN0YXJ0LAogICAgICAgICAvLyBBbiBlbmQgbWlk cG9pbnQgaGFzIGJlZW4gZW5jb3VudGVyZWQgd2l0aGluIG91ciBvYmplY3QuICBXZQogICAgICAg ICAvLyBuZWVkIHRvIGdvIGFoZWFkIGFuZCBhcHBlbmQgYSBydW4gd2l0aCBvdXIgZW5kcG9pbnQu CiAgICAgICAgIGlmIChzdGF0aWNfY2FzdDxpbnQ+KG5leHRNaWRwb2ludC5vZmZzZXQoKSArIDEp IDw9IGVuZCkgewotICAgICAgICAgICAgbGluZU1pZHBvaW50U3RhdGUuYmV0d2Vlbk1pZHBvaW50 cyA9IHRydWU7Ci0gICAgICAgICAgICBsaW5lTWlkcG9pbnRTdGF0ZS5jdXJyZW50TWlkcG9pbnQr KzsKKyAgICAgICAgICAgIGxpbmVNaWRwb2ludFN0YXRlLnNldEJldHdlZW5NaWRwb2ludHModHJ1 ZSk7CisgICAgICAgICAgICBsaW5lTWlkcG9pbnRTdGF0ZS5pbmNyZW1lbnRDdXJyZW50TWlkcG9p bnQoKTsKICAgICAgICAgICAgIGlmIChuZXh0TWlkcG9pbnQub2Zmc2V0KCkgIT0gVUlOVF9NQVgp IHsgLy8gVUlOVF9NQVggbWVhbnMgc3RvcCBhdCB0aGUgb2JqZWN0IGFuZCBkb24ndCBpbmNsdWRl IGFueSBvZiBpdC4KICAgICAgICAgICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8aW50PihuZXh0TWlk cG9pbnQub2Zmc2V0KCkgKyAxKSA+IHN0YXJ0KQogICAgICAgICAgICAgICAgICAgICBydW5zLmFk ZFJ1bihjcmVhdGVSdW4oc3RhcnQsIG5leHRNaWRwb2ludC5vZmZzZXQoKSArIDEsIG9iaiwgcmVz b2x2ZXIpKTsKQEAgLTkzOCw3ICs5MzgsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY29uc3RydWN0 QmlkaVJ1bnNGb3JMaW5lKGNvbnN0IFJlbmRlckJsb2NrRmxvdyogYmxvY2ssIElubGluZQogICAg ICAgICAgICAgc2VnbWVudE1hcmtlci0+bV9zdGFydHNTZWdtZW50ID0gdHJ1ZTsKICAgICAgICAg ICAgIGJpZGlSdW5zLmFkZFJ1bihzZWdtZW50TWFya2VyKTsKICAgICAgICAgICAgIC8vIERvIG5v dCBjb2xsYXBzZSBtaWRwb2ludHMgYmV0d2VlbiBzZWdtZW50cwotICAgICAgICAgICAgdG9wUmVz b2x2ZXIubWlkcG9pbnRTdGF0ZSgpLmJldHdlZW5NaWRwb2ludHMgPSBmYWxzZTsKKyAgICAgICAg ICAgIHRvcFJlc29sdmVyLm1pZHBvaW50U3RhdGUoKS5zZXRCZXR3ZWVuTWlkcG9pbnRzKGZhbHNl KTsKICAgICAgICAgfQogICAgICAgICBpZiAoc2VnbWVudFN0YXJ0ID09IHNlZ21lbnRFbmQpCiAg ICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaAppbmRleCBlNDdkOGM3 Li4zM2QyOTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVh a2luZ0NvbnRleHRJbmxpbmVIZWFkZXJzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oCkBAIC0xMDY4LDE2ICsxMDY4LDE2 IEBAIGlubGluZSB2b2lkIGNoZWNrTWlkcG9pbnRzKExpbmVNaWRwb2ludFN0YXRlJiBsaW5lTWlk cG9pbnRTdGF0ZSwgSW5saW5lSXRlcmF0b3ImCiAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIG91ciBs YXN0IG1pZHBvaW50IGlzIGEgc3RhcnQgcG9pbnQgYmV5b25kIHRoZSBsaW5lIGJyZWFrLiBJZiBz bywKICAgICAvLyBzaGF2ZSBpdCBvZmYgdGhlIGxpc3QsIGFuZCBzaGF2ZSBvZmYgYSB0cmFpbGlu ZyBzcGFjZSBpZiB0aGUgcHJldmlvdXMgZW5kIHBvaW50IGRvZXNuJ3QKICAgICAvLyBwcmVzZXJ2 ZSB3aGl0ZXNwYWNlLgotICAgIGlmIChsQnJlYWsucmVuZGVyZXIoKSAmJiBsaW5lTWlkcG9pbnRT dGF0ZS5udW1NaWRwb2ludHMgJiYgIShsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMgJSAy KSkgewotICAgICAgICBJbmxpbmVJdGVyYXRvciogbWlkcG9pbnRzID0gbGluZU1pZHBvaW50U3Rh dGUubWlkcG9pbnRzLmRhdGEoKTsKLSAgICAgICAgSW5saW5lSXRlcmF0b3ImIGVuZHBvaW50ID0g bWlkcG9pbnRzW2xpbmVNaWRwb2ludFN0YXRlLm51bU1pZHBvaW50cyAtIDJdOwotICAgICAgICBj b25zdCBJbmxpbmVJdGVyYXRvciYgc3RhcnRwb2ludCA9IG1pZHBvaW50c1tsaW5lTWlkcG9pbnRT dGF0ZS5udW1NaWRwb2ludHMgLSAxXTsKKyAgICBpZiAobEJyZWFrLnJlbmRlcmVyKCkgJiYgbGlu ZU1pZHBvaW50U3RhdGUubnVtTWlkcG9pbnRzKCkgJiYgIShsaW5lTWlkcG9pbnRTdGF0ZS5udW1N aWRwb2ludHMoKSAlIDIpKSB7CisgICAgICAgIElubGluZUl0ZXJhdG9yKiBtaWRwb2ludHMgPSBs aW5lTWlkcG9pbnRTdGF0ZS5taWRwb2ludHMoKS5kYXRhKCk7CisgICAgICAgIElubGluZUl0ZXJh dG9yJiBlbmRwb2ludCA9IG1pZHBvaW50c1tsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMo KSAtIDJdOworICAgICAgICBjb25zdCBJbmxpbmVJdGVyYXRvciYgc3RhcnRwb2ludCA9IG1pZHBv aW50c1tsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMoKSAtIDFdOwogICAgICAgICBJbmxp bmVJdGVyYXRvciBjdXJycG9pbnQgPSBlbmRwb2ludDsKICAgICAgICAgd2hpbGUgKCFjdXJycG9p bnQuYXRFbmQoKSAmJiBjdXJycG9pbnQgIT0gc3RhcnRwb2ludCAmJiBjdXJycG9pbnQgIT0gbEJy ZWFrKQogICAgICAgICAgICAgY3VycnBvaW50LmluY3JlbWVudCgpOwogICAgICAgICBpZiAoY3Vy cnBvaW50ID09IGxCcmVhaykgewogICAgICAgICAgICAgLy8gV2UgaGl0IHRoZSBsaW5lIGJyZWFr IGJlZm9yZSB0aGUgc3RhcnQgcG9pbnQuIFNoYXZlIG9mZiB0aGUgc3RhcnQgcG9pbnQuCi0gICAg ICAgICAgICBsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMtLTsKKyAgICAgICAgICAgIGxp bmVNaWRwb2ludFN0YXRlLmRlY3JlYXNlTnVtTWlkcG9pbnRzKCk7CiAgICAgICAgICAgICBpZiAo ZW5kcG9pbnQucmVuZGVyZXIoKS0+c3R5bGUoKS5jb2xsYXBzZVdoaXRlU3BhY2UoKSAmJiBlbmRw b2ludC5yZW5kZXJlcigpLT5pc1RleHQoKSkKICAgICAgICAgICAgICAgICBlbmRwb2ludC5zZXRP ZmZzZXQoZW5kcG9pbnQub2Zmc2V0KCkgLSAxKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxpbmdPYmplY3RzLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9saW5lL1RyYWlsaW5nT2JqZWN0cy5jcHAKaW5kZXggNjc2NjM5Mi4u OTY0OTBjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxp bmdPYmplY3RzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9UcmFpbGlu Z09iamVjdHMuY3BwCkBAIC0zNiwyNCArMzYsMjQgQEAgdm9pZCBUcmFpbGluZ09iamVjdHM6OnVw ZGF0ZU1pZHBvaW50c0ZvclRyYWlsaW5nQm94ZXMoTGluZU1pZHBvaW50U3RhdGUmIGxpbmVNaWQK IAogICAgIC8vIFRoaXMgb2JqZWN0IGlzIGVpdGhlciBnb2luZyB0byBiZSBwYXJ0IG9mIHRoZSBs YXN0IG1pZHBvaW50LCBvciBpdCBpcyBnb2luZyB0byBiZSB0aGUgYWN0dWFsIGVuZHBvaW50Lgog ICAgIC8vIEluIGJvdGggY2FzZXMgd2UganVzdCBkZWNyZWFzZSBvdXIgcG9zIGJ5IDEgbGV2ZWwg dG8gZXhjbHVkZSB0aGUgc3BhY2UsIGFsbG93aW5nIGl0IHRvIC0gaW4gZWZmZWN0IC0gY29sbGFw c2UgaW50byB0aGUgbmV3bGluZS4KLSAgICBpZiAobGluZU1pZHBvaW50U3RhdGUubnVtTWlkcG9p bnRzICUgMikgeworICAgIGlmIChsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMoKSAlIDIp IHsKICAgICAgICAgLy8gRmluZCB0aGUgdHJhaWxpbmcgc3BhY2Ugb2JqZWN0J3MgbWlkcG9pbnQu Ci0gICAgICAgIGludCB0cmFpbGluZ1NwYWNlTWlkcG9pbnQgPSBsaW5lTWlkcG9pbnRTdGF0ZS5u dW1NaWRwb2ludHMgLSAxOwotICAgICAgICBmb3IgKCA7IHRyYWlsaW5nU3BhY2VNaWRwb2ludCA+ IDAgJiYgbGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW3RyYWlsaW5nU3BhY2VNaWRwb2ludF0u cmVuZGVyZXIoKSAhPSBtX3doaXRlc3BhY2U7IC0tdHJhaWxpbmdTcGFjZU1pZHBvaW50KSB7IH0K KyAgICAgICAgaW50IHRyYWlsaW5nU3BhY2VNaWRwb2ludCA9IGxpbmVNaWRwb2ludFN0YXRlLm51 bU1pZHBvaW50cygpIC0gMTsKKyAgICAgICAgZm9yICggOyB0cmFpbGluZ1NwYWNlTWlkcG9pbnQg PiAwICYmIGxpbmVNaWRwb2ludFN0YXRlLm1pZHBvaW50cygpW3RyYWlsaW5nU3BhY2VNaWRwb2lu dF0ucmVuZGVyZXIoKSAhPSBtX3doaXRlc3BhY2U7IC0tdHJhaWxpbmdTcGFjZU1pZHBvaW50KSB7 IH0KICAgICAgICAgQVNTRVJUKHRyYWlsaW5nU3BhY2VNaWRwb2ludCA+PSAwKTsKICAgICAgICAg aWYgKGNvbGxhcHNlRmlyc3RTcGFjZSA9PSBDb2xsYXBzZUZpcnN0U3BhY2UpCi0gICAgICAgICAg ICBsaW5lTWlkcG9pbnRTdGF0ZS5taWRwb2ludHNbdHJhaWxpbmdTcGFjZU1pZHBvaW50XS5zZXRP ZmZzZXQobGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW3RyYWlsaW5nU3BhY2VNaWRwb2ludF0u b2Zmc2V0KCkgLTEpOworICAgICAgICAgICAgbGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzKClb dHJhaWxpbmdTcGFjZU1pZHBvaW50XS5zZXRPZmZzZXQobGluZU1pZHBvaW50U3RhdGUubWlkcG9p bnRzKClbdHJhaWxpbmdTcGFjZU1pZHBvaW50XS5vZmZzZXQoKSAtMSk7CiAKICAgICAgICAgLy8g Tm93IG1ha2Ugc3VyZSBldmVyeSBzaW5nbGUgdHJhaWxpbmdQb3NpdGlvbmVkQm94IGZvbGxvd2lu ZyB0aGUgdHJhaWxpbmdTcGFjZU1pZHBvaW50IHByb3Blcmx5IHN0b3BzIGFuZCBzdGFydHMKICAg ICAgICAgLy8gaWdub3Jpbmcgc3BhY2VzLgogICAgICAgICBzaXplX3QgY3VycmVudE1pZHBvaW50 ID0gdHJhaWxpbmdTcGFjZU1pZHBvaW50ICsgMTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBtX2JveGVzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoY3VycmVudE1pZHBv aW50ID49IGxpbmVNaWRwb2ludFN0YXRlLm51bU1pZHBvaW50cykgeworICAgICAgICAgICAgaWYg KGN1cnJlbnRNaWRwb2ludCA+PSBsaW5lTWlkcG9pbnRTdGF0ZS5udW1NaWRwb2ludHMoKSkgewog ICAgICAgICAgICAgICAgIC8vIFdlIGRvbid0IGhhdmUgYSBtaWRwb2ludCBmb3IgdGhpcyBib3gg eWV0LgogICAgICAgICAgICAgICAgIGxpbmVNaWRwb2ludFN0YXRlLmVuc3VyZUxpbmVCb3hJbnNp ZGVJZ25vcmVkU3BhY2VzKG1fYm94ZXNbaV0pOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgICAgICBBU1NFUlQobGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW2N1cnJlbnRNaWRw b2ludF0ucmVuZGVyZXIoKSA9PSBtX2JveGVzW2ldKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQo bGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW2N1cnJlbnRNaWRwb2ludCArIDFdLnJlbmRlcmVy KCkgPT0gbV9ib3hlc1tpXSk7CisgICAgICAgICAgICAgICAgQVNTRVJUKGxpbmVNaWRwb2ludFN0 YXRlLm1pZHBvaW50cygpW2N1cnJlbnRNaWRwb2ludF0ucmVuZGVyZXIoKSA9PSBtX2JveGVzW2ld KTsKKyAgICAgICAgICAgICAgICBBU1NFUlQobGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzKClb Y3VycmVudE1pZHBvaW50ICsgMV0ucmVuZGVyZXIoKSA9PSBtX2JveGVzW2ldKTsKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIGN1cnJlbnRNaWRwb2ludCArPSAyOwogICAgICAgICB9Cg==