173390 2017-06-14 17:20:44 -0700 REGRESSION(r218267): "The previous rollout of r218263, r218265, and r218266 by mlewis13 on bug 173383 missed r218267 and broke the GTK+ build" (Requested by clopez_ on #webkit). 2017-06-14 17:24:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 173364 173383 1 commit-queue commit-queue cgarcia clopez mcatanzaro oldest_to_newest 1319382 0 commit-queue 2017-06-14 17:20:44 -0700 http://trac.webkit.org/changeset/218267 broke the build: "The previous rollout of r218263, r218265, and r218266 by mlewis13 on bug 173383 missed r218267 and broke the GTK+ build" (Requested by clopez_ on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1319384 1 312935 commit-queue 2017-06-14 17:20:48 -0700 Created attachment 312935 ROLLOUT of r218267 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1319385 2 312935 commit-queue 2017-06-14 17:24:15 -0700 Comment on attachment 312935 ROLLOUT of r218267 Clearing flags on attachment: 312935 Committed r218297: <http://trac.webkit.org/changeset/218297> 1319386 3 commit-queue 2017-06-14 17:24:16 -0700 All reviewed patches have been landed. Closing bug. 312935 2017-06-14 17:20:48 -0700 2017-06-14 17:24:15 -0700 ROLLOUT of r218267 bug-173390-20170614202048.patch text/plain 14624 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4Mjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGVlNjhlM2Q5Nzc4MGU4 ODYxNDc1NzBjZDAxOThiZDM5ZDg4ZjBhMS4uYzk2ZTdiM2U2Njc3YmZmMWIyOTdlZmI4MGJkZTE0 Y2MxY2I2YjE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA2LTE0ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjE4MjY3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTczMzkwCisKKyAgICAgICAgIlRoZSBwcmV2aW91cyByb2xsb3V0IG9m IHIyMTgyNjMsIHIyMTgyNjUsIGFuZCByMjE4MjY2IGJ5CisgICAgICAgIG1sZXdpczEzIG9uIGJ1 ZyAxNzMzODMgbWlzc2VkIHIyMTgyNjcgYW5kIGJyb2tlIHRoZSBHVEsrCisgICAgICAgIGJ1aWxk IiAoUmVxdWVzdGVkIGJ5IGNsb3Blel8gb24gI3dlYmtpdCkuCisKKyAgICAgICAgUmV2ZXJ0ZWQg Y2hhbmdlc2V0OgorCisgICAgICAgICJbR1RLXSBVc2UgQVBJOjpJbmplY3RlZEJ1bmRsZTo6UmVz b3VyY2VMb2FkQ2xpZW50IGluCisgICAgICAgIFdlYktpdFdlYlBhZ2UiCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMzNjQKKyAgICAgICAgaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjE4MjY3CisKIDIwMTctMDYtMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQgZmFsc2VseSByZXBvcnRz IHRoYXQgYSB3ZWIgcHJvY2VzcyBpcyB1bnJlc3BvbnNpdmUgaWYgeW91IGNsb3NlIGEgcGFnZSBz aG9ydGx5IGFmdGVyIHN0b3BwaW5nIGEgbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBh Z2UuY3BwCmluZGV4IDFmZGE4ZGMyZDYxODBkNWY0N2Q2YTFlMzdkNzdmZmI1YjVmMjVjNWMuLjNl MzhmY2UxODFkNmNiNjRjMDZjYzRiMTlmM2UxYjc1ZGU0MjlkYzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJQYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9n dGsvV2ViS2l0V2ViUGFnZS5jcHAKQEAgLTI0LDYgKzI0LDggQEAKICNpbmNsdWRlICJBUElEaWN0 aW9uYXJ5LmgiCiAjaW5jbHVkZSAiSW1hZ2VPcHRpb25zLmgiCiAjaW5jbHVkZSAiSW5qZWN0ZWRC dW5kbGUuaCIKKyNpbmNsdWRlICJXS0J1bmRsZUFQSUNhc3QuaCIKKyNpbmNsdWRlICJXS0J1bmRs ZUZyYW1lLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtLmgiCiAjaW5jbHVkZSAiV2Vi SW1hZ2UuaCIKICNpbmNsdWRlICJXZWJLaXRDb25zb2xlTWVzc2FnZVByaXZhdGUuaCIKQEAgLTIw NSwxMDggKzIwNywxMDEgQEAgcHJpdmF0ZToKICAgICBXZWJLaXRXZWJQYWdlKiBtX3dlYlBhZ2U7 CiB9OwogCitzdGF0aWMgdm9pZCBkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZShXS0J1bmRsZVBh Z2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgdWludDY0X3QgaWRlbnRpZmllciwg V0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIGJvb2wgLyogcGFnZUxvYWRJc1Byb3Zpc2lvbmFsICov LCBjb25zdCB2b2lkKikKK3sKKyAgICBBUEk6OkRpY3Rpb25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsK KyAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdlIiksIHRvSW1wbChwYWdlKSk7 CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiRnJhbWUiKSwgdG9JbXBsKGZyYW1l KSk7CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpLCBBUEk6 OlVJbnQ2NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKKyAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZy b21VVEY4KCJSZXF1ZXN0IiksIHRvSW1wbChyZXF1ZXN0KSk7CisgICAgV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgi V2ViUGFnZS5EaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6OmNy ZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7Cit9CiAKLWNsYXNzIFBhZ2VSZXNvdXJjZUxv YWRDbGllbnQgZmluYWwgOiBwdWJsaWMgQVBJOjpJbmplY3RlZEJ1bmRsZTo6UmVzb3VyY2VMb2Fk Q2xpZW50IHsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBQYWdlUmVzb3VyY2VMb2FkQ2xpZW50KFdl YktpdFdlYlBhZ2UqIHdlYlBhZ2UpCi0gICAgICAgIDogbV93ZWJQYWdlKHdlYlBhZ2UpCi0gICAg ewotICAgIH0KLQotcHJpdmF0ZToKLSAgICB2b2lkIGRpZEluaXRpYXRlTG9hZEZvclJlc291cmNl KFdlYlBhZ2UmIHBhZ2UsIFdlYkZyYW1lJiBmcmFtZSwgdWludDY0X3QgaWRlbnRpZmllciwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBib29sKSBvdmVycmlkZQotICAgIHsKLSAgICAg ICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7Ci0gICAgICAgIG1lc3NhZ2Uuc2V0 KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwgJnBhZ2UpOwotICAgICAgICBtZXNzYWdlLnNldChT dHJpbmc6OmZyb21VVEY4KCJGcmFtZSIpLCAmZnJhbWUpOwotICAgICAgICBtZXNzYWdlLnNldChT dHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiksIEFQSTo6VUludDY0OjpjcmVhdGUoaWRlbnRp ZmllcikpOwotICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJSZXF1ZXN0Iiks IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlcXVlc3QpKTsKLSAgICAgICAgV2ViUHJvY2Vzczo6 c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRG OCgiV2ViUGFnZS5EaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6 OmNyZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7Ci0gICAgfQorc3RhdGljIFdLVVJMUmVx dWVzdFJlZiB3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tC dW5kbGVGcmFtZVJlZiwgdWludDY0X3QgaWRlbnRpZmllciwgV0tVUkxSZXF1ZXN0UmVmIHdrUmVx dWVzdCwgV0tVUkxSZXNwb25zZVJlZiB3a1JlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pCit7CisgICAgR1JlZlB0cjxXZWJLaXRVUklSZXF1ZXN0PiByZXF1ZXN0ID0gYWRv cHRHUmVmKHdlYmtpdFVSSVJlcXVlc3RDcmVhdGVGb3JSZXNvdXJjZVJlcXVlc3QodG9JbXBsKHdr UmVxdWVzdCktPnJlc291cmNlUmVxdWVzdCgpKSk7CisgICAgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVkaXJlY3RSZXNvdXJjZVJlc3BvbnNlID0gdG9JbXBsKHdrUmVkaXJlY3RSZXNwb25zZSkt PnJlc291cmNlUmVzcG9uc2UoKTsKKyAgICBHUmVmUHRyPFdlYktpdFVSSVJlc3BvbnNlPiByZWRp cmVjdFJlc3BvbnNlID0gIXJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZS5pc051bGwoKSA/IGFkb3B0 R1JlZih3ZWJraXRVUklSZXNwb25zZUNyZWF0ZUZvclJlc291cmNlUmVzcG9uc2UocmVkaXJlY3RS ZXNvdXJjZVJlc3BvbnNlKSkgOiBudWxscHRyOwogCi0gICAgdm9pZCB3aWxsU2VuZFJlcXVlc3RG b3JGcmFtZShXZWJQYWdlJiBwYWdlLCBXZWJGcmFtZSYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFJl c291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZWRpcmVjdFJlc291cmNlUmVzcG9uc2UpIG92ZXJyaWRlCi0gICAgewotICAgICAgICBHUmVmUHRy PFdlYktpdFVSSVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0VVJJUmVxdWVzdENy ZWF0ZUZvclJlc291cmNlUmVxdWVzdChyZXNvdXJjZVJlcXVlc3QpKTsKLSAgICAgICAgR1JlZlB0 cjxXZWJLaXRVUklSZXNwb25zZT4gcmVkaXJlY3RSZXNwb25zZSA9ICFyZWRpcmVjdFJlc291cmNl UmVzcG9uc2UuaXNOdWxsKCkgPyBhZG9wdEdSZWYod2Via2l0VVJJUmVzcG9uc2VDcmVhdGVGb3JS ZXNvdXJjZVJlc3BvbnNlKHJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZSkpIDogbnVsbHB0cjsKKyAg ICBnYm9vbGVhbiByZXR1cm5WYWx1ZTsKKyAgICBnX3NpZ25hbF9lbWl0KFdFQktJVF9XRUJfUEFH RShjbGllbnRJbmZvKSwgc2lnbmFsc1tTRU5EX1JFUVVFU1RdLCAwLCByZXF1ZXN0LmdldCgpLCBy ZWRpcmVjdFJlc3BvbnNlLmdldCgpLCAmcmV0dXJuVmFsdWUpOworICAgIGlmIChyZXR1cm5WYWx1 ZSkKKyAgICAgICAgcmV0dXJuIDA7CiAKLSAgICAgICAgZ2Jvb2xlYW4gcmV0dXJuVmFsdWU7Ci0g ICAgICAgIGdfc2lnbmFsX2VtaXQobV93ZWJQYWdlLCBzaWduYWxzW1NFTkRfUkVRVUVTVF0sIDAs IHJlcXVlc3QuZ2V0KCksIHJlZGlyZWN0UmVzcG9uc2UuZ2V0KCksICZyZXR1cm5WYWx1ZSk7Ci0g ICAgICAgIGlmIChyZXR1cm5WYWx1ZSkgewotICAgICAgICAgICAgcmVzb3VyY2VSZXF1ZXN0ID0g eyB9OwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgUmVzb3VyY2VSZXF1ZXN0 IHJlc291cmNlUmVxdWVzdDsKKyAgICB3ZWJraXRVUklSZXF1ZXN0R2V0UmVzb3VyY2VSZXF1ZXN0 KHJlcXVlc3QuZ2V0KCksIHJlc291cmNlUmVxdWVzdCk7CisgICAgcmVzb3VyY2VSZXF1ZXN0LnNl dEluaXRpYXRpbmdQYWdlSUQodG9JbXBsKHBhZ2UpLT5wYWdlSUQoKSk7CisgICAgUmVmPEFQSTo6 VVJMUmVxdWVzdD4gbmV3UmVxdWVzdCA9IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNl UmVxdWVzdCk7CiAKLSAgICAgICAgd2Via2l0VVJJUmVxdWVzdEdldFJlc291cmNlUmVxdWVzdChy ZXF1ZXN0LmdldCgpLCByZXNvdXJjZVJlcXVlc3QpOwotICAgICAgICByZXNvdXJjZVJlcXVlc3Qu c2V0SW5pdGlhdGluZ1BhZ2VJRChwYWdlLnBhZ2VJRCgpKTsKKyAgICBBUEk6OkRpY3Rpb25hcnk6 Ok1hcFR5cGUgbWVzc2FnZTsKKyAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdl IiksIHRvSW1wbChwYWdlKSk7CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRl bnRpZmllciIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKKyAgICBtZXNzYWdl LnNldChTdHJpbmc6OmZyb21VVEY4KCJSZXF1ZXN0IiksIG5ld1JlcXVlc3QucHRyKCkpOworICAg IGlmICghcmVkaXJlY3RSZXNvdXJjZVJlc3BvbnNlLmlzTnVsbCgpKQorICAgICAgICBtZXNzYWdl LnNldChTdHJpbmc6OmZyb21VVEY4KCJSZWRpcmVjdFJlc3BvbnNlIiksIHRvSW1wbCh3a1JlZGly ZWN0UmVzcG9uc2UpKTsKKyAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRs ZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQYWdlLkRpZFNlbmRSZXF1ZXN0 Rm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RGTW92ZShtZXNzYWdlKSku cHRyKCkpOwogCi0gICAgICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOwotICAg ICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdlIiksICZwYWdlKTsKLSAgICAg ICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpLCBBUEk6OlVJbnQ2 NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKLSAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9t VVRGOCgiUmVxdWVzdCIpLCBBUEk6OlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXNvdXJjZVJlcXVlc3Qp KTsKLSAgICAgICAgaWYgKCFyZWRpcmVjdFJlc291cmNlUmVzcG9uc2UuaXNOdWxsKCkpCi0gICAg ICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJSZWRpcmVjdFJlc3BvbnNlIiks IEFQSTo6VVJMUmVzcG9uc2U6OmNyZWF0ZShyZWRpcmVjdFJlc291cmNlUmVzcG9uc2UpKTsKLSAg ICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+cG9zdE1lc3Nh Z2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRTZW5kUmVxdWVzdEZvclJlc291cmNlIiks IEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigpKTsKLSAgICB9 CisgICAgcmV0dXJuIHRvQVBJKCZuZXdSZXF1ZXN0LmxlYWtSZWYoKSk7Cit9CiAKLSAgICB2b2lk IGRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlKFdlYlBhZ2UmIHBhZ2UsIFdlYkZyYW1lJiwg dWludDY0X3QgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpIG92 ZXJyaWRlCi0gICAgewotICAgICAgICBBUEk6OkRpY3Rpb25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsK LSAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCAmcGFnZSk7Ci0g ICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpV SW50NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7Ci0gICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6 ZnJvbVVURjgoIlJlc3BvbnNlIiksIEFQSTo6VVJMUmVzcG9uc2U6OmNyZWF0ZShyZXNwb25zZSkp OwotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0 TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQYWdlLkRpZFJlY2VpdmVSZXNwb25zZUZvclJl c291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigp KTsKLQotICAgICAgICAvLyBQb3N0IG9uIHRoZSBjb25zb2xlIGFzIHdlbGwgdG8gYmUgY29uc2lz dGVudCB3aXRoIHRoZSBpbnNwZWN0b3IuCi0gICAgICAgIGlmIChyZXNwb25zZS5odHRwU3RhdHVz Q29kZSgpID49IDQwMCkgewotICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBlcnJvck1lc3NhZ2U7 Ci0gICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTGl0ZXJhbCgiRmFpbGVkIHRvIGxvYWQg cmVzb3VyY2U6IHRoZSBzZXJ2ZXIgcmVzcG9uZGVkIHdpdGggYSBzdGF0dXMgb2YgIik7Ci0gICAg ICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTnVtYmVyKHJlc3BvbnNlLmh0dHBTdGF0dXNDb2Rl KCkpOwotICAgICAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVuZExpdGVyYWwoIiAoIik7Ci0gICAg ICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kKHJlc3BvbnNlLmh0dHBTdGF0dXNUZXh0KCkpOwot ICAgICAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVuZCgnKScpOwotICAgICAgICAgICAgd2Via2l0 V2ViUGFnZURpZFNlbmRDb25zb2xlTWVzc2FnZShtX3dlYlBhZ2UsIE1lc3NhZ2VTb3VyY2U6Ok5l dHdvcmssIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIGVycm9yTWVzc2FnZS50b1N0cmluZygpLCAwLCBy ZXNwb25zZS51cmwoKS5zdHJpbmcoKSk7Ci0gICAgICAgIH0KK3N0YXRpYyB2b2lkIGRpZFJlY2Vp dmVSZXNwb25zZUZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1l UmVmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBjb25z dCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNz YWdlOworICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwgdG9JbXBsKHBh Z2UpKTsKKyAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiksIEFQ STo6VUludDY0OjpjcmVhdGUoaWRlbnRpZmllcikpOworICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6 ZnJvbVVURjgoIlJlc3BvbnNlIiksIHRvSW1wbChyZXNwb25zZSkpOworICAgIFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLmluamVjdGVkQnVuZGxlKCktPnBvc3RNZXNzYWdlKFN0cmluZzo6ZnJvbVVU RjgoIldlYlBhZ2UuRGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9u YXJ5OjpjcmVhdGUoV1RGTW92ZShtZXNzYWdlKSkucHRyKCkpOworCisgICAgLy8gUG9zdCBvbiB0 aGUgY29uc29sZSBhcyB3ZWxsIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgaW5zcGVjdG9yLgor ICAgIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2UgPSB0b0ltcGwocmVz cG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCk7CisgICAgaWYgKHJlc291cmNlUmVzcG9uc2UuaHR0 cFN0YXR1c0NvZGUoKSA+PSA0MDApIHsKKyAgICAgICAgU3RyaW5nQnVpbGRlciBlcnJvck1lc3Nh Z2U7CisgICAgICAgIGVycm9yTWVzc2FnZS5hcHBlbmRMaXRlcmFsKCJGYWlsZWQgdG8gbG9hZCBy ZXNvdXJjZTogdGhlIHNlcnZlciByZXNwb25kZWQgd2l0aCBhIHN0YXR1cyBvZiAiKTsKKyAgICAg ICAgZXJyb3JNZXNzYWdlLmFwcGVuZE51bWJlcihyZXNvdXJjZVJlc3BvbnNlLmh0dHBTdGF0dXND b2RlKCkpOworICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTGl0ZXJhbCgiICgiKTsKKyAgICAg ICAgZXJyb3JNZXNzYWdlLmFwcGVuZChyZXNvdXJjZVJlc3BvbnNlLmh0dHBTdGF0dXNUZXh0KCkp OworICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kKCcpJyk7CisgICAgICAgIHdlYmtpdFdlYlBh Z2VEaWRTZW5kQ29uc29sZU1lc3NhZ2UoV0VCS0lUX1dFQl9QQUdFKGNsaWVudEluZm8pLCBNZXNz YWdlU291cmNlOjpOZXR3b3JrLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBlcnJvck1lc3NhZ2UudG9T dHJpbmcoKSwgMCwgcmVzb3VyY2VSZXNwb25zZS51cmwoKS5zdHJpbmcoKSk7CiAgICAgfQorfQog Ci0gICAgdm9pZCBkaWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlKFdlYlBhZ2UmIHBh Z2UsIFdlYkZyYW1lJiwgdWludDY0X3QgaWRlbnRpZmllciwgdWludDY0X3QgY29udGVudExlbmd0 aCkgb3ZlcnJpZGUKLSAgICB7Ci0gICAgICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNz YWdlOwotICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdlIiksICZwYWdl KTsKLSAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpLCBB UEk6OlVJbnQ2NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKLSAgICAgICAgbWVzc2FnZS5zZXQoU3Ry aW5nOjpmcm9tVVRGOCgiQ29udGVudExlbmd0aCIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGNvbnRl bnRMZW5ndGgpKTsKLSAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5k bGUoKS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRSZWNlaXZlQ29u dGVudExlbmd0aEZvclJlc291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUo bWVzc2FnZSkpLnB0cigpKTsKLSAgICB9CitzdGF0aWMgdm9pZCBkaWRSZWNlaXZlQ29udGVudExl bmd0aEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmLCB1 aW50NjRfdCBpZGVudGlmaWVyLCB1aW50NjRfdCBsZW5ndGgsIGNvbnN0IHZvaWQqKQoreworICAg IEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOworICAgIG1lc3NhZ2Uuc2V0KFN0cmlu Zzo6ZnJvbVVURjgoIlBhZ2UiKSwgdG9JbXBsKHBhZ2UpKTsKKyAgICBtZXNzYWdlLnNldChTdHJp bmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiksIEFQSTo6VUludDY0OjpjcmVhdGUoaWRlbnRpZmll cikpOworICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIkNvbnRlbnRMZW5ndGgiKSwg QVBJOjpVSW50NjQ6OmNyZWF0ZShsZW5ndGgpKTsKKyAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24o KS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQYWdl LkRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9uYXJ5Ojpj cmVhdGUoV1RGTW92ZShtZXNzYWdlKSkucHRyKCkpOworfQogCi0gICAgdm9pZCBkaWRGaW5pc2hM b2FkRm9yUmVzb3VyY2UoV2ViUGFnZSYgcGFnZSwgV2ViRnJhbWUmLCB1aW50NjRfdCBpZGVudGlm aWVyKSBvdmVycmlkZQotICAgIHsKLSAgICAgICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1l c3NhZ2U7Ci0gICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwgJnBh Z2UpOwotICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiks IEFQSTo6VUludDY0OjpjcmVhdGUoaWRlbnRpZmllcikpOwotICAgICAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4 KCJXZWJQYWdlLkRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6OmNy ZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7Ci0gICAgfQorc3RhdGljIHZvaWQgZGlkRmlu aXNoTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVm LCB1aW50NjRfdCBpZGVudGlmaWVyLCBjb25zdCB2b2lkKikKK3sKKyAgICBBUEk6OkRpY3Rpb25h cnk6Ok1hcFR5cGUgbWVzc2FnZTsKKyAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQ YWdlIiksIHRvSW1wbChwYWdlKSk7CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgi SWRlbnRpZmllciIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKKyAgICBXZWJQ cm9jZXNzOjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6 OmZyb21VVEY4KCJXZWJQYWdlLkRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rp b25hcnk6OmNyZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7Cit9CiAKLSAgICB2b2lkIGRp ZEZhaWxMb2FkRm9yUmVzb3VyY2UoV2ViUGFnZSYgcGFnZSwgV2ViRnJhbWUmLCB1aW50NjRfdCBp ZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikgb3ZlcnJpZGUKLSAgICB7Ci0g ICAgICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOwotICAgICAgICBtZXNzYWdl LnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdlIiksICZwYWdlKTsKLSAgICAgICAgbWVzc2FnZS5z ZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGlk ZW50aWZpZXIpKTsKLSAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiRXJyb3Ii KSwgQVBJOjpFcnJvcjo6Y3JlYXRlKGVycm9yKSk7Ci0gICAgICAgIFdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLmluamVjdGVkQnVuZGxlKCktPnBvc3RNZXNzYWdlKFN0cmluZzo6ZnJvbVVURjgoIldl YlBhZ2UuRGlkRmFpbExvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6OmNyZWF0ZShX VEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7Ci0KLSAgICAgICAgLy8gUG9zdCBvbiB0aGUgY29uc29s ZSBhcyB3ZWxsIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgaW5zcGVjdG9yLgotICAgICAgICBp ZiAoIWVycm9yLmlzQ2FuY2VsbGF0aW9uKCkpIHsKLSAgICAgICAgICAgIFN0cmluZ0J1aWxkZXIg ZXJyb3JNZXNzYWdlOwotICAgICAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVuZExpdGVyYWwoIkZh aWxlZCB0byBsb2FkIHJlc291cmNlIik7Ci0gICAgICAgICAgICBpZiAoIWVycm9yLmxvY2FsaXpl ZERlc2NyaXB0aW9uKCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgZXJyb3JNZXNzYWdl LmFwcGVuZExpdGVyYWwoIjogIik7Ci0gICAgICAgICAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVu ZChlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHdlYmtpdFdlYlBhZ2VEaWRTZW5kQ29uc29sZU1lc3NhZ2UobV93ZWJQYWdlLCBNZXNzYWdl U291cmNlOjpOZXR3b3JrLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBlcnJvck1lc3NhZ2UudG9TdHJp bmcoKSwgMCwgZXJyb3IuZmFpbGluZ1VSTCgpKTsKK3N0YXRpYyB2b2lkIGRpZEZhaWxMb2FkRm9y UmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90 IGlkZW50aWZpZXIsIFdLRXJyb3JSZWYgZXJyb3IsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7 CisgICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7CisgICAgbWVzc2FnZS5zZXQo U3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCB0b0ltcGwocGFnZSkpOworICAgIG1lc3NhZ2Uuc2V0 KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVu dGlmaWVyKSk7CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiRXJyb3IiKSwgdG9J bXBsKGVycm9yKSk7CisgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUo KS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRGYWlsTG9hZEZvclJl c291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigp KTsKKworICAgIC8vIFBvc3Qgb24gdGhlIGNvbnNvbGUgYXMgd2VsbCB0byBiZSBjb25zaXN0ZW50 IHdpdGggdGhlIGluc3BlY3Rvci4KKyAgICBjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVy cm9yID0gdG9JbXBsKGVycm9yKS0+cGxhdGZvcm1FcnJvcigpOworICAgIGlmICghcmVzb3VyY2VF cnJvci5pc0NhbmNlbGxhdGlvbigpKSB7CisgICAgICAgIFN0cmluZ0J1aWxkZXIgZXJyb3JNZXNz YWdlOworICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTGl0ZXJhbCgiRmFpbGVkIHRvIGxvYWQg cmVzb3VyY2UiKTsKKyAgICAgICAgaWYgKCFyZXNvdXJjZUVycm9yLmxvY2FsaXplZERlc2NyaXB0 aW9uKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTGl0ZXJh bCgiOiAiKTsKKyAgICAgICAgICAgIGVycm9yTWVzc2FnZS5hcHBlbmQocmVzb3VyY2VFcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpKTsKICAgICAgICAgfQorICAgICAgICB3ZWJraXRXZWJQYWdl RGlkU2VuZENvbnNvbGVNZXNzYWdlKFdFQktJVF9XRUJfUEFHRShjbGllbnRJbmZvKSwgTWVzc2Fn ZVNvdXJjZTo6TmV0d29yaywgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdlLnRvU3Ry aW5nKCksIDAsIHJlc291cmNlRXJyb3IuZmFpbGluZ1VSTCgpKTsKICAgICB9Ci0KLSAgICBXZWJL aXRXZWJQYWdlKiBtX3dlYlBhZ2U7Ci19OworfQogCiBjbGFzcyBQYWdlQ29udGV4dE1lbnVDbGll bnQgZmluYWwgOiBwdWJsaWMgQVBJOjpJbmplY3RlZEJ1bmRsZTo6UGFnZUNvbnRleHRNZW51Q2xp ZW50IHsKIHB1YmxpYzoKQEAgLTU0Nyw3ICs1NDIsMjIgQEAgV2ViS2l0V2ViUGFnZSogd2Via2l0 V2ViUGFnZUNyZWF0ZShXZWJQYWdlKiB3ZWJQYWdlKQogICAgIFdlYktpdFdlYlBhZ2UqIHBhZ2Ug PSBXRUJLSVRfV0VCX1BBR0UoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9QQUdFLCBOVUxM KSk7CiAgICAgcGFnZS0+cHJpdi0+d2ViUGFnZSA9IHdlYlBhZ2U7CiAKLSAgICB3ZWJQYWdlLT5z ZXRJbmplY3RlZEJ1bmRsZVJlc291cmNlTG9hZENsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VS ZXNvdXJjZUxvYWRDbGllbnQ+KHBhZ2UpKTsKKyAgICBXS0J1bmRsZVBhZ2VSZXNvdXJjZUxvYWRD bGllbnRWMSByZXNvdXJjZUxvYWRDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDEs IC8vIHZlcnNpb24KKyAgICAgICAgICAgIHBhZ2UsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwK KyAgICAgICAgZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UsCisgICAgICAgIHdpbGxTZW5kUmVx dWVzdEZvckZyYW1lLAorICAgICAgICBkaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNvdXJjZSwKKyAg ICAgICAgZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZSwKKyAgICAgICAgZGlkRmlu aXNoTG9hZEZvclJlc291cmNlLAorICAgICAgICBkaWRGYWlsTG9hZEZvclJlc291cmNlLAorICAg ICAgICAwLCAvLyBzaG91bGRDYWNoZVJlc3BvbnNlCisgICAgICAgIDAgLy8gc2hvdWxkVXNlQ3Jl ZGVudGlhbFN0b3JhZ2UKKyAgICB9OworICAgIFdLQnVuZGxlUGFnZVNldFJlc291cmNlTG9hZENs aWVudCh0b0FQSSh3ZWJQYWdlKSwgJnJlc291cmNlTG9hZENsaWVudC5iYXNlKTsKKwogICAgIHdl YlBhZ2UtPnNldEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudChzdGQ6Om1ha2VfdW5pcXVl PFBhZ2VMb2FkZXJDbGllbnQ+KHBhZ2UpKTsKICAgICB3ZWJQYWdlLT5zZXRJbmplY3RlZEJ1bmRs ZUNvbnRleHRNZW51Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8UGFnZUNvbnRleHRNZW51Q2xpZW50 PihwYWdlKSk7CiAgICAgd2ViUGFnZS0+c2V0SW5qZWN0ZWRCdW5kbGVVSUNsaWVudChzdGQ6Om1h a2VfdW5pcXVlPFBhZ2VVSUNsaWVudD4ocGFnZSkpOwo=