140841 2015-01-23 15:06:57 -0800 Web Inspector: Rename InjectedScriptHost::type to subtype 2015-01-23 18:34:27 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1063782 0 joepeck 2015-01-23 15:06:57 -0800 * SUMMARY Rename InjectedScriptHost::type to subtype. It is about getting the subtype of an "object" type. 1063784 1 245251 joepeck 2015-01-23 15:08:22 -0800 Created attachment 245251 [PATCH] Proposed Fix 1063852 2 245251 commit-queue 2015-01-23 18:34:23 -0800 Comment on attachment 245251 [PATCH] Proposed Fix Clearing flags on attachment: 245251 Committed r179053: <http://trac.webkit.org/changeset/179053> 1063853 3 commit-queue 2015-01-23 18:34:27 -0800 All reviewed patches have been landed. Closing bug. 245251 2015-01-23 15:08:22 -0800 2015-01-23 18:34:23 -0800 [PATCH] Proposed Fix subtype.patch text/plain 9715 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDA2YTc3NjMuLjYyYjkyZDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTAxLTIzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVuYW1l IEluamVjdGVkU2NyaXB0SG9zdDo6dHlwZSB0byBzdWJ0eXBlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA4NDEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSB3ZXJlIHVzaW5nIHRoaXMgdG8gc2V0IHRo ZSBzdWJ0eXBlIG9mIGFuICJvYmplY3QiIHR5cGUgUmVtb3RlT2JqZWN0CisgICAgICAgIHNvIHdl IHNob3VsZCBjbGVhbiB1cCB0aGUgbmFtZSBhbmQgY2FsbCBpdCBzdWJ0eXBlLgorCisgICAgICAg ICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9J bmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNj cmlwdEhvc3QuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6 c3VidHlwZSk6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojp0eXBl KTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuaDoK KyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUuY3BwOgor ICAgICAgICAoSW5zcGVjdG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZTo6ZmluaXNo Q3JlYXRpb24pOgorICAgICAgICAoSW5zcGVjdG9yOjpqc0luamVjdGVkU2NyaXB0SG9zdFByb3Rv dHlwZUZ1bmN0aW9uU3VidHlwZSk6CisgICAgICAgIChJbnNwZWN0b3I6OmpzSW5qZWN0ZWRTY3Jp cHRIb3N0UHJvdG90eXBlRnVuY3Rpb25UeXBlKTogRGVsZXRlZC4KKworMjAxNS0wMS0yMyAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE9iamVjdCBQcmV2aWV3cyBpbiB0aGUgQ29uc29sZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MjA0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5oCmluZGV4IDNiMGMxN2Uu LmFmMWUwY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRIb3N0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdEhvc3QuaApAQCAtMzksNyArMzksNyBAQCBwdWJsaWM6CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8SW5qZWN0ZWRTY3JpcHRIb3N0PiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJl ZihuZXcgSW5qZWN0ZWRTY3JpcHRIb3N0KTsgfQogICAgIHZpcnR1YWwgfkluamVjdGVkU2NyaXB0 SG9zdCgpOwogCi0gICAgdmlydHVhbCBKU0M6OkpTVmFsdWUgdHlwZShKU0M6OkV4ZWNTdGF0ZSos IEpTQzo6SlNWYWx1ZSkgeyByZXR1cm4gSlNDOjpqc1VuZGVmaW5lZCgpOyB9CisgICAgdmlydHVh bCBKU0M6OkpTVmFsdWUgc3VidHlwZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSkgeyBy ZXR1cm4gSlNDOjpqc1VuZGVmaW5lZCgpOyB9CiAgICAgdmlydHVhbCBib29sIGlzSFRNTEFsbENv bGxlY3Rpb24oSlNDOjpKU1ZhbHVlKSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgSlNDOjpKU1Zh bHVlIGpzV3JhcHBlcihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNHbG9iYWxPYmplY3QqKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRT b3VyY2UuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 U291cmNlLmpzCmluZGV4IDhhNzU5ODguLjg1OTM1MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtMTA0 LDcgKzEwNCw3IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGNv bHVtbk5hbWVzID0gbnVsbDsKICAgICAgICAgaWYgKHR5cGVvZiBjb2x1bW5zID09PSAic3RyaW5n IikKICAgICAgICAgICAgIGNvbHVtbnMgPSBbY29sdW1uc107Ci0gICAgICAgIGlmIChJbmplY3Rl ZFNjcmlwdEhvc3QudHlwZShjb2x1bW5zKSA9PT0gImFycmF5IikgeworICAgICAgICBpZiAoSW5q ZWN0ZWRTY3JpcHRIb3N0LnN1YnR5cGUoY29sdW1ucykgPT09ICJhcnJheSIpIHsKICAgICAgICAg ICAgIGNvbHVtbk5hbWVzID0gW107CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNv bHVtbnMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICAgICAgY29sdW1uTmFtZXMucHVzaChTdHJp bmcoY29sdW1uc1tpXSkpOwpAQCAtNjExLDcgKzYxMSw3IEBAIEluamVjdGVkU2NyaXB0LnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2lzSFRNTEFsbENvbGxlY3Rpb24ob2JqKSkKICAg ICAgICAgICAgIHJldHVybiAiYXJyYXkiOwogCi0gICAgICAgIHZhciBwcmVjaXNlVHlwZSA9IElu amVjdGVkU2NyaXB0SG9zdC50eXBlKG9iaik7CisgICAgICAgIHZhciBwcmVjaXNlVHlwZSA9IElu amVjdGVkU2NyaXB0SG9zdC5zdWJ0eXBlKG9iaik7CiAgICAgICAgIGlmIChwcmVjaXNlVHlwZSkK ICAgICAgICAgICAgIHJldHVybiBwcmVjaXNlVHlwZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAppbmRleCBk OTA3Nzc1Li40NDU5NDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcApAQCAtMTA2LDcgKzEwNiw3IEBAIEpT VmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmlzSFRNTEFsbENvbGxlY3Rpb24oRXhlY1N0YXRl KiBleGVjKQogICAgIHJldHVybiBqc0Jvb2xlYW4oaW1wbCgpLmlzSFRNTEFsbENvbGxlY3Rpb24o dmFsdWUpKTsKIH0KIAotSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6dHlwZShFeGVjU3Rh dGUqIGV4ZWMpCitKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpzdWJ0eXBlKEV4ZWNTdGF0 ZSogZXhlYykKIHsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAg cmV0dXJuIGpzVW5kZWZpbmVkKCk7CkBAIC0xMzYsNyArMTM2LDcgQEAgSlNWYWx1ZSBKU0luamVj dGVkU2NyaXB0SG9zdDo6dHlwZShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKHZhbHVlLmluaGVy aXRzKEpTRmxvYXQzMkFycmF5OjppbmZvKCkpIHx8IHZhbHVlLmluaGVyaXRzKEpTRmxvYXQ2NEFy cmF5OjppbmZvKCkpKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFT Q0lJTGl0ZXJhbCgiYXJyYXkiKSk7CiAKLSAgICByZXR1cm4gaW1wbCgpLnR5cGUoZXhlYywgdmFs dWUpOworICAgIHJldHVybiBpbXBsKCkuc3VidHlwZShleGVjLCB2YWx1ZSk7CiB9CiAKIEpTVmFs dWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmZ1bmN0aW9uRGV0YWlscyhFeGVjU3RhdGUqIGV4ZWMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRT Y3JpcHRIb3N0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRT Y3JpcHRIb3N0LmgKaW5kZXggZDNiMmJlYS4uNzMwNjhlZSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3QuaApAQCAtNjIs NyArNjIsNyBAQCBwdWJsaWM6CiAgICAgLy8gRnVuY3Rpb25zLgogICAgIEpTQzo6SlNWYWx1ZSBp bnRlcm5hbENvbnN0cnVjdG9yTmFtZShKU0M6OkV4ZWNTdGF0ZSopOwogICAgIEpTQzo6SlNWYWx1 ZSBpc0hUTUxBbGxDb2xsZWN0aW9uKEpTQzo6RXhlY1N0YXRlKik7Ci0gICAgSlNDOjpKU1ZhbHVl IHR5cGUoSlNDOjpFeGVjU3RhdGUqKTsKKyAgICBKU0M6OkpTVmFsdWUgc3VidHlwZShKU0M6OkV4 ZWNTdGF0ZSopOwogICAgIEpTQzo6SlNWYWx1ZSBmdW5jdGlvbkRldGFpbHMoSlNDOjpFeGVjU3Rh dGUqKTsKICAgICBKU0M6OkpTVmFsdWUgZ2V0SW50ZXJuYWxQcm9wZXJ0aWVzKEpTQzo6RXhlY1N0 YXRlKik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJ bmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHAKaW5kZXggY2FlOTIxNC4u MzFkMmM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0lu amVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHAKQEAgLTM4LDcgKzM4 LDcgQEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIEluc3BlY3RvciB7CiAKLXN0 YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJv dG90eXBlRnVuY3Rpb25UeXBlKEV4ZWNTdGF0ZSopOworc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpT Q19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblN1YnR5cGUo RXhlY1N0YXRlKik7CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVj dGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uRnVuY3Rpb25EZXRhaWxzKEV4ZWNTdGF0ZSop Owogc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhv c3RQcm90b3R5cGVGdW5jdGlvbkdldEludGVybmFsUHJvcGVydGllcyhFeGVjU3RhdGUqKTsKIHN0 YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJv dG90eXBlRnVuY3Rpb25JbnRlcm5hbENvbnN0cnVjdG9yTmFtZShFeGVjU3RhdGUqKTsKQEAgLTU0 LDcgKzU0LDcgQEAgdm9pZCBKU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZTo6ZmluaXNoQ3Jl YXRpb24oVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmEKICAgICBBU1NFUlQoaW5oZXJpdHMo aW5mbygpKSk7CiAgICAgdm0ucHJvdG90eXBlTWFwLmFkZFByb3RvdHlwZSh0aGlzKTsKIAotICAg IEpTQ19OQVRJVkVfRlVOQ1RJT04oInR5cGUiLCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlw ZUZ1bmN0aW9uVHlwZSwgRG9udEVudW0sIDEpOworICAgIEpTQ19OQVRJVkVfRlVOQ1RJT04oInN1 YnR5cGUiLCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uU3VidHlwZSwgRG9u dEVudW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT04oImZ1bmN0aW9uRGV0YWlscyIsIGpz SW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVuY3Rpb25GdW5jdGlvbkRldGFpbHMsIERvbnRF bnVtLCAxKTsKICAgICBKU0NfTkFUSVZFX0ZVTkNUSU9OKCJnZXRJbnRlcm5hbFByb3BlcnRpZXMi LCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uR2V0SW50ZXJuYWxQcm9wZXJ0 aWVzLCBEb250RW51bSwgMSk7CiAgICAgSlNDX05BVElWRV9GVU5DVElPTigiaW50ZXJuYWxDb25z dHJ1Y3Rvck5hbWUiLCBqc0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZUZ1bmN0aW9uSW50ZXJu YWxDb25zdHJ1Y3Rvck5hbWUsIERvbnRFbnVtLCAxKTsKQEAgLTEwMCw3ICsxMDAsNyBAQCBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlRnVu Y3Rpb25Jc0hUTUxBbGxDb2xsZQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhp cy0+aXNIVE1MQWxsQ29sbGVjdGlvbihleGVjKSk7CiB9CiAKLUVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblR5cGUoRXhlY1N0 YXRlKiBleGVjKQorRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0luamVjdGVkU2NyaXB0 SG9zdFByb3RvdHlwZUZ1bmN0aW9uU3VidHlwZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgSlNW YWx1ZSB0aGlzVmFsdWUgPSBleGVjLT50aGlzVmFsdWUoKTsKICAgICBKU0luamVjdGVkU2NyaXB0 SG9zdCogY2FzdGVkVGhpcyA9IGpzRHluYW1pY0Nhc3Q8SlNJbmplY3RlZFNjcmlwdEhvc3QqPih0 aGlzVmFsdWUpOwpAQCAtMTA4LDcgKzEwOCw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5jdGlvblR5cGUoRXhlY1N0YXRlCiAg ICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogCiAgICAgQVNTRVJUX0dDX09C SkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCBKU0luamVjdGVkU2NyaXB0SG9zdDo6aW5mbygpKTsK LSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhc3RlZFRoaXMtPnR5cGUoZXhlYykpOworICAg IHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+c3VidHlwZShleGVjKSk7CiB9CiAK IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5 cGVGdW5jdGlvbkZ1bmN0aW9uRGV0YWlscyhFeGVjU3RhdGUqIGV4ZWMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzBlYWFmZC4uMjk5YTQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTAxLTIz ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogUmVuYW1lIEluamVjdGVkU2NyaXB0SG9zdDo6dHlwZSB0byBzdWJ0eXBlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA4NDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9X ZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViSW5qZWN0ZWRT Y3JpcHRIb3N0OjpzdWJ0eXBlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkluamVjdGVkU2NyaXB0 SG9zdDo6dHlwZSk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9yL1dlYkluamVjdGVkU2Ny aXB0SG9zdC5oOgorCiAyMDE1LTAxLTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgTGV2ZXJhZ2UgQ1NTVmFsdWVQb29sJ3MgZm9udCBmYW1pbHkgY2FjaGUgaW4g Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3QuY3BwCmluZGV4IDU1ZjdhNmQuLmMzOTJkMWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3Qu Y3BwCkBAIC00MSw3ICs0MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBpZiAodmFsdWUu aW5oZXJpdHMoSlMjI2ludGVyZmFjZU5hbWU6OmluZm8oKSkpIFwKICAgICAgICAgcmV0dXJuIGpz Tm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoImVycm9yIikpOwogCi1KU1ZhbHVl IFdlYkluamVjdGVkU2NyaXB0SG9zdDo6dHlwZShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpK U1ZhbHVlIHZhbHVlKQorSlNWYWx1ZSBXZWJJbmplY3RlZFNjcmlwdEhvc3Q6OnN1YnR5cGUoSlND OjpFeGVjU3RhdGUqIGV4ZWMsIEpTQzo6SlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBpZiAodmFsdWUu aW5oZXJpdHMoSlNOb2RlOjppbmZvKCkpKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3Ry aW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgibm9kZSIpKTsKQEAgLTQ5LDcgKzQ5LDcgQEAgSlNWYWx1 ZSBXZWJJbmplY3RlZFNjcmlwdEhvc3Q6OnR5cGUoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEpTQzo6 SlNWYWx1ZSB2YWx1ZSkKICAgICAgICAgcmV0dXJuIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBB U0NJSUxpdGVyYWwoImFycmF5IikpOwogICAgIGlmICh2YWx1ZS5pbmhlcml0cyhKU0hUTUxDb2xs ZWN0aW9uOjppbmZvKCkpKQogICAgICAgICByZXR1cm4ganNOb250cml2aWFsU3RyaW5nKGV4ZWMs IEFTQ0lJTGl0ZXJhbCgiYXJyYXkiKSk7Ci0gICAgCisKICAgICBET01fRVhDRVBUSU9OX0lOVEVS RkFDRVNfRk9SX0VBQ0goUkVUVVJOX0VSUk9SX0lGX1ZBTFVFX0lOSEVSSVRTX0VYQ0VQVElPTl9U WVBFKQogCiAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRIb3N0LmgKaW5kZXggNjNhNzI0ZC4uNmU3Zjk4NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0SG9z dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdEhvc3Qu aApAQCAtMzQsNyArMzQsNyBAQCBjbGFzcyBXZWJJbmplY3RlZFNjcmlwdEhvc3QgZmluYWwgOiBw dWJsaWMgSW5zcGVjdG9yOjpJbmplY3RlZFNjcmlwdEhvc3QgewogcHVibGljOgogICAgIHN0YXRp YyBQYXNzUmVmUHRyPFdlYkluamVjdGVkU2NyaXB0SG9zdD4gY3JlYXRlKCkgeyByZXR1cm4gYWRv cHRSZWYobmV3IFdlYkluamVjdGVkU2NyaXB0SG9zdCk7IH0KIAotICAgIHZpcnR1YWwgSlNDOjpK U1ZhbHVlIHR5cGUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUpIG92ZXJyaWRlOworICAg IHZpcnR1YWwgSlNDOjpKU1ZhbHVlIHN1YnR5cGUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFs dWUpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBpc0hUTUxBbGxDb2xsZWN0aW9uKEpTQzo6 SlNWYWx1ZSkgb3ZlcnJpZGU7CiB9OwogCg==