190086 2018-09-28 13:22:30 -0700 Rename createMarkup to serializePreservingVisualAppearance 2018-09-28 15:26:12 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 157443 1 rniwa rniwa darin koivisto ross.kirsling webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1464475 0 rniwa 2018-09-28 13:22:30 -0700 Rename createMarkup to serializePreservingVisualAppearance 1464476 1 351102 rniwa 2018-09-28 13:23:54 -0700 Created attachment 351102 Cleanup 1464493 2 rniwa 2018-09-28 14:08:56 -0700 Committed r236612: <https://trac.webkit.org/changeset/236612> 1464494 3 webkit-bug-importer 2018-09-28 14:09:31 -0700 <rdar://problem/44874418> 1464540 4 ross.kirsling 2018-09-28 15:24:18 -0700 This broke all Windows builds. 1464542 5 ross.kirsling 2018-09-28 15:26:12 -0700 (In reply to Ross Kirsling from comment #4) > This broke all Windows builds. Oops, looks like there's already a fix: https://trac.webkit.org/changeset/236616/webkit 351102 2018-09-28 13:23:54 -0700 2018-09-28 13:26:54 -0700 Cleanup bug-190086-20180928132353.patch text/plain 13215 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE4LTA5LTI4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmFtZSBjcmVhdGVNYXJrdXAg dG8gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDA4NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZWQgdGhlIGZ1bmN0aW9uIHRvIGNs YXJpZnkgd2hhdCBpdCBkb2VzLiBBbHNvIHJlbW92ZWQgdGhlIHVudXNlZCBSYW5nZTo6dG9IVE1M LgorCisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJhbmdlOjp0 b0hUTUwgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGRvbS9SYW5nZS5oOgorICAgICAgICAq IGVkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29t cG9zaXRlRWRpdENvbW1hbmQ6Om1vdmVQYXJhZ3JhcGhzKToKKyAgICAgICAgKiBlZGl0aW5nL2Nv Y29hL0VkaXRvckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzZWxlY3Rpb25J bkhUTUxGb3JtYXQpOgorICAgICAgICAqIGVkaXRpbmcvZ3RrL0VkaXRvckd0ay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFZGl0b3I6OndyaXRlU2VsZWN0aW9uVG9QYXN0ZWJvYXJkKToKKyAgICAg ICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXJpYWxpemVQcmVz ZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVNYXJrdXAp OiBEZWxldGVkLgorICAgICAgICAqIGVkaXRpbmcvbWFya3VwLmg6CisgICAgICAgICogZWRpdGlu Zy93cGUvRWRpdG9yV1BFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6d3JpdGVTZWxl Y3Rpb25Ub1Bhc3RlYm9hcmQpOgorICAgICAgICAqIGxvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdl YkFyY2hpdmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rp b24pOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBhc3RlYm9hcmQ6OndyaXRlUmFuZ2VUb0RhdGFPYmplY3QpOgorCiAyMDE4LTA5 LTI4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFNpbXBsaWZ5 IFN0eWxlZE1hcmt1cEFjY3VtdWxhdG9yOjp0cmF2ZXJzZU5vZGVzRm9yU2VyaWFsaXphdGlvbgpJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vUmFuZ2UuY3BwCShyZXZpc2lvbiAyMzY2MDcpCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vUmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NTIsMTEgKzk1Miw2IEBAIFN0cmlu ZyBSYW5nZTo6dG9TdHJpbmcoKSBjb25zdAogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7 CiB9CiAKLVN0cmluZyBSYW5nZTo6dG9IVE1MKCkgY29uc3QKLXsKLSAgICByZXR1cm4gY3JlYXRl TWFya3VwKCp0aGlzKTsKLX0KLQogU3RyaW5nIFJhbmdlOjp0ZXh0KCkgY29uc3QKIHsKICAgICAv LyBXZSBuZWVkIHRvIHVwZGF0ZSBsYXlvdXQsIHNpbmNlIHBsYWluVGV4dCB1c2VzIGxpbmUgYm94 ZXMgaW4gdGhlIHJlbmRlciB0cmVlLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgJKHJldmlzaW9uIDIzNjYw NykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3 ICs4NCw2IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBFeGNlcHRpb25Pcjx2b2lkPiBp bnNlcnROb2RlKFJlZjxOb2RlPiYmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgdG9TdHJp bmcoKSBjb25zdDsKIAotICAgIFN0cmluZyB0b0hUTUwoKSBjb25zdDsKICAgICBXRUJDT1JFX0VY UE9SVCBTdHJpbmcgdGV4dCgpIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgRXhjZXB0aW9u T3I8UmVmPERvY3VtZW50RnJhZ21lbnQ+PiBjcmVhdGVDb250ZXh0dWFsRnJhZ21lbnQoY29uc3Qg U3RyaW5nJiBodG1sKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRp dENvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9z aXRlRWRpdENvbW1hbmQuY3BwCShyZXZpc2lvbiAyMzY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0NCw3 ICsxNDQ0LDcgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6bW92ZVBhcmFncmFwaAogICAg IFJlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBmcmFnbWVudDsKICAgICAvLyBUaGlzIHVzZWQgdG8g dXNlIGEgdGVybmFyeSBmb3IgaW5pdGlhbGl6YXRpb24sIGJ1dCB0aGF0IGNvbmZ1c2VkIHNvbWUg dmVyc2lvbnMgb2YgR0NDLCBzZWUgYnVnIDM3OTEyCiAgICAgaWYgKHN0YXJ0T2ZQYXJhZ3JhcGhU b01vdmUgIT0gZW5kT2ZQYXJhZ3JhcGhUb01vdmUpCi0gICAgICAgIGZyYWdtZW50ID0gY3JlYXRl RnJhZ21lbnRGcm9tTWFya3VwKGRvY3VtZW50KCksIGNyZWF0ZU1hcmt1cCgqcmFuZ2UsIG51bGxw dHIsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6Ok5vLCBDb252ZXJ0QmxvY2tzVG9JbmxpbmVzOjpZ ZXMpLCBlbXB0eVN0cmluZygpKTsKKyAgICAgICAgZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZy b21NYXJrdXAoZG9jdW1lbnQoKSwgc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2Uo KnJhbmdlLCBudWxscHRyLCBBbm5vdGF0ZUZvckludGVyY2hhbmdlOjpObywgQ29udmVydEJsb2Nr c1RvSW5saW5lczo6WWVzKSwgZW1wdHlTdHJpbmcoKSk7CiAKICAgICAvLyBBIG5vbi1lbXB0eSBw YXJhZ3JhcGgncyBzdHlsZSBpcyBtb3ZlZCB3aGVuIHdlIGNvcHkgYW5kIG1vdmUgaXQuICBXZSBk b24ndCBtb3ZlIAogICAgIC8vIGFueXRoaW5nIGlmIHdlJ3JlIGdpdmVuIGFuIGVtcHR5IHBhcmFn cmFwaCwgYnV0IGFuIGVtcHR5IHBhcmFncmFwaCBjYW4gaGF2ZSBzdHlsZQpJbmRleDogU291cmNl L1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbWFya3VwLmNwcAkocmV2aXNpb24gMjM2NjA5KQorKysgU291cmNlL1dlYkNvcmUv ZWRpdGluZy9tYXJrdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDQsNyArODQ0LDcgQEAgc3Rh dGljIFN0cmluZyBjcmVhdGVNYXJrdXBJbnRlcm5hbChEb2N1bQogICAgIHJldHVybiBhY2N1bXVs YXRvci50YWtlUmVzdWx0cygpOwogfQogCi1TdHJpbmcgY3JlYXRlTWFya3VwKGNvbnN0IFJhbmdl JiByYW5nZSwgVmVjdG9yPE5vZGUqPiogbm9kZXMsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2UgYW5u b3RhdGUsIENvbnZlcnRCbG9ja3NUb0lubGluZXMgY29udmVydEJsb2Nrc1RvSW5saW5lcywgUmVz b2x2ZVVSTHMgdXJsc1RvUmVzbHZlKQorU3RyaW5nIHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxB cHBlYXJhbmNlKGNvbnN0IFJhbmdlJiByYW5nZSwgVmVjdG9yPE5vZGUqPiogbm9kZXMsIEFubm90 YXRlRm9ySW50ZXJjaGFuZ2UgYW5ub3RhdGUsIENvbnZlcnRCbG9ja3NUb0lubGluZXMgY29udmVy dEJsb2Nrc1RvSW5saW5lcywgUmVzb2x2ZVVSTHMgdXJsc1RvUmVzbHZlKQogewogICAgIHJldHVy biBjcmVhdGVNYXJrdXBJbnRlcm5hbChyYW5nZS5vd25lckRvY3VtZW50KCksIHJhbmdlLCBub2Rl cywgYW5ub3RhdGUsIGNvbnZlcnRCbG9ja3NUb0lubGluZXMsIHVybHNUb1Jlc2x2ZSwgTVNPTGlz dE1vZGU6OkRvTm90UHJlc2VydmUpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9t YXJrdXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5oCShy ZXZpc2lvbiAyMzY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02OSwxMiArNjksMTEgQEAgRXhjZXB0aW9uT3I8dm9pZD4gcmVwbGFjZUNo aWxkcmVuV2l0aEZyYQogCiBlbnVtIGNsYXNzIFJlc29sdmVVUkxzIDogdWludDhfdCB7IE5vLCBZ ZXMsIFllc0V4Y2x1ZGluZ0xvY2FsRmlsZVVSTHNGb3JQcml2YWN5IH07CiBlbnVtIGNsYXNzIENv bnZlcnRCbG9ja3NUb0lubGluZXMgOiB1aW50OF90IHsgTm8sIFllcyB9OwotV0VCQ09SRV9FWFBP UlQgU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBSYW5nZSYsIFZlY3RvcjxOb2RlKj4qID0gbnVs bHB0ciwgQW5ub3RhdGVGb3JJbnRlcmNoYW5nZSA9IEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6Ok5v LCBDb252ZXJ0QmxvY2tzVG9JbmxpbmVzID0gQ29udmVydEJsb2Nrc1RvSW5saW5lczo6Tm8sIFJl c29sdmVVUkxzID0gUmVzb2x2ZVVSTHM6Ok5vKTsKK1dFQkNPUkVfRVhQT1JUIFN0cmluZyBzZXJp YWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShjb25zdCBSYW5nZSYsIFZlY3RvcjxOb2Rl Kj4qID0gbnVsbHB0ciwgQW5ub3RhdGVGb3JJbnRlcmNoYW5nZSA9IEFubm90YXRlRm9ySW50ZXJj aGFuZ2U6Ok5vLCBDb252ZXJ0QmxvY2tzVG9JbmxpbmVzID0gQ29udmVydEJsb2Nrc1RvSW5saW5l czo6Tm8sIFJlc29sdmVVUkxzID0gUmVzb2x2ZVVSTHM6Ok5vKTsKIAogZW51bSBjbGFzcyBTZXJp YWxpemVkTm9kZXMgOiB1aW50OF90IHsgU3VidHJlZUluY2x1ZGluZ05vZGUsIFN1YnRyZWVzT2ZD aGlsZHJlbiB9OwogZW51bSBjbGFzcyBTZXJpYWxpemF0aW9uU3ludGF4IDogdWludDhfdCB7IEhU TUwsIFhNTCB9OwogV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHNlcmlhbGl6ZUZyYWdtZW50KGNvbnN0 IE5vZGUmLCBTZXJpYWxpemVkTm9kZXMsIFZlY3RvcjxOb2RlKj4qID0gbnVsbHB0ciwgUmVzb2x2 ZVVSTHMgPSBSZXNvbHZlVVJMczo6Tm8sIFZlY3RvcjxRdWFsaWZpZWROYW1lPiogdGFnTmFtZXNU b1NraXAgPSBudWxscHRyLCBTZXJpYWxpemF0aW9uU3ludGF4ID0gU2VyaWFsaXphdGlvblN5bnRh eDo6SFRNTCk7Ci1XRUJDT1JFX0VYUE9SVCBTdHJpbmcgc2VyaWFsaXplRnJhZ21lbnRXaXRoRG9j VHlwZShjb25zdCBOb2RlJik7CiAKIFN0cmluZyB1cmxUb01hcmt1cChjb25zdCBVUkwmLCBjb25z dCBTdHJpbmcmIHRpdGxlKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9F ZGl0b3JDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29h L0VkaXRvckNvY29hLm1tCShyZXZpc2lvbiAyMzY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL0VkaXRvckNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBA IHN0YXRpYyBSZWZQdHI8U2hhcmVkQnVmZmVyPiBhcmNoaXZlZERhdGEKIFN0cmluZyBFZGl0b3I6 OnNlbGVjdGlvbkluSFRNTEZvcm1hdCgpCiB7CiAgICAgaWYgKGF1dG8gcmFuZ2UgPSBzZWxlY3Rl ZFJhbmdlKCkpCi0gICAgICAgIHJldHVybiBjcmVhdGVNYXJrdXAoKnJhbmdlLCBudWxscHRyLCBB bm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMsIENvbnZlcnRCbG9ja3NUb0lubGluZXM6Ok5vLCBS ZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3kpOworICAgICAg ICByZXR1cm4gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UoKnJhbmdlLCBudWxs cHRyLCBBbm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMsIENvbnZlcnRCbG9ja3NUb0lubGluZXM6 Ok5vLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3kpOwog ICAgIHJldHVybiB7IH07CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvZ3RrL0Vk aXRvckd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9ndGsvRWRp dG9yR3RrLmNwcAkocmV2aXNpb24gMjM2NjA3KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9n dGsvRWRpdG9yR3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcgKzE0Niw3IEBAIHZvaWQg RWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZCgKICAgICBQYXN0ZWJvYXJkV2ViQ29u dGVudCBwYXN0ZWJvYXJkQ29udGVudDsKICAgICBwYXN0ZWJvYXJkQ29udGVudC5jYW5TbWFydENv cHlPckRlbGV0ZSA9IGNhblNtYXJ0Q29weU9yRGVsZXRlKCk7CiAgICAgcGFzdGVib2FyZENvbnRl bnQudGV4dCA9IHNlbGVjdGVkVGV4dEZvckRhdGFUcmFuc2ZlcigpOwotICAgIHBhc3RlYm9hcmRD b250ZW50Lm1hcmt1cCA9IGNyZWF0ZU1hcmt1cCgqc2VsZWN0ZWRSYW5nZSgpLCBudWxscHRyLCBB bm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMsIENvbnZlcnRCbG9ja3NUb0lubGluZXM6Ok5vLCBS ZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3kpOworICAgIHBh c3RlYm9hcmRDb250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJh bmNlKCpzZWxlY3RlZFJhbmdlKCksIG51bGxwdHIsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6Olll cywgQ29udmVydEJsb2Nrc1RvSW5saW5lczo6Tm8sIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdM b2NhbEZpbGVVUkxzRm9yUHJpdmFjeSk7CiAgICAgcGFzdGVib2FyZC53cml0ZShwYXN0ZWJvYXJk Q29udGVudCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvd3BlL0VkaXRvcldQ RS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy93cGUvRWRpdG9yV1BF LmNwcAkocmV2aXNpb24gMjM2NjA3KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy93cGUvRWRp dG9yV1BFLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsNyArNjQsNyBAQCB2b2lkIEVkaXRvcjo6 d3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9hcmQoCiB7CiAgICAgUGFzdGVib2FyZFdlYkNvbnRlbnQg cGFzdGVib2FyZENvbnRlbnQ7CiAgICAgcGFzdGVib2FyZENvbnRlbnQudGV4dCA9IHNlbGVjdGVk VGV4dEZvckRhdGFUcmFuc2ZlcigpOwotICAgIHBhc3RlYm9hcmRDb250ZW50Lm1hcmt1cCA9IGNy ZWF0ZU1hcmt1cCgqc2VsZWN0ZWRSYW5nZSgpLCBudWxscHRyLCBBbm5vdGF0ZUZvckludGVyY2hh bmdlOjpZZXMsIENvbnZlcnRCbG9ja3NUb0lubGluZXM6Ok5vLCBSZXNvbHZlVVJMczo6WWVzRXhj bHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3kpOworICAgIHBhc3RlYm9hcmRDb250ZW50Lm1h cmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKCpzZWxlY3RlZFJhbmdl KCksIG51bGxwdHIsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6OlllcywgQ29udmVydEJsb2Nrc1Rv SW5saW5lczo6Tm8sIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJp dmFjeSk7CiAgICAgcGFzdGVib2FyZC53cml0ZShwYXN0ZWJvYXJkQ29udGVudCk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdl YkFyY2hpdmUuY3BwCShyZXZpc2lvbiAyMzY2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv YXJjaGl2ZS9jZi9MZWdhY3lXZWJBcmNoaXZlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYwLDcg KzQ2MCw3IEBAIFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBMZWdhY3lXZWJBcmNoaXYKIAogICAg IC8vIEZJWE1FOiBUaGlzIGlzIGFsd2F5cyAiZm9yIGludGVyY2hhbmdlIi4gSXMgdGhhdCByaWdo dD8KICAgICBWZWN0b3I8Tm9kZSo+IG5vZGVMaXN0OwotICAgIFN0cmluZyBtYXJrdXBTdHJpbmcg PSBkb2N1bWVudFR5cGVTdHJpbmcoZG9jdW1lbnQpICsgY3JlYXRlTWFya3VwKCpyYW5nZSwgJm5v ZGVMaXN0LCBBbm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMpOworICAgIFN0cmluZyBtYXJrdXBT dHJpbmcgPSBkb2N1bWVudFR5cGVTdHJpbmcoZG9jdW1lbnQpICsgc2VyaWFsaXplUHJlc2Vydmlu Z1Zpc3VhbEFwcGVhcmFuY2UoKnJhbmdlLCAmbm9kZUxpc3QsIEFubm90YXRlRm9ySW50ZXJjaGFu Z2U6Olllcyk7CiAgICAgcmV0dXJuIGNyZWF0ZShtYXJrdXBTdHJpbmcsICpmcmFtZSwgbm9kZUxp c3QsIG51bGxwdHIpOwogfQogCkBAIC01NTUsNyArNTU1LDcgQEAgUmVmUHRyPExlZ2FjeVdlYkFy Y2hpdmU+IExlZ2FjeVdlYkFyY2hpdgogCiAgICAgVmVjdG9yPE5vZGUqPiBub2RlTGlzdDsKICAg ICBpZiAoYXV0byBzZWxlY3Rpb25SYW5nZSA9IGZyYW1lLT5zZWxlY3Rpb24oKS50b05vcm1hbGl6 ZWRSYW5nZSgpKQotICAgICAgICBidWlsZGVyLmFwcGVuZChjcmVhdGVNYXJrdXAoKnNlbGVjdGlv blJhbmdlLCAmbm9kZUxpc3QsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6OlllcykpOworICAgICAg ICBidWlsZGVyLmFwcGVuZChzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZSgqc2Vs ZWN0aW9uUmFuZ2UsICZub2RlTGlzdCwgQW5ub3RhdGVGb3JJbnRlcmNoYW5nZTo6WWVzKSk7CiAK ICAgICBhdXRvIGFyY2hpdmUgPSBjcmVhdGUoYnVpbGRlci50b1N0cmluZygpLCAqZnJhbWUsIG5v ZGVMaXN0LCBudWxscHRyKTsKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dp bi9QYXN0ZWJvYXJkV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93aW4vUGFzdGVib2FyZFdpbi5jcHAJKHJldmlzaW9uIDIzNjYwNykKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQ0 LDcgKzQ0NCw3IEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVSYW5nZVRvRGF0YU9iamVjdCgKICAg ICBtZWRpdW0udHltZWQgPSBUWU1FRF9IR0xPQkFMOwogCiAgICAgVmVjdG9yPGNoYXI+IGRhdGE7 Ci0gICAgbWFya3VwVG9DRkhUTUwoY3JlYXRlTWFya3VwKHNlbGVjdGVkUmFuZ2UsIG51bGxwdHIs IEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6OlllcyksCisgICAgbWFya3VwVG9DRkhUTUwoc2VyaWFs aXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2Uoc2VsZWN0ZWRSYW5nZSwgbnVsbHB0ciwgQW5u b3RhdGVGb3JJbnRlcmNoYW5nZTo6WWVzKSwKICAgICAgICAgc2VsZWN0ZWRSYW5nZS5zdGFydENv bnRhaW5lcigpLmRvY3VtZW50KCkudXJsKCkuc3RyaW5nKCksIGRhdGEpOwogICAgIG1lZGl1bS5o R2xvYmFsID0gY3JlYXRlR2xvYmFsRGF0YShkYXRhKTsKICAgICBpZiAobWVkaXVtLmhHbG9iYWwg JiYgRkFJTEVEKG1fd3JpdGFibGVEYXRhT2JqZWN0LT5TZXREYXRhKGh0bWxGb3JtYXQoKSwgJm1l ZGl1bSwgVFJVRSkpKQpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjYwOSkKKysrIFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMDkt MjggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVuYW1lIGNy ZWF0ZU1hcmt1cCB0byBzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMDg2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L2d0ay9XZWJFZGl0b3JDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJFZGl0b3JDbGllbnQ6OnVwZGF0ZUdsb2JhbFNlbGVjdGlvbik6CisKIDIwMTgtMDktMjgg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3Jpbmc6 IGVsaW1pbmF0ZSByYXcgcG9pbnRlciB1c2FnZSBpbiBGdWxsc2NyZWVuIGNvZGUKSW5kZXg6IFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9ndGsvV2ViRWRpdG9yQ2xpZW50 R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvZ3RrL1dlYkVkaXRvckNsaWVudEd0ay5jcHAJKHJldmlzaW9uIDIzNjYwNykKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9ndGsvV2ViRWRpdG9yQ2xpZW50 R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI2LDcgKzEyNiw3IEBAIHZvaWQgV2ViRWRpdG9y Q2xpZW50Ojp1cGRhdGVHbG9iYWxTZWxlY3QKICAgICBQYXN0ZWJvYXJkV2ViQ29udGVudCBwYXN0 ZWJvYXJkQ29udGVudDsKICAgICBwYXN0ZWJvYXJkQ29udGVudC5jYW5TbWFydENvcHlPckRlbGV0 ZSA9IGZhbHNlOwogICAgIHBhc3RlYm9hcmRDb250ZW50LnRleHQgPSByYW5nZS0+dGV4dCgpOwot ICAgIHBhc3RlYm9hcmRDb250ZW50Lm1hcmt1cCA9IGNyZWF0ZU1hcmt1cCgqcmFuZ2UsIG51bGxw dHIsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2U6OlllcywgQ29udmVydEJsb2Nrc1RvSW5saW5lczo6 Tm8sIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJpdmFjeSk7Cisg ICAgcGFzdGVib2FyZENvbnRlbnQubWFya3VwID0gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFw cGVhcmFuY2UoKnJhbmdlLCBudWxscHRyLCBBbm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMsIENv bnZlcnRCbG9ja3NUb0lubGluZXM6Ok5vLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxG aWxlVVJMc0ZvclByaXZhY3kpOwogICAgIFBhc3RlYm9hcmQ6OmNyZWF0ZUZvckdsb2JhbFNlbGVj dGlvbigpLT53cml0ZShwYXN0ZWJvYXJkQ29udGVudCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJL aXRMZWdhY3kvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjYwNykKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE4LTA5LTI4 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmFtZSBjcmVh dGVNYXJrdXAgdG8gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDA4NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRE9NL1dlYkRPTU9wZXJh dGlvbnMubW06CisgICAgICAgICgtW0RPTVJhbmdlIG1hcmt1cFN0cmluZ10pOgorCiAyMDE4LTA5 LTI4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9y aW5nOiBlbGltaW5hdGUgcmF3IHBvaW50ZXIgdXNhZ2UgaW4gRnVsbHNjcmVlbiBjb2RlCkluZGV4 OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQko cmV2aXNpb24gMjM2NjA3KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL1dlYkRPTU9w ZXJhdGlvbnMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE5NSw3ICsxOTUsNyBAQCAtIChXZWJBcmNo aXZlICopd2ViQXJjaGl2ZQogLSAoTlNTdHJpbmcgKiltYXJrdXBTdHJpbmcKIHsKICAgICBhdXRv JiByYW5nZSA9ICpjb3JlKHNlbGYpOwotICAgIHJldHVybiBTdHJpbmcgeyBkb2N1bWVudFR5cGVT dHJpbmcocmFuZ2Uuc3RhcnRDb250YWluZXIoKS5kb2N1bWVudCgpKSArIGNyZWF0ZU1hcmt1cChy YW5nZSwgbnVsbHB0ciwgQW5ub3RhdGVGb3JJbnRlcmNoYW5nZTo6WWVzKSB9OworICAgIHJldHVy biBTdHJpbmcgeyBkb2N1bWVudFR5cGVTdHJpbmcocmFuZ2Uuc3RhcnRDb250YWluZXIoKS5kb2N1 bWVudCgpKSArIHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKHJhbmdlLCBudWxs cHRyLCBBbm5vdGF0ZUZvckludGVyY2hhbmdlOjpZZXMpIH07CiB9CiAKIEBlbmQK