200168 2019-07-26 10:54:00 -0700 Web Inspector: CSS Formatter: comments with an escape character aren't formatted 2019-08-03 01:53:20 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1556154 0 hi 2019-07-26 10:54:00 -0700 /* comment start \*/ comment{display:block} /* comment end */ 1556249 1 374990 hi 2019-07-26 15:22:27 -0700 Created attachment 374990 Patch 1558273 2 374990 joepeck 2019-08-03 01:22:23 -0700 Comment on attachment 374990 Patch r=me 1558275 3 374990 commit-queue 2019-08-03 01:52:59 -0700 Comment on attachment 374990 Patch Clearing flags on attachment: 374990 Committed r248197: <https://trac.webkit.org/changeset/248197> 1558276 4 commit-queue 2019-08-03 01:53:00 -0700 All reviewed patches have been landed. Closing bug. 1558277 5 webkit-bug-importer 2019-08-03 01:53:20 -0700 <rdar://problem/53895926> 374990 2019-07-26 15:22:27 -0700 2019-08-03 01:52:59 -0700 Patch 200168.diff text/plain 11625 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwODM1YjI2ZTdkZi4uZjFiYzNhZTgzMzAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxOS0wNy0yNiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogQ1NTIEZvcm1hdHRlcjogY29tbWVudHMgd2l0aCBhbiBlc2NhcGUgY2hh cmFjdGVyIGFyZW4ndCBmb3JtYXR0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMDE2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zvcm1hdHRpbmcvZm9ybWF0dGluZy1jc3MuaHRt bDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZm9ybWF0dGluZy9mb3JtYXR0aW5nLWNzcy1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2Nzcy10ZXN0 cy9jb21tZW50LmNzczogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVz b3VyY2VzL2Nzcy10ZXN0cy9jb21tZW50LWV4cGVjdGVkLmNzczogQWRkZWQuCisKIDIwMTktMDct MjUgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDc4MDYuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZm9ybWF0dGluZy9mb3JtYXR0aW5nLWNzcy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZm9ybWF0dGluZy9mb3JtYXR0aW5nLWNzcy1leHBlY3RlZC50eHQKaW5k ZXggYTdjNzBkZjg0MDcuLjM4ZWIwNGY4ZDE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZm9ybWF0dGluZy9mb3JtYXR0aW5nLWNzcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvZm9ybWF0dGluZy1jc3MtZXhwZWN0ZWQudHh0CkBA IC01LDYgKzUsOSBAQCBUZXN0IENTUyBmb3JtYXR0aW5nLgogLS0gUnVubmluZyB0ZXN0IGNhc2U6 IENTU0Zvcm1hdHRlci5iYXNpYy5jc3MKIFBBU1MKIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IENT U0Zvcm1hdHRlci5jb21tZW50LmNzcworUEFTUworCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogQ1NT Rm9ybWF0dGVyLmdyYWRpZW50LmNzcwogUEFTUwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZm9ybWF0dGluZy9mb3JtYXR0aW5nLWNzcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2Zvcm1hdHRpbmcvZm9ybWF0dGluZy1jc3MuaHRtbAppbmRleCAwMzI0YzIxYzdkZS4u ODA3YjJkNGE3ZDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5n L2Zvcm1hdHRpbmctY3NzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRp bmcvZm9ybWF0dGluZy1jc3MuaHRtbApAQCAtMTAsNiArMTAsNyBAQCBmdW5jdGlvbiB0ZXN0KCkK IAogICAgIGFkZEZvcm1hdHRpbmdUZXN0cyhzdWl0ZSwgInRleHQvY3NzIiwgWwogICAgICAgICAi cmVzb3VyY2VzL2Nzcy10ZXN0cy9iYXNpYy5jc3MiLAorICAgICAgICAicmVzb3VyY2VzL2Nzcy10 ZXN0cy9jb21tZW50LmNzcyIsCiAgICAgICAgICJyZXNvdXJjZXMvY3NzLXRlc3RzL2dyYWRpZW50 LmNzcyIsCiAgICAgICAgICJyZXNvdXJjZXMvY3NzLXRlc3RzL2tleWZyYW1lcy5jc3MiLAogICAg ICAgICAicmVzb3VyY2VzL2Nzcy10ZXN0cy9tZWRpYS1xdWVyeS5jc3MiLApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2Nzcy10ZXN0cy9jb21t ZW50LWV4cGVjdGVkLmNzcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291 cmNlcy9jc3MtdGVzdHMvY29tbWVudC1leHBlY3RlZC5jc3MKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAuLjA1ZDBkMTlmNjlkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2Nzcy10ZXN0cy9jb21tZW50LWV4 cGVjdGVkLmNzcwpAQCAtMCwwICsxLDgwIEBACisvKiB0ZXN0IFwqLworeCB7CisgICAgYTogYjsK KyAgICBjOiBkCit9CisvKiByZXNldCAqLworCisvKiB0ZXN0IFwqLworeCB7CisgICAgYTogYjsK KyAgICBjOiBkCit9CisvKiByZXNldCAqLworCit4IC8qIHRlc3QgXCovIHsKKyAgICBhOiBiOwor ICAgIGM6IGQKK30KKy8qIHJlc2V0ICovCisKK3ggeworICAgIC8qIHRlc3QgXCovCisgICAgYTog YjsKKyAgICBjOiBkCit9CisvKiByZXNldCAqLworCit4IHsKKyAgICBhIC8qIHRlc3QgXCovOiBi OworICAgIGM6IGQKK30KKy8qIHJlc2V0ICovCisKK3ggeworICAgIGE6IC8qIHRlc3QgXCovIGI7 CisgICAgYzogZAorfQorLyogcmVzZXQgKi8KKworeCB7CisgICAgYTogYiAvKiB0ZXN0IFwqLzsK KyAgICBjOiBkCit9CisvKiByZXNldCAqLworCit4IHsKKyAgICBhOiBiOworICAgIC8qIHRlc3Qg XCovCisgICAgYzogZAorfQorLyogcmVzZXQgKi8KKworeCB7CisgICAgYTogYjsKKyAgICBjIC8q IHRlc3QgXCovOiBkCit9CisvKiByZXNldCAqLworCit4IHsKKyAgICBhOiBiOworICAgIGM6IC8q IHRlc3QgXCovIGQKK30KKy8qIHJlc2V0ICovCisKK3ggeworICAgIGE6IGI7CisgICAgYzogZCAv KiB0ZXN0IFwqLworfQorLyogcmVzZXQgKi8KKworeCB7CisgICAgYTogYjsKKyAgICBjOiBkCit9 CisvKiB0ZXN0IFwqLworLyogcmVzZXQgKi8KKworLyogMSBcKi8KKy8qIDIgXCovCisvKiAzIFwq LwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2Vz L2Nzcy10ZXN0cy9jb21tZW50LmNzcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5n L3Jlc291cmNlcy9jc3MtdGVzdHMvY29tbWVudC5jc3MKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAuLjc5YWNjZjhjNWE1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2Nzcy10ZXN0cy9jb21tZW50LmNzcwpA QCAtMCwwICsxLDQwIEBACisvKiB0ZXN0IFwqLworeHthOmI7YzpkfQorLyogcmVzZXQgKi8KKwor LyogdGVzdCBcKi94e2E6YjtjOmR9CisvKiByZXNldCAqLworCit4LyogdGVzdCBcKi97YTpiO2M6 ZH0KKy8qIHJlc2V0ICovCisKK3h7LyogdGVzdCBcKi9hOmI7YzpkfQorLyogcmVzZXQgKi8KKwor eHthLyogdGVzdCBcKi86YjtjOmR9CisvKiByZXNldCAqLworCit4e2E6LyogdGVzdCBcKi9iO2M6 ZH0KKy8qIHJlc2V0ICovCisKK3h7YTpiLyogdGVzdCBcKi87YzpkfQorLyogcmVzZXQgKi8KKwor eHthOmI7LyogdGVzdCBcKi9jOmR9CisvKiByZXNldCAqLworCit4e2E6YjtjLyogdGVzdCBcKi86 ZH0KKy8qIHJlc2V0ICovCisKK3h7YTpiO2M6LyogdGVzdCBcKi9kfQorLyogcmVzZXQgKi8KKwor eHthOmI7YzpkLyogdGVzdCBcKi99CisvKiByZXNldCAqLworCit4e2E6YjtjOmR9LyogdGVzdCBc Ki8KKy8qIHJlc2V0ICovCisKKy8qIDEgXCovCisvKiAyIFwqLworLyogMyBcKi8KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCmluZGV4IDI3ZjBmOGQyZjViLi5kYTVmYTIxYjJmNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDctMjYgIERldmluIFJvdXNzbyAg PGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENTUyBGb3JtYXR0 ZXI6IGNvbW1lbnRzIHdpdGggYW4gZXNjYXBlIGNoYXJhY3RlciBhcmVuJ3QgZm9ybWF0dGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAxNjgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBhbGxv dyBlc2NhcGluZyBvZiB0aGUgIioiIGluIENTUyBjb21tZW50cyAoZS5nLiBgXCovYCkuCisKKyAg ICAgICAgQWRkIGFkZGl0aW9uYWwgcHJldHR5IHByaW50aW5nIHJ1bGVzIGZvciBjb21tZW50cyBz byB0aGF0IHRoZXJlJ3MgYWx3YXlzIHNvbWUgc3BhY2UgYmV0d2VlbgorICAgICAgICB0aGVtIGFu ZCB0aGUgc3Vycm91bmRpbmcgdGV4dC4gVGhpcyBlbnN1cmVzIHRoYXQgdGhleSBkb24ndCBpbnRl cmZlcmUgd2l0aCByZWFkYWJpbGl0eS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvV29ya2Vy cy9Gb3JtYXR0ZXIvQ1NTRm9ybWF0dGVyLmpzOgorICAgICAgICAoQ1NTRm9ybWF0dGVyLnByb3Rv dHlwZS5fZm9ybWF0KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0 ZXIvRm9ybWF0dGVyQ29udGVudEJ1aWxkZXIuanM6CisgICAgICAgIChGb3JtYXR0ZXJDb250ZW50 QnVpbGRlci5wcm90b3R5cGUuZ2V0IGluZGVudGVkKTogQWRkZWQuCisKIDIwMTktMDctMjQgIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFJFR1JFU1NJT046IG5vIGNvbnRleHQgbWVudSBpdGVtcyB3b3JrIHdoZW4gY29udGV4dCBtZW51 IGNsaWNraW5nIG9uICJBZGQgQnJlYWtwb2ludCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVyL0NTU0Zvcm1hdHRlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVyL0NT U0Zvcm1hdHRlci5qcwppbmRleCBjMTFiYzU2OTBkOS4uY2U0MWQ2NTRkYjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVyL0NT U0Zvcm1hdHRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9X b3JrZXJzL0Zvcm1hdHRlci9DU1NGb3JtYXR0ZXIuanMKQEAgLTc2LDYgKzc2LDggQEAgQ1NTRm9y bWF0dGVyID0gY2xhc3MgQ1NTRm9ybWF0dGVyCiAgICAgICAgIGNvbnN0IHJlbW92ZVNwYWNlQmVm b3JlID0gbmV3IFNldChbYCxgLCBgKGAsIGApYCwgYH1gLCBgOmAsIGA7YF0pOwogICAgICAgICBj b25zdCByZW1vdmVTcGFjZUFmdGVyID0gbmV3IFNldChbYChgLCBge2AsIGB9YCwgYCxgLCBgIWAs IGA7YF0pOwogCisgICAgICAgIGNvbnN0IHdoaXRlc3BhY2VPbmx5UmVnRXhwID0gL15ccyokLzsK KwogICAgICAgICBjb25zdCBpbkF0UnVsZVJlZ0V4cCA9IC9eXHMqQFthLXpBLVpdWy1hLXpBLVpd Ky87CiAgICAgICAgIGNvbnN0IGluQXRSdWxlQmVmb3JlUGFyZW50aGVzaXNSZWdFeHAgPSAvXlxz KkBbYS16QS1aXVstYS16QS1aXSskLzsKICAgICAgICAgY29uc3QgaW5BdFJ1bGVBZnRlclBhcmVu dGhlc2lzUmVnRXhwID0gL15ccypAW2EtekEtWl1bLWEtekEtWl0rW14oIic6XSpcKFteIic6XSo6 LzsKQEAgLTkyLDYgKzk0LDggQEAgQ1NTRm9ybWF0dGVyID0gY2xhc3MgQ1NTRm9ybWF0dGVyCiAK ICAgICAgICAgICAgIGxldCB0ZXN0Q3VycmVudExpbmUgPSAocmVnRXhwKSA9PiByZWdFeHAudGVz dCh0aGlzLl9idWlsZGVyLmN1cnJlbnRMaW5lKTsKIAorICAgICAgICAgICAgbGV0IGluQ29tbWVu dCA9IGZhbHNlOworCiAgICAgICAgICAgICBsZXQgaW5TZWxlY3RvciA9ICgpID0+IHsKICAgICAg ICAgICAgICAgICBsZXQgbmV4dE9wZW5CcmFjZSA9IHRoaXMuX3NvdXJjZVRleHQuaW5kZXhPZihg e2AsIGkpOwogICAgICAgICAgICAgICAgIGlmIChuZXh0T3BlbkJyYWNlICE9PSAtMSkgewpAQCAt MjI1LDM2ICsyMjksODQgQEAgQ1NTRm9ybWF0dGVyID0gY2xhc3MgQ1NTRm9ybWF0dGVyCiAgICAg ICAgICAgICBsZXQgc3BlY2lhbFNlcXVlbmNlRW5kID0gbnVsbDsKICAgICAgICAgICAgIGlmIChx dW90ZVR5cGVzLmhhcyhjKSkKICAgICAgICAgICAgICAgICBzcGVjaWFsU2VxdWVuY2VFbmQgPSBj OwotICAgICAgICAgICAgZWxzZSBpZiAoYyA9PT0gYC9gICYmIHRoaXMuX3NvdXJjZVRleHRbaSAr IDFdID09PSBgKmApCisgICAgICAgICAgICBlbHNlIGlmIChjID09PSBgL2AgJiYgdGhpcy5fc291 cmNlVGV4dFtpICsgMV0gPT09IGAqYCkgeworICAgICAgICAgICAgICAgIGluQ29tbWVudCA9IHRy dWU7CiAgICAgICAgICAgICAgICAgc3BlY2lhbFNlcXVlbmNlRW5kID0gYCovYDsKLSAgICAgICAg ICAgIGVsc2UgaWYgKGMgPT09IGB1YCAmJiB0aGlzLl9zb3VyY2VUZXh0W2kgKyAxXSA9PT0gYHJg ICYmIHRoaXMuX3NvdXJjZVRleHRbaSArIDJdID09PSBgbGAgJiYgdGhpcy5fc291cmNlVGV4dFtp ICsgM10gPT09IGAoYCkKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoYyA9PT0gYHVgICYmIHRoaXMu X3NvdXJjZVRleHRbaSArIDFdID09PSBgcmAgJiYgdGhpcy5fc291cmNlVGV4dFtpICsgMl0gPT09 IGBsYCAmJiB0aGlzLl9zb3VyY2VUZXh0W2kgKyAzXSA9PT0gYChgKQogICAgICAgICAgICAgICAg IHNwZWNpYWxTZXF1ZW5jZUVuZCA9IGApYDsKIAogICAgICAgICAgICAgaWYgKHNwZWNpYWxTZXF1 ZW5jZUVuZCkgeworICAgICAgICAgICAgICAgIGxldCBzdGFydEluZGV4ID0gaTsKICAgICAgICAg ICAgICAgICBsZXQgZW5kSW5kZXggPSBpOwogICAgICAgICAgICAgICAgIGRvIHsKICAgICAgICAg ICAgICAgICAgICAgZW5kSW5kZXggPSB0aGlzLl9zb3VyY2VUZXh0LmluZGV4T2Yoc3BlY2lhbFNl cXVlbmNlRW5kLCBlbmRJbmRleCArIHNwZWNpYWxTZXF1ZW5jZUVuZC5sZW5ndGgpOwotICAgICAg ICAgICAgICAgIH0gd2hpbGUgKGVuZEluZGV4ICE9PSAtMSAmJiB0aGlzLl9zb3VyY2VUZXh0W2Vu ZEluZGV4IC0gMV0gPT09IGBcXGApOworICAgICAgICAgICAgICAgIH0gd2hpbGUgKGVuZEluZGV4 ICE9PSAtMSAmJiAhaW5Db21tZW50ICYmIHRoaXMuX3NvdXJjZVRleHRbZW5kSW5kZXggLSAxXSA9 PT0gYFxcYCk7CiAKICAgICAgICAgICAgICAgICBpZiAoZW5kSW5kZXggPT09IC0xKQogICAgICAg ICAgICAgICAgICAgICBlbmRJbmRleCA9IHRoaXMuX3NvdXJjZVRleHQubGVuZ3RoOworICAgICAg ICAgICAgICAgIGVuZEluZGV4ICs9IHNwZWNpYWxTZXF1ZW5jZUVuZC5sZW5ndGg7CiAKLSAgICAg ICAgICAgICAgICB0aGlzLl9idWlsZGVyLmFwcGVuZFRva2VuKHRoaXMuX3NvdXJjZVRleHQuc3Vi c3RyaW5nKGksIGVuZEluZGV4ICsgc3BlY2lhbFNlcXVlbmNlRW5kLmxlbmd0aCksIGkpOwotICAg ICAgICAgICAgICAgIGkgPSBlbmRJbmRleCArIHNwZWNpYWxTZXF1ZW5jZUVuZC5sZW5ndGggLSAx OyAvLyBBY2NvdW50IGZvciB0aGUgaXRlcmF0aW9uIG9mIHRoZSBmb3IgbG9vcC4KKyAgICAgICAg ICAgICAgICBsZXQgc3BlY2lhbFNlcXVlbmNlVGV4dCA9IHRoaXMuX3NvdXJjZVRleHQuc3Vic3Ry aW5nKHN0YXJ0SW5kZXgsIGVuZEluZGV4KTsKIAorICAgICAgICAgICAgICAgIGxldCBsYXN0U291 cmNlTmV3bGluZVdhc011bHRpcGxlID0gdGhpcy5fc291cmNlVGV4dFtzdGFydEluZGV4IC0gMV0g PT09IGBcbmAgJiYgdGhpcy5fc291cmNlVGV4dFtzdGFydEluZGV4IC0gMl0gPT09IGBcbmA7Cisg ICAgICAgICAgICAgICAgbGV0IGxhc3RBcHBlbmROZXdsaW5lV2FzTXVsdGlwbGUgPSB0aGlzLl9i dWlsZGVyLmxhc3ROZXdsaW5lQXBwZW5kV2FzTXVsdGlwbGU7CisKKyAgICAgICAgICAgICAgICBs ZXQgY29tbWVudE9uT3duTGluZSA9IGZhbHNlOworICAgICAgICAgICAgICAgIGlmIChpbkNvbW1l bnQpIHsKKyAgICAgICAgICAgICAgICAgICAgY29tbWVudE9uT3duTGluZSA9IHRlc3RDdXJyZW50 TGluZSh3aGl0ZXNwYWNlT25seVJlZ0V4cCk7CisKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFj b21tZW50T25Pd25MaW5lIHx8IGxhc3RBcHBlbmROZXdsaW5lV2FzTXVsdGlwbGUpIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHdoaWxlICh0aGlzLl9idWlsZGVyLmxhc3RUb2tlbldhc05ld2xp bmUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYnVpbGRlci5yZW1vdmVMYXN0 TmV3bGluZSgpOworICAgICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAg aWYgKGNvbW1lbnRPbk93bkxpbmUpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzdGFy dEluZGV4ID4gMCAmJiAhdGhpcy5fYnVpbGRlci5pbmRlbnRlZCkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLl9idWlsZGVyLmFwcGVuZE5ld2xpbmUoKTsKKyAgICAgICAgICAgICAg ICAgICAgfSBlbHNlIGlmICh0aGlzLl9idWlsZGVyLmN1cnJlbnRMaW5lLmxlbmd0aCAmJiAhdGhp cy5fYnVpbGRlci5sYXN0VG9rZW5XYXNXaGl0ZXNwYWNlKQorICAgICAgICAgICAgICAgICAgICAg ICAgdGhpcy5fYnVpbGRlci5hcHBlbmRTcGFjZSgpOworCisgICAgICAgICAgICAgICAgICAgIGlm ICh0aGlzLl9idWlsZGVyLmxhc3RUb2tlbldhc05ld2xpbmUgJiYgbGFzdFNvdXJjZU5ld2xpbmVX YXNNdWx0aXBsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2J1aWxkZXIuYXBwZW5k TmV3bGluZSh0cnVlKTsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICB0aGlz Ll9idWlsZGVyLmFwcGVuZFRva2VuKHNwZWNpYWxTZXF1ZW5jZVRleHQsIHN0YXJ0SW5kZXgpOwor CisgICAgICAgICAgICAgICAgaSA9IGVuZEluZGV4OwogICAgICAgICAgICAgICAgIGMgPSB0aGlz Ll9zb3VyY2VUZXh0W2ldOworCisgICAgICAgICAgICAgICAgaWYgKGluQ29tbWVudCkgeworICAg ICAgICAgICAgICAgICAgICBpZiAoY29tbWVudE9uT3duTGluZSkgeworICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGxhc3RBcHBlbmROZXdsaW5lV2FzTXVsdGlwbGUgJiYgIWxhc3RTb3VyY2VO ZXdsaW5lV2FzTXVsdGlwbGUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYnVp bGRlci5hcHBlbmRNdWx0aXBsZU5ld2xpbmVzKDIpOworICAgICAgICAgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2J1aWxkZXIuYXBwZW5kTmV3 bGluZSgpOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKCEvXHMvLnRlc3QoYykpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIGlmICghdGVzdEN1cnJlbnRMaW5lKGluQXRSdWxlUmVn RXhwKSAmJiAhaW5TZWxlY3RvcigpICYmICFpblByb3BlcnR5KCkpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGhpcy5fYnVpbGRlci5hcHBlbmROZXdsaW5lKCk7CisgICAgICAgICAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYnVpbGRl ci5hcHBlbmRTcGFjZSgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgLS1pOyAvLyBBY2NvdW50IGZvciB0aGUgaXRlcmF0aW9uIG9m IHRoZSBmb3IgbG9vcC4KKyAgICAgICAgICAgICAgICBjID0gdGhpcy5fc291cmNlVGV4dFtpXTsK KwogICAgICAgICAgICAgICAgIGZvcm1hdEFmdGVyKCk7CiAgICAgICAgICAgICAgICAgY29udGlu dWU7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmICgvXHMvLnRlc3QoYykpIHsKLSAg ICAgICAgICAgICAgICBpZiAoYyA9PT0gYFxuYCAmJiAhdGhpcy5fYnVpbGRlci5sYXN0VG9rZW5X YXNOZXdsaW5lKSB7Ci0gICAgICAgICAgICAgICAgICAgIHdoaWxlICh0aGlzLl9idWlsZGVyLmxh c3RUb2tlbldhc1doaXRlc3BhY2UpCi0gICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9idWls ZGVyLnJlbW92ZUxhc3RXaGl0ZXNwYWNlKCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmICghcmVt b3ZlU3BhY2VBZnRlci5oYXModGhpcy5fYnVpbGRlci5sYXN0VG9rZW4pKQotICAgICAgICAgICAg ICAgICAgICAgICAgdGhpcy5fYnVpbGRlci5hcHBlbmROZXdsaW5lKCk7Ci0gICAgICAgICAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2J1aWxkZXIuYXBwZW5k U3BhY2UoKTsKKyAgICAgICAgICAgICAgICBpZiAoYyA9PT0gYFxuYCkgeworICAgICAgICAgICAg ICAgICAgICB0aGlzLl9idWlsZGVyLmFkZE9yaWdpbmFsTGluZUVuZGluZyhpKTsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKCF0aGlzLl9idWlsZGVyLmxhc3RUb2tlbldhc05ld2xpbmUpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHdoaWxlICh0aGlzLl9idWlsZGVyLmxhc3RUb2tlbldhc1do aXRlc3BhY2UpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYnVpbGRlci5yZW1v dmVMYXN0V2hpdGVzcGFjZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFyZW1vdmVT cGFjZUFmdGVyLmhhcyh0aGlzLl9idWlsZGVyLmxhc3RUb2tlbikpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGhpcy5fYnVpbGRlci5hcHBlbmROZXdsaW5lKCk7CisgICAgICAgICAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYnVpbGRl ci5hcHBlbmRTcGFjZSgpOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg fSBlbHNlIGlmICghdGhpcy5fYnVpbGRlci5sYXN0VG9rZW5XYXNXaGl0ZXNwYWNlICYmICFyZW1v dmVTcGFjZUFmdGVyLmhhcyh0aGlzLl9idWlsZGVyLmxhc3RUb2tlbikpCiAgICAgICAgICAgICAg ICAgICAgIHRoaXMuX2J1aWxkZXIuYXBwZW5kU3BhY2UoKTsKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dv cmtlcnMvRm9ybWF0dGVyL0Zvcm1hdHRlckNvbnRlbnRCdWlsZGVyLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRm9ybWF0dGVyQ29udGVu dEJ1aWxkZXIuanMKaW5kZXggOGQxNDJlNTA3MTQuLmZkNTVlMmI3OGZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Gb3Jt YXR0ZXJDb250ZW50QnVpbGRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5qcwpAQCAt ODcsNiArODcsMTEgQEAgRm9ybWF0dGVyQ29udGVudEJ1aWxkZXIgPSBjbGFzcyBGb3JtYXR0ZXJD b250ZW50QnVpbGRlcgogICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudExpbmU7CiAgICAgfQog CisgICAgZ2V0IGluZGVudGVkKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9pbmRlbnQg PiAwOworICAgIH0KKwogICAgIHNldE9yaWdpbmFsQ29udGVudChvcmlnaW5hbENvbnRlbnQpCiAg ICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fb3JpZ2luYWxDb250ZW50KTsK