164489 2016-11-07 14:21:24 -0800 [CSS Parser] Fix grid layout parsing 2016-11-09 13:30:48 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1248839 0 hyatt 2016-11-07 14:21:24 -0800 [CSS Parser] Fix grid layout parsing 1248841 1 294084 hyatt 2016-11-07 14:24:48 -0800 Created attachment 294084 Patch 1249471 2 hyatt 2016-11-09 13:30:48 -0800 Fixed in r208478. 294084 2016-11-07 14:24:48 -0800 2016-11-07 14:35:42 -0800 Patch patch.txt text/plain 13166 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTExLTA3ICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBGaXggZ3JpZCBs YXlvdXQgcGFyc2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY0NDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBjc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbjoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NT U1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVGaXRDb250ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OmlzR3JpZFRyYWNrRml4ZWRTaXplZCk6CisgICAgICAgIChX ZWJDb3JlOjpjb25zdW1lR3JpZFRyYWNrU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpjb25zdW1l R3JpZFRyYWNrUmVwZWF0RnVuY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3VtZUdyaWRU cmFja0xpc3QpOgorICAgICAgICAoV2ViQ29yZTo6aXNDdXN0b21JZGVudFZhbHVlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lR3JpZEl0ZW1Qb3NpdGlvblNo b3J0aGFuZCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUdy aWRBcmVhU2hvcnRoYW5kKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVJbXBsaWNpdEdyaWRB dXRvRmxvdyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUdy aWRTaG9ydGhhbmQpOgorCiAyMDE2LTExLTAyICBEYXZlIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgogCiAgICAgICAgIFtDU1MgUGFyc2VyXSBDbGVhbiB1cCBuZXcgcGFyc2VyJ3MgZ3JpZCBsYXlv dXQgaWZkZWZzL3J1bnRpbWUgY2hlY2tpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NW YWx1ZUtleXdvcmRzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1 ZUtleXdvcmRzLmluCShyZXZpc2lvbiAyMDgyNjkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT VmFsdWVLZXl3b3Jkcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTI1Nyw2ICsxMjU3LDcgQEAgc3Bh bgogCiAvLyBncmlkLXRlbXBsYXRlLXtjb2x1bW5zfHJvd3N9CiBtaW5tYXgKK2ZpdC1jb250ZW50 CiAKIC8vIGdyaWQtYXV0by1mbG93CiBhdXRvLWZsb3cKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz cy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDgzMDEpCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjc1NSw3ICsyNzU1LDcgQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29u c3VtZUZpdENvbnRlbgogICAgIGlmICghbGVuZ3RoIHx8ICFhcmdzLmF0RW5kKCkpCiAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgIHJhbmdlID0gcmFuZ2VDb3B5OwotICAgIFJlZlB0cjxDU1NG dW5jdGlvblZhbHVlPiByZXN1bHQgPSBDU1NGdW5jdGlvblZhbHVlOjpjcmVhdGUoQ1NTVmFsdWVX ZWJraXRGaXRDb250ZW50KTsKKyAgICBSZWZQdHI8Q1NTRnVuY3Rpb25WYWx1ZT4gcmVzdWx0ID0g Q1NTRnVuY3Rpb25WYWx1ZTo6Y3JlYXRlKENTU1ZhbHVlRml0Q29udGVudCk7CiAgICAgcmVzdWx0 LT5hcHBlbmQobGVuZ3RoLnJlbGVhc2VOb25OdWxsKCkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9 CkBAIC0yODMyLDcgKzI4MzIsNyBAQCBzdGF0aWMgYm9vbCBpc0dyaWRUcmFja0ZpeGVkU2l6ZWQo Y29uc3QgCiAKICAgICBBU1NFUlQodmFsdWUuaXNGdW5jdGlvblZhbHVlKCkpOwogICAgIGF1dG8m IGZ1bmN0aW9uID0gZG93bmNhc3Q8Q1NTRnVuY3Rpb25WYWx1ZT4odmFsdWUpOwotICAgIGlmIChm dW5jdGlvbi5uYW1lKCkgPT0gQ1NTVmFsdWVXZWJraXRGaXRDb250ZW50IHx8IGZ1bmN0aW9uLmFy Z3VtZW50cygpID09IG51bGxwdHIgfHwgZnVuY3Rpb24uYXJndW1lbnRzKCktPmxlbmd0aCgpIDwg MikKKyAgICBpZiAoZnVuY3Rpb24ubmFtZSgpID09IENTU1ZhbHVlRml0Q29udGVudCB8fCBmdW5j dGlvbi5hcmd1bWVudHMoKSA9PSBudWxscHRyIHx8IGZ1bmN0aW9uLmFyZ3VtZW50cygpLT5sZW5n dGgoKSA8IDIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIENTU1ZhbHVlKiBtaW5Qcmlt aXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihmdW5jdGlvbi5hcmd1bWVu dHMoKS0+aXRlbSgwKSk7CkBAIC0yOTY5LDcgKzI5NjksNyBAQCBzdGF0aWMgUmVmUHRyPENTU1Zh bHVlPiBjb25zdW1lR3JpZFRyYWNrCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0g ICAgaWYgKHRva2VuLmZ1bmN0aW9uSWQoKSA9PSBDU1NWYWx1ZVdlYmtpdEZpdENvbnRlbnQpCisg ICAgaWYgKHRva2VuLmZ1bmN0aW9uSWQoKSA9PSBDU1NWYWx1ZUZpdENvbnRlbnQpCiAgICAgICAg IHJldHVybiBjb25zdW1lRml0Q29udGVudChyYW5nZSwgY3NzUGFyc2VyTW9kZSk7CiAKICAgICBy ZXR1cm4gY29uc3VtZUdyaWRCcmVhZHRoKHJhbmdlLCBjc3NQYXJzZXJNb2RlKTsKQEAgLTMwNDEs NyArMzA0MSw3IEBAIHN0YXRpYyBib29sIGNvbnN1bWVHcmlkVHJhY2tSZXBlYXRGdW5jdGkKICAg ICAgICAgcmVwZXRpdGlvbnMgPSBzdGQ6Om1pbihyZXBldGl0aW9ucywga0dyaWRNYXhUcmFja3Mg LyBudW1iZXJPZlRyYWNrcyk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcmVwZXRp dGlvbnM7ICsraSkgewogICAgICAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGogPCByZXBlYXRl ZFZhbHVlcy0+bGVuZ3RoKCk7ICsraikKLSAgICAgICAgICAgICAgICBsaXN0LmFwcGVuZChhZG9w dFJlZigqcmVwZWF0ZWRWYWx1ZXMtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaikpKTsKKyAgICAg ICAgICAgICAgICBsaXN0LmFwcGVuZCgqcmVwZWF0ZWRWYWx1ZXMtPml0ZW1XaXRob3V0Qm91bmRz Q2hlY2soaikpOwogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiB0cnVlOwpAQCAtMzA1OSw3 ICszMDU5LDcgQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUdyaWRUcmFjawogICAg ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIHZhbHVlcy0+YXBwZW5kKGxpbmVOYW1l cy5yZWxlYXNlTm9uTnVsbCgpKTsKICAgICB9Ci0KKyAgICAKICAgICBib29sIGFsbG93UmVwZWF0 ID0gdHJhY2tMaXN0VHlwZSA9PSBHcmlkVGVtcGxhdGU7CiAgICAgYm9vbCBzZWVuQXV0b1JlcGVh dCA9IGZhbHNlOwogICAgIGJvb2wgYWxsVHJhY2tzQXJlRml4ZWRTaXplZCA9IHRydWU7CkBAIC00 NjI4LDYgKzQ2MjgsMTQgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUJhY2tncm91 bgogICAgIHJldHVybiB0cnVlOwogfQogCisvLyBGSVhNRS1ORVdQQVJTRVI6IEhhY2sgdG8gd29y ayBhcm91bmQgdGhlIGZhY3QgdGhhdCB3ZSBhcmVuJ3QgdXNpbmcgQ1NTQ3VzdG9tSWRlbnRWYWx1 ZQorLy8gZm9yIHN0dWZmIHlldC4gVGhpcyBjYW4gYmUgcmVwbGFjZWQgYnkgQ1NTVmFsdWU6Omlz Q3VzdG9tSWRlbnRWYWx1ZSgpIG9uY2Ugd2Ugc3dpdGNoCisvLyB0byB1c2luZyBDU1NDdXN0b21J ZGVudFZhbHVlIGV2ZXJ5d2hlcmUuCitzdGF0aWMgYm9vbCBpc0N1c3RvbUlkZW50VmFsdWUoY29u c3QgQ1NTVmFsdWUmIHZhbHVlKQoreworICAgIHJldHVybiBpczxDU1NQcmltaXRpdmVWYWx1ZT4o dmFsdWUpICYmIGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSkuaXNTdHJpbmcoKTsK K30KKwogYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUdyaWRJdGVtUG9zaXRpb25TaG9y dGhhbmQoQ1NTUHJvcGVydHlJRCBzaG9ydGhhbmRJZCwgYm9vbCBpbXBvcnRhbnQpCiB7CiAgICAg Y29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCYgc2hvcnRoYW5kID0gc2hvcnRoYW5kRm9yUHJv cGVydHkoc2hvcnRoYW5kSWQpOwpAQCAtNDY0Miw3ICs0NjUwLDcgQEAgYm9vbCBDU1NQcm9wZXJ0 eVBhcnNlcjo6Y29uc3VtZUdyaWRJdGVtUAogICAgICAgICBpZiAoIWVuZFZhbHVlKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGVuZFZhbHVlID0gc3Rh cnRWYWx1ZS0+aXNDdXN0b21JZGVudFZhbHVlKCkgPyBzdGFydFZhbHVlIDogQ1NTVmFsdWVQb29s OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVBdXRvKTsKKyAgICAg ICAgZW5kVmFsdWUgPSBpc0N1c3RvbUlkZW50VmFsdWUoKnN0YXJ0VmFsdWUpID8gc3RhcnRWYWx1 ZSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1Zh bHVlQXV0byk7CiAgICAgfQogICAgIGlmICghbV9yYW5nZS5hdEVuZCgpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CkBAIC00Njc3LDExICs0Njg1LDExIEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6 OmNvbnN1bWVHcmlkQXJlYVMKICAgICBpZiAoIW1fcmFuZ2UuYXRFbmQoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGlmICghY29sdW1uU3RhcnRWYWx1ZSkKLSAgICAgICAgY29sdW1uU3Rh cnRWYWx1ZSA9IHJvd1N0YXJ0VmFsdWUtPmlzQ3VzdG9tSWRlbnRWYWx1ZSgpID8gcm93U3RhcnRW YWx1ZSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT U1ZhbHVlQXV0byk7CisgICAgICAgIGNvbHVtblN0YXJ0VmFsdWUgPSBpc0N1c3RvbUlkZW50VmFs dWUoKnJvd1N0YXJ0VmFsdWUpID8gcm93U3RhcnRWYWx1ZSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xl dG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlQXV0byk7CiAgICAgaWYgKCFyb3dF bmRWYWx1ZSkKLSAgICAgICAgcm93RW5kVmFsdWUgPSByb3dTdGFydFZhbHVlLT5pc0N1c3RvbUlk ZW50VmFsdWUoKSA/IHJvd1N0YXJ0VmFsdWUgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy ZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUF1dG8pOworICAgICAgICByb3dFbmRWYWx1ZSA9 IGlzQ3VzdG9tSWRlbnRWYWx1ZSgqcm93U3RhcnRWYWx1ZSkgPyByb3dTdGFydFZhbHVlIDogQ1NT VmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVBdXRv KTsKICAgICBpZiAoIWNvbHVtbkVuZFZhbHVlKQotICAgICAgICBjb2x1bW5FbmRWYWx1ZSA9IGNv bHVtblN0YXJ0VmFsdWUtPmlzQ3VzdG9tSWRlbnRWYWx1ZSgpID8gY29sdW1uU3RhcnRWYWx1ZSA6 IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVl QXV0byk7CisgICAgICAgIGNvbHVtbkVuZFZhbHVlID0gaXNDdXN0b21JZGVudFZhbHVlKCpjb2x1 bW5TdGFydFZhbHVlKSA/IGNvbHVtblN0YXJ0VmFsdWUgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUF1dG8pOwogCiAgICAgYWRkUHJvcGVy dHkoQ1NTUHJvcGVydHlHcmlkUm93U3RhcnQsIENTU1Byb3BlcnR5R3JpZEFyZWEsIHJvd1N0YXJ0 VmFsdWUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKICAgICBhZGRQcm9wZXJ0eShDU1NQ cm9wZXJ0eUdyaWRDb2x1bW5TdGFydCwgQ1NTUHJvcGVydHlHcmlkQXJlYSwgY29sdW1uU3RhcnRW YWx1ZS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwpAQCAtNDc3Niw2ICs0Nzg0LDMyIEBA IGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVHcmlkVGVtcGwKICAgICByZXR1cm4gY29u c3VtZUdyaWRUZW1wbGF0ZVJvd3NBbmRBcmVhc0FuZENvbHVtbnMoc2hvcnRoYW5kSWQsIGltcG9y dGFudCk7CiB9CiAKK3N0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVJbXBsaWNpdEdyaWRB dXRvRmxvdyhDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgUmVmPENTU1ByaW1pdGl2ZVZhbHVl PiYmIGZsb3dEaXJlY3Rpb24pCit7CisgICAgLy8gWyBhdXRvLWZsb3cgJiYgZGVuc2U/IF0KKyAg ICBpZiAocmFuZ2UuYXRFbmQoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgYXV0byBs aXN0ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOworICAgIGxpc3QtPmFw cGVuZChXVEZNb3ZlKGZsb3dEaXJlY3Rpb24pKTsKKyAgICBpZiAocmFuZ2UucGVlaygpLmlkKCkg PT0gQ1NTVmFsdWVBdXRvRmxvdykgeworICAgICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hp dGVzcGFjZSgpOworICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IGRlbnNlSWRlbnQgPSBjb25zdW1l SWRlbnQ8Q1NTVmFsdWVEZW5zZT4ocmFuZ2UpOworICAgICAgICBpZiAoZGVuc2VJZGVudCkKKyAg ICAgICAgICAgIGxpc3QtPmFwcGVuZChkZW5zZUlkZW50LnJlbGVhc2VOb25OdWxsKCkpOworICAg IH0gZWxzZSB7CisgICAgICAgIC8vIERlbnNlIGNhc2UKKyAgICAgICAgaWYgKHJhbmdlLnBlZWso KS5pZCgpICE9IENTU1ZhbHVlRGVuc2UpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAg ICAgICAgcmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKTsKKyAgICAgICAgaWYgKHJh bmdlLmF0RW5kKCkgfHwgcmFuZ2UucGVlaygpLmlkKCkgIT0gQ1NTVmFsdWVBdXRvRmxvdykKKyAg ICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5n V2hpdGVzcGFjZSgpOworICAgICAgICBsaXN0LT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0 b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVEZW5zZSkpOworICAgIH0KKyAgICAK KyAgICByZXR1cm4gV1RGTW92ZShsaXN0KTsKK30KKwogYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6 Y29uc3VtZUdyaWRTaG9ydGhhbmQoYm9vbCBpbXBvcnRhbnQpCiB7CiAgICAgQVNTRVJUKHNob3J0 aGFuZEZvclByb3BlcnR5KENTU1Byb3BlcnR5R3JpZCkubGVuZ3RoKCkgPT0gOCk7CkBAIC00Nzk2 LDQ1ICs0ODMwLDY4IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVHcmlkU2hvcnQK IAogICAgIG1fcmFuZ2UgPSByYW5nZUNvcHk7CiAKLSAgICAvLyAyLSA8Z3JpZC1hdXRvLWZsb3c+ IFsgPGdyaWQtYXV0by1yb3dzPiBbIC8gPGdyaWQtYXV0by1jb2x1bW5zPiBdPyBdCi0gICAgUmVm UHRyPENTU1ZhbHVlTGlzdD4gZ3JpZEF1dG9GbG93ID0gY29uc3VtZUdyaWRBdXRvRmxvdyhtX3Jh bmdlKTsKLSAgICBpZiAoIWdyaWRBdXRvRmxvdykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAg ICAgUmVmUHRyPENTU1ZhbHVlPiBhdXRvQ29sdW1uc1ZhbHVlOwogICAgIFJlZlB0cjxDU1NWYWx1 ZT4gYXV0b1Jvd3NWYWx1ZTsKLQotICAgIGlmICghbV9yYW5nZS5hdEVuZCgpKSB7Ci0gICAgICAg IGF1dG9Sb3dzVmFsdWUgPSBjb25zdW1lR3JpZFRyYWNrTGlzdChtX3JhbmdlLCBtX2NvbnRleHQu bW9kZSwgR3JpZEF1dG8pOwotICAgICAgICBpZiAoIWF1dG9Sb3dzVmFsdWUpCisgICAgUmVmUHRy PENTU1ZhbHVlPiB0ZW1wbGF0ZVJvd3M7CisgICAgUmVmUHRyPENTU1ZhbHVlPiB0ZW1wbGF0ZUNv bHVtbnM7CisgICAgUmVmUHRyPENTU1ZhbHVlPiBncmlkQXV0b0Zsb3c7CisgICAgCisgICAgaWYg KG1fcmFuZ2UucGVlaygpLmlkKCkgPT0gQ1NTVmFsdWVBdXRvRmxvdyB8fCBtX3JhbmdlLnBlZWso KS5pZCgpID09IENTU1ZhbHVlRGVuc2UpIHsKKyAgICAgICAgLy8gMi0gWyBhdXRvLWZsb3cgJiYg ZGVuc2U/IF0gPGdyaWQtYXV0by1yb3dzPj8gLyA8Z3JpZC10ZW1wbGF0ZS1jb2x1bW5zPgorICAg ICAgICBncmlkQXV0b0Zsb3cgPSBjb25zdW1lSW1wbGljaXRHcmlkQXV0b0Zsb3cobV9yYW5nZSwg Q1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVS b3cpKTsKKyAgICAgICAgaWYgKCFncmlkQXV0b0Zsb3cgfHwgbV9yYW5nZS5hdEVuZCgpKQorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoY29uc3VtZVNsYXNoSW5jbHVkaW5n V2hpdGVzcGFjZShtX3JhbmdlKSkKKyAgICAgICAgICAgIGF1dG9Sb3dzVmFsdWUgPSBDU1NWYWx1 ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCk7CisgICAgICAg IGVsc2UgeworICAgICAgICAgICAgYXV0b1Jvd3NWYWx1ZSA9IGNvbnN1bWVHcmlkVHJhY2tMaXN0 KG1fcmFuZ2UsIG1fY29udGV4dC5tb2RlLCBHcmlkQXV0byk7CisgICAgICAgICAgICBpZiAoIWF1 dG9Sb3dzVmFsdWUpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAg aWYgKCFjb25zdW1lU2xhc2hJbmNsdWRpbmdXaGl0ZXNwYWNlKG1fcmFuZ2UpKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICBpZiAobV9yYW5nZS5hdEVu ZCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoY29uc3VtZVNsYXNo SW5jbHVkaW5nV2hpdGVzcGFjZShtX3JhbmdlKSkgeworICAgICAgICB0ZW1wbGF0ZUNvbHVtbnMg PSBjb25zdW1lR3JpZFRlbXBsYXRlc1Jvd3NPckNvbHVtbnMobV9yYW5nZSwgbV9jb250ZXh0Lm1v ZGUpOworICAgICAgICBpZiAoIXRlbXBsYXRlQ29sdW1ucykKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgdGVtcGxhdGVSb3dzID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5j cmVhdGVJbXBsaWNpdEluaXRpYWxWYWx1ZSgpOworICAgICAgICBhdXRvQ29sdW1uc1ZhbHVlID0g Q1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJbXBsaWNpdEluaXRpYWxWYWx1ZSgpOwor ICAgIH0gZWxzZSB7CisgICAgICAgIC8vIDMtIDxncmlkLXRlbXBsYXRlLXJvd3M+IC8gWyBhdXRv LWZsb3cgJiYgZGVuc2U/IF0gPGdyaWQtYXV0by1jb2x1bW5zPj8KKyAgICAgICAgdGVtcGxhdGVS b3dzID0gY29uc3VtZUdyaWRUZW1wbGF0ZXNSb3dzT3JDb2x1bW5zKG1fcmFuZ2UsIG1fY29udGV4 dC5tb2RlKTsKKyAgICAgICAgaWYgKCF0ZW1wbGF0ZVJvd3MpCisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIGlmICghY29uc3VtZVNsYXNoSW5jbHVkaW5nV2hpdGVzcGFjZShtX3Jh bmdlKSB8fCBtX3JhbmdlLmF0RW5kKCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIGdyaWRBdXRvRmxvdyA9IGNvbnN1bWVJbXBsaWNpdEdyaWRBdXRvRmxvdyhtX3JhbmdlLCBD U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUNv bHVtbikpOworICAgICAgICBpZiAoIWdyaWRBdXRvRmxvdykKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgaWYgKG1fcmFuZ2UuYXRFbmQoKSkKKyAgICAgICAgICAgIGF1dG9Db2x1 bW5zVmFsdWUgPSBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0SW5pdGlh bFZhbHVlKCk7CisgICAgICAgIGVsc2UgewogICAgICAgICAgICAgYXV0b0NvbHVtbnNWYWx1ZSA9 IGNvbnN1bWVHcmlkVHJhY2tMaXN0KG1fcmFuZ2UsIG1fY29udGV4dC5tb2RlLCBHcmlkQXV0byk7 CiAgICAgICAgICAgICBpZiAoIWF1dG9Db2x1bW5zVmFsdWUpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAgICAgIGlmICghbV9yYW5nZS5hdEVuZCgpKQotICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIE90aGVyIG9t aXR0ZWQgdmFsdWVzIGFyZSBzZXQgdG8gdGhlaXIgaW5pdGlhbCB2YWx1ZXMuCi0gICAgICAgIGF1 dG9Db2x1bW5zVmFsdWUgPSBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUltcGxpY2l0 SW5pdGlhbFZhbHVlKCk7CisgICAgICAgIHRlbXBsYXRlQ29sdW1ucyA9IENTU1ZhbHVlUG9vbDo6 c2luZ2xldG9uKCkuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKTsKICAgICAgICAgYXV0b1Jv d3NWYWx1ZSA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSW1wbGljaXRJbml0aWFs VmFsdWUoKTsKICAgICB9Ci0KLSAgICAvLyBpZiA8Z3JpZC1hdXRvLWNvbHVtbnM+IHZhbHVlIGlz IG9taXR0ZWQsIGl0IGlzIHNldCB0byB0aGUgdmFsdWUgc3BlY2lmaWVkIGZvciBncmlkLWF1dG8t cm93cy4KLSAgICBpZiAoIWF1dG9Db2x1bW5zVmFsdWUpCi0gICAgICAgIGF1dG9Db2x1bW5zVmFs dWUgPSBhdXRvUm93c1ZhbHVlOwotCisgICAgCisgICAgaWYgKCFtX3JhbmdlLmF0RW5kKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKICAgICAvLyBJdCBjYW4gb25seSBiZSBzcGVjaWZp ZWQgdGhlIGV4cGxpY2l0IG9yIHRoZSBpbXBsaWNpdCBncmlkIHByb3BlcnRpZXMgaW4gYSBzaW5n bGUgZ3JpZCBkZWNsYXJhdGlvbi4KICAgICAvLyBUaGUgc3ViLXByb3BlcnRpZXMgbm90IHNwZWNp ZmllZCBhcmUgc2V0IHRvIHRoZWlyIGluaXRpYWwgdmFsdWUsIGFzIG5vcm1hbCBmb3Igc2hvcnRo YW5kcy4KLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUdyaWRUZW1wbGF0ZUNvbHVtbnMsIENT U1Byb3BlcnR5R3JpZCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJbXBsaWNpdElu aXRpYWxWYWx1ZSgpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5R3Jp ZFRlbXBsYXRlUm93cywgQ1NTUHJvcGVydHlHcmlkLCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp LmNyZWF0ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVy dHkoQ1NTUHJvcGVydHlHcmlkVGVtcGxhdGVDb2x1bW5zLCBDU1NQcm9wZXJ0eUdyaWQsIHRlbXBs YXRlQ29sdW1ucy5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5 KENTU1Byb3BlcnR5R3JpZFRlbXBsYXRlUm93cywgQ1NTUHJvcGVydHlHcmlkLCB0ZW1wbGF0ZVJv d3MucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKICAgICBhZGRQcm9wZXJ0eShDU1NQcm9w ZXJ0eUdyaWRUZW1wbGF0ZUFyZWFzLCBDU1NQcm9wZXJ0eUdyaWQsIENTU1ZhbHVlUG9vbDo6c2lu Z2xldG9uKCkuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKSwgaW1wb3J0YW50KTsKICAgICBh ZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUdyaWRBdXRvRmxvdywgQ1NTUHJvcGVydHlHcmlkLCBncmlk QXV0b0Zsb3cucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKICAgICBhZGRQcm9wZXJ0eShD U1NQcm9wZXJ0eUdyaWRBdXRvQ29sdW1ucywgQ1NTUHJvcGVydHlHcmlkLCBhdXRvQ29sdW1uc1Zh bHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7CiAgICAgYWRkUHJvcGVydHkoQ1NTUHJv cGVydHlHcmlkQXV0b1Jvd3MsIENTU1Byb3BlcnR5R3JpZCwgYXV0b1Jvd3NWYWx1ZS5yZWxlYXNl Tm9uTnVsbCgpLCBpbXBvcnRhbnQpOwogICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5R3JpZENv bHVtbkdhcCwgQ1NTUHJvcGVydHlHcmlkLCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0 ZUltcGxpY2l0SW5pdGlhbFZhbHVlKCksIGltcG9ydGFudCk7CiAgICAgYWRkUHJvcGVydHkoQ1NT UHJvcGVydHlHcmlkUm93R2FwLCBDU1NQcm9wZXJ0eUdyaWQsIENTU1ZhbHVlUG9vbDo6c2luZ2xl dG9uKCkuY3JlYXRlSW1wbGljaXRJbml0aWFsVmFsdWUoKSwgaW1wb3J0YW50KTsKKyAgICAKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4NDIyKQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTYtMTEt MDcgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUyBQYXJzZXJd IEZpeCBncmlkIGxheW91dCBwYXJzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjQ0ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtYXV0by1jb2x1bW5z LXJvd3MtYXV0by1mbG93LXJlc29sdXRpb24uaHRtbDoKKwogMjAxNi0xMS0wNyAgUnlhbiBIYWRk YWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMjA4MzgyLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3Jp ZC1hdXRvLWNvbHVtbnMtcm93cy1hdXRvLWZsb3ctcmVzb2x1dGlvbi5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtYXV0by1jb2x1bW5zLXJv d3MtYXV0by1mbG93LXJlc29sdXRpb24uaHRtbAkocmV2aXNpb24gMjA4MjY5KQorKysgTGF5b3V0 VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1hdXRvLWNvbHVtbnMtcm93cy1hdXRvLWZs b3ctcmVzb2x1dGlvbi5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw3ICsxNCw3IEBACiB9CiAK IC5ncmlkQXV0b01pbk1heCB7Ci0gICAgZm9udDogMTAvMSBBaGVtOworICAgIGZvbnQ6IDEwcHgv MSBBaGVtOwogICAgIHdpZHRoOiAxMDAwcHg7CiAgICAgZ3JpZC1hdXRvLXJvd3M6IG1pbm1heCgx MGVtLCAxNXB4KTsKICAgICBncmlkLWF1dG8tY29sdW1uczogbWlubWF4KDMwJSwgMTAwcHgpOwo=