149021 2015-09-09 17:33:04 -0700 Web Inspector: Make WebInspectorProxy inspectorURL path methods static 2015-09-10 10:28:01 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1124772 0 joepeck 2015-09-09 17:33:04 -0700 * SUMMARY Make WebInspectorProxy inspectorURL path methods static. These do not depend on anything within an instance, so make them static for clarity. That would make them easier to share if needed. 1124826 1 260907 joepeck 2015-09-09 20:43:46 -0700 Created attachment 260907 [PATCH] Proposed Fix 1124913 2 260907 bburg 2015-09-10 09:35:35 -0700 Comment on attachment 260907 [PATCH] Proposed Fix r=me I can't think of any reason why we would make it dynamic. 1124936 3 260907 commit-queue 2015-09-10 10:27:57 -0700 Comment on attachment 260907 [PATCH] Proposed Fix Clearing flags on attachment: 260907 Committed r189572: <http://trac.webkit.org/changeset/189572> 1124937 4 commit-queue 2015-09-10 10:28:01 -0700 All reviewed patches have been landed. Closing bug. 260907 2015-09-09 20:43:46 -0700 2015-09-10 10:27:57 -0700 [PATCH] Proposed Fix static-methods.patch text/plain 9643 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwN2M1ZWJhLi4xNTI3YzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTUtMDktMDkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIFdlYkluc3BlY3RvclByb3h5IGluc3BlY3RvclVS TCBwYXRoIG1ldGhvZHMgc3RhdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDkwMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpkaWRSZWxhdW5jaEluc3BlY3RvclBhZ2VQcm9j ZXNzKToKKyAgICAgICAgKFdlYktpdDo6aXNNYWluT3JUZXN0SW5zcGVjdG9yUGFnZSk6CisgICAg ICAgIChXZWJLaXQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6ZWFnZXJseUNyZWF0ZUluc3BlY3RvclBhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6Y3JlYXRlSW5zcGVjdG9yUGFnZSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKToKKyAgICAgICAgKFdlYktpdDo6V2Vi SW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclRlc3RQYWdlVVJMKToKKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VVUkwpOgorICAgICAgICAqIFVJUHJvY2Vz cy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JQcm94eTo6aW5zcGVjdG9yUGFnZVVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3Bl Y3RvclByb3h5OjppbnNwZWN0b3JUZXN0UGFnZVVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYklu c3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNlVVJMKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYkluc3BlY3RvclByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQ cm94eTo6aW5zcGVjdG9yUGFnZVVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclBy b3h5OjppbnNwZWN0b3JUZXN0UGFnZVVSTCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rv clByb3h5OjppbnNwZWN0b3JCYXNlVVJMKToKKworMjAxNS0wOS0wOSAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBk ZWFkIFdlYkluc3BlY3RvclByb3h5IHJlbGF0ZWQgY29kZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5MDE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCmluZGV4IGZkYmNjMWQuLjM0MmYzZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcApAQCAt MTc4LDcgKzE3OCw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmNsb3NlKCkKIHZvaWQgV2Vi SW5zcGVjdG9yUHJveHk6OmRpZFJlbGF1bmNoSW5zcGVjdG9yUGFnZVByb2Nlc3MoKQogewogICAg IG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdl LT5wYWdlSUQoKSwgKnRoaXMpOwotICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFzc3Vt ZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoaW5zcGVjdG9yQmFzZVVSTCgpKTsKKyAgICBtX2luc3BlY3Rv clBhZ2UtPnByb2Nlc3MoKS5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKFdlYkluc3BlY3RvclBy b3h5OjppbnNwZWN0b3JCYXNlVVJMKCkpOwogCiAgICAgLy8gV2hlbiBkaWRSZWxhdW5jaEluc3Bl Y3RvclBhZ2VQcm9jZXNzIGlzIGNhbGxlZCB3ZSBjYW4gYXNzdW1lIGl0IGlzIGR1cmluZyBhIGxv YWQgcmVxdWVzdC4KICAgICAvLyBBbnkgbWVzc2FnZXMgd2Ugd291bGQgaGF2ZSBzZW50IHRvIGEg dGVybWluYXRlZCBwcm9jZXNzIG5lZWQgdG8gYmUgcmUtc2VudC4KQEAgLTMyOSwyNCArMzI5LDI0 IEBAIGJvb2wgV2ViSW5zcGVjdG9yUHJveHk6OmlzSW5zcGVjdG9yUGFnZShXZWJQYWdlUHJveHkm IHdlYlBhZ2UpCiAgICAgcmV0dXJuIHBhZ2VMZXZlbE1hcCgpLmNvbnRhaW5zKCZ3ZWJQYWdlKTsK IH0KIAotc3RhdGljIGJvb2wgaXNNYWluT3JUZXN0SW5zcGVjdG9yUGFnZShjb25zdCBXZWJJbnNw ZWN0b3JQcm94eSogd2ViSW5zcGVjdG9yUHJveHksIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0UmVm KQorc3RhdGljIGJvb2wgaXNNYWluT3JUZXN0SW5zcGVjdG9yUGFnZShXS1VSTFJlcXVlc3RSZWYg cmVxdWVzdFJlZikKIHsKICAgICBVUkwgcmVxdWVzdFVSTChVUkwoKSwgdG9JbXBsKHJlcXVlc3RS ZWYpLT5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKSk7CiAgICAgaWYgKCFXZWJDb3JlOjpTY2hlbWVS ZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKHJlcXVlc3RVUkwucHJvdG9jb2wo KSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFVzZSBVUkwgc28gd2UgY2FuIGNv bXBhcmUganVzdCB0aGUgcGF0aHMuCi0gICAgVVJMIG1haW5QYWdlVVJMKFVSTCgpLCB3ZWJJbnNw ZWN0b3JQcm94eS0+aW5zcGVjdG9yUGFnZVVSTCgpKTsKKyAgICBVUkwgbWFpblBhZ2VVUkwoVVJM KCksIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKCkpOwogICAgIEFTU0VSVChX ZWJDb3JlOjpTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKG1haW5Q YWdlVVJMLnByb3RvY29sKCkpKTsKICAgICBpZiAoZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHJl cXVlc3RVUkwucGF0aCgpKSA9PSBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMobWFpblBhZ2VVUkwu cGF0aCgpKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBXZSBtaWdodCBub3QgaGF2 ZSBhIFRlc3QgVVJMIGluIFByb2R1Y3Rpb24gYnVpbGRzLgotICAgIFN0cmluZyB0ZXN0UGFnZVVS TFN0cmluZyA9IHdlYkluc3BlY3RvclByb3h5LT5pbnNwZWN0b3JUZXN0UGFnZVVSTCgpOworICAg IFN0cmluZyB0ZXN0UGFnZVVSTFN0cmluZyA9IFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JU ZXN0UGFnZVVSTCgpOwogICAgIGlmICh0ZXN0UGFnZVVSTFN0cmluZy5pc051bGwoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgVVJMIHRlc3RQYWdlVVJMKFVSTCgpLCB3ZWJJbnNwZWN0 b3JQcm94eS0+aW5zcGVjdG9yVGVzdFBhZ2VVUkwoKSk7CisgICAgVVJMIHRlc3RQYWdlVVJMKFVS TCgpLCB0ZXN0UGFnZVVSTFN0cmluZyk7CiAgICAgQVNTRVJUKFdlYkNvcmU6OlNjaGVtZVJlZ2lz dHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodGVzdFBhZ2VVUkwucHJvdG9jb2woKSkp OwogICAgIHJldHVybiBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMocmVxdWVzdFVSTC5wYXRoKCkp ID09IGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyh0ZXN0UGFnZVVSTC5wYXRoKCkpOwogfQpAQCAt MzcwLDcgKzM3MCw3IEBAIHN0YXRpYyB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmIGZyYW1lUmVmLCBXS0ZyCiAgICAgQVNTRVJUKHdlYklu c3BlY3RvclByb3h5KTsKIAogICAgIC8vIEFsbG93IGxvYWRpbmcgb2YgdGhlIG1haW4gaW5zcGVj dG9yIGZpbGUuCi0gICAgaWYgKGlzTWFpbk9yVGVzdEluc3BlY3RvclBhZ2Uod2ViSW5zcGVjdG9y UHJveHksIHJlcXVlc3RSZWYpKSB7CisgICAgaWYgKGlzTWFpbk9yVGVzdEluc3BlY3RvclBhZ2Uo cmVxdWVzdFJlZikpIHsKICAgICAgICAgdG9JbXBsKGxpc3RlbmVyUmVmKS0+dXNlKCk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC00NzQsNyArNDc0LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQ cm94eTo6ZWFnZXJseUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIFdLUGFnZVNldFBhZ2VMb2Fk ZXJDbGllbnQodG9BUEkobV9pbnNwZWN0b3JQYWdlKSwgJmxvYWRlckNsaWVudC5iYXNlKTsKIAog ICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdl czo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQ YWdlLT5wYWdlSUQoKSwgKnRoaXMpOwotICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFz c3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoaW5zcGVjdG9yQmFzZVVSTCgpKTsKKyAgICBtX2luc3Bl Y3RvclBhZ2UtPnByb2Nlc3MoKS5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKFdlYkluc3BlY3Rv clByb3h5OjppbnNwZWN0b3JCYXNlVVJMKCkpOwogfQogCiAvLyBDYWxsZWQgYnkgV2ViSW5zcGVj dG9yUHJveHkgbWVzc2FnZXMKQEAgLTUxNyw3ICs1MTcsNyBAQCB2b2lkIFdlYkluc3BlY3RvclBy b3h5OjpjcmVhdGVJbnNwZWN0b3JQYWdlKElQQzo6QXR0YWNobWVudCBjb25uZWN0aW9uSWRlbnRp ZmllcgogICAgICAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpX ZWJJbnNwZWN0b3JVSTo6U2V0RG9ja2luZ1VuYXZhaWxhYmxlKCFtX2NhbkF0dGFjaCksIG1faW5z cGVjdG9yUGFnZS0+cGFnZUlEKCkpOwogICAgIH0KIAotICAgIG1faW5zcGVjdG9yUGFnZS0+bG9h ZFJlcXVlc3QoVVJMKFVSTCgpLCBtX3VuZGVyVGVzdCA/IGluc3BlY3RvclRlc3RQYWdlVVJMKCkg OiBpbnNwZWN0b3JQYWdlVVJMKCkpKTsKKyAgICBtX2luc3BlY3RvclBhZ2UtPmxvYWRSZXF1ZXN0 KFVSTChVUkwoKSwgbV91bmRlclRlc3QgPyBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yVGVz dFBhZ2VVUkwoKSA6IFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKCkpKTsKIH0K IAogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6b3BlbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCmluZGV4IDI3ZjI5NzkuLjVlY2ZiMDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCkBAIC0xMzksOSArMTM5 LDkgQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIGlzSW5zcGVjdG9yUGFnZShXZWJQYWdlUHJv eHkmKTsKIAogICAgIC8vIFByb3ZpZGVkIGJ5IHBsYXRmb3JtIFdlYkluc3BlY3RvclByb3h5IGlt cGxlbWVudGF0aW9ucy4KLSAgICBTdHJpbmcgaW5zcGVjdG9yUGFnZVVSTCgpIGNvbnN0OwotICAg IFN0cmluZyBpbnNwZWN0b3JUZXN0UGFnZVVSTCgpIGNvbnN0OwotICAgIFN0cmluZyBpbnNwZWN0 b3JCYXNlVVJMKCkgY29uc3Q7CisgICAgc3RhdGljIFN0cmluZyBpbnNwZWN0b3JQYWdlVVJMKCk7 CisgICAgc3RhdGljIFN0cmluZyBpbnNwZWN0b3JUZXN0UGFnZVVSTCgpOworICAgIHN0YXRpYyBT dHJpbmcgaW5zcGVjdG9yQmFzZVVSTCgpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIp CiAgICAgdm9pZCBlbmFibGVSZW1vdGVJbnNwZWN0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCmluZGV4IGFhNmQ0 MzYuLmVlNjg1M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2Vi SW5zcGVjdG9yUHJveHlFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv V2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCkBAIC0xNzAsMjUgKzE3MCwyMyBAQCB2b2lkIFdlYklu c3BlY3RvclByb3h5OjpwbGF0Zm9ybUluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3RyaW5nJiB1 cmwpCiAgICAgZWNvcmVfZXZhc190aXRsZV9zZXQobV9pbnNwZWN0b3JXaW5kb3csIHRpdGxlLnV0 ZjgoKS5kYXRhKCkpOwogfQogCi1TdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclBh Z2VVUkwoKSBjb25zdAorU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJM KCkKIHsKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7Ci0gICAgYnVpbGRlci5hcHBlbmQoaW5z cGVjdG9yQmFzZVVSTCgpKTsKKyAgICBidWlsZGVyLmFwcGVuZChXZWJJbnNwZWN0b3JQcm94eTo6 aW5zcGVjdG9yQmFzZVVSTCgpKTsKICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIi9NYWluLmh0 bWwiKTsKLQogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7CiB9CiAKLVN0cmluZyBXZWJJ bnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yVGVzdFBhZ2VVUkwoKSBjb25zdAorU3RyaW5nIFdlYklu c3BlY3RvclByb3h5OjppbnNwZWN0b3JUZXN0UGFnZVVSTCgpCiB7CiAgICAgU3RyaW5nQnVpbGRl ciBidWlsZGVyOwotICAgIGJ1aWxkZXIuYXBwZW5kKGluc3BlY3RvckJhc2VVUkwoKSk7CisgICAg YnVpbGRlci5hcHBlbmQoV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VVUkwoKSk7CiAg ICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIvVGVzdC5odG1sIik7Ci0KICAgICByZXR1cm4gYnVp bGRlci50b1N0cmluZygpOwogfQogCi1TdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3Rv ckJhc2VVUkwoKSBjb25zdAorU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNl VVJMKCkKIHsKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CiAgICAgYnVpbGRlci5hcHBlbmRM aXRlcmFsKCJmaWxlOi8vIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9n dGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCmluZGV4IDYwNmQ1NzcuLjRmOWU1OTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlH dGsuY3BwCkBAIC0yNTAsMTcgKzI1MCwxNyBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0 Zm9ybUluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3RyaW5nJiB1cmwpCiAgICAgICAgIHVwZGF0 ZUluc3BlY3RvcldpbmRvd1RpdGxlKCk7CiB9CiAKLVN0cmluZyBXZWJJbnNwZWN0b3JQcm94eTo6 aW5zcGVjdG9yUGFnZVVSTCgpIGNvbnN0CitTdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3Bl Y3RvclBhZ2VVUkwoKQogewogICAgIHJldHVybiBTdHJpbmcoInJlc291cmNlOi8vL29yZy93ZWJr aXRndGsvaW5zcGVjdG9yL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sIik7CiB9CiAKLVN0cmluZyBX ZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yVGVzdFBhZ2VVUkwoKSBjb25zdAorU3RyaW5nIFdl Ykluc3BlY3RvclByb3h5OjppbnNwZWN0b3JUZXN0UGFnZVVSTCgpCiB7CiAgICAgcmV0dXJuIFN0 cmluZygicmVzb3VyY2U6Ly8vb3JnL3dlYmtpdGd0ay9pbnNwZWN0b3IvVXNlckludGVyZmFjZS9U ZXN0Lmh0bWwiKTsKIH0KIAotU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNl VVJMKCkgY29uc3QKK1N0cmluZyBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yQmFzZVVSTCgp CiB7CiAgICAgcmV0dXJuIFN0cmluZygicmVzb3VyY2U6Ly8vb3JnL3dlYmtpdGd0ay9pbnNwZWN0 b3IvVXNlckludGVyZmFjZS8iKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCmluZGV4IGQzYWNiMjQuLjE5YmFiNTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlN YWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94 eU1hYy5tbQpAQCAtODUwLDcgKzg1MCw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRm b3JtU3RhcnRXaW5kb3dEcmFnKCkKICNlbmRpZgogfQogCi1TdHJpbmcgV2ViSW5zcGVjdG9yUHJv eHk6Omluc3BlY3RvclBhZ2VVUkwoKSBjb25zdAorU3RyaW5nIFdlYkluc3BlY3RvclByb3h5Ojpp bnNwZWN0b3JQYWdlVVJMKCkKIHsKICAgICAvLyBDYWxsIHRoZSBzb2Z0IGxpbmsgZnJhbWV3b3Jr IGZ1bmN0aW9uIHRvIGRsb3BlbiBpdCwgdGhlbiBbTlNCdW5kbGUgYnVuZGxlV2l0aElkZW50aWZp ZXI6XSB3aWxsIHdvcmsuCiAgICAgV2ViSW5zcGVjdG9yVUlMaWJyYXJ5KCk7CkBAIC04NjEsNyAr ODYxLDcgQEAgU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JQYWdlVVJMKCkgY29u c3QKICAgICByZXR1cm4gW1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGF0aF0gYWJzb2x1dGVTdHJp bmddOwogfQogCi1TdHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclRlc3RQYWdlVVJM KCkgY29uc3QKK1N0cmluZyBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yVGVzdFBhZ2VVUkwo KQogewogICAgIC8vIENhbGwgdGhlIHNvZnQgbGluayBmcmFtZXdvcmsgZnVuY3Rpb24gdG8gZGxv cGVuIGl0LCB0aGVuIFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpdIHdpbGwgd29yay4K ICAgICBXZWJJbnNwZWN0b3JVSUxpYnJhcnkoKTsKQEAgLTg3NSw3ICs4NzUsNyBAQCBTdHJpbmcg V2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvclRlc3RQYWdlVVJMKCkgY29uc3QKICAgICByZXR1 cm4gW1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGF0aF0gYWJzb2x1dGVTdHJpbmddOwogfQogCi1T dHJpbmcgV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VVUkwoKSBjb25zdAorU3RyaW5n IFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNlVVJMKCkKIHsKICAgICAvLyBDYWxsIHRo ZSBzb2Z0IGxpbmsgZnJhbWV3b3JrIGZ1bmN0aW9uIHRvIGRsb3BlbiBpdCwgdGhlbiBbTlNCdW5k bGUgYnVuZGxlV2l0aElkZW50aWZpZXI6XSB3aWxsIHdvcmsuCiAgICAgV2ViSW5zcGVjdG9yVUlM aWJyYXJ5KCk7Cg==