107709 2013-01-23 11:17:23 -0800 Remove DocType support from MarkupTokenBase now that NEW_XML is gone 2013-01-23 12:14:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107522 1 eric eric abarth ojan.autocc tonyg webkit.review.bot oldest_to_newest 814394 0 eric 2013-01-23 11:17:23 -0800 Remove DocType support from MarkupTokenBase now that NEW_XML is gone 814400 1 184269 eric 2013-01-23 11:19:39 -0800 Created attachment 184269 Patch 814479 2 184269 webkit.review.bot 2013-01-23 12:14:29 -0800 Comment on attachment 184269 Patch Clearing flags on attachment: 184269 Committed r140569: <http://trac.webkit.org/changeset/140569> 814480 3 webkit.review.bot 2013-01-23 12:14:32 -0800 All reviewed patches have been landed. Closing bug. 184269 2013-01-23 11:19:39 -0800 2013-01-23 12:14:29 -0800 Patch bug-107709-20130123111635.patch text/plain 10935 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRiOWM3ZjFlMTY3MjQ4 MGUxNzI0NjRkNjY2YmJmNGZmNGMwMmRlZi4uMWVlZWY0ZjA3M2M1OTA5MjFlNWU1MTQyNGNiNTIz Y2U1ZGYyODIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEzLTAxLTIzICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZW1vdmUgRG9jVHlwZSBzdXBw b3J0IGZyb20gTWFya3VwVG9rZW5CYXNlIG5vdyB0aGF0IE5FV19YTUwgaXMgZ29uZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NzA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSnVzdCBtb3ZpbmcgY29k ZSBvdXQgb2YgTWFya3VwVG9rZW5CYXNlIGFuZCBpbnRvIEhUTUxUb2tlbi4KKyAgICAgICAgVGhl IHRlc3QgZm9yIHRoaXMgY2hhbmdlIGlzIGlmIGl0IGNvbXBpbGVzLiA6KSAgV2hpY2ggaXQgZG9l cy4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUb2tlbi5oOgorICAgICAgICAoRG9jdHlw ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdHlwZURhdGE6OkRvY3R5cGVEYXRhKToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuOjphcHBlbmRUb05h bWUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuOjpuYW1lKToKKyAgICAgICAgKEhUTUxU b2tlbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmJlZ2luRE9DVFlQRSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OnB1YmxpY0lkZW50aWZpZXIpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFRva2VuOjpzeXN0ZW1JZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxUb2tlbjo6c2V0UHVibGljSWRlbnRpZmllclRvRW1wdHlTdHJpbmcpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFRva2VuOjpzZXRTeXN0ZW1JZGVudGlmaWVyVG9FbXB0eVN0cmluZyk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmFwcGVuZFRvUHVibGljSWRlbnRpZmllcik6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmFwcGVuZFRvU3lzdGVtSWRlbnRpZmllcik6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OnJlbGVhc2VEb2N0eXBlRGF0YSk6CisgICAgICAgIChX ZWJDb3JlOjpBdG9taWNIVE1MVG9rZW46OkF0b21pY0hUTUxUb2tlbik6CisgICAgICAgIChBdG9t aWNIVE1MVG9rZW4pOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUb2tlblR5cGVzLmg6Cisg ICAgICAgICogeG1sL3BhcnNlci9NYXJrdXBUb2tlbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAoTWFya3VwVG9rZW5CYXNlKToKKworMjAxMy0wMS0yMyAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgQ2xhcmlmeSBzb21lIHVzYWdlIG9mIHNob3Vs ZFVzZVRocmVhZGluZyB2cyBtX2hhdmVCYWNrZ3JvdW5kUGFyc2VyLCBmaXhpbmcgYWJvdXQ6Ymxh bmsgcGFyc2luZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA3NjY0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxU b2tlbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuLmgKaW5kZXggNWUx MjIyZWQyMjA4ZGY5MzVhZjJkMDA5ZDE2OGFiZmRmZTUyY2Y4Yy4uYWRlMTc4NjQ0NzJhZDg5YmEz MTEwODdmMjRmMDMzNjk0NzkxMzVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRva2VuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRv a2VuLmgKQEAgLTM0LDE4ICszNCwzNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNz IEhUTUxUb2tlbiA6IHB1YmxpYyBNYXJrdXBUb2tlbkJhc2U8SFRNTFRva2VuVHlwZXMsIEhUTUxU b2tlblR5cGVzOjpEb2N0eXBlRGF0YT4geworY2xhc3MgRG9jdHlwZURhdGEgeworICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKERvY3R5cGVEYXRhKTsKK3B1YmxpYzoKKyAgICBEb2N0eXBlRGF0YSgp CisgICAgICAgIDogbV9oYXNQdWJsaWNJZGVudGlmaWVyKGZhbHNlKQorICAgICAgICAsIG1faGFz U3lzdGVtSWRlbnRpZmllcihmYWxzZSkKKyAgICAgICAgLCBtX2ZvcmNlUXVpcmtzKGZhbHNlKQor ICAgIHsKKyAgICB9CisKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIFN0cmluZyBpbnN0 ZWFkIG9mIFZlY3RvcjxVQ2hhcj4uCisgICAgYm9vbCBtX2hhc1B1YmxpY0lkZW50aWZpZXI7Cisg ICAgYm9vbCBtX2hhc1N5c3RlbUlkZW50aWZpZXI7CisgICAgV1RGOjpWZWN0b3I8VUNoYXI+IG1f cHVibGljSWRlbnRpZmllcjsKKyAgICBXVEY6OlZlY3RvcjxVQ2hhcj4gbV9zeXN0ZW1JZGVudGlm aWVyOworICAgIGJvb2wgbV9mb3JjZVF1aXJrczsKK307CisKK2NsYXNzIEhUTUxUb2tlbiA6IHB1 YmxpYyBNYXJrdXBUb2tlbkJhc2U8SFRNTFRva2VuVHlwZXM+IHsKIHB1YmxpYzoKICAgICB2b2lk IGFwcGVuZFRvTmFtZShVQ2hhciBjaGFyYWN0ZXIpCiAgICAgewogICAgICAgICBBU1NFUlQobV90 eXBlID09IEhUTUxUb2tlblR5cGVzOjpTdGFydFRhZyB8fCBtX3R5cGUgPT0gSFRNTFRva2VuVHlw ZXM6OkVuZFRhZyB8fCBtX3R5cGUgPT0gSFRNTFRva2VuVHlwZXM6OkRPQ1RZUEUpOwotICAgICAg ICBNYXJrdXBUb2tlbkJhc2U8SFRNTFRva2VuVHlwZXMsIEhUTUxUb2tlblR5cGVzOjpEb2N0eXBl RGF0YT46OmFwcGVuZFRvTmFtZShjaGFyYWN0ZXIpOworICAgICAgICBNYXJrdXBUb2tlbkJhc2U8 SFRNTFRva2VuVHlwZXM+OjphcHBlbmRUb05hbWUoY2hhcmFjdGVyKTsKICAgICB9CiAKICAgICBj b25zdCBEYXRhVmVjdG9yJiBuYW1lKCkgY29uc3QKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3R5 cGUgPT0gSFRNTFRva2VuVHlwZXM6OlN0YXJ0VGFnIHx8IG1fdHlwZSA9PSBIVE1MVG9rZW5UeXBl czo6RW5kVGFnIHx8IG1fdHlwZSA9PSBIVE1MVG9rZW5UeXBlczo6RE9DVFlQRSk7Ci0gICAgICAg IHJldHVybiBNYXJrdXBUb2tlbkJhc2U8SFRNTFRva2VuVHlwZXMsIEhUTUxUb2tlblR5cGVzOjpE b2N0eXBlRGF0YT46Om5hbWUoKTsKKyAgICAgICAgcmV0dXJuIE1hcmt1cFRva2VuQmFzZTxIVE1M VG9rZW5UeXBlcz46Om5hbWUoKTsKICAgICB9CiAKICAgICBib29sIGZvcmNlUXVpcmtzKCkgY29u c3QKQEAgLTU5LDYgKzc3LDc0IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBI VE1MVG9rZW5UeXBlczo6RE9DVFlQRSk7CiAgICAgICAgIG1fZG9jdHlwZURhdGEtPm1fZm9yY2VR dWlya3MgPSB0cnVlOwogICAgIH0KKworICAgIHZvaWQgYmVnaW5ET0NUWVBFKCkKKyAgICB7Cisg ICAgICAgIEFTU0VSVChtX3R5cGUgPT0gSFRNTFRva2VuVHlwZXM6OlVuaW5pdGlhbGl6ZWQpOwor ICAgICAgICBtX3R5cGUgPSBIVE1MVG9rZW5UeXBlczo6RE9DVFlQRTsKKyAgICAgICAgbV9kb2N0 eXBlRGF0YSA9IGFkb3B0UHRyKG5ldyBEb2N0eXBlRGF0YSk7CisgICAgfQorCisgICAgdm9pZCBi ZWdpbkRPQ1RZUEUoVUNoYXIgY2hhcmFjdGVyKQorICAgIHsKKyAgICAgICAgQVNTRVJUKGNoYXJh Y3Rlcik7CisgICAgICAgIGJlZ2luRE9DVFlQRSgpOworICAgICAgICBtX2RhdGEuYXBwZW5kKGNo YXJhY3Rlcik7CisgICAgICAgIG1fb3JBbGxEYXRhIHw9IGNoYXJhY3RlcjsKKyAgICB9CisKKyAg ICAvLyBGSVhNRTogRGlzdGluZ3Vpc2ggYmV0d2VlbiBhIG1pc3NpbmcgcHVibGljIGlkZW50aWZl ciBhbmQgYW4gZW1wdHkgb25lLgorICAgIGNvbnN0IFdURjo6VmVjdG9yPFVDaGFyPiYgcHVibGlj SWRlbnRpZmllcigpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQobV90eXBlID09IEhUTUxU b2tlblR5cGVzOjpET0NUWVBFKTsKKyAgICAgICAgcmV0dXJuIG1fZG9jdHlwZURhdGEtPm1fcHVi bGljSWRlbnRpZmllcjsKKyAgICB9CisKKyAgICAvLyBGSVhNRTogRGlzdGluZ3Vpc2ggYmV0d2Vl biBhIG1pc3Npbmcgc3lzdGVtIGlkZW50aWZlciBhbmQgYW4gZW1wdHkgb25lLgorICAgIGNvbnN0 IFdURjo6VmVjdG9yPFVDaGFyPiYgc3lzdGVtSWRlbnRpZmllcigpIGNvbnN0CisgICAgeworICAg ICAgICBBU1NFUlQobV90eXBlID09IEhUTUxUb2tlblR5cGVzOjpET0NUWVBFKTsKKyAgICAgICAg cmV0dXJuIG1fZG9jdHlwZURhdGEtPm1fc3lzdGVtSWRlbnRpZmllcjsKKyAgICB9CisKKyAgICB2 b2lkIHNldFB1YmxpY0lkZW50aWZpZXJUb0VtcHR5U3RyaW5nKCkKKyAgICB7CisgICAgICAgIEFT U0VSVChtX3R5cGUgPT0gSFRNTFRva2VuVHlwZXM6OkRPQ1RZUEUpOworICAgICAgICBtX2RvY3R5 cGVEYXRhLT5tX2hhc1B1YmxpY0lkZW50aWZpZXIgPSB0cnVlOworICAgICAgICBtX2RvY3R5cGVE YXRhLT5tX3B1YmxpY0lkZW50aWZpZXIuY2xlYXIoKTsKKyAgICB9CisKKyAgICB2b2lkIHNldFN5 c3RlbUlkZW50aWZpZXJUb0VtcHR5U3RyaW5nKCkKKyAgICB7CisgICAgICAgIEFTU0VSVChtX3R5 cGUgPT0gSFRNTFRva2VuVHlwZXM6OkRPQ1RZUEUpOworICAgICAgICBtX2RvY3R5cGVEYXRhLT5t X2hhc1N5c3RlbUlkZW50aWZpZXIgPSB0cnVlOworICAgICAgICBtX2RvY3R5cGVEYXRhLT5tX3N5 c3RlbUlkZW50aWZpZXIuY2xlYXIoKTsKKyAgICB9CisKKyAgICB2b2lkIGFwcGVuZFRvUHVibGlj SWRlbnRpZmllcihVQ2hhciBjaGFyYWN0ZXIpCisgICAgeworICAgICAgICBBU1NFUlQoY2hhcmFj dGVyKTsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBIVE1MVG9rZW5UeXBlczo6RE9DVFlQRSk7 CisgICAgICAgIEFTU0VSVChtX2RvY3R5cGVEYXRhLT5tX2hhc1B1YmxpY0lkZW50aWZpZXIpOwor ICAgICAgICBtX2RvY3R5cGVEYXRhLT5tX3B1YmxpY0lkZW50aWZpZXIuYXBwZW5kKGNoYXJhY3Rl cik7CisgICAgfQorCisgICAgdm9pZCBhcHBlbmRUb1N5c3RlbUlkZW50aWZpZXIoVUNoYXIgY2hh cmFjdGVyKQorICAgIHsKKyAgICAgICAgQVNTRVJUKGNoYXJhY3Rlcik7CisgICAgICAgIEFTU0VS VChtX3R5cGUgPT0gSFRNTFRva2VuVHlwZXM6OkRPQ1RZUEUpOworICAgICAgICBBU1NFUlQobV9k b2N0eXBlRGF0YS0+bV9oYXNTeXN0ZW1JZGVudGlmaWVyKTsKKyAgICAgICAgbV9kb2N0eXBlRGF0 YS0+bV9zeXN0ZW1JZGVudGlmaWVyLmFwcGVuZChjaGFyYWN0ZXIpOworICAgIH0KKworICAgIFBh c3NPd25QdHI8RG9jdHlwZURhdGE+IHJlbGVhc2VEb2N0eXBlRGF0YSgpCisgICAgeworICAgICAg ICByZXR1cm4gbV9kb2N0eXBlRGF0YS5yZWxlYXNlKCk7CisgICAgfQorCitwcml2YXRlOgorICAg IC8vIEZvciBET0NUWVBFCisgICAgT3duUHRyPERvY3R5cGVEYXRhPiBtX2RvY3R5cGVEYXRhOwog fTsKIAogY2xhc3MgQXRvbWljSFRNTFRva2VuIDogcHVibGljIFJlZkNvdW50ZWQ8QXRvbWljSFRN TFRva2VuPiB7CkBAIC0yMTksNyArMzA1LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIEhUTUxUb2tlblR5cGVzOjpET0NUWVBFOgogICAgICAgICAgICAgbV9u YW1lID0gdG9rZW4uZGF0YSgpOwotICAgICAgICAgICAgbV9kb2N0eXBlRGF0YSA9IGFkb3B0UHRy KG5ldyBIVE1MVG9rZW46OkRvY3R5cGVEYXRhKCkpOworICAgICAgICAgICAgbV9kb2N0eXBlRGF0 YSA9IGFkb3B0UHRyKG5ldyBEb2N0eXBlRGF0YSgpKTsKICAgICAgICAgICAgIG1fZG9jdHlwZURh dGEtPm1faGFzUHVibGljSWRlbnRpZmllciA9IHRydWU7CiAgICAgICAgICAgICBtX2RvY3R5cGVE YXRhLT5tX3B1YmxpY0lkZW50aWZpZXIuYXBwZW5kKHRva2VuLnB1YmxpY0lkZW50aWZpZXIoKS5j aGFyYWN0ZXJzKCksIHRva2VuLnB1YmxpY0lkZW50aWZpZXIoKS5sZW5ndGgoKSk7CiAgICAgICAg ICAgICBtX2RvY3R5cGVEYXRhLT5tX2hhc1N5c3RlbUlkZW50aWZpZXIgPSB0cnVlOwpAQCAtMzAw LDcgKzM4Niw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzQWxsOEJpdERhdGE7CiAKICAgICAv LyBGb3IgRE9DVFlQRQotICAgIE93blB0cjxIVE1MVG9rZW5UeXBlczo6RG9jdHlwZURhdGE+IG1f ZG9jdHlwZURhdGE7CisgICAgT3duUHRyPERvY3R5cGVEYXRhPiBtX2RvY3R5cGVEYXRhOwogCiAg ICAgLy8gRm9yIFN0YXJ0VGFnIGFuZCBFbmRUYWcKICAgICBib29sIG1fc2VsZkNsb3Npbmc7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9rZW5UeXBlcy5oIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuVHlwZXMuaAppbmRleCAyNDBlMjU0 ZGNiZDU0MjAwMDg0MDg3MTdiNWQwOWMwMzZiZjhkYzdiLi4xYWVkMjFiMTUwNmI5NDY4YTg5ZTY0 MmJiOGFiY2NhZGZhMTRjZGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNl ci9IVE1MVG9rZW5UeXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxU b2tlblR5cGVzLmgKQEAgLTQyLDE3ICs0Miw2IEBAIHB1YmxpYzoKICAgICAgICAgQ2hhcmFjdGVy LAogICAgICAgICBFbmRPZkZpbGUsCiAgICAgfTsKLQotICAgIGNsYXNzIERvY3R5cGVEYXRhIDog cHVibGljIERvY3R5cGVEYXRhQmFzZSB7Ci0gICAgICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKERv Y3R5cGVEYXRhKTsKLSAgICBwdWJsaWM6Ci0gICAgICAgIERvY3R5cGVEYXRhKCkKLSAgICAgICAg ICAgIDogbV9mb3JjZVF1aXJrcyhmYWxzZSkKLSAgICAgICAgewotICAgICAgICB9Ci0KLSAgICAg ICAgYm9vbCBtX2ZvcmNlUXVpcmtzOwotICAgIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS94bWwvcGFyc2VyL01hcmt1cFRva2VuQmFzZS5oIGIvU291cmNlL1dlYkNvcmUv eG1sL3BhcnNlci9NYXJrdXBUb2tlbkJhc2UuaAppbmRleCA1MWMxZDA1YTVhNDRiMDcxY2QwNTM4 MjRlYWI2Yzg0MTI1YmQ0NjY3Li44ODdiMmFiYTgwMTBhOTNjZDg1NjIyNTMyYzlmYjk5MTAwMWJj OGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL01hcmt1cFRva2VuQmFz ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvTWFya3VwVG9rZW5CYXNlLmgKQEAg LTQ1LDIxICs0NSw2IEBAIHN0YXRpYyBpbmxpbmUgQXR0cmlidXRlKiBmaW5kQXR0cmlidXRlSW5W ZWN0b3IoVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMsIGNvCiAgICAgcmV0dXJuIDA7CiB9 CiAKLWNsYXNzIERvY3R5cGVEYXRhQmFzZSB7Ci0gICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoRG9j dHlwZURhdGFCYXNlKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Ci1wdWJsaWM6Ci0gICAgRG9j dHlwZURhdGFCYXNlKCkKLSAgICAgICAgOiBtX2hhc1B1YmxpY0lkZW50aWZpZXIoZmFsc2UpCi0g ICAgICAgICwgbV9oYXNTeXN0ZW1JZGVudGlmaWVyKGZhbHNlKQotICAgIHsKLSAgICB9Ci0KLSAg ICBib29sIG1faGFzUHVibGljSWRlbnRpZmllcjsKLSAgICBib29sIG1faGFzU3lzdGVtSWRlbnRp ZmllcjsKLSAgICBXVEY6OlZlY3RvcjxVQ2hhcj4gbV9wdWJsaWNJZGVudGlmaWVyOwotICAgIFdU Rjo6VmVjdG9yPFVDaGFyPiBtX3N5c3RlbUlkZW50aWZpZXI7Ci19OwotCiBjbGFzcyBBdHRyaWJ1 dGVCYXNlIHsKIHB1YmxpYzoKICAgICBjbGFzcyBSYW5nZSB7CkBAIC03NCwxNCArNTksMTMgQEAg cHVibGljOgogICAgIFdURjo6VmVjdG9yPFVDaGFyLCAzMj4gbV92YWx1ZTsKIH07CiAKLXRlbXBs YXRlPHR5cGVuYW1lIFR5cGVTZXQsIHR5cGVuYW1lIERvY3R5cGVEYXRhVHlwZSA9IERvY3R5cGVE YXRhQmFzZSwgdHlwZW5hbWUgQXR0cmlidXRlVHlwZSA9IEF0dHJpYnV0ZUJhc2U+Cit0ZW1wbGF0 ZTx0eXBlbmFtZSBUeXBlU2V0LCB0eXBlbmFtZSBBdHRyaWJ1dGVUeXBlID0gQXR0cmlidXRlQmFz ZT4KIGNsYXNzIE1hcmt1cFRva2VuQmFzZSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTWFy a3VwVG9rZW5CYXNlKTsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAg ICB0eXBlZGVmIFR5cGVTZXQgVHlwZTsKICAgICB0eXBlZGVmIEF0dHJpYnV0ZVR5cGUgQXR0cmli dXRlOwotICAgIHR5cGVkZWYgRG9jdHlwZURhdGFUeXBlIERvY3R5cGVEYXRhOwogCiAgICAgdHlw ZWRlZiBXVEY6OlZlY3RvcjxBdHRyaWJ1dGUsIDEwPiBBdHRyaWJ1dGVMaXN0OwogICAgIHR5cGVk ZWYgV1RGOjpWZWN0b3I8VUNoYXIsIDEwMjQ+IERhdGFWZWN0b3I7CkBAIC0xNjksMjEgKzE1Myw2 IEBAIHB1YmxpYzoKICAgICAgICAgbV90eXBlID0gVHlwZVNldDo6Q29tbWVudDsKICAgICB9CiAK LSAgICB2b2lkIGJlZ2luRE9DVFlQRSgpCi0gICAgewotICAgICAgICBBU1NFUlQobV90eXBlID09 IFR5cGVTZXQ6OlVuaW5pdGlhbGl6ZWQpOwotICAgICAgICBtX3R5cGUgPSBUeXBlU2V0OjpET0NU WVBFOwotICAgICAgICBtX2RvY3R5cGVEYXRhID0gYWRvcHRQdHIobmV3IERvY3R5cGVEYXRhKTsK LSAgICB9Ci0KLSAgICB2b2lkIGJlZ2luRE9DVFlQRShVQ2hhciBjaGFyYWN0ZXIpCi0gICAgewot ICAgICAgICBBU1NFUlQoY2hhcmFjdGVyKTsKLSAgICAgICAgYmVnaW5ET0NUWVBFKCk7Ci0gICAg ICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKLSAgICAgICAgbV9vckFsbERhdGEgfD0gY2hh cmFjdGVyOwotICAgIH0KLQogICAgIHZvaWQgYXBwZW5kVG9DaGFyYWN0ZXIoY2hhciBjaGFyYWN0 ZXIpCiAgICAgewogICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGVTZXQ6OkNoYXJhY3Rlcik7 CkBAIC0zMzEsNTAgKzMwMCw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIChtX29yQWxsRGF0 YSA8PSAweGZmKTsKICAgICB9CiAKLSAgICAvLyBGSVhNRTogRGlzdGluZ3Vpc2ggYmV0d2VlbiBh IG1pc3NpbmcgcHVibGljIGlkZW50aWZlciBhbmQgYW4gZW1wdHkgb25lLgotICAgIGNvbnN0IFdU Rjo6VmVjdG9yPFVDaGFyPiYgcHVibGljSWRlbnRpZmllcigpIGNvbnN0Ci0gICAgewotICAgICAg ICBBU1NFUlQobV90eXBlID09IFR5cGVTZXQ6OkRPQ1RZUEUpOwotICAgICAgICByZXR1cm4gbV9k b2N0eXBlRGF0YS0+bV9wdWJsaWNJZGVudGlmaWVyOwotICAgIH0KLQotICAgIC8vIEZJWE1FOiBE aXN0aW5ndWlzaCBiZXR3ZWVuIGEgbWlzc2luZyBzeXN0ZW0gaWRlbnRpZmVyIGFuZCBhbiBlbXB0 eSBvbmUuCi0gICAgY29uc3QgV1RGOjpWZWN0b3I8VUNoYXI+JiBzeXN0ZW1JZGVudGlmaWVyKCkg Y29uc3QKLSAgICB7Ci0gICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZVNldDo6RE9DVFlQRSk7 Ci0gICAgICAgIHJldHVybiBtX2RvY3R5cGVEYXRhLT5tX3N5c3RlbUlkZW50aWZpZXI7Ci0gICAg fQotCi0gICAgdm9pZCBzZXRQdWJsaWNJZGVudGlmaWVyVG9FbXB0eVN0cmluZygpCi0gICAgewot ICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGVTZXQ6OkRPQ1RZUEUpOwotICAgICAgICBtX2Rv Y3R5cGVEYXRhLT5tX2hhc1B1YmxpY0lkZW50aWZpZXIgPSB0cnVlOwotICAgICAgICBtX2RvY3R5 cGVEYXRhLT5tX3B1YmxpY0lkZW50aWZpZXIuY2xlYXIoKTsKLSAgICB9Ci0KLSAgICB2b2lkIHNl dFN5c3RlbUlkZW50aWZpZXJUb0VtcHR5U3RyaW5nKCkKLSAgICB7Ci0gICAgICAgIEFTU0VSVCht X3R5cGUgPT0gVHlwZVNldDo6RE9DVFlQRSk7Ci0gICAgICAgIG1fZG9jdHlwZURhdGEtPm1faGFz U3lzdGVtSWRlbnRpZmllciA9IHRydWU7Ci0gICAgICAgIG1fZG9jdHlwZURhdGEtPm1fc3lzdGVt SWRlbnRpZmllci5jbGVhcigpOwotICAgIH0KLQotICAgIHZvaWQgYXBwZW5kVG9QdWJsaWNJZGVu dGlmaWVyKFVDaGFyIGNoYXJhY3RlcikKLSAgICB7Ci0gICAgICAgIEFTU0VSVChjaGFyYWN0ZXIp OwotICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGVTZXQ6OkRPQ1RZUEUpOwotICAgICAgICBB U1NFUlQobV9kb2N0eXBlRGF0YS0+bV9oYXNQdWJsaWNJZGVudGlmaWVyKTsKLSAgICAgICAgbV9k b2N0eXBlRGF0YS0+bV9wdWJsaWNJZGVudGlmaWVyLmFwcGVuZChjaGFyYWN0ZXIpOwotICAgIH0K LQotICAgIHZvaWQgYXBwZW5kVG9TeXN0ZW1JZGVudGlmaWVyKFVDaGFyIGNoYXJhY3RlcikKLSAg ICB7Ci0gICAgICAgIEFTU0VSVChjaGFyYWN0ZXIpOwotICAgICAgICBBU1NFUlQobV90eXBlID09 IFR5cGVTZXQ6OkRPQ1RZUEUpOwotICAgICAgICBBU1NFUlQobV9kb2N0eXBlRGF0YS0+bV9oYXNT eXN0ZW1JZGVudGlmaWVyKTsKLSAgICAgICAgbV9kb2N0eXBlRGF0YS0+bV9zeXN0ZW1JZGVudGlm aWVyLmFwcGVuZChjaGFyYWN0ZXIpOwotICAgIH0KLQogICAgIGNvbnN0IERhdGFWZWN0b3ImIG5h bWUoKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1fZGF0YTsKQEAgLTM4OSwxMSArMzE0 LDYgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gU3RyaW5nKG1fZGF0YS5kYXRhKCksIG1fZGF0 YS5zaXplKCkpOwogICAgIH0KIAotICAgIFBhc3NPd25QdHI8RG9jdHlwZURhdGE+IHJlbGVhc2VE b2N0eXBlRGF0YSgpCi0gICAgewotICAgICAgICByZXR1cm4gbV9kb2N0eXBlRGF0YS5yZWxlYXNl KCk7Ci0gICAgfQotCiBwcm90ZWN0ZWQ6CiAKICNpZm5kZWYgTkRFQlVHCkBAIC00MTgsOSArMzM4 LDYgQEAgcHJvdGVjdGVkOgogICAgIERhdGFWZWN0b3IgbV9kYXRhOwogICAgIFVDaGFyIG1fb3JB bGxEYXRhOwogCi0gICAgLy8gRm9yIERPQ1RZUEUKLSAgICBPd25QdHI8RG9jdHlwZURhdGE+IG1f ZG9jdHlwZURhdGE7Ci0KICAgICAvLyBGb3IgU3RhcnRUYWcgYW5kIEVuZFRhZwogICAgIGJvb2wg bV9zZWxmQ2xvc2luZzsKICAgICBBdHRyaWJ1dGVMaXN0IG1fYXR0cmlidXRlczsK