173364 2017-06-14 05:16:06 -0700 [GTK] Use API::InjectedBundle::ResourceLoadClient in WebKitWebPage 2017-06-15 02:20:02 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 173362 173390 1 cgarcia webkit-unassigned bugs-noreply commit-queue mcatanzaro zan oldest_to_newest 1319099 0 cgarcia 2017-06-14 05:16:06 -0700 Instead of the C API. 1319101 1 312885 cgarcia 2017-06-14 05:17:30 -0700 Created attachment 312885 Patch 1319202 2 cgarcia 2017-06-14 10:22:53 -0700 Committed r218267: <http://trac.webkit.org/changeset/218267> 1319383 3 commit-queue 2017-06-14 17:20:45 -0700 Re-opened since this is blocked by bug 173390 1319513 4 cgarcia 2017-06-15 02:20:02 -0700 Committed r218324: <http://trac.webkit.org/changeset/218324> 312885 2017-06-14 05:17:30 -0700 2017-06-14 08:52:02 -0700 Patch wk2-gtk-resource-load-api.diff text/plain 14571 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZjQzOWY3MWU3NS4uY2QyMmQwNTZlMjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMyBAQAogMjAxNy0wNi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlJlc291 cmNlTG9hZENsaWVudCBpbiBXZWJLaXRXZWJQYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMzNjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHRoZSBDIEFQSS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJQYWdlLmNwcDoKKyAg ICAgICAgKHdlYmtpdFdlYlBhZ2VDcmVhdGUpOgorICAgICAgICAoZGlkSW5pdGlhdGVMb2FkRm9y UmVzb3VyY2UpOiBEZWxldGVkLgorICAgICAgICAod2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUpOiBE ZWxldGVkLgorICAgICAgICAoZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UpOiBEZWxldGVk LgorICAgICAgICAoZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZSk6IERlbGV0ZWQu CisgICAgICAgIChkaWRGaW5pc2hMb2FkRm9yUmVzb3VyY2UpOiBEZWxldGVkLgorICAgICAgICAo ZGlkRmFpbExvYWRGb3JSZXNvdXJjZSk6IERlbGV0ZWQuCisKKzIwMTctMDYtMTQgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIEFkZCBBUEk6Oklu amVjdGVkQnVuZGxlOjpSZXNvdXJjZUxvYWRDbGllbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzM2MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0 V2ViUGFnZS5jcHAKaW5kZXggM2UzOGZjZTE4MWQuLjFmZGE4ZGMyZDYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwCkBAIC0yNCw4ICsyNCw2IEBACiAjaW5jbHVkZSAiQVBJ RGljdGlvbmFyeS5oIgogI2luY2x1ZGUgIkltYWdlT3B0aW9ucy5oIgogI2luY2x1ZGUgIkluamVj dGVkQnVuZGxlLmgiCi0jaW5jbHVkZSAiV0tCdW5kbGVBUElDYXN0LmgiCi0jaW5jbHVkZSAiV0tC dW5kbGVGcmFtZS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZW51SXRlbS5oIgogI2luY2x1ZGUg IldlYkltYWdlLmgiCiAjaW5jbHVkZSAiV2ViS2l0Q29uc29sZU1lc3NhZ2VQcml2YXRlLmgiCkBA IC0yMDcsMTAxICsyMDUsMTA4IEBAIHByaXZhdGU6CiAgICAgV2ViS2l0V2ViUGFnZSogbV93ZWJQ YWdlOwogfTsKIAotc3RhdGljIHZvaWQgZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UoV0tCdW5k bGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIHVpbnQ2NF90IGlkZW50aWZp ZXIsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBib29sIC8qIHBhZ2VMb2FkSXNQcm92aXNpb25h bCAqLywgY29uc3Qgdm9pZCopCi17Ci0gICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3Nh Z2U7Ci0gICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCB0b0ltcGwocGFn ZSkpOwotICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIkZyYW1lIiksIHRvSW1wbChm cmFtZSkpOwotICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwg QVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7Ci0gICAgbWVzc2FnZS5zZXQoU3RyaW5n Ojpmcm9tVVRGOCgiUmVxdWVzdCIpLCB0b0ltcGwocmVxdWVzdCkpOwotICAgIFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLmluamVjdGVkQnVuZGxlKCktPnBvc3RNZXNzYWdlKFN0cmluZzo6ZnJvbVVU RjgoIldlYlBhZ2UuRGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9uYXJ5 OjpjcmVhdGUoV1RGTW92ZShtZXNzYWdlKSkucHRyKCkpOwotfQogCi1zdGF0aWMgV0tVUkxSZXF1 ZXN0UmVmIHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1 bmRsZUZyYW1lUmVmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYgd2tSZXF1 ZXN0LCBXS1VSTFJlc3BvbnNlUmVmIHdrUmVkaXJlY3RSZXNwb25zZSwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbykKLXsKLSAgICBHUmVmUHRyPFdlYktpdFVSSVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9w dEdSZWYod2Via2l0VVJJUmVxdWVzdENyZWF0ZUZvclJlc291cmNlUmVxdWVzdCh0b0ltcGwod2tS ZXF1ZXN0KS0+cmVzb3VyY2VSZXF1ZXN0KCkpKTsKLSAgICBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZWRpcmVjdFJlc291cmNlUmVzcG9uc2UgPSB0b0ltcGwod2tSZWRpcmVjdFJlc3BvbnNlKS0+ cmVzb3VyY2VSZXNwb25zZSgpOwotICAgIEdSZWZQdHI8V2ViS2l0VVJJUmVzcG9uc2U+IHJlZGly ZWN0UmVzcG9uc2UgPSAhcmVkaXJlY3RSZXNvdXJjZVJlc3BvbnNlLmlzTnVsbCgpID8gYWRvcHRH UmVmKHdlYmtpdFVSSVJlc3BvbnNlQ3JlYXRlRm9yUmVzb3VyY2VSZXNwb25zZShyZWRpcmVjdFJl c291cmNlUmVzcG9uc2UpKSA6IG51bGxwdHI7CitjbGFzcyBQYWdlUmVzb3VyY2VMb2FkQ2xpZW50 IGZpbmFsIDogcHVibGljIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlJlc291cmNlTG9hZENsaWVudCB7 CitwdWJsaWM6CisgICAgZXhwbGljaXQgUGFnZVJlc291cmNlTG9hZENsaWVudChXZWJLaXRXZWJQ YWdlKiB3ZWJQYWdlKQorICAgICAgICA6IG1fd2ViUGFnZSh3ZWJQYWdlKQorICAgIHsKKyAgICB9 CiAKLSAgICBnYm9vbGVhbiByZXR1cm5WYWx1ZTsKLSAgICBnX3NpZ25hbF9lbWl0KFdFQktJVF9X RUJfUEFHRShjbGllbnRJbmZvKSwgc2lnbmFsc1tTRU5EX1JFUVVFU1RdLCAwLCByZXF1ZXN0Lmdl dCgpLCByZWRpcmVjdFJlc3BvbnNlLmdldCgpLCAmcmV0dXJuVmFsdWUpOwotICAgIGlmIChyZXR1 cm5WYWx1ZSkKLSAgICAgICAgcmV0dXJuIDA7Citwcml2YXRlOgorICAgIHZvaWQgZGlkSW5pdGlh dGVMb2FkRm9yUmVzb3VyY2UoV2ViUGFnZSYgcGFnZSwgV2ViRnJhbWUmIGZyYW1lLCB1aW50NjRf dCBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGJvb2wpIG92ZXJy aWRlCisgICAgeworICAgICAgICBBUEk6OkRpY3Rpb25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsKKyAg ICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCAmcGFnZSk7CisgICAg ICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIkZyYW1lIiksICZmcmFtZSk7CisgICAg ICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50 NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7CisgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJv bVVURjgoIlJlcXVlc3QiKSwgQVBJOjpVUkxSZXF1ZXN0OjpjcmVhdGUocmVxdWVzdCkpOworICAg ICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2Fn ZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQYWdlLkRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlIiks IEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigpKTsKKyAgICB9 CiAKLSAgICBSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0OwotICAgIHdlYmtpdFVSSVJl cXVlc3RHZXRSZXNvdXJjZVJlcXVlc3QocmVxdWVzdC5nZXQoKSwgcmVzb3VyY2VSZXF1ZXN0KTsK LSAgICByZXNvdXJjZVJlcXVlc3Quc2V0SW5pdGlhdGluZ1BhZ2VJRCh0b0ltcGwocGFnZSktPnBh Z2VJRCgpKTsKLSAgICBSZWY8QVBJOjpVUkxSZXF1ZXN0PiBuZXdSZXF1ZXN0ID0gQVBJOjpVUkxS ZXF1ZXN0OjpjcmVhdGUocmVzb3VyY2VSZXF1ZXN0KTsKKyAgICB2b2lkIHdpbGxTZW5kUmVxdWVz dEZvckZyYW1lKFdlYlBhZ2UmIHBhZ2UsIFdlYkZyYW1lJiwgdWludDY0X3QgaWRlbnRpZmllciwg UmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um IHJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZSkgb3ZlcnJpZGUKKyAgICB7CisgICAgICAgIEdSZWZQ dHI8V2ViS2l0VVJJUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJraXRVUklSZXF1ZXN0 Q3JlYXRlRm9yUmVzb3VyY2VSZXF1ZXN0KHJlc291cmNlUmVxdWVzdCkpOworICAgICAgICBHUmVm UHRyPFdlYktpdFVSSVJlc3BvbnNlPiByZWRpcmVjdFJlc3BvbnNlID0gIXJlZGlyZWN0UmVzb3Vy Y2VSZXNwb25zZS5pc051bGwoKSA/IGFkb3B0R1JlZih3ZWJraXRVUklSZXNwb25zZUNyZWF0ZUZv clJlc291cmNlUmVzcG9uc2UocmVkaXJlY3RSZXNvdXJjZVJlc3BvbnNlKSkgOiBudWxscHRyOwog Ci0gICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7Ci0gICAgbWVzc2FnZS5zZXQo U3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCB0b0ltcGwocGFnZSkpOwotICAgIG1lc3NhZ2Uuc2V0 KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVu dGlmaWVyKSk7Ci0gICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUmVxdWVzdCIpLCBu ZXdSZXF1ZXN0LnB0cigpKTsKLSAgICBpZiAoIXJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZS5pc051 bGwoKSkKLSAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUmVkaXJlY3RSZXNw b25zZSIpLCB0b0ltcGwod2tSZWRpcmVjdFJlc3BvbnNlKSk7Ci0gICAgV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgi V2ViUGFnZS5EaWRTZW5kUmVxdWVzdEZvclJlc291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3Jl YXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigpKTsKKyAgICAgICAgZ2Jvb2xlYW4gcmV0dXJuVmFs dWU7CisgICAgICAgIGdfc2lnbmFsX2VtaXQobV93ZWJQYWdlLCBzaWduYWxzW1NFTkRfUkVRVUVT VF0sIDAsIHJlcXVlc3QuZ2V0KCksIHJlZGlyZWN0UmVzcG9uc2UuZ2V0KCksICZyZXR1cm5WYWx1 ZSk7CisgICAgICAgIGlmIChyZXR1cm5WYWx1ZSkgeworICAgICAgICAgICAgcmVzb3VyY2VSZXF1 ZXN0ID0geyB9OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKLSAgICByZXR1cm4g dG9BUEkoJm5ld1JlcXVlc3QubGVha1JlZigpKTsKLX0KKyAgICAgICAgd2Via2l0VVJJUmVxdWVz dEdldFJlc291cmNlUmVxdWVzdChyZXF1ZXN0LmdldCgpLCByZXNvdXJjZVJlcXVlc3QpOworICAg ICAgICByZXNvdXJjZVJlcXVlc3Quc2V0SW5pdGlhdGluZ1BhZ2VJRChwYWdlLnBhZ2VJRCgpKTsK IAotc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVz cG9uc2VSZWYgcmVzcG9uc2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCi17Ci0gICAgQVBJOjpE aWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7Ci0gICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9t VVRGOCgiUGFnZSIpLCB0b0ltcGwocGFnZSkpOwotICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJv bVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7Ci0g ICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUmVzcG9uc2UiKSwgdG9JbXBsKHJlc3Bv bnNlKSk7Ci0gICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUoKS0+cG9z dE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRSZWNlaXZlUmVzcG9uc2VGb3JS ZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6OmNyZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIo KSk7Ci0KLSAgICAvLyBQb3N0IG9uIHRoZSBjb25zb2xlIGFzIHdlbGwgdG8gYmUgY29uc2lzdGVu dCB3aXRoIHRoZSBpbnNwZWN0b3IuCi0gICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzb3Vy Y2VSZXNwb25zZSA9IHRvSW1wbChyZXNwb25zZSktPnJlc291cmNlUmVzcG9uc2UoKTsKLSAgICBp ZiAocmVzb3VyY2VSZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgewotICAgICAgICBT dHJpbmdCdWlsZGVyIGVycm9yTWVzc2FnZTsKLSAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVuZExp dGVyYWwoIkZhaWxlZCB0byBsb2FkIHJlc291cmNlOiB0aGUgc2VydmVyIHJlc3BvbmRlZCB3aXRo IGEgc3RhdHVzIG9mICIpOwotICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTnVtYmVyKHJlc291 cmNlUmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSk7Ci0gICAgICAgIGVycm9yTWVzc2FnZS5hcHBl bmRMaXRlcmFsKCIgKCIpOwotICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kKHJlc291cmNlUmVz cG9uc2UuaHR0cFN0YXR1c1RleHQoKSk7Ci0gICAgICAgIGVycm9yTWVzc2FnZS5hcHBlbmQoJykn KTsKLSAgICAgICAgd2Via2l0V2ViUGFnZURpZFNlbmRDb25zb2xlTWVzc2FnZShXRUJLSVRfV0VC X1BBR0UoY2xpZW50SW5mbyksIE1lc3NhZ2VTb3VyY2U6Ok5ldHdvcmssIE1lc3NhZ2VMZXZlbDo6 RXJyb3IsIGVycm9yTWVzc2FnZS50b1N0cmluZygpLCAwLCByZXNvdXJjZVJlc3BvbnNlLnVybCgp LnN0cmluZygpKTsKKyAgICAgICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7Cisg ICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwgJnBhZ2UpOworICAg ICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiksIEFQSTo6VUlu dDY0OjpjcmVhdGUoaWRlbnRpZmllcikpOworICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZy b21VVEY4KCJSZXF1ZXN0IiksIEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNlUmVxdWVz dCkpOworICAgICAgICBpZiAoIXJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZS5pc051bGwoKSkKKyAg ICAgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlJlZGlyZWN0UmVzcG9uc2Ui KSwgQVBJOjpVUkxSZXNwb25zZTo6Y3JlYXRlKHJlZGlyZWN0UmVzb3VyY2VSZXNwb25zZSkpOwor ICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVz c2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQYWdlLkRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2Ui KSwgQVBJOjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RGTW92ZShtZXNzYWdlKSkucHRyKCkpOwogICAg IH0KLX0KIAotc3RhdGljIHZvaWQgZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZShX S0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiwgdWludDY0X3QgaWRlbnRpZmll ciwgdWludDY0X3QgbGVuZ3RoLCBjb25zdCB2b2lkKikKLXsKLSAgICBBUEk6OkRpY3Rpb25hcnk6 Ok1hcFR5cGUgbWVzc2FnZTsKLSAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJQYWdl IiksIHRvSW1wbChwYWdlKSk7Ci0gICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRl bnRpZmllciIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGlkZW50aWZpZXIpKTsKLSAgICBtZXNzYWdl LnNldChTdHJpbmc6OmZyb21VVEY4KCJDb250ZW50TGVuZ3RoIiksIEFQSTo6VUludDY0OjpjcmVh dGUobGVuZ3RoKSk7Ci0gICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5qZWN0ZWRCdW5kbGUo KS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRSZWNlaXZlQ29udGVu dExlbmd0aEZvclJlc291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVz c2FnZSkpLnB0cigpKTsKLX0KKyAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNl KFdlYlBhZ2UmIHBhZ2UsIFdlYkZyYW1lJiwgdWludDY0X3QgaWRlbnRpZmllciwgY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpIG92ZXJyaWRlCisgICAgeworICAgICAgICBBUEk6OkRp Y3Rpb25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsKKyAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpm cm9tVVRGOCgiUGFnZSIpLCAmcGFnZSk7CisgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJv bVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7Cisg ICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlJlc3BvbnNlIiksIEFQSTo6VVJM UmVzcG9uc2U6OmNyZWF0ZShyZXNwb25zZSkpOworICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQ YWdlLkRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlIiksIEFQSTo6RGljdGlvbmFyeTo6Y3Jl YXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigpKTsKKworICAgICAgICAvLyBQb3N0IG9uIHRoZSBj b25zb2xlIGFzIHdlbGwgdG8gYmUgY29uc2lzdGVudCB3aXRoIHRoZSBpbnNwZWN0b3IuCisgICAg ICAgIGlmIChyZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgeworICAgICAgICAgICAg U3RyaW5nQnVpbGRlciBlcnJvck1lc3NhZ2U7CisgICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBw ZW5kTGl0ZXJhbCgiRmFpbGVkIHRvIGxvYWQgcmVzb3VyY2U6IHRoZSBzZXJ2ZXIgcmVzcG9uZGVk IHdpdGggYSBzdGF0dXMgb2YgIik7CisgICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kTnVt YmVyKHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOworICAgICAgICAgICAgZXJyb3JNZXNzYWdl LmFwcGVuZExpdGVyYWwoIiAoIik7CisgICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5kKHJl c3BvbnNlLmh0dHBTdGF0dXNUZXh0KCkpOworICAgICAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVu ZCgnKScpOworICAgICAgICAgICAgd2Via2l0V2ViUGFnZURpZFNlbmRDb25zb2xlTWVzc2FnZSht X3dlYlBhZ2UsIE1lc3NhZ2VTb3VyY2U6Ok5ldHdvcmssIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIGVy cm9yTWVzc2FnZS50b1N0cmluZygpLCAwLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSk7CisgICAg ICAgIH0KKyAgICB9CiAKLXN0YXRpYyB2b2lkIGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZShXS0J1 bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiwgdWludDY0X3QgaWRlbnRpZmllciwg Y29uc3Qgdm9pZCopCi17Ci0gICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlIG1lc3NhZ2U7Ci0g ICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCB0b0ltcGwocGFnZSkpOwot ICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50 NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7Ci0gICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuaW5q ZWN0ZWRCdW5kbGUoKS0+cG9zdE1lc3NhZ2UoU3RyaW5nOjpmcm9tVVRGOCgiV2ViUGFnZS5EaWRG aW5pc2hMb2FkRm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RGTW92ZSht ZXNzYWdlKSkucHRyKCkpOwotfQorICAgIHZvaWQgZGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JS ZXNvdXJjZShXZWJQYWdlJiBwYWdlLCBXZWJGcmFtZSYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIHVp bnQ2NF90IGNvbnRlbnRMZW5ndGgpIG92ZXJyaWRlCisgICAgeworICAgICAgICBBUEk6OkRpY3Rp b25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsKKyAgICAgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9t VVRGOCgiUGFnZSIpLCAmcGFnZSk7CisgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVU RjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVudGlmaWVyKSk7CisgICAg ICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIkNvbnRlbnRMZW5ndGgiKSwgQVBJOjpV SW50NjQ6OmNyZWF0ZShjb250ZW50TGVuZ3RoKSk7CisgICAgICAgIFdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLmluamVjdGVkQnVuZGxlKCktPnBvc3RNZXNzYWdlKFN0cmluZzo6ZnJvbVVURjgoIldl YlBhZ2UuRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGhGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25h cnk6OmNyZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7CisgICAgfQogCi1zdGF0aWMgdm9p ZCBkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZy YW1lUmVmLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS0Vycm9yUmVmIGVycm9yLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKQotewotICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOwot ICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwgdG9JbXBsKHBhZ2UpKTsK LSAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIiksIEFQSTo6VUlu dDY0OjpjcmVhdGUoaWRlbnRpZmllcikpOwotICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVU RjgoIkVycm9yIiksIHRvSW1wbChlcnJvcikpOwotICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LmluamVjdGVkQnVuZGxlKCktPnBvc3RNZXNzYWdlKFN0cmluZzo6ZnJvbVVURjgoIldlYlBhZ2Uu RGlkRmFpbExvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6OmNyZWF0ZShXVEZNb3Zl KG1lc3NhZ2UpKS5wdHIoKSk7Ci0KLSAgICAvLyBQb3N0IG9uIHRoZSBjb25zb2xlIGFzIHdlbGwg dG8gYmUgY29uc2lzdGVudCB3aXRoIHRoZSBpbnNwZWN0b3IuCi0gICAgY29uc3QgUmVzb3VyY2VF cnJvciYgcmVzb3VyY2VFcnJvciA9IHRvSW1wbChlcnJvciktPnBsYXRmb3JtRXJyb3IoKTsKLSAg ICBpZiAoIXJlc291cmNlRXJyb3IuaXNDYW5jZWxsYXRpb24oKSkgewotICAgICAgICBTdHJpbmdC dWlsZGVyIGVycm9yTWVzc2FnZTsKLSAgICAgICAgZXJyb3JNZXNzYWdlLmFwcGVuZExpdGVyYWwo IkZhaWxlZCB0byBsb2FkIHJlc291cmNlIik7Ci0gICAgICAgIGlmICghcmVzb3VyY2VFcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgZXJyb3JNZXNz YWdlLmFwcGVuZExpdGVyYWwoIjogIik7Ci0gICAgICAgICAgICBlcnJvck1lc3NhZ2UuYXBwZW5k KHJlc291cmNlRXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSk7CisgICAgdm9pZCBkaWRGaW5p c2hMb2FkRm9yUmVzb3VyY2UoV2ViUGFnZSYgcGFnZSwgV2ViRnJhbWUmLCB1aW50NjRfdCBpZGVu dGlmaWVyKSBvdmVycmlkZQorICAgIHsKKyAgICAgICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBl IG1lc3NhZ2U7CisgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSwg JnBhZ2UpOworICAgICAgICBtZXNzYWdlLnNldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVy IiksIEFQSTo6VUludDY0OjpjcmVhdGUoaWRlbnRpZmllcikpOworICAgICAgICBXZWJQcm9jZXNz OjpzaW5nbGV0b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21V VEY4KCJXZWJQYWdlLkRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSIpLCBBUEk6OkRpY3Rpb25hcnk6 OmNyZWF0ZShXVEZNb3ZlKG1lc3NhZ2UpKS5wdHIoKSk7CisgICAgfQorCisgICAgdm9pZCBkaWRG YWlsTG9hZEZvclJlc291cmNlKFdlYlBhZ2UmIHBhZ2UsIFdlYkZyYW1lJiwgdWludDY0X3QgaWRl bnRpZmllciwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpIG92ZXJyaWRlCisgICAgeworICAg ICAgICBBUEk6OkRpY3Rpb25hcnk6Ok1hcFR5cGUgbWVzc2FnZTsKKyAgICAgICAgbWVzc2FnZS5z ZXQoU3RyaW5nOjpmcm9tVVRGOCgiUGFnZSIpLCAmcGFnZSk7CisgICAgICAgIG1lc3NhZ2Uuc2V0 KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSwgQVBJOjpVSW50NjQ6OmNyZWF0ZShpZGVu dGlmaWVyKSk7CisgICAgICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVURjgoIkVycm9yIiks IEFQSTo6RXJyb3I6OmNyZWF0ZShlcnJvcikpOworICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0 b24oKS5pbmplY3RlZEJ1bmRsZSgpLT5wb3N0TWVzc2FnZShTdHJpbmc6OmZyb21VVEY4KCJXZWJQ YWdlLkRpZEZhaWxMb2FkRm9yUmVzb3VyY2UiKSwgQVBJOjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RG TW92ZShtZXNzYWdlKSkucHRyKCkpOworCisgICAgICAgIC8vIFBvc3Qgb24gdGhlIGNvbnNvbGUg YXMgd2VsbCB0byBiZSBjb25zaXN0ZW50IHdpdGggdGhlIGluc3BlY3Rvci4KKyAgICAgICAgaWYg KCFlcnJvci5pc0NhbmNlbGxhdGlvbigpKSB7CisgICAgICAgICAgICBTdHJpbmdCdWlsZGVyIGVy cm9yTWVzc2FnZTsKKyAgICAgICAgICAgIGVycm9yTWVzc2FnZS5hcHBlbmRMaXRlcmFsKCJGYWls ZWQgdG8gbG9hZCByZXNvdXJjZSIpOworICAgICAgICAgICAgaWYgKCFlcnJvci5sb2NhbGl6ZWRE ZXNjcmlwdGlvbigpLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIGVycm9yTWVzc2FnZS5h cHBlbmRMaXRlcmFsKCI6ICIpOworICAgICAgICAgICAgICAgIGVycm9yTWVzc2FnZS5hcHBlbmQo ZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICB9CisgICAgICAgICAg ICB3ZWJraXRXZWJQYWdlRGlkU2VuZENvbnNvbGVNZXNzYWdlKG1fd2ViUGFnZSwgTWVzc2FnZVNv dXJjZTo6TmV0d29yaywgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJyb3JNZXNzYWdlLnRvU3RyaW5n KCksIDAsIGVycm9yLmZhaWxpbmdVUkwoKSk7CiAgICAgICAgIH0KLSAgICAgICAgd2Via2l0V2Vi UGFnZURpZFNlbmRDb25zb2xlTWVzc2FnZShXRUJLSVRfV0VCX1BBR0UoY2xpZW50SW5mbyksIE1l c3NhZ2VTb3VyY2U6Ok5ldHdvcmssIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIGVycm9yTWVzc2FnZS50 b1N0cmluZygpLCAwLCByZXNvdXJjZUVycm9yLmZhaWxpbmdVUkwoKSk7CiAgICAgfQotfQorCisg ICAgV2ViS2l0V2ViUGFnZSogbV93ZWJQYWdlOworfTsKIAogY2xhc3MgUGFnZUNvbnRleHRNZW51 Q2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBhZ2VDb250ZXh0TWVu dUNsaWVudCB7CiBwdWJsaWM6CkBAIC01NDIsMjIgKzU0Nyw3IEBAIFdlYktpdFdlYlBhZ2UqIHdl YmtpdFdlYlBhZ2VDcmVhdGUoV2ViUGFnZSogd2ViUGFnZSkKICAgICBXZWJLaXRXZWJQYWdlKiBw YWdlID0gV0VCS0lUX1dFQl9QQUdFKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfUEFHRSwg TlVMTCkpOwogICAgIHBhZ2UtPnByaXYtPndlYlBhZ2UgPSB3ZWJQYWdlOwogCi0gICAgV0tCdW5k bGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50VjEgcmVzb3VyY2VMb2FkQ2xpZW50ID0gewotICAgICAg ICB7Ci0gICAgICAgICAgICAxLCAvLyB2ZXJzaW9uCi0gICAgICAgICAgICBwYWdlLCAvLyBjbGll bnRJbmZvCi0gICAgICAgIH0sCi0gICAgICAgIGRpZEluaXRpYXRlTG9hZEZvclJlc291cmNlLAot ICAgICAgICB3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSwKLSAgICAgICAgZGlkUmVjZWl2ZVJlc3Bv bnNlRm9yUmVzb3VyY2UsCi0gICAgICAgIGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3Vy Y2UsCi0gICAgICAgIGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSwKLSAgICAgICAgZGlkRmFpbExv YWRGb3JSZXNvdXJjZSwKLSAgICAgICAgMCwgLy8gc2hvdWxkQ2FjaGVSZXNwb25zZQotICAgICAg ICAwIC8vIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlCi0gICAgfTsKLSAgICBXS0J1bmRsZVBh Z2VTZXRSZXNvdXJjZUxvYWRDbGllbnQodG9BUEkod2ViUGFnZSksICZyZXNvdXJjZUxvYWRDbGll bnQuYmFzZSk7Ci0KKyAgICB3ZWJQYWdlLT5zZXRJbmplY3RlZEJ1bmRsZVJlc291cmNlTG9hZENs aWVudChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VSZXNvdXJjZUxvYWRDbGllbnQ+KHBhZ2UpKTsKICAg ICB3ZWJQYWdlLT5zZXRJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQoc3RkOjptYWtlX3Vu aXF1ZTxQYWdlTG9hZGVyQ2xpZW50PihwYWdlKSk7CiAgICAgd2ViUGFnZS0+c2V0SW5qZWN0ZWRC dW5kbGVDb250ZXh0TWVudUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VDb250ZXh0TWVudUNs aWVudD4ocGFnZSkpOwogICAgIHdlYlBhZ2UtPnNldEluamVjdGVkQnVuZGxlVUlDbGllbnQoc3Rk OjptYWtlX3VuaXF1ZTxQYWdlVUlDbGllbnQ+KHBhZ2UpKTsK