40508 2010-06-11 17:19:42 -0700 Rename the last few *Tokenizer classes (which don't have their own files) to *DocumentParser 2010-06-12 23:21:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth commit-queue eric mrobinson webkit.review.bot xan.lopez oldest_to_newest 237167 0 eric 2010-06-11 17:19:42 -0700 Rename the last few *Tokenizer classes (which don't have their own files) to *DocumentParser 237168 1 58530 eric 2010-06-11 17:21:49 -0700 Created attachment 58530 Patch 237172 2 58530 abarth 2010-06-11 17:22:35 -0700 Comment on attachment 58530 Patch k 237266 3 58530 commit-queue 2010-06-12 03:44:30 -0700 Comment on attachment 58530 Patch Rejecting patch 58530 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Adam Barth', u'--force']" exit_code: 1 Last 500 characters of output: ment.h Hunk #1 FAILED at 49. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/html/HTMLViewSourceDocument.h.rej patching file WebCore/loader/FTPDirectoryDocument.cpp Hunk #1 FAILED at 48. Hunk #2 FAILED at 94. 2 out of 10 hunks FAILED -- saving rejects to file WebCore/loader/FTPDirectoryDocument.cpp.rej patching file WebCore/loader/MediaDocument.cpp patching file WebCore/loader/PluginDocument.cpp patching file WebCore/loader/SinkDocument.cpp patching file WebCore/loader/TextDocument.cpp Full output: http://webkit-commit-queue.appspot.com/results/3191260 237493 4 58530 commit-queue 2010-06-12 22:36:33 -0700 Comment on attachment 58530 Patch Clearing flags on attachment: 58530 Committed r61081: <http://trac.webkit.org/changeset/61081> 237494 5 commit-queue 2010-06-12 22:36:40 -0700 All reviewed patches have been landed. Closing bug. 237504 6 webkit.review.bot 2010-06-12 22:55:37 -0700 http://trac.webkit.org/changeset/61081 might have broken GTK Linux 64-bit Release 237509 7 eric 2010-06-12 23:21:02 -0700 I don't see how this rename would cause one test on one gtk bot to start crashing. We can always try rolling it out of course. 58530 2010-06-11 17:21:49 -0700 2010-06-12 22:36:33 -0700 Patch bug-40508-20100611172148.patch text/plain 17052 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzNhM2NlMWM5NGM5MDNmZWE5MjcwNTNkYjA0MWJkNGJlYWY5OGFhMy4uNDU1MDA5OThiYjYwMTU5 YmM5Njg4NzI1NjFjODJhNGMyNDI2OGQ0NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiw2NyBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFJlbmFtZSB0aGUgbGFzdCBmZXcgKlRv a2VuaXplciBjbGFzc2VzICh3aGljaCBkb24ndCBoYXZlIHRoZWlyIG93biBmaWxlcykgdG8gKkRv Y3VtZW50UGFyc2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00MDUwOAorCisgICAgICAgIFRoaXMgd2FzIGEgdmVyeSBzaW1wbGUgZG8td2ViY29yZS1y ZW5hbWUtZ2VuZXJhdGVkIHBhdGNoLgorCisgICAgICAgIFBsdWdpblRva2VuaXplciA9PiBQbHVn aW5Eb2N1bWVudFBhcnNlcgorICAgICAgICBUZXh0VG9rZW5pemVyID0+IFRleHREb2N1bWVudFBh cnNlcgorICAgICAgICBTaW5rVG9rZW5pemVyID0+IFNpbmtEb2N1bWVudFBhcnNlcgorICAgICAg ICBNZWRpYVRva2VuaXplciA9PiBNZWRpYURvY3VtZW50UGFyc2VyCisgICAgICAgIEZUUERpcmVj dG9yeVRva2VuaXplciA9PiBGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcgorCisgICAgICAgIE5v IGZ1bmN0aW9uYWwgY2hhbmdlcywgdGh1cyBubyB0ZXN0cy4KKworICAgICAgICAqIGh0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJj ZURvY3VtZW50OjpjcmVhdGVUb2tlbml6ZXIpOgorICAgICAgICAqIGh0bWwvSFRNTFZpZXdTb3Vy Y2VEb2N1bWVudC5oOgorICAgICAgICAqIGxvYWRlci9GVFBEaXJlY3RvcnlEb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcjo6RlRQRGlyZWN0 b3J5RG9jdW1lbnRQYXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6RlRQRGlyZWN0b3J5RG9jdW1l bnRQYXJzZXI6OmFwcGVuZEVudHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkZUUERpcmVjdG9yeURv Y3VtZW50UGFyc2VyOjpjcmVhdGVUREZvckZpbGVuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkZU UERpcmVjdG9yeURvY3VtZW50UGFyc2VyOjpwYXJzZUFuZEFwcGVuZE9uZUxpbmUpOgorICAgICAg ICAoV2ViQ29yZTo6RlRQRGlyZWN0b3J5RG9jdW1lbnRQYXJzZXI6OmxvYWREb2N1bWVudFRlbXBs YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkZUUERpcmVjdG9yeURvY3VtZW50UGFyc2VyOjpjcmVh dGVCYXNpY0RvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZUUERpcmVjdG9yeURvY3VtZW50 UGFyc2VyOjp3cml0ZSk6CisgICAgICAgIChXZWJDb3JlOjpGVFBEaXJlY3RvcnlEb2N1bWVudFBh cnNlcjo6ZmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkZUUERpcmVjdG9yeURvY3VtZW50Ojpj cmVhdGVUb2tlbml6ZXIpOgorICAgICAgICAqIGxvYWRlci9NZWRpYURvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhRG9jdW1lbnRQYXJzZXI6Ok1lZGlhRG9jdW1lbnRQYXJzZXIp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFEb2N1bWVudFBhcnNlcjo6d3JpdGUpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFEb2N1bWVudFBhcnNlcjo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFEb2N1bWVudFBhcnNlcjo6d3JpdGVSYXdEYXRhKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRG9jdW1lbnRQYXJzZXI6OmZpbmlzaCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYURvY3VtZW50UGFyc2VyOjppc1dhaXRpbmdGb3JTY3JpcHRzKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhRG9jdW1lbnQ6OmNyZWF0ZVRva2VuaXplcik6CisgICAgICAg ICogbG9hZGVyL1BsdWdpbkRvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRv Y3VtZW50UGFyc2VyOjpQbHVnaW5Eb2N1bWVudFBhcnNlcik6CisgICAgICAgIChXZWJDb3JlOjpQ bHVnaW5Eb2N1bWVudFBhcnNlcjo6cGx1Z2luV2lkZ2V0RnJvbURvY3VtZW50KToKKyAgICAgICAg KFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjp3cml0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpQbHVnaW5Eb2N1bWVudFBhcnNlcjo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUpOgorICAgICAg ICAoV2ViQ29yZTo6UGx1Z2luRG9jdW1lbnRQYXJzZXI6OndyaXRlUmF3RGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpQbHVnaW5Eb2N1bWVudFBhcnNlcjo6ZmluaXNoKToKKyAgICAgICAgKFdlYkNv cmU6OlBsdWdpbkRvY3VtZW50UGFyc2VyOjppc1dhaXRpbmdGb3JTY3JpcHRzKToKKyAgICAgICAg KFdlYkNvcmU6OlBsdWdpbkRvY3VtZW50OjpjcmVhdGVUb2tlbml6ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6UGx1Z2luRG9jdW1lbnQ6OnBsdWdpbldpZGdldCk6CisgICAgICAgICogbG9hZGVyL1Np bmtEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW5rRG9jdW1lbnRQYXJzZXI6OlNp bmtEb2N1bWVudFBhcnNlcik6CisgICAgICAgIChXZWJDb3JlOjpTaW5rRG9jdW1lbnRQYXJzZXI6 OmZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpTaW5rRG9jdW1lbnQ6OmNyZWF0ZVRva2VuaXpl cik6CisgICAgICAgICogbG9hZGVyL1RleHREb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpUZXh0RG9jdW1lbnRQYXJzZXI6OlRleHREb2N1bWVudFBhcnNlcik6CisgICAgICAgIChXZWJD b3JlOjpUZXh0RG9jdW1lbnRQYXJzZXI6On5UZXh0RG9jdW1lbnRQYXJzZXIpOgorICAgICAgICAo V2ViQ29yZTo6VGV4dERvY3VtZW50UGFyc2VyOjp3cml0ZSk6CisgICAgICAgIChXZWJDb3JlOjpU ZXh0RG9jdW1lbnRQYXJzZXI6OmZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RG9jdW1l bnRQYXJzZXI6OmlzV2FpdGluZ0ZvclNjcmlwdHMpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dERv Y3VtZW50OjpjcmVhdGVUb2tlbml6ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlVGV4dFRv a2VuaXplcik6CisKKzIwMTAtMDYtMTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFJlbmFtZSB0 aGUgcmVzdCBvZiB0aGUgKlRva2VuaXplciBjbGFzc2VzIHRvICpEb2N1bWVudFBhcnNlcgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA1MDcKIApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwIGIvV2ViQ29y ZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCmluZGV4IDAxMDY2MjgwYzNhNWQ4YWFj NDcyMzdkNDc0MmM1NGE4YjliMWQ0NDUuLjlkMjZkN2FiODEyMWM3NjQwOTVlMWVhZjhkZGQwYTIz NGQ2NmJhN2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50 LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAKQEAgLTUz LDcgKzUzLDcgQEAgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6SFRNTFZpZXdTb3VyY2VEb2N1bWVu dChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWltZVQKIAogRG9jdW1lbnRQYXJzZXIqIEhU TUxWaWV3U291cmNlRG9jdW1lbnQ6OmNyZWF0ZVRva2VuaXplcigpCiB7Ci0gICAgLy8gVXNlIEhU TUxEb2N1bWVudFBhcnNlciBpZiBhcHBsaWNhYmxlLCBvdGhlcndpc2UgdXNlIFRleHRUb2tlbml6 ZXIuCisgICAgLy8gVXNlIEhUTUxEb2N1bWVudFBhcnNlciBpZiBhcHBsaWNhYmxlLCBvdGhlcndp c2UgdXNlIFRleHREb2N1bWVudFBhcnNlci4KICAgICBpZiAobV90eXBlID09ICJ0ZXh0L2h0bWwi IHx8IG1fdHlwZSA9PSAiYXBwbGljYXRpb24veGh0bWwreG1sIiB8fCBtX3R5cGUgPT0gImltYWdl L3N2Zyt4bWwiIHx8IERPTUltcGxlbWVudGF0aW9uOjppc1hNTE1JTUVUeXBlKG1fdHlwZSkKICNp ZiBFTkFCTEUoWEhUTUxNUCkKICAgICAgICAgfHwgbV90eXBlID09ICJhcHBsaWNhdGlvbi92bmQu d2FwLnhodG1sK3htbCIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURv Y3VtZW50LmggYi9XZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5oCmluZGV4IDhk ZWVjM2U2ODQzNmI3MzYyOWM4MmRmODBmM2FjOTliOGY4Y2U1NzcuLjE3ZGI4ZWY3ZDI3MGNhZjk5 OWZkNzk5NmY3YzEwYTRjMjk4OGYwNjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVmll d1NvdXJjZURvY3VtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1l bnQuaApAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIEhUTUxWaWV3U291 cmNlRG9jdW1lbnQoRnJhbWUqLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKIAotICAgIC8vIFJl dHVybnMgSFRNTERvY3VtZW50UGFyc2VyIG9yIFRleHRUb2tlbml6ZXIgYmFzZWQgb24gbV90eXBl LgorICAgIC8vIFJldHVybnMgSFRNTERvY3VtZW50UGFyc2VyIG9yIFRleHREb2N1bWVudFBhcnNl ciBiYXNlZCBvbiBtX3R5cGUuCiAgICAgdmlydHVhbCBEb2N1bWVudFBhcnNlciogY3JlYXRlVG9r ZW5pemVyKCk7CiAKICAgICB2b2lkIGNyZWF0ZUNvbnRhaW5pbmdUYWJsZSgpOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9sb2FkZXIvRlRQRGlyZWN0b3J5RG9jdW1lbnQuY3BwIGIvV2ViQ29yZS9sb2Fk ZXIvRlRQRGlyZWN0b3J5RG9jdW1lbnQuY3BwCmluZGV4IDRjYWFjOWNkOTA5MjcwYmQzYjkzOWFj M2U0ZDQ3OWQ0NGU2ZDlmNDMuLjc5YWQ4M2YzNmRlOTRkMWUyZjY1MDBhYTg5Mjk1ZmQ5ZWZmNjFi MWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZUUERpcmVjdG9yeURvY3VtZW50LmNwcAor KysgYi9XZWJDb3JlL2xvYWRlci9GVFBEaXJlY3RvcnlEb2N1bWVudC5jcHAKQEAgLTQ4LDkgKzQ4 LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwog ICAgIAotY2xhc3MgRlRQRGlyZWN0b3J5VG9rZW5pemVyIDogcHVibGljIEhUTUxEb2N1bWVudFBh cnNlciB7CitjbGFzcyBGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlciA6IHB1YmxpYyBIVE1MRG9j dW1lbnRQYXJzZXIgewogcHVibGljOgotICAgIEZUUERpcmVjdG9yeVRva2VuaXplcihIVE1MRG9j dW1lbnQqKTsKKyAgICBGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcihIVE1MRG9jdW1lbnQqKTsK IAogICAgIHZpcnR1YWwgdm9pZCB3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmLCBib29sIGFw cGVuZERhdGEpOwogICAgIHZpcnR1YWwgdm9pZCBmaW5pc2goKTsKQEAgLTk0LDcgKzk0LDcgQEAg cHJpdmF0ZToKICAgICBMaXN0U3RhdGUgbV9saXN0U3RhdGU7CiB9OwogCi1GVFBEaXJlY3RvcnlU b2tlbml6ZXI6OkZUUERpcmVjdG9yeVRva2VuaXplcihIVE1MRG9jdW1lbnQqIGRvYykKK0ZUUERp cmVjdG9yeURvY3VtZW50UGFyc2VyOjpGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcihIVE1MRG9j dW1lbnQqIGRvYykKICAgICA6IEhUTUxEb2N1bWVudFBhcnNlcihkb2MsIGZhbHNlKQogICAgICwg bV9kb2MoZG9jKQogICAgICwgbV9za2lwTEYoZmFsc2UpCkBAIC0xMDUsNyArMTA1LDcgQEAgRlRQ RGlyZWN0b3J5VG9rZW5pemVyOjpGVFBEaXJlY3RvcnlUb2tlbml6ZXIoSFRNTERvY3VtZW50KiBk b2MpCiB7ICAgIAogfSAgICAKIAotdm9pZCBGVFBEaXJlY3RvcnlUb2tlbml6ZXI6OmFwcGVuZEVu dHJ5KGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGNvbnN0IFN0cmluZyYgc2l6ZSwgY29uc3QgU3Ry aW5nJiBkYXRlLCBib29sIGlzRGlyZWN0b3J5KQordm9pZCBGVFBEaXJlY3RvcnlEb2N1bWVudFBh cnNlcjo6YXBwZW5kRW50cnkoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgY29uc3QgU3RyaW5nJiBz aXplLCBjb25zdCBTdHJpbmcmIGRhdGUsIGJvb2wgaXNEaXJlY3RvcnkpCiB7CiAgICAgRXhjZXB0 aW9uQ29kZSBlYzsKIApAQCAtMTM1LDcgKzEzNSw3IEBAIHZvaWQgRlRQRGlyZWN0b3J5VG9rZW5p emVyOjphcHBlbmRFbnRyeShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIHNp CiAgICAgcm93RWxlbWVudC0+YXBwZW5kQ2hpbGQoZWxlbWVudCwgZWMpOwogfQogCi1QYXNzUmVm UHRyPEVsZW1lbnQ+IEZUUERpcmVjdG9yeVRva2VuaXplcjo6Y3JlYXRlVERGb3JGaWxlbmFtZShj b25zdCBTdHJpbmcmIGZpbGVuYW1lKQorUGFzc1JlZlB0cjxFbGVtZW50PiBGVFBEaXJlY3RvcnlE b2N1bWVudFBhcnNlcjo6Y3JlYXRlVERGb3JGaWxlbmFtZShjb25zdCBTdHJpbmcmIGZpbGVuYW1l KQogewogICAgIEV4Y2VwdGlvbkNvZGUgZWM7CiAgICAgCkBAIC0yNTcsNyArMjU3LDcgQEAgc3Rh dGljIFN0cmluZyBwcm9jZXNzRmlsZURhdGVTdHJpbmcoY29uc3QgRlRQVGltZSYgZmlsZVRpbWUp CiAgICAgcmV0dXJuIGRhdGVTdHJpbmcgKyB0aW1lT2ZEYXk7CiB9CiAKLXZvaWQgRlRQRGlyZWN0 b3J5VG9rZW5pemVyOjpwYXJzZUFuZEFwcGVuZE9uZUxpbmUoY29uc3QgU3RyaW5nJiBpbnB1dExp bmUpCit2b2lkIEZUUERpcmVjdG9yeURvY3VtZW50UGFyc2VyOjpwYXJzZUFuZEFwcGVuZE9uZUxp bmUoY29uc3QgU3RyaW5nJiBpbnB1dExpbmUpCiB7CiAgICAgTGlzdFJlc3VsdCByZXN1bHQ7CiAg ICAgQ1N0cmluZyBsYXRpbjFJbnB1dCA9IGlucHV0TGluZS5sYXRpbjEoKTsKQEAgLTI5Miw3ICsy OTIsNyBAQCBzdGF0aWMgaW5saW5lIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBjcmVhdGVUZW1w bGF0ZURvY3VtZW50RGF0YShTZXR0aW5ncyogc2V0dAogICAgIHJldHVybiBidWZmZXIucmVsZWFz ZSgpOwogfQogICAgIAotYm9vbCBGVFBEaXJlY3RvcnlUb2tlbml6ZXI6OmxvYWREb2N1bWVudFRl bXBsYXRlKCkKK2Jvb2wgRlRQRGlyZWN0b3J5RG9jdW1lbnRQYXJzZXI6OmxvYWREb2N1bWVudFRl bXBsYXRlKCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFJlZlB0cjxTaGFyZWRCdWZmZXI+ LCB0ZW1wbGF0ZURvY3VtZW50RGF0YSwgKGNyZWF0ZVRlbXBsYXRlRG9jdW1lbnREYXRhKG1fZG9j LT5zZXR0aW5ncygpKSkpOwogICAgIC8vIEZJWE1FOiBJbnN0ZWFkIG9mIHN0b3JpbmcgdGhlIGRh dGEsIHdlJ2QgcmF0aGVyIGFjdHVhbGx5IHBhcnNlIHRoZSB0ZW1wbGF0ZSBkYXRhIGludG8gdGhl IHRlbXBsYXRlIERvY3VtZW50IG9uY2UsCkBAIC0zMzgsNyArMzM4LDcgQEAgYm9vbCBGVFBEaXJl Y3RvcnlUb2tlbml6ZXI6OmxvYWREb2N1bWVudFRlbXBsYXRlKCkKICAgICByZXR1cm4gdHJ1ZTsK IH0KIAotdm9pZCBGVFBEaXJlY3RvcnlUb2tlbml6ZXI6OmNyZWF0ZUJhc2ljRG9jdW1lbnQoKQor dm9pZCBGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcjo6Y3JlYXRlQmFzaWNEb2N1bWVudCgpCiB7 CiAgICAgTE9HKEZUUCwgIkNyZWF0aW5nIGEgYmFzaWMgRlRQIGRvY3VtZW50IHN0cnVjdHVyZSBh cyBubyB0ZW1wbGF0ZSB3YXMgbG9hZGVkIik7CiAKQEAgLTM1Nyw3ICszNTcsNyBAQCB2b2lkIEZU UERpcmVjdG9yeVRva2VuaXplcjo6Y3JlYXRlQmFzaWNEb2N1bWVudCgpCiAgICAgYm9keUVsZW1l bnQtPmFwcGVuZENoaWxkKG1fdGFibGVFbGVtZW50LCBlYyk7CiB9CiAKLXZvaWQgRlRQRGlyZWN0 b3J5VG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHMsIGJvb2wgLyphcHBl bmREYXRhKi8pCit2b2lkIEZUUERpcmVjdG9yeURvY3VtZW50UGFyc2VyOjp3cml0ZShjb25zdCBT ZWdtZW50ZWRTdHJpbmcmIHMsIGJvb2wgLyphcHBlbmREYXRhKi8pCiB7ICAgIAogICAgIC8vIE1h a2Ugc3VyZSB3ZSBoYXZlIHRoZSB0YWJsZSBlbGVtZW50IHRvIGFwcGVuZCB0byBieSBsb2FkaW5n IHRoZSB0ZW1wbGF0ZSBzZXQgaW4gdGhlIHByZWYsIG9yCiAgICAgLy8gY3JlYXRpbmcgYSB2ZXJ5 IGJhc2ljIGRvY3VtZW50IHdpdGggdGhlIGFwcHJvcHJpYXRlIHRhYmxlCkBAIC00MjAsNyArNDIw LDcgQEAgdm9pZCBGVFBEaXJlY3RvcnlUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0 cmluZyYgcywgYm9vbCAvKmFwcGVuZERhdGEqLykKICAgICAgICAgbV9jYXJyeU92ZXIuYXBwZW5k KFN0cmluZyhzdGFydCwgY3Vyc29yIC0gc3RhcnQgLSAxKSk7CiB9CiAKLXZvaWQgRlRQRGlyZWN0 b3J5VG9rZW5pemVyOjpmaW5pc2goKQordm9pZCBGVFBEaXJlY3RvcnlEb2N1bWVudFBhcnNlcjo6 ZmluaXNoKCkKIHsKICAgICAvLyBQb3NzaWJsZSB0aGUgbGFzdCBsaW5lIGluIHRoZSBsaXN0aW5n IGhhZCBubyBuZXdsaW5lLCBzbyB0cnkgdG8gcGFyc2UgaXQgbm93CiAgICAgaWYgKCFtX2NhcnJ5 T3Zlci5pc0VtcHR5KCkpIHsKQEAgLTQ0NCw3ICs0NDQsNyBAQCBGVFBEaXJlY3RvcnlEb2N1bWVu dDo6RlRQRGlyZWN0b3J5RG9jdW1lbnQoRnJhbWUqIGZyYW1lKQogCiBEb2N1bWVudFBhcnNlciog RlRQRGlyZWN0b3J5RG9jdW1lbnQ6OmNyZWF0ZVRva2VuaXplcigpCiB7Ci0gICAgcmV0dXJuIG5l dyBGVFBEaXJlY3RvcnlUb2tlbml6ZXIodGhpcyk7CisgICAgcmV0dXJuIG5ldyBGVFBEaXJlY3Rv cnlEb2N1bWVudFBhcnNlcih0aGlzKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2Fk ZXIvTWVkaWFEb2N1bWVudC5jcHAgYi9XZWJDb3JlL2xvYWRlci9NZWRpYURvY3VtZW50LmNwcApp bmRleCA5NDQ3M2MyMGVjZDM0ZDM1MWQ1MTNjNGY0ZDMwNzdjODUxZDU2YTAwLi5kYjAwZTA4YjA5 OWRiYWQ4YTJlY2EwN2Y1MThjOWUwY2ExM2IwZDNhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRl ci9NZWRpYURvY3VtZW50LmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9NZWRpYURvY3VtZW50LmNw cApAQCAtNTEsOSArNTEsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFj ZSBIVE1MTmFtZXM7CiAKLWNsYXNzIE1lZGlhVG9rZW5pemVyIDogcHVibGljIERvY3VtZW50UGFy c2VyIHsKK2NsYXNzIE1lZGlhRG9jdW1lbnRQYXJzZXIgOiBwdWJsaWMgRG9jdW1lbnRQYXJzZXIg ewogcHVibGljOgotICAgIE1lZGlhVG9rZW5pemVyKERvY3VtZW50KiBkb2MpIDogbV9kb2MoZG9j KSwgbV9tZWRpYUVsZW1lbnQoMCkge30KKyAgICBNZWRpYURvY3VtZW50UGFyc2VyKERvY3VtZW50 KiBkb2MpIDogbV9kb2MoZG9jKSwgbV9tZWRpYUVsZW1lbnQoMCkge30KICAgICAgICAgCiBwcml2 YXRlOgogICAgIHZpcnR1YWwgdm9pZCB3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmLCBib29s IGFwcGVuZERhdGEpOwpAQCAtNjksMTIgKzY5LDEyIEBAIHByaXZhdGU6CiAgICAgSFRNTE1lZGlh RWxlbWVudCogbV9tZWRpYUVsZW1lbnQ7CiB9OwogCi12b2lkIE1lZGlhVG9rZW5pemVyOjp3cml0 ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmLCBib29sKQordm9pZCBNZWRpYURvY3VtZW50UGFyc2Vy Ojp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmLCBib29sKQogewogICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogfQogICAgIAotdm9pZCBNZWRpYVRva2VuaXplcjo6Y3JlYXRlRG9jdW1lbnRT dHJ1Y3R1cmUoKQordm9pZCBNZWRpYURvY3VtZW50UGFyc2VyOjpjcmVhdGVEb2N1bWVudFN0cnVj dHVyZSgpCiB7CiAgICAgRXhjZXB0aW9uQ29kZSBlYzsKICAgICBSZWZQdHI8RWxlbWVudD4gcm9v dEVsZW1lbnQgPSBtX2RvYy0+Y3JlYXRlRWxlbWVudChodG1sVGFnLCBmYWxzZSk7CkBAIC0xMDQs NyArMTA0LDcgQEAgdm9pZCBNZWRpYVRva2VuaXplcjo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUo KQogICAgIGZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+bWFpblJlc291 cmNlTG9hZGVyKCktPnNldFNob3VsZEJ1ZmZlckRhdGEoZmFsc2UpOwogfQogICAgIAotYm9vbCBN ZWRpYVRva2VuaXplcjo6d3JpdGVSYXdEYXRhKGNvbnN0IGNoYXIqLCBpbnQpCitib29sIE1lZGlh RG9jdW1lbnRQYXJzZXI6OndyaXRlUmF3RGF0YShjb25zdCBjaGFyKiwgaW50KQogewogICAgIEFT U0VSVCghbV9tZWRpYUVsZW1lbnQpOwogICAgIGlmIChtX21lZGlhRWxlbWVudCkKQEAgLTExNSwx MyArMTE1LDEzIEBAIGJvb2wgTWVkaWFUb2tlbml6ZXI6OndyaXRlUmF3RGF0YShjb25zdCBjaGFy KiwgaW50KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBNZWRpYVRva2VuaXplcjo6Zmlu aXNoKCkKK3ZvaWQgTWVkaWFEb2N1bWVudFBhcnNlcjo6ZmluaXNoKCkKIHsKICAgICBpZiAoIW1f cGFyc2VyU3RvcHBlZCkgCiAgICAgICAgIG1fZG9jLT5maW5pc2hlZFBhcnNpbmcoKTsKIH0KICAg ICAKLWJvb2wgTWVkaWFUb2tlbml6ZXI6OmlzV2FpdGluZ0ZvclNjcmlwdHMoKSBjb25zdAorYm9v bCBNZWRpYURvY3VtZW50UGFyc2VyOjppc1dhaXRpbmdGb3JTY3JpcHRzKCkgY29uc3QKIHsKICAg ICAvLyBBIG1lZGlhIGRvY3VtZW50IGlzIG5ldmVyIHdhaXRpbmcgZm9yIHNjcmlwdHMKICAgICBy ZXR1cm4gZmFsc2U7CkBAIC0xNDEsNyArMTQxLDcgQEAgTWVkaWFEb2N1bWVudDo6fk1lZGlhRG9j dW1lbnQoKQogCiBEb2N1bWVudFBhcnNlciogTWVkaWFEb2N1bWVudDo6Y3JlYXRlVG9rZW5pemVy KCkKIHsKLSAgICByZXR1cm4gbmV3IE1lZGlhVG9rZW5pemVyKHRoaXMpOworICAgIHJldHVybiBu ZXcgTWVkaWFEb2N1bWVudFBhcnNlcih0aGlzKTsKIH0KIAogdm9pZCBNZWRpYURvY3VtZW50Ojpk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9h ZGVyL1BsdWdpbkRvY3VtZW50LmNwcCBiL1dlYkNvcmUvbG9hZGVyL1BsdWdpbkRvY3VtZW50LmNw cAppbmRleCBlYjczZWNkMmI5NTE2NDM0NzJjNzJlMDExOTRlZGNhNTBkNjc4ZDM0Li44ZGIwOTlh YjFlMTExZDBkZjUwN2NhNGJjM2VlMDIzMjJkZDY2MDBjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xv YWRlci9QbHVnaW5Eb2N1bWVudC5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvUGx1Z2luRG9jdW1l bnQuY3BwCkBAIC00NSw5ICs0NSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAKIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAgICAgCi1jbGFzcyBQbHVnaW5Ub2tlbml6ZXIgOiBwdWJs aWMgRG9jdW1lbnRQYXJzZXIgeworY2xhc3MgUGx1Z2luRG9jdW1lbnRQYXJzZXIgOiBwdWJsaWMg RG9jdW1lbnRQYXJzZXIgewogcHVibGljOgotICAgIFBsdWdpblRva2VuaXplcihEb2N1bWVudCog ZG9jKSA6IG1fZG9jKGRvYyksIG1fZW1iZWRFbGVtZW50KDApIHt9CisgICAgUGx1Z2luRG9jdW1l bnRQYXJzZXIoRG9jdW1lbnQqIGRvYykgOiBtX2RvYyhkb2MpLCBtX2VtYmVkRWxlbWVudCgwKSB7 fQogICAgIHN0YXRpYyBXaWRnZXQqIHBsdWdpbldpZGdldEZyb21Eb2N1bWVudChEb2N1bWVudCog ZG9jKTsKICAgICAgICAgCiBwcml2YXRlOgpAQCAtNjQsNyArNjQsNyBAQCBwcml2YXRlOgogICAg IEhUTUxFbWJlZEVsZW1lbnQqIG1fZW1iZWRFbGVtZW50OwogfTsKIAotV2lkZ2V0KiBQbHVnaW5U b2tlbml6ZXI6OnBsdWdpbldpZGdldEZyb21Eb2N1bWVudChEb2N1bWVudCogZG9jKQorV2lkZ2V0 KiBQbHVnaW5Eb2N1bWVudFBhcnNlcjo6cGx1Z2luV2lkZ2V0RnJvbURvY3VtZW50KERvY3VtZW50 KiBkb2MpCiB7CiAgICAgQVNTRVJUKGRvYyk7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IGJvZHkgPSBk b2MtPmJvZHkoKTsKQEAgLTc4LDEyICs3OCwxMiBAQCBXaWRnZXQqIFBsdWdpblRva2VuaXplcjo6 cGx1Z2luV2lkZ2V0RnJvbURvY3VtZW50KERvY3VtZW50KiBkb2MpCiAgICAgcmV0dXJuIDA7CiB9 CiAKLXZvaWQgUGx1Z2luVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmLCBi b29sKQordm9pZCBQbHVnaW5Eb2N1bWVudFBhcnNlcjo6d3JpdGUoY29uc3QgU2VnbWVudGVkU3Ry aW5nJiwgYm9vbCkKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KICAgICAKLXZvaWQg UGx1Z2luVG9rZW5pemVyOjpjcmVhdGVEb2N1bWVudFN0cnVjdHVyZSgpCit2b2lkIFBsdWdpbkRv Y3VtZW50UGFyc2VyOjpjcmVhdGVEb2N1bWVudFN0cnVjdHVyZSgpCiB7CiAgICAgRXhjZXB0aW9u Q29kZSBlYzsKICAgICBSZWZQdHI8RWxlbWVudD4gcm9vdEVsZW1lbnQgPSBtX2RvYy0+Y3JlYXRl RWxlbWVudChodG1sVGFnLCBmYWxzZSk7CkBAIC0xMDksNyArMTA5LDcgQEAgdm9pZCBQbHVnaW5U b2tlbml6ZXI6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKCkKICAgICBib2R5LT5hcHBlbmRDaGls ZChlbWJlZEVsZW1lbnQsIGVjKTsgICAgCiB9CiAgICAgCi1ib29sIFBsdWdpblRva2VuaXplcjo6 d3JpdGVSYXdEYXRhKGNvbnN0IGNoYXIqLCBpbnQpCitib29sIFBsdWdpbkRvY3VtZW50UGFyc2Vy Ojp3cml0ZVJhd0RhdGEoY29uc3QgY2hhciosIGludCkKIHsKICAgICBBU1NFUlQoIW1fZW1iZWRF bGVtZW50KTsKICAgICBpZiAobV9lbWJlZEVsZW1lbnQpCkBAIC0xMzQsMTMgKzEzNCwxMyBAQCBi b29sIFBsdWdpblRva2VuaXplcjo6d3JpdGVSYXdEYXRhKGNvbnN0IGNoYXIqLCBpbnQpCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi12b2lkIFBsdWdpblRva2VuaXplcjo6ZmluaXNoKCkKK3ZvaWQg UGx1Z2luRG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgpCiB7CiAgICAgaWYgKCFtX3BhcnNlclN0b3Bw ZWQpIAogICAgICAgICBtX2RvYy0+ZmluaXNoZWRQYXJzaW5nKCk7ICAgICAgICAgICAgCiB9CiAg ICAgCi1ib29sIFBsdWdpblRva2VuaXplcjo6aXNXYWl0aW5nRm9yU2NyaXB0cygpIGNvbnN0Citi b29sIFBsdWdpbkRvY3VtZW50UGFyc2VyOjppc1dhaXRpbmdGb3JTY3JpcHRzKCkgY29uc3QKIHsK ICAgICAvLyBBIHBsdWdpbiBkb2N1bWVudCBpcyBuZXZlciB3YWl0aW5nIGZvciBzY3JpcHRzCiAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtMTU0LDEyICsxNTQsMTIgQEAgUGx1Z2luRG9jdW1lbnQ6OlBs dWdpbkRvY3VtZW50KEZyYW1lKiBmcmFtZSkKICAgICAKIERvY3VtZW50UGFyc2VyKiBQbHVnaW5E b2N1bWVudDo6Y3JlYXRlVG9rZW5pemVyKCkKIHsKLSAgICByZXR1cm4gbmV3IFBsdWdpblRva2Vu aXplcih0aGlzKTsKKyAgICByZXR1cm4gbmV3IFBsdWdpbkRvY3VtZW50UGFyc2VyKHRoaXMpOwog fQogCiBXaWRnZXQqIFBsdWdpbkRvY3VtZW50OjpwbHVnaW5XaWRnZXQoKQogewotICAgIHJldHVy biBQbHVnaW5Ub2tlbml6ZXI6OnBsdWdpbldpZGdldEZyb21Eb2N1bWVudCh0aGlzKTsKKyAgICBy ZXR1cm4gUGx1Z2luRG9jdW1lbnRQYXJzZXI6OnBsdWdpbldpZGdldEZyb21Eb2N1bWVudCh0aGlz KTsKIH0KIAogTm9kZSogUGx1Z2luRG9jdW1lbnQ6OnBsdWdpbk5vZGUoKQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9sb2FkZXIvU2lua0RvY3VtZW50LmNwcCBiL1dlYkNvcmUvbG9hZGVyL1NpbmtEb2N1 bWVudC5jcHAKaW5kZXggZGUxMWY2MDViNzRkZDIxOTMwYzVlMTY0ZTVmMDQyYzYxYjIzNjMzNy4u OWUzYzY3MDRiNGVhYjIyMjJkYTRhNTA5MzljN2MzMWJmODYxNDRlNCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9sb2FkZXIvU2lua0RvY3VtZW50LmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9TaW5rRG9j dW1lbnQuY3BwCkBAIC0zMCw5ICszMCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xh c3MgU2lua1Rva2VuaXplciA6IHB1YmxpYyBEb2N1bWVudFBhcnNlciB7CitjbGFzcyBTaW5rRG9j dW1lbnRQYXJzZXIgOiBwdWJsaWMgRG9jdW1lbnRQYXJzZXIgewogcHVibGljOgotICAgIFNpbmtU b2tlbml6ZXIoRG9jdW1lbnQqIGRvY3VtZW50KSA6IG1fZG9jdW1lbnQoZG9jdW1lbnQpIHsgfQor ICAgIFNpbmtEb2N1bWVudFBhcnNlcihEb2N1bWVudCogZG9jdW1lbnQpIDogbV9kb2N1bWVudChk b2N1bWVudCkgeyB9CiAgICAgICAgIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgd3JpdGUo Y29uc3QgU2VnbWVudGVkU3RyaW5nJiwgYm9vbCkgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQpA QCAtNDUsNyArNDUsNyBAQCBwcml2YXRlOgogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwogfTsK IAotdm9pZCBTaW5rVG9rZW5pemVyOjpmaW5pc2goKQordm9pZCBTaW5rRG9jdW1lbnRQYXJzZXI6 OmZpbmlzaCgpCiB7CiAgICAgaWYgKCFtX3BhcnNlclN0b3BwZWQpIAogICAgICAgICBtX2RvY3Vt ZW50LT5maW5pc2hlZFBhcnNpbmcoKTsgICAgCkBAIC01OSw3ICs1OSw3IEBAIFNpbmtEb2N1bWVu dDo6U2lua0RvY3VtZW50KEZyYW1lKiBmcmFtZSkKICAgICAKIERvY3VtZW50UGFyc2VyKiBTaW5r RG9jdW1lbnQ6OmNyZWF0ZVRva2VuaXplcigpCiB7Ci0gICAgcmV0dXJuIG5ldyBTaW5rVG9rZW5p emVyKHRoaXMpOworICAgIHJldHVybiBuZXcgU2lua0RvY3VtZW50UGFyc2VyKHRoaXMpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9UZXh0 RG9jdW1lbnQuY3BwIGIvV2ViQ29yZS9sb2FkZXIvVGV4dERvY3VtZW50LmNwcAppbmRleCAwYmE3 M2I1ZDQ2Y2NhNjNlMmVkZDhhMmQzNTAzZTVkYzk5OWVlNmM0Li41ZmM1MzI5MWZkYjM5NzZjZDBm ZmFhZWQyZWVhMTMxNTU5ZjU0OGExIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9UZXh0RG9j dW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL1RleHREb2N1bWVudC5jcHAKQEAgLTM4LDEx ICszOCwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKLWNsYXNzIFRleHRUb2tlbml6ZXIgOiBwdWJsaWMgRG9jdW1lbnRQYXJzZXIgeworY2xh c3MgVGV4dERvY3VtZW50UGFyc2VyIDogcHVibGljIERvY3VtZW50UGFyc2VyIHsKIHB1YmxpYzoK LSAgICBUZXh0VG9rZW5pemVyKERvY3VtZW50Kik7Ci0gICAgdmlydHVhbCB+VGV4dFRva2VuaXpl cigpOwotICAgIFRleHRUb2tlbml6ZXIoSFRNTFZpZXdTb3VyY2VEb2N1bWVudCopOworICAgIFRl eHREb2N1bWVudFBhcnNlcihEb2N1bWVudCopOworICAgIHZpcnR1YWwgflRleHREb2N1bWVudFBh cnNlcigpOworICAgIFRleHREb2N1bWVudFBhcnNlcihIVE1MVmlld1NvdXJjZURvY3VtZW50Kik7 CiAKICAgICB2aXJ0dWFsIHZvaWQgd3JpdGUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiwgYm9vbCBh cHBlbmREYXRhKTsKICAgICB2aXJ0dWFsIHZvaWQgZmluaXNoKCk7CkBAIC03MSw3ICs3MSw3IEBA IHByaXZhdGU6CiAgICAgVUNoYXIqIG1fZGVzdDsKIH07CiAKLVRleHRUb2tlbml6ZXI6OlRleHRU b2tlbml6ZXIoRG9jdW1lbnQqIGRvYykKK1RleHREb2N1bWVudFBhcnNlcjo6VGV4dERvY3VtZW50 UGFyc2VyKERvY3VtZW50KiBkb2MpCiAgICAgOiBtX2RvYyhkb2MpCiAgICAgLCBtX3ByZUVsZW1l bnQoMCkKICAgICAsIG1fc2tpcExGKGZhbHNlKQpAQCAtODIsNyArODIsNyBAQCBUZXh0VG9rZW5p emVyOjpUZXh0VG9rZW5pemVyKERvY3VtZW50KiBkb2MpCiAgICAgbV9kZXN0ID0gbV9idWZmZXI7 CiB9ICAgIAogCi1UZXh0VG9rZW5pemVyOjpUZXh0VG9rZW5pemVyKEhUTUxWaWV3U291cmNlRG9j dW1lbnQqIGRvYykKK1RleHREb2N1bWVudFBhcnNlcjo6VGV4dERvY3VtZW50UGFyc2VyKEhUTUxW aWV3U291cmNlRG9jdW1lbnQqIGRvYykKICAgICA6IERvY3VtZW50UGFyc2VyKHRydWUpCiAgICAg LCBtX2RvYyhkb2MpCiAgICAgLCBtX3ByZUVsZW1lbnQoMCkKQEAgLTk0LDEzICs5NCwxMyBAQCBU ZXh0VG9rZW5pemVyOjpUZXh0VG9rZW5pemVyKEhUTUxWaWV3U291cmNlRG9jdW1lbnQqIGRvYykK ICAgICBtX2Rlc3QgPSBtX2J1ZmZlcjsKIH0KIAotVGV4dFRva2VuaXplcjo6flRleHRUb2tlbml6 ZXIoKQorVGV4dERvY3VtZW50UGFyc2VyOjp+VGV4dERvY3VtZW50UGFyc2VyKCkKIHsKICAgICAv LyBmaW5pc2goKSBzaG91bGQgaGF2ZSBiZWVuIGNhbGxlZCB0byBwcmV2ZW50IGFueSBsZWFrcwog ICAgIEFTU0VSVCghbV9idWZmZXIpOwogfQogCi12b2lkIFRleHRUb2tlbml6ZXI6OndyaXRlKGNv bnN0IFNlZ21lbnRlZFN0cmluZyYgcywgYm9vbCkKK3ZvaWQgVGV4dERvY3VtZW50UGFyc2VyOjp3 cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHMsIGJvb2wpCiB7CiAgICAgRXhjZXB0aW9uQ29k ZSBlYzsKIApAQCAtMTYwLDcgKzE2MCw3IEBAIHZvaWQgVGV4dFRva2VuaXplcjo6d3JpdGUoY29u c3QgU2VnbWVudGVkU3RyaW5nJiBzLCBib29sKQogICAgIH0KIH0KIAotdm9pZCBUZXh0VG9rZW5p emVyOjpmaW5pc2goKQordm9pZCBUZXh0RG9jdW1lbnRQYXJzZXI6OmZpbmlzaCgpCiB7CiAgICAg aWYgKCFtX3ByZUVsZW1lbnQpCiAgICAgICAgIHdyaXRlKFNlZ21lbnRlZFN0cmluZygpLCB0cnVl KTsgLy8gQ3JlYXRlIGRvY3VtZW50IHN0cnVjdHVyZSBmb3IgYW4gZW1wdHkgdGV4dCBkb2N1bWVu dC4KQEAgLTE3Miw3ICsxNzIsNyBAQCB2b2lkIFRleHRUb2tlbml6ZXI6OmZpbmlzaCgpCiAgICAg bV9kb2MtPmZpbmlzaGVkUGFyc2luZygpOwogfQogCi1ib29sIFRleHRUb2tlbml6ZXI6OmlzV2Fp dGluZ0ZvclNjcmlwdHMoKSBjb25zdAorYm9vbCBUZXh0RG9jdW1lbnRQYXJzZXI6OmlzV2FpdGlu Z0ZvclNjcmlwdHMoKSBjb25zdAogewogICAgIC8vIEEgdGV4dCBkb2N1bWVudCBpcyBuZXZlciB3 YWl0aW5nIGZvciBzY3JpcHRzCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTg1LDEyICsxODUsMTIg QEAgVGV4dERvY3VtZW50OjpUZXh0RG9jdW1lbnQoRnJhbWUqIGZyYW1lKQogCiBEb2N1bWVudFBh cnNlciogVGV4dERvY3VtZW50OjpjcmVhdGVUb2tlbml6ZXIoKQogewotICAgIHJldHVybiBuZXcg VGV4dFRva2VuaXplcih0aGlzKTsKKyAgICByZXR1cm4gbmV3IFRleHREb2N1bWVudFBhcnNlcih0 aGlzKTsKIH0KIAogRG9jdW1lbnRQYXJzZXIqIGNyZWF0ZVRleHRUb2tlbml6ZXIoSFRNTFZpZXdT b3VyY2VEb2N1bWVudCogZG9jdW1lbnQpCiB7Ci0gICAgcmV0dXJuIG5ldyBUZXh0VG9rZW5pemVy KGRvY3VtZW50KTsKKyAgICByZXR1cm4gbmV3IFRleHREb2N1bWVudFBhcnNlcihkb2N1bWVudCk7 CiB9CiAKIH0K