180796 2017-12-13 19:39:29 -0800 Web Inspector: Network Tab - Make text filter just a URL filter and update incrementally 2017-12-13 23:45:34 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1381470 0 joepeck 2017-12-13 19:39:29 -0800 Network Tab - Make text filter just a URL filter and update incrementally Currently the text filter searches resource text content, which caused us to turn of incremental filtering because full text search is expensive. However general feedback is that the filter should update live, like other filters. So lets make the main filter a URL filter. We can find a way to add back different forms of filtering (like full text filter) later. 1381485 1 329319 joepeck 2017-12-13 20:27:22 -0800 Created attachment 329319 [PATCH] Proposed Fix 1381487 2 joepeck 2017-12-13 20:31:20 -0800 <rdar://problem/35973683> 1381491 3 329319 bburg 2017-12-13 20:42:39 -0800 Comment on attachment 329319 [PATCH] Proposed Fix r=me 1381522 4 329319 commit-queue 2017-12-13 23:45:32 -0800 Comment on attachment 329319 [PATCH] Proposed Fix Clearing flags on attachment: 329319 Committed r225895: <https://trac.webkit.org/changeset/225895> 1381523 5 commit-queue 2017-12-13 23:45:34 -0800 All reviewed patches have been landed. Closing bug. 329319 2017-12-13 20:27:22 -0800 2017-12-13 23:45:32 -0800 [PATCH] Proposed Fix url-filter-1.patch text/plain 15310 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2ZGM2ZjM4NDE4Li5iMzhkMDQyMTczZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTctMTItMTMgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBOZXR3b3JrIFRhYiAtIE1ha2UgdGV4dCBmaWx0ZXIganVzdCBhIFVSTCBmaWx0ZXIgYW5kIHVw ZGF0ZSBpbmNyZW1lbnRhbGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODA3OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZXZlcnQgdGhlIE5ldHdvcmsgVGFiJ3MgdGV4dCBmaWx0ZXIgYmFjayB0byBi ZWluZyBqdXN0IGEgVVJMIGZpbHRlciB3aXRoIHRoZQorICAgICAgICBub3JtYWwgYmVoYXZpb3Jz IG9mIG91ciBvdGhlciB0ZXh0IGZpbHRlcnMgdGhhdCB1cGRhdGUgYXMgeW91IHR5cGUgKGluY3Jl bWVudGFsKS4KKyAgICAgICAgVGhpcyBhbHNvIHJlbmFtZXMgdGhlICJ0ZXh0IGZpbHRlciIgdG8g InVybCBmaWx0ZXIiIGV2ZXJ5d2hlcmUgaW4gdGhlIENvbnRlbnRWaWV3CisgICAgICAgIGZvciBj bGFyaXR5LiBBIGZvbGxvdy11cCBjaGFuZ2Ugd2lsbCBtYWtlIHRoZSB1cmwgZmlsdGVyIGJlIGNh c2UtaW5zZW5zaXRpdmUKKyAgICAgICAgdG8gZnVsbHkgbWF0Y2ggdGhlIGZpbHRlciBiYXJzIGlu IG90aGVyIHRhYnMuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3KToKKyAg ICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgZmlsdGVyTmF2 aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3Rv dHlwZS5fY2hlY2tVUkxGaWx0ZXJBZ2FpbnN0RmluaXNoZWRSZXNvdXJjZSk6CisgICAgICAgIChX SS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVVSTEZpbHRlckFjdGl2 ZUluZGljYXRvcik6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5 cGUuX3Jlc291cmNlTG9hZGluZ0RpZEZpbmlzaCk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVD b250ZW50Vmlldy5wcm90b3R5cGUuX3Jlc291cmNlTG9hZGluZ0RpZEZhaWwpOgorICAgICAgICAo V0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9oYXNVUkxGaWx0ZXIpOgorICAg ICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9oYXNBY3RpdmVGaWx0 ZXIpOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9wYXNz VVJMRmlsdGVyKToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5fcGFzc0ZpbHRlcik6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90 b3R5cGUuX3VwZGF0ZUZpbHRlcmVkRW50cmllcyk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVD b250ZW50Vmlldy5wcm90b3R5cGUuX3Jlc2V0RmlsdGVycyk6CisgICAgICAgIChXSS5OZXR3b3Jr VGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX3VybEZpbHRlckRpZENoYW5nZSk6CisgICAgICAg IChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2NoZWNrVGV4dEZpbHRlckFn YWluc3RGaW5pc2hlZFJlc291cmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLk5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY2hlY2tUZXh0RmlsdGVyQWdhaW5zdEZhaWxlZFJlc291 cmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3Rv dHlwZS5fdXBkYXRlVGV4dEZpbHRlckFjdGl2ZUluZGljYXRvcik6IERlbGV0ZWQuCisgICAgICAg IChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhc1RleHRGaWx0ZXIpOiBE ZWxldGVkLgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9w YXNzVGV4dEZpbHRlcik6IERlbGV0ZWQuCisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50 Vmlldy5wcm90b3R5cGUuX3RleHRGaWx0ZXJEaWRDaGFuZ2UpOiBEZWxldGVkLgorCiAyMDE3LTEy LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVH UkVTU0lPTjogV2ViIEluc3BlY3RvcjogT3BlbmluZyBpbnNwZWN0b3IgY3Jhc2hlcyBwYWdlIGlm IHRoZXJlIGFyZSBlbXB0eSByZXNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IDc4NjM4YjdjNWZhLi5lZThiMTFiYjZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC00MTQsNyArNDE0LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siRmlsZW5hbWUi XSA9ICJGaWxlbmFtZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGaWxsIl0gPSAiRmlsbCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJGaWxsIE1vZGUiXSA9ICJGaWxsIE1vZGUiOwogbG9jYWxpemVkU3RyaW5n c1siRmlsdGVyIl0gPSAiRmlsdGVyIjsKLWxvY2FsaXplZFN0cmluZ3NbIkZpbHRlciBGdWxsIFVS TCBhbmQgVGV4dCJdID0gIkZpbHRlciBGdWxsIFVSTCBhbmQgVGV4dCI7Citsb2NhbGl6ZWRTdHJp bmdzWyJGaWx0ZXIgRnVsbCBVUkwiXSA9ICJGaWx0ZXIgRnVsbCBVUkwiOwogbG9jYWxpemVkU3Ry aW5nc1siRmxleGJveCJdID0gIkZsZXhib3giOwogbG9jYWxpemVkU3RyaW5nc1siRmxvYXQiXSA9 ICJGbG9hdCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGbG9hdCBhbmQgQ2xlYXIiXSA9ICJGbG9hdCBh bmQgQ2xlYXIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCAz ZTJiNmU5ZWRiNy4uYWQ4YTNmMjEwNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmpzCkBAIC04MiwxNyArODIsMTUgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcg PSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAg ICAgICAgdGhpcy5fdHlwZUZpbHRlclNjb3BlQmFyID0gbmV3IFdJLlNjb3BlQmFyKCJuZXR3b3Jr LXR5cGUtZmlsdGVyLXNjb3BlLWJhciIsIHR5cGVGaWx0ZXJTY29wZUJhckl0ZW1zLCB0eXBlRmls dGVyU2NvcGVCYXJJdGVtc1swXSk7CiAgICAgICAgIHRoaXMuX3R5cGVGaWx0ZXJTY29wZUJhci5h ZGRFdmVudExpc3RlbmVyKFdJLlNjb3BlQmFyLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMu X3R5cGVGaWx0ZXJTY29wZUJhclNlbGVjdGlvbkNoYW5nZWQsIHRoaXMpOwogCi0gICAgICAgIHRo aXMuX3RleHRGaWx0ZXJTZWFyY2hJZCA9IDA7Ci0gICAgICAgIHRoaXMuX3RleHRGaWx0ZXJTZWFy Y2hUZXh0ID0gbnVsbDsKLSAgICAgICAgdGhpcy5fdGV4dEZpbHRlcklzQWN0aXZlID0gZmFsc2U7 CisgICAgICAgIHRoaXMuX3VybEZpbHRlclNlYXJjaFRleHQgPSBudWxsOworICAgICAgICB0aGlz Ll91cmxGaWx0ZXJJc0FjdGl2ZSA9IGZhbHNlOwogCi0gICAgICAgIHRoaXMuX3RleHRGaWx0ZXJO YXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5GaWx0ZXJCYXJOYXZpZ2F0aW9uSXRlbTsKLSAgICAgICAg dGhpcy5fdGV4dEZpbHRlck5hdmlnYXRpb25JdGVtLmZpbHRlckJhci5pbmNyZW1lbnRhbCA9IGZh bHNlOwotICAgICAgICB0aGlzLl90ZXh0RmlsdGVyTmF2aWdhdGlvbkl0ZW0uZmlsdGVyQmFyLmFk ZEV2ZW50TGlzdGVuZXIoV0kuRmlsdGVyQmFyLkV2ZW50LkZpbHRlckRpZENoYW5nZSwgdGhpcy5f dGV4dEZpbHRlckRpZENoYW5nZSwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX3RleHRGaWx0ZXJOYXZp Z2F0aW9uSXRlbS5maWx0ZXJCYXIucGxhY2Vob2xkZXIgPSBXSS5VSVN0cmluZygiRmlsdGVyIEZ1 bGwgVVJMIGFuZCBUZXh0Iik7CisgICAgICAgIHRoaXMuX3VybEZpbHRlck5hdmlnYXRpb25JdGVt ID0gbmV3IFdJLkZpbHRlckJhck5hdmlnYXRpb25JdGVtOworICAgICAgICB0aGlzLl91cmxGaWx0 ZXJOYXZpZ2F0aW9uSXRlbS5maWx0ZXJCYXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5GaWx0ZXJCYXIu RXZlbnQuRmlsdGVyRGlkQ2hhbmdlLCB0aGlzLl91cmxGaWx0ZXJEaWRDaGFuZ2UsIHRoaXMpOwor ICAgICAgICB0aGlzLl91cmxGaWx0ZXJOYXZpZ2F0aW9uSXRlbS5maWx0ZXJCYXIucGxhY2Vob2xk ZXIgPSBXSS5VSVN0cmluZygiRmlsdGVyIEZ1bGwgVVJMIik7CiAKICAgICAgICAgdGhpcy5fYWN0 aXZlVHlwZUZpbHRlcnMgPSB0aGlzLl9nZW5lcmF0ZVR5cGVGaWx0ZXIoKTsKLSAgICAgICAgdGhp cy5fYWN0aXZlVGV4dEZpbHRlclJlc291cmNlcyA9IG5ldyBTZXQ7CisgICAgICAgIHRoaXMuX2Fj dGl2ZVVSTEZpbHRlclJlc291cmNlcyA9IG5ldyBTZXQ7CiAKICAgICAgICAgdGhpcy5fZW1wdHlG aWx0ZXJSZXN1bHRzTWVzc2FnZUVsZW1lbnQgPSBudWxsOwogCkBAIC0yMDEsMTEgKzE5OSw3IEBA IFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAKICAgICBnZXQgZmlsdGVyTmF2aWdhdGlvbkl0ZW1z KCkKICAgICB7Ci0gICAgICAgIGxldCBpdGVtcyA9IFtdOwotICAgICAgICBpZiAod2luZG93LlBh Z2VBZ2VudCkKLSAgICAgICAgICAgIGl0ZW1zLnB1c2godGhpcy5fdGV4dEZpbHRlck5hdmlnYXRp b25JdGVtKTsKLSAgICAgICAgaXRlbXMucHVzaCh0aGlzLl90eXBlRmlsdGVyU2NvcGVCYXIpOwot ICAgICAgICByZXR1cm4gaXRlbXM7CisgICAgICAgIHJldHVybiBbdGhpcy5fdXJsRmlsdGVyTmF2 aWdhdGlvbkl0ZW0sIHRoaXMuX3R5cGVGaWx0ZXJTY29wZUJhcl07CiAgICAgfQogCiAgICAgZ2V0 IHN1cHBvcnRzU2F2ZSgpCkBAIC05MTAsNDEgKzkwNCwxMSBAQCBXSS5OZXR3b3JrVGFibGVDb250 ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVu dFZpZQogICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQogCi0gICAgX2NoZWNrVGV4 dEZpbHRlckFnYWluc3RGaW5pc2hlZFJlc291cmNlKHJlc291cmNlKQorICAgIF9jaGVja1VSTEZp bHRlckFnYWluc3RGaW5pc2hlZFJlc291cmNlKHJlc291cmNlKQogICAgIHsKLSAgICAgICAgbGV0 IGZyYW1lID0gcmVzb3VyY2UucGFyZW50RnJhbWU7Ci0gICAgICAgIGlmICghZnJhbWUpCi0gICAg ICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgbGV0IHNlYXJjaFF1ZXJ5ID0gdGhpcy5fdGV4dEZp bHRlclNlYXJjaFRleHQ7Ci0gICAgICAgIGlmIChyZXNvdXJjZS51cmwuaW5jbHVkZXMoc2VhcmNo UXVlcnkpKSB7Ci0gICAgICAgICAgICB0aGlzLl9hY3RpdmVUZXh0RmlsdGVyUmVzb3VyY2VzLmFk ZChyZXNvdXJjZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBs ZXQgc2VhcmNoSWQgPSB0aGlzLl90ZXh0RmlsdGVyU2VhcmNoSWQ7Ci0KLSAgICAgICAgY29uc3Qg aXNDYXNlU2Vuc2l0aXZlID0gdHJ1ZTsKLSAgICAgICAgY29uc3QgaXNSZWdleCA9IGZhbHNlOwot ICAgICAgICBQYWdlQWdlbnQuc2VhcmNoSW5SZXNvdXJjZShmcmFtZS5pZCwgcmVzb3VyY2UudXJs LCBzZWFyY2hRdWVyeSwgaXNDYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCByZXNvdXJjZS5yZXF1ZXN0 SWRlbnRpZmllciwgKGVycm9yLCBzZWFyY2hSZXN1bHRzKSA9PiB7Ci0gICAgICAgICAgICBpZiAo c2VhcmNoSWQgIT09IHRoaXMuX3RleHRGaWx0ZXJTZWFyY2hJZCkKLSAgICAgICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgICAgIGlmIChlcnJvciB8fCAhc2VhcmNoUmVzdWx0cyB8fCAhc2Vh cmNoUmVzdWx0cy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAg ICB0aGlzLl9hY3RpdmVUZXh0RmlsdGVyUmVzb3VyY2VzLmFkZChyZXNvdXJjZSk7Ci0KLSAgICAg ICAgICAgIHRoaXMuX3BlbmRpbmdGaWx0ZXIgPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5uZWVk c0xheW91dCgpOwotICAgICAgICB9KTsKLSAgICB9Ci0KLSAgICBfY2hlY2tUZXh0RmlsdGVyQWdh aW5zdEZhaWxlZFJlc291cmNlKHJlc291cmNlKQotICAgIHsKLSAgICAgICAgbGV0IHNlYXJjaFF1 ZXJ5ID0gdGhpcy5fdGV4dEZpbHRlclNlYXJjaFRleHQ7CisgICAgICAgIGxldCBzZWFyY2hRdWVy eSA9IHRoaXMuX3VybEZpbHRlclNlYXJjaFRleHQ7CiAgICAgICAgIGlmIChyZXNvdXJjZS51cmwu aW5jbHVkZXMoc2VhcmNoUXVlcnkpKQotICAgICAgICAgICAgdGhpcy5fYWN0aXZlVGV4dEZpbHRl clJlc291cmNlcy5hZGQocmVzb3VyY2UpOworICAgICAgICAgICAgdGhpcy5fYWN0aXZlVVJMRmls dGVyUmVzb3VyY2VzLmFkZChyZXNvdXJjZSk7CiAgICAgfQogCiAgICAgX3Jvd0luZGV4Rm9yUmVz b3VyY2UocmVzb3VyY2UpCkBAIC0xMDI2LDkgKzk5MCw5IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRl bnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmllCiAgICAgICAgIHRoaXMuX3RhYmxlLnNjcm9sbENvbnRhaW5lci5zdHlsZS53aWR0aCA9IHRo aXMuX25hbWVDb2x1bW4ud2lkdGggKyAicHgiOwogICAgIH0KIAotICAgIF91cGRhdGVUZXh0Rmls dGVyQWN0aXZlSW5kaWNhdG9yKCkKKyAgICBfdXBkYXRlVVJMRmlsdGVyQWN0aXZlSW5kaWNhdG9y KCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3RleHRGaWx0ZXJOYXZpZ2F0aW9uSXRlbS5maWx0ZXJC YXIuaW5kaWNhdGluZ0FjdGl2ZSA9IHRoaXMuX2hhc1RleHRGaWx0ZXIoKTsKKyAgICAgICAgdGhp cy5fdXJsRmlsdGVyTmF2aWdhdGlvbkl0ZW0uZmlsdGVyQmFyLmluZGljYXRpbmdBY3RpdmUgPSB0 aGlzLl9oYXNVUkxGaWx0ZXIoKTsKICAgICB9CiAKICAgICBfdXBkYXRlRW1wdHlGaWx0ZXJSZXN1 bHRzTWVzc2FnZSgpCkBAIC0xMTEyLDggKzEwNzYsOCBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50 VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZp ZQogICAgICAgICBpZiAocmVzb3VyY2UudGltaW5nRGF0YS5yZXNwb25zZUVuZCA+IHRoaXMuX3dh dGVyZmFsbEVuZFRpbWUpCiAgICAgICAgICAgICB0aGlzLl93YXRlcmZhbGxFbmRUaW1lID0gcmVz b3VyY2UudGltaW5nRGF0YS5yZXNwb25zZUVuZDsKIAotICAgICAgICBpZiAodGhpcy5faGFzVGV4 dEZpbHRlcigpKQotICAgICAgICAgICAgdGhpcy5fY2hlY2tUZXh0RmlsdGVyQWdhaW5zdEZpbmlz aGVkUmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICBpZiAodGhpcy5faGFzVVJMRmlsdGVyKCkp CisgICAgICAgICAgICB0aGlzLl9jaGVja1VSTEZpbHRlckFnYWluc3RGaW5pc2hlZFJlc291cmNl KHJlc291cmNlKTsKIAogICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQpAQCAtMTEy OCw4ICsxMDkyLDggQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3Jr VGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgaWYgKHJlc291 cmNlLnRpbWluZ0RhdGEucmVzcG9uc2VFbmQgPiB0aGlzLl93YXRlcmZhbGxFbmRUaW1lKQogICAg ICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsRW5kVGltZSA9IHJlc291cmNlLnRpbWluZ0RhdGEucmVz cG9uc2VFbmQ7CiAKLSAgICAgICAgaWYgKHRoaXMuX2hhc1RleHRGaWx0ZXIoKSkKLSAgICAgICAg ICAgIHRoaXMuX2NoZWNrVGV4dEZpbHRlckFnYWluc3RGYWlsZWRSZXNvdXJjZShyZXNvdXJjZSk7 CisgICAgICAgIGlmICh0aGlzLl9oYXNVUkxGaWx0ZXIoKSkKKyAgICAgICAgICAgIHRoaXMuX2No ZWNrVVJMRmlsdGVyQWdhaW5zdEZpbmlzaGVkUmVzb3VyY2UocmVzb3VyY2UpOwogCiAgICAgICAg IHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CkBAIC0xMjQ1LDE1ICsxMjA5LDE1IEBAIFdJLk5l dHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgIHJldHVybiAhIXRoaXMuX2FjdGl2ZVR5cGVGaWx0 ZXJzOwogICAgIH0KIAotICAgIF9oYXNUZXh0RmlsdGVyKCkKKyAgICBfaGFzVVJMRmlsdGVyKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90ZXh0RmlsdGVySXNBY3RpdmU7CisgICAgICAg IHJldHVybiB0aGlzLl91cmxGaWx0ZXJJc0FjdGl2ZTsKICAgICB9CiAKICAgICBfaGFzQWN0aXZl RmlsdGVyKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9oYXNUeXBlRmlsdGVyKCkKLSAg ICAgICAgICAgIHx8IHRoaXMuX2hhc1RleHRGaWx0ZXIoKTsKKyAgICAgICAgICAgIHx8IHRoaXMu X2hhc1VSTEZpbHRlcigpOwogICAgIH0KIAogICAgIF9wYXNzVHlwZUZpbHRlcihlbnRyeSkKQEAg LTEyNjMsMTcgKzEyMjcsMTcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBO ZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgcmV0 dXJuIHRoaXMuX2FjdGl2ZVR5cGVGaWx0ZXJzLnNvbWUoKGNoZWNrZXIpID0+IGNoZWNrZXIoZW50 cnkucmVzb3VyY2UudHlwZSkpOwogICAgIH0KIAotICAgIF9wYXNzVGV4dEZpbHRlcihlbnRyeSkK KyAgICBfcGFzc1VSTEZpbHRlcihlbnRyeSkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5faGFz VGV4dEZpbHRlcigpKQorICAgICAgICBpZiAoIXRoaXMuX2hhc1VSTEZpbHRlcigpKQogICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIHJldHVybiB0aGlzLl9hY3RpdmVUZXh0RmlsdGVy UmVzb3VyY2VzLmhhcyhlbnRyeS5yZXNvdXJjZSk7CisgICAgICAgIHJldHVybiB0aGlzLl9hY3Rp dmVVUkxGaWx0ZXJSZXNvdXJjZXMuaGFzKGVudHJ5LnJlc291cmNlKTsKICAgICB9CiAKICAgICBf cGFzc0ZpbHRlcihlbnRyeSkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9wYXNzVHlwZUZp bHRlcihlbnRyeSkKLSAgICAgICAgICAgICYmIHRoaXMuX3Bhc3NUZXh0RmlsdGVyKGVudHJ5KTsK KyAgICAgICAgICAgICYmIHRoaXMuX3Bhc3NVUkxGaWx0ZXIoZW50cnkpOwogICAgIH0KIAogICAg IF91cGRhdGVTb3J0QW5kRmlsdGVyZWRFbnRyaWVzKCkKQEAgLTEyOTEsNyArMTI1NSw3IEBAIFdJ Lk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmllCiAKICAgICAgICAgdGhpcy5fcmVzdG9yZVNlbGVjdGVkUm93 KCk7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlVGV4dEZpbHRlckFjdGl2ZUluZGljYXRvcigpOwor ICAgICAgICB0aGlzLl91cGRhdGVVUkxGaWx0ZXJBY3RpdmVJbmRpY2F0b3IoKTsKICAgICAgICAg dGhpcy5fdXBkYXRlRW1wdHlGaWx0ZXJSZXN1bHRzTWVzc2FnZSgpOwogICAgIH0KIApAQCAtMTMw OCwxNCArMTI3MiwxMiBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdv cmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgIHsKICAgICAgICAg Y29uc29sZS5hc3NlcnQodGhpcy5faGFzQWN0aXZlRmlsdGVyKCkpOwogCi0gICAgICAgIC8vIENs ZWFyIHRleHQgZmlsdGVyLgotICAgICAgICB0aGlzLl90ZXh0RmlsdGVyU2VhcmNoSWQrKzsKLSAg ICAgICAgdGhpcy5fdGV4dEZpbHRlck5hdmlnYXRpb25JdGVtLmZpbHRlckJhci5pbmRpY2F0aW5n UHJvZ3Jlc3MgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fdGV4dEZpbHRlclNlYXJjaFRleHQgPSBu dWxsOwotICAgICAgICB0aGlzLl90ZXh0RmlsdGVySXNBY3RpdmUgPSBmYWxzZTsKLSAgICAgICAg dGhpcy5fYWN0aXZlVGV4dEZpbHRlclJlc291cmNlcy5jbGVhcigpOwotICAgICAgICB0aGlzLl90 ZXh0RmlsdGVyTmF2aWdhdGlvbkl0ZW0uZmlsdGVyQmFyLmNsZWFyKCk7Ci0gICAgICAgIGNvbnNv bGUuYXNzZXJ0KCF0aGlzLl9oYXNUZXh0RmlsdGVyKCkpOworICAgICAgICAvLyBDbGVhciB1cmwg ZmlsdGVyLgorICAgICAgICB0aGlzLl91cmxGaWx0ZXJTZWFyY2hUZXh0ID0gbnVsbDsKKyAgICAg ICAgdGhpcy5fdXJsRmlsdGVySXNBY3RpdmUgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fYWN0aXZl VVJMRmlsdGVyUmVzb3VyY2VzLmNsZWFyKCk7CisgICAgICAgIHRoaXMuX3VybEZpbHRlck5hdmln YXRpb25JdGVtLmZpbHRlckJhci5jbGVhcigpOworICAgICAgICBjb25zb2xlLmFzc2VydCghdGhp cy5faGFzVVJMRmlsdGVyKCkpOwogCiAgICAgICAgIC8vIENsZWFyIHR5cGUgZmlsdGVyLgogICAg ICAgICB0aGlzLl90eXBlRmlsdGVyU2NvcGVCYXIucmVzZXRUb0RlZmF1bHQoKTsKQEAgLTEzNjEs ODcgKzEzMjMsMzggQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3Jr VGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgdGhpcy5fdGFi bGUucmVsb2FkRGF0YSgpOwogICAgIH0KIAotICAgIF90ZXh0RmlsdGVyRGlkQ2hhbmdlKGV2ZW50 KQorICAgIF91cmxGaWx0ZXJEaWRDaGFuZ2UoZXZlbnQpCiAgICAgewotICAgICAgICBsZXQgc2Vh cmNoUXVlcnkgPSB0aGlzLl90ZXh0RmlsdGVyTmF2aWdhdGlvbkl0ZW0uZmlsdGVyQmFyLmZpbHRl cnMudGV4dDsKLSAgICAgICAgaWYgKHNlYXJjaFF1ZXJ5ID09PSB0aGlzLl90ZXh0RmlsdGVyU2Vh cmNoVGV4dCkKKyAgICAgICAgbGV0IHNlYXJjaFF1ZXJ5ID0gdGhpcy5fdXJsRmlsdGVyTmF2aWdh dGlvbkl0ZW0uZmlsdGVyQmFyLmZpbHRlcnMudGV4dDsKKyAgICAgICAgaWYgKHNlYXJjaFF1ZXJ5 ID09PSB0aGlzLl91cmxGaWx0ZXJTZWFyY2hUZXh0KQogICAgICAgICAgICAgcmV0dXJuOwogCiAg ICAgICAgIC8vIEV2ZW4gaWYgdGhlIHNlbGVjdGVkIHJlc291cmNlIHdvdWxkIHN0aWxsIGJlIHZp c2libGUsIGxldHMgY2xvc2UgdGhlIGRldGFpbCB2aWV3IGlmIGEgZmlsdGVyIGNoYW5nZXMuCiAg ICAgICAgIHRoaXMuX2hpZGVSZXNvdXJjZURldGFpbFZpZXcoKTsKIAotICAgICAgICBsZXQgc2Vh cmNoSWQgPSArK3RoaXMuX3RleHRGaWx0ZXJTZWFyY2hJZDsKLQogICAgICAgICAvLyBTZWFyY2gg Y2xlYXJlZC4KICAgICAgICAgaWYgKCFzZWFyY2hRdWVyeSkgewotICAgICAgICAgICAgdGhpcy5f dGV4dEZpbHRlck5hdmlnYXRpb25JdGVtLmZpbHRlckJhci5pbmRpY2F0aW5nUHJvZ3Jlc3MgPSBm YWxzZTsKLSAgICAgICAgICAgIHRoaXMuX3RleHRGaWx0ZXJTZWFyY2hUZXh0ID0gbnVsbDsKLSAg ICAgICAgICAgIHRoaXMuX3RleHRGaWx0ZXJJc0FjdGl2ZSA9IGZhbHNlOwotICAgICAgICAgICAg dGhpcy5fYWN0aXZlVGV4dEZpbHRlclJlc291cmNlcy5jbGVhcigpOworICAgICAgICAgICAgdGhp cy5fdXJsRmlsdGVyU2VhcmNoVGV4dCA9IG51bGw7CisgICAgICAgICAgICB0aGlzLl91cmxGaWx0 ZXJJc0FjdGl2ZSA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fYWN0aXZlVVJMRmlsdGVyUmVz b3VyY2VzLmNsZWFyKCk7CiAKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUZpbHRlcmVkRW50cmll cygpOwogICAgICAgICAgICAgdGhpcy5fdGFibGUucmVsb2FkRGF0YSgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fdGV4dEZpbHRlclNlYXJjaFRleHQg PSBzZWFyY2hRdWVyeTsKLSAgICAgICAgdGhpcy5fdGV4dEZpbHRlck5hdmlnYXRpb25JdGVtLmZp bHRlckJhci5pbmRpY2F0aW5nUHJvZ3Jlc3MgPSB0cnVlOwotCi0gICAgICAgIC8vIE5ldHdvcmtU YWJsZSB0ZXh0IGZpbHRlciBjdXJyZW50bHkgc2VhcmNoZXM6Ci0gICAgICAgIC8vICAgLSBSZXNv dXJjZSBVUkwKLSAgICAgICAgLy8gICAtIFJlc291cmNlIFRleHQgQ29udGVudAotICAgICAgICAv LyBJdCBkb2VzIG5vdCBzZWFyY2ggYWxsIHRoZSBjb250ZW50IGluIHRoZSB0YWJsZSAobGlrZSBt aW1lVHlwZSwgaGVhZGVycywgZXRjKS4KLSAgICAgICAgLy8gRm9yIHRob3NlIHdlIHNob3VsZCBw cm92aWRlIG1vcmUgY3VzdG9tIGZpbHRlcnMuCi0KLSAgICAgICAgY29uc3QgaXNDYXNlU2Vuc2l0 aXZlID0gdHJ1ZTsKLSAgICAgICAgY29uc3QgaXNSZWdleCA9IGZhbHNlOwotICAgICAgICBQYWdl QWdlbnQuc2VhcmNoSW5SZXNvdXJjZXMoc2VhcmNoUXVlcnksIGlzQ2FzZVNlbnNpdGl2ZSwgaXNS ZWdleCwgKGVycm9yLCBzZWFyY2hSZXN1bHRzKSA9PiB7Ci0gICAgICAgICAgICBpZiAoc2VhcmNo SWQgIT09IHRoaXMuX3RleHRGaWx0ZXJTZWFyY2hJZCkKLSAgICAgICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgICAgIHRoaXMuX3RleHRGaWx0ZXJJc0FjdGl2ZSA9IHRydWU7Ci0gICAgICAg ICAgICB0aGlzLl9hY3RpdmVUZXh0RmlsdGVyUmVzb3VyY2VzLmNsZWFyKCk7Ci0gICAgICAgICAg ICB0aGlzLl90ZXh0RmlsdGVyTmF2aWdhdGlvbkl0ZW0uZmlsdGVyQmFyLmluZGljYXRpbmdQcm9n cmVzcyA9IGZhbHNlOwotCi0gICAgICAgICAgICAvLyBBZGQgcmVzb3VyY2VzIGJhc2VkIG9uIFVS TC4KLSAgICAgICAgICAgIGZvciAobGV0IGVudHJ5IG9mIHRoaXMuX2VudHJpZXMpIHsKLSAgICAg ICAgICAgICAgICBsZXQgcmVzb3VyY2UgPSBlbnRyeS5yZXNvdXJjZTsKLSAgICAgICAgICAgICAg ICBpZiAocmVzb3VyY2UudXJsLmluY2x1ZGVzKHNlYXJjaFF1ZXJ5KSkKLSAgICAgICAgICAgICAg ICAgICAgdGhpcy5fYWN0aXZlVGV4dEZpbHRlclJlc291cmNlcy5hZGQocmVzb3VyY2UpOwotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICAvLyBBZGQgcmVzb3VyY2VzIGJhc2VkIG9uIGNvbnRl bnQuCi0gICAgICAgICAgICBpZiAoIWVycm9yKSB7Ci0gICAgICAgICAgICAgICAgZm9yIChsZXQg e3VybCwgZnJhbWVJZCwgcmVxdWVzdElkfSBvZiBzZWFyY2hSZXN1bHRzKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGlmIChyZXF1ZXN0SWQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxldCBy ZXNvdXJjZSA9IFdJLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLnJlc291cmNlRm9yUmVxdWVzdElkZW50 aWZpZXIocmVxdWVzdElkKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChyZXNvdXJjZSkg ewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FjdGl2ZVRleHRGaWx0ZXJSZXNv dXJjZXMuYWRkKHJlc291cmNlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgfQotCi0g ICAgICAgICAgICAgICAgICAgIGlmIChmcmFtZUlkICYmIHVybCkgewotICAgICAgICAgICAgICAg ICAgICAgICAgbGV0IGZyYW1lID0gV0kuZnJhbWVSZXNvdXJjZU1hbmFnZXIuZnJhbWVGb3JJZGVu dGlmaWVyKGZyYW1lSWQpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lKSB7Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lLm1haW5SZXNvdXJjZS51cmwgPT09 IHVybCkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9hY3RpdmVUZXh0 RmlsdGVyUmVzb3VyY2VzLmFkZChmcmFtZS5tYWluUmVzb3VyY2UpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbGV0IHJlc291cmNlID0gZnJhbWUucmVzb3Vy Y2VGb3JVUkwodXJsKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2Up IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWN0aXZlVGV4dEZpbHRl clJlc291cmNlcy5hZGQocmVzb3VyY2UpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIC8vIEFwcGx5LgotICAgICAgICAgICAgdGhpcy5f dXBkYXRlRmlsdGVyZWRFbnRyaWVzKCk7Ci0gICAgICAgICAgICB0aGlzLl90YWJsZS5yZWxvYWRE YXRhKCk7Ci0gICAgICAgIH0pOworICAgICAgICB0aGlzLl91cmxGaWx0ZXJJc0FjdGl2ZSA9IHRy dWU7CisgICAgICAgIHRoaXMuX3VybEZpbHRlclNlYXJjaFRleHQgPSBzZWFyY2hRdWVyeTsKKyAg ICAgICAgdGhpcy5fYWN0aXZlVVJMRmlsdGVyUmVzb3VyY2VzLmNsZWFyKCk7CisKKyAgICAgICAg Zm9yIChsZXQgZW50cnkgb2YgdGhpcy5fZW50cmllcykgeworICAgICAgICAgICAgbGV0IHJlc291 cmNlID0gZW50cnkucmVzb3VyY2U7CisgICAgICAgICAgICBpZiAocmVzb3VyY2UudXJsLmluY2x1 ZGVzKHNlYXJjaFF1ZXJ5KSkKKyAgICAgICAgICAgICAgICB0aGlzLl9hY3RpdmVVUkxGaWx0ZXJS ZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX3VwZGF0 ZUZpbHRlcmVkRW50cmllcygpOworICAgICAgICB0aGlzLl90YWJsZS5yZWxvYWREYXRhKCk7CiAg ICAgfQogCiAgICAgX3Jlc3RvcmVTZWxlY3RlZFJvdygpCg==