165701 2016-12-09 16:22:59 -0800 Web Inspector: Move MainTarget and WorkerTarget to their own files 2016-12-11 15:37:48 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1258449 0 joepeck 2016-12-09 16:22:59 -0800 Summary: Move MainTarget and WorkerTarget to their own files This is cleanup that I had in another patch that is stalled. Separating it out into its own patch. 1258455 1 296737 joepeck 2016-12-09 16:27:14 -0800 Created attachment 296737 [PATCH] Proposed Fix 1258893 2 296737 bburg 2016-12-11 15:12:30 -0800 Comment on attachment 296737 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=296737&action=review rs=me > Source/WebInspectorUI/UserInterface/Protocol/Target.js:-147 > - initialize() Why did this construction ever exist instead of putting in just one subclass constructor? 1258898 3 296737 commit-queue 2016-12-11 15:37:43 -0800 Comment on attachment 296737 [PATCH] Proposed Fix Clearing flags on attachment: 296737 Committed r209686: <http://trac.webkit.org/changeset/209686> 1258899 4 commit-queue 2016-12-11 15:37:48 -0800 All reviewed patches have been landed. Closing bug. 296737 2016-12-09 16:27:14 -0800 2016-12-11 15:37:43 -0800 [PATCH] Proposed Fix cleanup-3.patch text/plain 14634 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ4ODkyOGYuLmVlMTgyYTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE2LTEyLTA5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBN YWluVGFyZ2V0IGFuZCBXb3JrZXJUYXJnZXQgdG8gdGhlaXIgb3duIGZpbGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU3MDEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyTWFuYWdlci5wcm90b3R5cGUuc2NyaXB0RGlkUGFyc2UpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvTWFpbi5odG1sOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTWFpblRh cmdldC5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTWFpblRhcmdldCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTWFpblRhcmdldC5wcm90b3R5cGUuZ2V0IGRpc3BsYXlOYW1lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5NYWluVGFyZ2V0LnByb3RvdHlwZS5nZXQgbWFpblJlc291 cmNlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UYXJnZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5UYXJn ZXQpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1haW5UYXJnZXQucHJvdG90eXBl LmdldCBkaXNwbGF5TmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTWFpblRh cmdldC5wcm90b3R5cGUuZ2V0IG1haW5SZXNvdXJjZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuTWFpblRhcmdldC5wcm90b3R5cGUuaW5pdGlhbGl6ZSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuV29ya2VyVGFyZ2V0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5Xb3JrZXJUYXJnZXQucHJvdG90eXBlLmdldCBkaXNwbGF5TmFtZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyVGFyZ2V0LnByb3RvdHlwZS5pbml0aWFsaXpl KTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1dvcmtlclRhcmdl dC5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyVGFyZ2V0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJUYXJnZXQucHJvdG90eXBlLmdldCBkaXNwbGF5TmFtZSk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9UZXN0Lmh0bWw6CisKKzIwMTYtMTItMDkgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBTb21lIHJlc291cmNlcyBmZXRjaGVkIHZpYSBGZXRjaCBBUEkgZG8gbm90IGhhdmUgZGF0YQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1MjMwCiAg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTQ0OTIyMD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2Vy TWFuYWdlci5qcwppbmRleCBmNjgyY2FlLi5kZmVlNTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVi dWdnZXJNYW5hZ2VyLmpzCkBAIC02OTksNyArNjk5LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TWFuYWdlciA9IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl Y3QKICAgICAgICAgaWYgKHRhcmdldCAhPT0gV2ViSW5zcGVjdG9yLm1haW5UYXJnZXQgJiYgIXRh cmdldC5tYWluUmVzb3VyY2UpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJr aXQub3JnL2IvMTY0NDI3PiBXZWIgSW5zcGVjdG9yOiBXb3JrZXJUYXJnZXQncyBtYWluUmVzb3Vy Y2Ugc2hvdWxkIGJlIGEgUmVzb3VyY2Ugbm90IGEgU2NyaXB0CiAgICAgICAgICAgICAvLyBXZSBt YWtlIHRoZSBtYWluIHJlc291cmNlIG9mIGEgV29ya2VyVGFyZ2V0IHRoZSBTY3JpcHQgaW5zdGVh ZCBvZiB0aGUgUmVzb3VyY2UKLSAgICAgICAgICAgIC8vIGJlY2F1c2UgdGhlIGZyb250ZW5kIG1h eSBub3QgYmUgaW5mb3JtZWQgb2YgdGhlIFJlc291cmNlLiBXZSBzaG91bGQgZ2F1cmFudGVlCisg ICAgICAgICAgICAvLyBiZWNhdXNlIHRoZSBmcm9udGVuZCBtYXkgbm90IGJlIGluZm9ybWVkIG9m IHRoZSBSZXNvdXJjZS4gV2Ugc2hvdWxkIGd1YXJhbnRlZQogICAgICAgICAgICAgLy8gdGhlIGZy b250ZW5kIGlzIGluZm9ybWVkIG9mIHRoZSBSZXNvdXJjZS4KICAgICAgICAgICAgIGlmIChzY3Jp cHQudXJsID09PSB0YXJnZXQubmFtZSkgewogICAgICAgICAgICAgICAgIHRhcmdldC5tYWluUmVz b3VyY2UgPSBzY3JpcHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N YWluLmh0bWwKaW5kZXggYjkwYzU5ZS4uNWUxZmYwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtMjU1LDI4ICsyNTUsMzIgQEAKICAgICA8 c2NyaXB0IHNyYz0iUHJvdG9jb2wvTG9nZ2luZ1Byb3RvY29sVHJhY2VyLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvSW5zcGVjdG9yQmFja2VuZC5qcyI+PC9zY3JpcHQ+ CiAKKyAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvQ29ubmVjdGlvbi5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL0luc3BlY3RvckZyb250ZW5kQVBJLmpzIj48L3Njcmlw dD4KKyAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvTG9hZEluc3BlY3RvckJhY2tlbmRDb21tYW5k cy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL01lc3NhZ2VEaXNwYXRj aGVyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvUmVtb3RlT2JqZWN0 LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvVGFyZ2V0LmpzIj48L3Nj cmlwdD4KKworICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9NYWluVGFyZ2V0LmpzIj48L3Njcmlw dD4KKyAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvV29ya2VyVGFyZ2V0LmpzIj48L3NjcmlwdD4K KwogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9BcHBsaWNhdGlvbkNhY2hlT2JzZXJ2ZXIuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9DU1NPYnNlcnZlci5qcyI+PC9z Y3JpcHQ+Ci0gICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL0Nvbm5lY3Rpb24uanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9Db25zb2xlT2JzZXJ2ZXIuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9ET01PYnNlcnZlci5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL0RPTVN0b3JhZ2VPYnNlcnZlci5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL0RhdGFiYXNlT2JzZXJ2ZXIuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9EZWJ1Z2dlck9ic2VydmVyLmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvSGVhcE9ic2VydmVyLmpzIj48L3NjcmlwdD4K LSAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9JbnNwZWN0b3JPYnNlcnZlci5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL0xheWVyVHJlZU9ic2VydmVyLmpzIj48 L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvTG9hZEluc3BlY3RvckJhY2tlbmRD b21tYW5kcy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL01lbW9yeU9i c2VydmVyLmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvTWVzc2FnZURp c3BhdGNoZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9OZXR3b3Jr T2JzZXJ2ZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9QYWdlT2Jz ZXJ2ZXIuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9SZW1vdGVPYmpl Y3QuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9SZXBsYXlPYnNlcnZl ci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL1J1bnRpbWVPYnNlcnZl ci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL1NjcmlwdFByb2ZpbGVy T2JzZXJ2ZXIuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9UYXJnZXQu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJQcm90b2NvbC9UaW1lbGluZU9ic2VydmVy LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvV29ya2VyT2JzZXJ2ZXIu anMiPjwvc2NyaXB0PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Qcm90b2NvbC9NYWluVGFyZ2V0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvUHJvdG9jb2wvTWFpblRhcmdldC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwLi45YjFjY2I1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTWFpblRhcmdldC5qcwpAQCAtMCwwICsxLDU2 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLk1haW5UYXJnZXQgPSBjbGFzcyBNYWluVGFy Z2V0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRhcmdldAoreworICAgIGNvbnN0cnVjdG9yKGNvbm5l Y3Rpb24pCisgICAgeworICAgICAgICBzdXBlcigibWFpbiIsICIiLCBXZWJJbnNwZWN0b3IuVGFy Z2V0LlR5cGUuTWFpbiwgSW5zcGVjdG9yQmFja2VuZC5tYWluQ29ubmVjdGlvbik7CisKKyAgICAg ICAgbGV0IGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2FibGVUeXBlID09PSBXZWJJ bnNwZWN0b3IuRGVidWdnYWJsZVR5cGUuV2ViID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNYWlu IEZyYW1lIikgOiB0aGlzLmRpc3BsYXlOYW1lOworICAgICAgICB0aGlzLl9leGVjdXRpb25Db250 ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5FeGVjdXRpb25Db250ZXh0KHRoaXMsIFdlYkluc3BlY3Rv ci5SdW50aW1lTWFuYWdlci5Ub3BMZXZlbENvbnRleHRFeGVjdXRpb25JZGVudGlmaWVyLCBkaXNw bGF5TmFtZSwgdHJ1ZSwgbnVsbCk7CisgICAgfQorCisgICAgLy8gUHJvdGVjdGVkIChUYXJnZXQp CisKKyAgICBnZXQgZGlzcGxheU5hbWUoKQorICAgIHsKKyAgICAgICAgc3dpdGNoIChXZWJJbnNw ZWN0b3IuZGVidWdnYWJsZVR5cGUpIHsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuRGVidWdn YWJsZVR5cGUuV2ViOgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygi UGFnZSIpOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5EZWJ1Z2dhYmxlVHlwZS5KYXZhU2Ny aXB0OgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSmF2YVNjcmlw dCBDb250ZXh0Iik7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjb25zb2xlLmVycm9y KCJVbmV4cGVjdGVkIGRlYnVnZ2FibGUgdHlwZTogIiwgV2ViSW5zcGVjdG9yLmRlYnVnZ2FibGVU eXBlKTsKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1haW4iKTsK KyAgICAgICAgfQorICAgIH0KKworICAgIGdldCBtYWluUmVzb3VyY2UoKQorICAgIHsKKyAgICAg ICAgbGV0IG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWlu RnJhbWU7CisgICAgICAgIHJldHVybiBtYWluRnJhbWUgPyBtYWluRnJhbWUubWFpblJlc291cmNl IDogbnVsbDsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMKaW5kZXggZTg1M2Q5Ny4uYmYyMjdmYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFy Z2V0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29s L1RhcmdldC5qcwpAQCAtMzksOCArMzksNiBAQCBXZWJJbnNwZWN0b3IuVGFyZ2V0ID0gY2xhc3Mg VGFyZ2V0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl9leHRyYVNj cmlwdENvbGxlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkNvbGxlY3Rpb24oV2ViSW5zcGVjdG9y LkNvbGxlY3Rpb24uVHlwZVZlcmlmaWVyLlNjcmlwdCk7CiAKICAgICAgICAgdGhpcy5fY29ubmVj dGlvbi50YXJnZXQgPSB0aGlzOwotCi0gICAgICAgIHRoaXMuaW5pdGlhbGl6ZSgpOwogICAgIH0K IAogICAgIC8vIEFnZW50cwpAQCAtOTQsNzMgKzkyLDMgQEAgV2ViSW5zcGVjdG9yLlRhcmdldC5F dmVudCA9IHsKICAgICBSZXNvdXJjZUFkZGVkOiAidGFyZ2V0LXJlc291cmNlLWFkZGVkIiwKICAg ICBTY3JpcHRBZGRlZDogInRhcmdldC1zY3JpcHQtYWRkZWQiLAogfTsKLQotV2ViSW5zcGVjdG9y Lk1haW5UYXJnZXQgPSBjbGFzcyBNYWluVGFyZ2V0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRhcmdl dAotewotICAgIGNvbnN0cnVjdG9yKGNvbm5lY3Rpb24pCi0gICAgewotICAgICAgICBzdXBlcigi bWFpbiIsICIiLCBXZWJJbnNwZWN0b3IuVGFyZ2V0LlR5cGUuTWFpbiwgSW5zcGVjdG9yQmFja2Vu ZC5tYWluQ29ubmVjdGlvbik7Ci0gICAgfQotCi0gICAgLy8gUHJvdGVjdGVkIChUYXJnZXQpCi0K LSAgICBnZXQgZGlzcGxheU5hbWUoKQotICAgIHsKLSAgICAgICAgc3dpdGNoIChXZWJJbnNwZWN0 b3IuZGVidWdnYWJsZVR5cGUpIHsKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuRGVidWdnYWJs ZVR5cGUuV2ViOgotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGFn ZSIpOwotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5EZWJ1Z2dhYmxlVHlwZS5KYXZhU2NyaXB0 OgotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSmF2YVNjcmlwdCBD b250ZXh0Iik7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBjb25zb2xlLmVycm9yKCJV bmV4cGVjdGVkIGRlYnVnZ2FibGUgdHlwZTogIiwgV2ViSW5zcGVjdG9yLmRlYnVnZ2FibGVUeXBl KTsKLSAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1haW4iKTsKLSAg ICAgICAgfQotICAgIH0KLQotICAgIGdldCBtYWluUmVzb3VyY2UoKQotICAgIHsKLSAgICAgICAg bGV0IG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJh bWU7Ci0gICAgICAgIHJldHVybiBtYWluRnJhbWUgPyBtYWluRnJhbWUubWFpblJlc291cmNlIDog bnVsbDsKLSAgICB9Ci0KLSAgICBpbml0aWFsaXplKCkKLSAgICB7Ci0gICAgICAgIGxldCBkaXNw bGF5TmFtZSA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dhYmxlVHlwZSA9PT0gV2ViSW5zcGVjdG9yLkRl YnVnZ2FibGVUeXBlLldlYiA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTWFpbiBGcmFtZSIpIDog dGhpcy5kaXNwbGF5TmFtZTsKLSAgICAgICAgdGhpcy5fZXhlY3V0aW9uQ29udGV4dCA9IG5ldyBX ZWJJbnNwZWN0b3IuRXhlY3V0aW9uQ29udGV4dCh0aGlzLCBXZWJJbnNwZWN0b3IuUnVudGltZU1h bmFnZXIuVG9wTGV2ZWxDb250ZXh0RXhlY3V0aW9uSWRlbnRpZmllciwgZGlzcGxheU5hbWUsIHRy dWUsIG51bGwpOwotICAgIH0KLX0KLQotV2ViSW5zcGVjdG9yLldvcmtlclRhcmdldCA9IGNsYXNz IFdvcmtlclRhcmdldCBleHRlbmRzIFdlYkluc3BlY3Rvci5UYXJnZXQKLXsKLSAgICBjb25zdHJ1 Y3Rvcih3b3JrZXJJZCwgbmFtZSwgY29ubmVjdGlvbikKLSAgICB7Ci0gICAgICAgIHN1cGVyKHdv cmtlcklkLCBuYW1lLCBXZWJJbnNwZWN0b3IuVGFyZ2V0LlR5cGUuV29ya2VyLCBjb25uZWN0aW9u KTsKLSAgICB9Ci0KLSAgICAvLyBQcm90ZWN0ZWQgKFRhcmdldCkKLQotICAgIGdldCBkaXNwbGF5 TmFtZSgpCi0gICAgewotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9y VVJMKHRoaXMuX25hbWUpOwotICAgIH0KLQotICAgIGluaXRpYWxpemUoKQotICAgIHsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmFkb3B0T3JwaGFuZWRSZXNvdXJj ZXNGb3JUYXJnZXQodGhpcyk7Ci0KLSAgICAgICAgaWYgKHRoaXMuUnVudGltZUFnZW50KSB7Ci0g ICAgICAgICAgICB0aGlzLl9leGVjdXRpb25Db250ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5FeGVj dXRpb25Db250ZXh0KHRoaXMsIFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5Ub3BMZXZlbENv bnRleHRFeGVjdXRpb25JZGVudGlmaWVyLCB0aGlzLmRpc3BsYXlOYW1lLCBmYWxzZSwgbnVsbCk7 Ci0gICAgICAgICAgICB0aGlzLlJ1bnRpbWVBZ2VudC5lbmFibGUoKTsKLSAgICAgICAgICAgIGlm IChXZWJJbnNwZWN0b3Iuc2hvd0phdmFTY3JpcHRUeXBlSW5mb3JtYXRpb25TZXR0aW5nICYmIFdl Ykluc3BlY3Rvci5zaG93SmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvblNldHRpbmcudmFsdWUpCi0g ICAgICAgICAgICAgICAgdGhpcy5SdW50aW1lQWdlbnQuZW5hYmxlVHlwZVByb2ZpbGVyKCk7Ci0g ICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXJTZXR0 aW5nICYmIFdlYkluc3BlY3Rvci5lbmFibGVDb250cm9sRmxvd1Byb2ZpbGVyU2V0dGluZy52YWx1 ZSkKLSAgICAgICAgICAgICAgICB0aGlzLlJ1bnRpbWVBZ2VudC5lbmFibGVDb250cm9sRmxvd1By b2ZpbGVyKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAodGhpcy5EZWJ1Z2dlckFnZW50KQot ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5pbml0aWFsaXplVGFyZ2V0 KHRoaXMpOwotCi0gICAgICAgIGlmICh0aGlzLkNvbnNvbGVBZ2VudCkKLSAgICAgICAgICAgIHRo aXMuQ29uc29sZUFnZW50LmVuYWJsZSgpOwotICAgIH0KLX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1dvcmtlclRhcmdldC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1dvcmtlclRhcmdldC5q cwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYWYyMTUyCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvV29y a2VyVGFyZ2V0LmpzCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09G VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFT IElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVU T1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBT UEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT CisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJ QUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YK KyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNwZWN0b3Iu V29ya2VyVGFyZ2V0ID0gY2xhc3MgV29ya2VyVGFyZ2V0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRh cmdldAoreworICAgIGNvbnN0cnVjdG9yKHdvcmtlcklkLCBuYW1lLCBjb25uZWN0aW9uKQorICAg IHsKKyAgICAgICAgc3VwZXIod29ya2VySWQsIG5hbWUsIFdlYkluc3BlY3Rvci5UYXJnZXQuVHlw ZS5Xb3JrZXIsIGNvbm5lY3Rpb24pOworCisgICAgICAgIFdlYkluc3BlY3Rvci5mcmFtZVJlc291 cmNlTWFuYWdlci5hZG9wdE9ycGhhbmVkUmVzb3VyY2VzRm9yVGFyZ2V0KHRoaXMpOworCisgICAg ICAgIGlmICh0aGlzLlJ1bnRpbWVBZ2VudCkgeworICAgICAgICAgICAgdGhpcy5fZXhlY3V0aW9u Q29udGV4dCA9IG5ldyBXZWJJbnNwZWN0b3IuRXhlY3V0aW9uQ29udGV4dCh0aGlzLCBXZWJJbnNw ZWN0b3IuUnVudGltZU1hbmFnZXIuVG9wTGV2ZWxDb250ZXh0RXhlY3V0aW9uSWRlbnRpZmllciwg dGhpcy5kaXNwbGF5TmFtZSwgZmFsc2UsIG51bGwpOworICAgICAgICAgICAgdGhpcy5SdW50aW1l QWdlbnQuZW5hYmxlKCk7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNob3dKYXZhU2Ny aXB0VHlwZUluZm9ybWF0aW9uU2V0dGluZyAmJiBXZWJJbnNwZWN0b3Iuc2hvd0phdmFTY3JpcHRU eXBlSW5mb3JtYXRpb25TZXR0aW5nLnZhbHVlKQorICAgICAgICAgICAgICAgIHRoaXMuUnVudGlt ZUFnZW50LmVuYWJsZVR5cGVQcm9maWxlcigpOworICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5lbmFibGVDb250cm9sRmxvd1Byb2ZpbGVyU2V0dGluZyAmJiBXZWJJbnNwZWN0b3IuZW5hYmxl Q29udHJvbEZsb3dQcm9maWxlclNldHRpbmcudmFsdWUpCisgICAgICAgICAgICAgICAgdGhpcy5S dW50aW1lQWdlbnQuZW5hYmxlQ29udHJvbEZsb3dQcm9maWxlcigpOworICAgICAgICB9CisKKyAg ICAgICAgaWYgKHRoaXMuRGVidWdnZXJBZ2VudCkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1hbmFnZXIuaW5pdGlhbGl6ZVRhcmdldCh0aGlzKTsKKworICAgICAgICBpZiAodGhp cy5Db25zb2xlQWdlbnQpCisgICAgICAgICAgICB0aGlzLkNvbnNvbGVBZ2VudC5lbmFibGUoKTsK KyAgICB9CisKKyAgICAvLyBQcm90ZWN0ZWQgKFRhcmdldCkKKworICAgIGdldCBkaXNwbGF5TmFt ZSgpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJM KHRoaXMuX25hbWUpOworICAgIH0KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Rlc3QuaHRtbAppbmRleCBmNDY2MzY1Li5lNzQ3NmU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0Lmh0bWwKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sCkBAIC02Niw2ICs2Niw5IEBACiAg ICAgPHNjcmlwdCBzcmM9IlByb3RvY29sL01lc3NhZ2VEaXNwYXRjaGVyLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iUHJvdG9jb2wvVGFyZ2V0LmpzIj48L3NjcmlwdD4KIAorICAgIDxz Y3JpcHQgc3JjPSJQcm90b2NvbC9NYWluVGFyZ2V0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0 IHNyYz0iUHJvdG9jb2wvV29ya2VyVGFyZ2V0LmpzIj48L3NjcmlwdD4KKwogICAgIDxzY3JpcHQg c3JjPSJQcm90b2NvbC9JbnNwZWN0b3JPYnNlcnZlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9IlByb3RvY29sL0NTU09ic2VydmVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNy Yz0iUHJvdG9jb2wvQ29uc29sZU9ic2VydmVyLmpzIj48L3NjcmlwdD4K