205098 2019-12-10 21:40:11 -0800 Web Inspector: replace all "Remove" context menu items with "Delete" to be consistent 2019-12-11 16:24:20 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1597496 0 hi 2019-12-10 21:40:11 -0800 There is already the concept of "Delete Breakpoint", so we should be consistent with things like "Remove Local Override" and instead use "Delete Local Override". In this case, "Delete" is also a slightly better word because it clarifies that the state/data is wholly destroyed, not just "hidden" or "deactivated". 1597497 1 385342 hi 2019-12-10 21:41:10 -0800 Created attachment 385342 Patch 1597821 2 385342 bburg 2019-12-11 15:38:31 -0800 Comment on attachment 385342 Patch r=me 1597843 3 385342 commit-queue 2019-12-11 16:23:19 -0800 Comment on attachment 385342 Patch Clearing flags on attachment: 385342 Committed r253402: <https://trac.webkit.org/changeset/253402> 1597844 4 commit-queue 2019-12-11 16:23:20 -0800 All reviewed patches have been landed. Closing bug. 1597845 5 webkit-bug-importer 2019-12-11 16:24:20 -0800 <rdar://problem/57858884> 385342 2019-12-10 21:41:10 -0800 2019-12-11 16:23:19 -0800 Patch 205098.diff text/plain 13732 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDYzZDJlZTk1YWVkLi5lMDdjZjkwYjU0YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMTItMTAgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl cGxhY2UgYWxsICJSZW1vdmUiIGNvbnRleHQgbWVudSBpdGVtcyB3aXRoICJEZWxldGUiIHRvIGJl IGNvbnNpc3RlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNTA5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CbGFja2JveFNldHRpbmdzVmlldy5qczoKKyAgICAg ICAgKFdJLkJsYWNrYm94U2V0dGluZ3NWaWV3LnByb3RvdHlwZS5fYWRkUm93KToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Jvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50LmpzOgorICAg ICAgICAoV0kuQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlLnBvcHVsYXRlQ29u dGV4dE1lbnUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlv blZpZXcuanM6CisgICAgICAgIChXSS5CcmVha3BvaW50QWN0aW9uVmlldyk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qczoKKyAgICAgICAgKFdJ LmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlKToKKyAgICAgICAgRHJpdmUtYnk6 IGlmIGEgbG9jYWwgb3ZlcnJpZGUgZXhpc3RzIGZvciB0aGUgZ2l2ZW4gc291cmNlIGNvZGUsIGFk ZCBhbiBpdGVtIGZvcgorICAgICAgICAgICAgICAgICAgZW5hYmxpbmcvZGlzYWJsaW5nIGFuZCBk ZWxldGluZyBpdC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VP dmVycmlkZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuTG9jYWxSZXNvdXJjZU92ZXJyaWRl VHJlZUVsZW1lbnQucHJvdG90eXBlLnBvcHVsYXRlQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qczoKKyAgICAgICAgKFdJ LlByb2JlU2V0RGV0YWlsc1NlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlQ29udGVudFZpZXcp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFy UGFuZWwuanM6CisgICAgICAgIChXSS5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90 b3R5cGUuX29iamVjdFRyZWVFbGVtZW50QWRkQ29udGV4dE1lbnVJdGVtcyk6CisgICAgICAgICog TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDE5LTEyLTEw ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHIyNTI1MjMpOiBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IHNlbWljb2xvbiBpcyB3cm9uZ2x5IHBv c2l0aW9uZWQgaW4gbXVsdGlsaW5lIHZhbHVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKaW5kZXggN2MyNmYzNDBiZDAuLjRjZWQ3NWNmYjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKQEAgLTM1OSw5ICszNTksMTUgQEAgbG9jYWxpemVkU3RyaW5nc1siRGVmZXJy ZWQgcGF1c2UgZnJvbSBibGFja2JveGVkIHNjcmlwdCJdID0gIkRlZmVycmVkIHBhdXNlIGZyb20K IC8qIFRvb2x0aXAgZm9yIGEgdGltZSByYW5nZSBiYXIgdGhhdCByZXByZXNlbnRzIHdoZW4gYSBD U1MgYW5pbWF0aW9uL3RyYW5zaXRpb24gaXMgZGVsYXllZCAqLwogbG9jYWxpemVkU3RyaW5nc1si RGVsYXkiXSA9ICJEZWxheSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWxldGUiXSA9ICJEZWxldGUi OworbG9jYWxpemVkU3RyaW5nc1siRGVsZXRlIEJsYWNrYm94Il0gPSAiRGVsZXRlIEJsYWNrYm94 IjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlbGV0ZSBCcmVha3BvaW50Il0gPSAiRGVsZXRlIEJyZWFr cG9pbnQiOwogbG9jYWxpemVkU3RyaW5nc1siRGVsZXRlIEJyZWFrcG9pbnRzIl0gPSAiRGVsZXRl IEJyZWFrcG9pbnRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlbGV0ZSBEZXNjZW5kYW50IEJyZWFr cG9pbnRzIl0gPSAiRGVsZXRlIERlc2NlbmRhbnQgQnJlYWtwb2ludHMiOworbG9jYWxpemVkU3Ry aW5nc1siRGVsZXRlIEluc3BlY3RvciBCb290c3RyYXAgU2NyaXB0Il0gPSAiRGVsZXRlIEluc3Bl Y3RvciBCb290c3RyYXAgU2NyaXB0IjsKK2xvY2FsaXplZFN0cmluZ3NbIkRlbGV0ZSBMb2NhbCBP dmVycmlkZSJdID0gIkRlbGV0ZSBMb2NhbCBPdmVycmlkZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJE ZWxldGUgV2F0Y2ggRXhwcmVzc2lvbiJdID0gIkRlbGV0ZSBXYXRjaCBFeHByZXNzaW9uIjsKK2xv Y2FsaXplZFN0cmluZ3NbIkRlbGV0ZSBwcm9iZSJdID0gIkRlbGV0ZSBwcm9iZSI7Citsb2NhbGl6 ZWRTdHJpbmdzWyJEZWxldGUgdGhpcyBicmVha3BvaW50IGFjdGlvbiJdID0gIkRlbGV0ZSB0aGlz IGJyZWFrcG9pbnQgYWN0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlbW8gQXVkaXQiXSA9ICJE ZW1vIEF1ZGl0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkRldGFjaCBpbnRvIHNlcGFyYXRlIHdpbmRv dyJdID0gIkRldGFjaCBpbnRvIHNlcGFyYXRlIHdpbmRvdyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJE ZXRhY2hlZCJdID0gIkRldGFjaGVkIjsKQEAgLTM4Niw2ICszOTIsNyBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJEaXNhYmxlIHBhaW50IGZsYXNoaW5nIl0gPSAiRGlzYWJsZSBwYWludCBmbGFzaGluZyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJEaXNhYmxlOiJdID0gIkRpc2FibGU6IjsKIGxvY2FsaXplZFN0 cmluZ3NbIkRpc2FibGVkIl0gPSAiRGlzYWJsZWQiOwogbG9jYWxpemVkU3RyaW5nc1siRGlzayBD YWNoZSJdID0gIkRpc2sgQ2FjaGUiOworbG9jYWxpemVkU3RyaW5nc1siRGlzbWlzcyJdID0gIkRp c21pc3MiOwogbG9jYWxpemVkU3RyaW5nc1siRGlzcGxheWVkIENvbHVtbnMiXSA9ICJEaXNwbGF5 ZWQgQ29sdW1ucyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEbyBub3QgY2xlYXIgbmV0d29yayBpdGVt cyBvbiBuZXcgcGFnZSBsb2FkcyJdID0gIkRvIG5vdCBjbGVhciBuZXR3b3JrIGl0ZW1zIG9uIG5l dyBwYWdlIGxvYWRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRvIG5vdCBjbGVhciB0aGUgY29uc29s ZSBvbiBuZXcgcGFnZSBsb2FkcyJdID0gIkRvIG5vdCBjbGVhciB0aGUgY29uc29sZSBvbiBuZXcg cGFnZSBsb2FkcyI7CkBAIC01OTQsNyArNjAxLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siSGVhZGlu ZyBMZXZlbCJdID0gIkhlYWRpbmcgTGV2ZWwiOwogbG9jYWxpemVkU3RyaW5nc1siSGVhcCBTbmFw c2hvdCAlcy0lcy0lcyBhdCAlcy4lcy4lcyJdID0gIkhlYXAgU25hcHNob3QgJXMtJXMtJXMgYXQg JXMuJXMuJXMiOwogbG9jYWxpemVkU3RyaW5nc1siSGVhcCBTbmFwc2hvdCBPYmplY3QgKCVzKSJd ID0gIkhlYXAgU25hcHNob3QgT2JqZWN0ICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siSGVpZ2h0 Il0gPSAiSGVpZ2h0IjsKLWxvY2FsaXplZFN0cmluZ3NbIkhpZGUiXSA9ICJIaWRlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkhpZGUgQ29uc29sZSJdID0gIkhpZGUgQ29uc29sZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJIaWRlIENvbnNvbGUgKCVzKSJdID0gIkhpZGUgQ29uc29sZSAoJXMpIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkhpZGUgRWxlbWVudHMiXSA9ICJIaWRlIEVsZW1lbnRzIjsKQEAgLTkxNiwx MiArOTIyLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siUmVndWxhciBFeHByZXNzaW9uIEAgU2V0dGlu Z3MiXSA9ICJSZWd1bGFyIEV4cHJlc3Npb24iOwogbG9jYWxpemVkU3RyaW5nc1siUmVsb2FkIFdl YiBJbnNwZWN0b3IiXSA9ICJSZWxvYWQgV2ViIEluc3BlY3RvciI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJSZWxvYWQgcGFnZSAoJXMpXG5SZWxvYWQgcGFnZSBpZ25vcmluZyBjYWNoZSAoJXMpIl0gPSAi UmVsb2FkIHBhZ2UgKCVzKVxuUmVsb2FkIHBhZ2UgaWdub3JpbmcgY2FjaGUgKCVzKSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJSZW1vdmFscyJdID0gIlJlbW92YWxzIjsKLWxvY2FsaXplZFN0cmluZ3Nb IlJlbW92ZSBCbGFja2JveCJdID0gIlJlbW92ZSBCbGFja2JveCI7Ci1sb2NhbGl6ZWRTdHJpbmdz WyJSZW1vdmUgSW5zcGVjdG9yIEJvb3RzdHJhcCBTY3JpcHQiXSA9ICJSZW1vdmUgSW5zcGVjdG9y IEJvb3RzdHJhcCBTY3JpcHQiOwotbG9jYWxpemVkU3RyaW5nc1siUmVtb3ZlIExvY2FsIE92ZXJy aWRlIl0gPSAiUmVtb3ZlIExvY2FsIE92ZXJyaWRlIjsKLWxvY2FsaXplZFN0cmluZ3NbIlJlbW92 ZSBXYXRjaCBFeHByZXNzaW9uIl0gPSAiUmVtb3ZlIFdhdGNoIEV4cHJlc3Npb24iOwotbG9jYWxp emVkU3RyaW5nc1siUmVtb3ZlIHByb2JlIl0gPSAiUmVtb3ZlIHByb2JlIjsKLWxvY2FsaXplZFN0 cmluZ3NbIlJlbW92ZSB0aGlzIGJyZWFrcG9pbnQgYWN0aW9uIl0gPSAiUmVtb3ZlIHRoaXMgYnJl YWtwb2ludCBhY3Rpb24iOwogbG9jYWxpemVkU3RyaW5nc1siUmVtb3ZlZCBhbmNlc3RvciAiXSA9 ICJSZW1vdmVkIGFuY2VzdG9yICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZW1vdmVkIGRlc2NlbmRh bnQgIl0gPSAiUmVtb3ZlZCBkZXNjZW5kYW50ICI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZW5kZXIg UGlwZWxpbmUgJWQiXSA9ICJSZW5kZXIgUGlwZWxpbmUgJWQiOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQmxhY2tib3hTZXR0aW5nc1ZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CbGFja2JveFNl dHRpbmdzVmlldy5qcwppbmRleCA1YzBjNTQyODQxOC4uMTljNjc0NGMxYWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JsYWNrYm94U2V0dGlu Z3NWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0JsYWNrYm94U2V0dGluZ3NWaWV3LmpzCkBAIC0xNDAsNyArMTQwLDcgQEAgV0kuQmxhY2tib3hT ZXR0aW5nc1ZpZXcgPSBjbGFzcyBCbGFja2JveFNldHRpbmdzVmlldyBleHRlbmRzIFdJLlNldHRp bmdzVmlldwogICAgICAgICBsZXQgcmVtb3ZlQmxhY2tib3hCb2R5Q2VsbCA9IHRhYmxlQm9keVJv dy5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ZCIpKTsKICAgICAgICAgcmVt b3ZlQmxhY2tib3hCb2R5Q2VsbC5jbGFzc0xpc3QuYWRkKCJyZW1vdmUtYmxhY2tib3giKTsKIAot ICAgICAgICBsZXQgcmVtb3ZlQmxhY2tib3hCdXR0b24gPSByZW1vdmVCbGFja2JveEJvZHlDZWxs LmFwcGVuZENoaWxkKFdJLkltYWdlVXRpbGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2VzL05hdmln YXRpb25JdGVtVHJhc2guc3ZnIiwgInJlbW92ZS1ibGFja2JveC1idXR0b24iLCBXSS5VSVN0cmlu ZygiUmVtb3ZlIEJsYWNrYm94IikpKTsKKyAgICAgICAgbGV0IHJlbW92ZUJsYWNrYm94QnV0dG9u ID0gcmVtb3ZlQmxhY2tib3hCb2R5Q2VsbC5hcHBlbmRDaGlsZChXSS5JbWFnZVV0aWxpdGllcy51 c2VTVkdTeW1ib2woIkltYWdlcy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIsICJyZW1vdmUtYmxh Y2tib3gtYnV0dG9uIiwgV0kuVUlTdHJpbmcoIkRlbGV0ZSBCbGFja2JveCIpKSk7CiAgICAgICAg IHJlbW92ZUJsYWNrYm94QnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2ZW50KSA9 PiB7CiAgICAgICAgICAgICBpZiAocmVnZXgpCiAgICAgICAgICAgICAgICAgV0kuZGVidWdnZXJN YW5hZ2VyLnNldFNob3VsZEJsYWNrYm94UGF0dGVybihyZWdleCwgZmFsc2UpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2Ny aXB0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Cb290c3RyYXBTY3JpcHRUcmVlRWxlbWVudC5qcwppbmRleCA1NzJmMzU2NzM4NC4uMjc2 NjNmZTk5OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Jvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50Lmpz CkBAIC04Niw3ICs4Niw3IEBAIFdJLkJvb3RzdHJhcFNjcmlwdFRyZWVFbGVtZW50ID0gY2xhc3Mg Qm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5TY3JpCiAgICAgICAgICAgICBX SS5uZXR3b3JrTWFuYWdlci5ib290c3RyYXBTY3JpcHRFbmFibGVkID0gIVdJLm5ldHdvcmtNYW5h Z2VyLmJvb3RzdHJhcFNjcmlwdEVuYWJsZWQ7CiAgICAgICAgIH0pOwogCi0gICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIlJlbW92ZSBJbnNwZWN0b3IgQm9vdHN0cmFw IFNjcmlwdCIpLCAoKSA9PiB7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlT dHJpbmcoIkRlbGV0ZSBJbnNwZWN0b3IgQm9vdHN0cmFwIFNjcmlwdCIpLCAoKSA9PiB7CiAgICAg ICAgICAgICBXSS5uZXR3b3JrTWFuYWdlci5kZXN0cm95Qm9vdHN0cmFwU2NyaXB0KCk7CiAgICAg ICAgIH0pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9CcmVha3BvaW50QWN0aW9uVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRBY3Rpb25WaWV3LmpzCmluZGV4IDM1YWU3OTU1 OWNiLi4wM2Y2YzY5NzFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlvblZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlvblZpZXcuanMKQEAg LTY0LDcgKzY0LDcgQEAgV0kuQnJlYWtwb2ludEFjdGlvblZpZXcgPSBjbGFzcyBCcmVha3BvaW50 QWN0aW9uVmlldyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBsZXQgcmVtb3ZlQWN0aW9uQnV0 dG9uID0gYnV0dG9uQ29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJidXR0b24iKSk7CiAgICAgICAgIHJlbW92ZUFjdGlvbkJ1dHRvbi5jbGFzc05hbWUg PSAiYnJlYWtwb2ludC1hY3Rpb24tcmVtb3ZlLWJ1dHRvbiI7CiAgICAgICAgIHJlbW92ZUFjdGlv bkJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlbW92ZUFjdGlvbi5iaW5k KHRoaXMpKTsKLSAgICAgICAgcmVtb3ZlQWN0aW9uQnV0dG9uLnRpdGxlID0gV0kuVUlTdHJpbmco IlJlbW92ZSB0aGlzIGJyZWFrcG9pbnQgYWN0aW9uIik7CisgICAgICAgIHJlbW92ZUFjdGlvbkJ1 dHRvbi50aXRsZSA9IFdJLlVJU3RyaW5nKCJEZWxldGUgdGhpcyBicmVha3BvaW50IGFjdGlvbiIp OwogCiAgICAgICAgIHRoaXMuX2JvZHlFbGVtZW50ID0gdGhpcy5fZWxlbWVudC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CiAgICAgICAgIHRoaXMuX2JvZHlFbGVt ZW50LmNsYXNzTmFtZSA9ICJicmVha3BvaW50LWFjdGlvbi1ibG9jay1ib2R5IjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51 VXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGV4dE1lbnVVdGlsaXRpZXMuanMKaW5kZXggMzIwOTdlYzkwOWMuLjAzOGE4ZGNkZmM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZXh0TWVudVV0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qcwpAQCAtODMsOSArODMsMTggQEAgV0ku YXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclNvdXJjZUNvZGUgPSBmdW5jdGlvbihjb250ZXh0TWVu dSwgc291cmNlQ29kZU9yTG9jYXQKICAgICAgICAgICAgIGxldCBsb2NhbFJlc291cmNlT3ZlcnJp ZGUgPSBXSS5uZXR3b3JrTWFuYWdlci5sb2NhbFJlc291cmNlT3ZlcnJpZGVGb3JVUkwoc291cmNl Q29kZS51cmwpOwogICAgICAgICAgICAgaWYgKGxvY2FsUmVzb3VyY2VPdmVycmlkZSkgewogICAg ICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworCiAgICAgICAgICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiUmV2ZWFsIExvY2FsIE92 ZXJyaWRlIiksICgpID0+IHsKICAgICAgICAgICAgICAgICAgICAgV0kuc2hvd0xvY2FsUmVzb3Vy Y2VPdmVycmlkZShsb2NhbFJlc291cmNlT3ZlcnJpZGUpOwogICAgICAgICAgICAgICAgIH0pOwor CisgICAgICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShsb2NhbFJlc291cmNlT3Zl cnJpZGUuZGlzYWJsZWQgPyBXSS5VSVN0cmluZygiRW5hYmxlIExvY2FsIE92ZXJyaWRlIikgOiBX SS5VSVN0cmluZygiRGlzYWJsZSBMb2NhbCBPdmVycmlkZSIpLCAoKSA9PiB7CisgICAgICAgICAg ICAgICAgICAgIGxvY2FsUmVzb3VyY2VPdmVycmlkZS5kaXNhYmxlZCA9ICFsb2NhbFJlc291cmNl T3ZlcnJpZGUuZGlzYWJsZWQ7CisgICAgICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJEZWxldGUgTG9jYWwgT3ZlcnJp ZGUiKSwgKCkgPT4geworICAgICAgICAgICAgICAgICAgICBXSS5uZXR3b3JrTWFuYWdlci5yZW1v dmVMb2NhbFJlc291cmNlT3ZlcnJpZGUobG9jYWxSZXNvdXJjZU92ZXJyaWRlKTsKKyAgICAgICAg ICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VP dmVycmlkZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTG9jYWxSZXNvdXJjZU92ZXJyaWRlVHJlZUVsZW1lbnQuanMKaW5kZXggYjA1OTYz MWI5MjYuLjQwYWQyODViYWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNl T3ZlcnJpZGVUcmVlRWxlbWVudC5qcwpAQCAtMTA5LDcgKzEwOSw3IEBAIFdJLkxvY2FsUmVzb3Vy Y2VPdmVycmlkZVRyZWVFbGVtZW50ID0gY2xhc3MgTG9jYWxSZXNvdXJjZU92ZXJyaWRlVHJlZUVs ZW1lbnQgZXh0CiAgICAgICAgICAgICB0aGlzLl9sb2NhbFJlc291cmNlT3ZlcnJpZGUuZGlzYWJs ZWQgPSAhdGhpcy5fbG9jYWxSZXNvdXJjZU92ZXJyaWRlLmRpc2FibGVkOwogICAgICAgICB9KTsK IAotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJSZW1vdmUgTG9j YWwgT3ZlcnJpZGUiKSwgKCkgPT4geworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJ LlVJU3RyaW5nKCJEZWxldGUgTG9jYWwgT3ZlcnJpZGUiKSwgKCkgPT4gewogICAgICAgICAgICAg V0kubmV0d29ya01hbmFnZXIucmVtb3ZlTG9jYWxSZXNvdXJjZU92ZXJyaWRlKHRoaXMuX2xvY2Fs UmVzb3VyY2VPdmVycmlkZSk7CiAgICAgICAgIH0pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERldGFpbHNTZWN0aW9uLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREZXRh aWxzU2VjdGlvbi5qcwppbmRleCBmOWI3YTkzY2Y4Ni4uZWZhMWE5YzQwOTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGV0YWls c1NlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUHJvYmVTZXREZXRhaWxzU2VjdGlvbi5qcwpAQCAtNTgsNyArNTgsNyBAQCBXSS5Qcm9iZVNl dERldGFpbHNTZWN0aW9uID0gY2xhc3MgUHJvYmVTZXREZXRhaWxzU2VjdGlvbiBleHRlbmRzIFdJ LkRldGFpbHNTZWN0aQogICAgICAgICB0aGlzLl9jbGVhclNhbXBsZXNCdXR0b25JdGVtLmVuYWJs ZWQgPSB0aGlzLl9wcm9iZVNldEhhc1NhbXBsZXMoKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlv bkJhci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9jbGVhclNhbXBsZXNCdXR0b25JdGVtKTsKIAot ICAgICAgICB0aGlzLl9yZW1vdmVQcm9iZUJ1dHRvbkl0ZW0gPSBuZXcgV0kuQnV0dG9uTmF2aWdh dGlvbkl0ZW0oInJlbW92ZS1wcm9iZSIsIFdJLlVJU3RyaW5nKCJSZW1vdmUgcHJvYmUiKSwgIklt YWdlcy9DbG9zZUxhcmdlLnN2ZyIsIDEyLCAxMik7CisgICAgICAgIHRoaXMuX3JlbW92ZVByb2Jl QnV0dG9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVtb3ZlLXByb2JlIiwg V0kuVUlTdHJpbmcoIkRlbGV0ZSBwcm9iZSIpLCAiSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnIiwgMTIs IDEyKTsKICAgICAgICAgdGhpcy5fcmVtb3ZlUHJvYmVCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVu ZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fcmVtb3ZlUHJv YmVCdXR0b25DbGlja2VkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGRO YXZpZ2F0aW9uSXRlbSh0aGlzLl9yZW1vdmVQcm9iZUJ1dHRvbkl0ZW0pOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VDb250ZW50Vmlldy5qcwppbmRleCA2NGIxMDc3MTcwYi4uNTkzY2EzMmY3OTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtNzEsNyArNzEsNyBAQCBXSS5SZXNvdXJj ZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRWaWV3CiAgICAgICAgICAgICAgICAgdGhpcy5faW1wb3J0TG9jYWxSZXNvdXJjZU92ZXJyaWRl QnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0 ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgICAgICAgICB0aGlzLl9pbXBvcnRM b2NhbFJlc291cmNlT3ZlcnJpZGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVy KFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZUltcG9y dExvY2FsUmVzb3VyY2VPdmVycmlkZSwgdGhpcyk7CiAKLSAgICAgICAgICAgICAgICB0aGlzLl9y ZW1vdmVMb2NhbFJlc291cmNlT3ZlcnJpZGVCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5C dXR0b25OYXZpZ2F0aW9uSXRlbSgicmVtb3ZlLWxvY2FsLXJlc291cmNlLW92ZXJyaWRlIiwgV0ku VUlTdHJpbmcoIlJlbW92ZSBMb2NhbCBPdmVycmlkZSIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVt VHJhc2guc3ZnIiwgMTUsIDE1KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9yZW1vdmVMb2NhbFJl c291cmNlT3ZlcnJpZGVCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0 aW9uSXRlbSgicmVtb3ZlLWxvY2FsLXJlc291cmNlLW92ZXJyaWRlIiwgV0kuVUlTdHJpbmcoIkRl bGV0ZSBMb2NhbCBPdmVycmlkZSIpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnIiwg MTUsIDE1KTsKICAgICAgICAgICAgICAgICB0aGlzLl9yZW1vdmVMb2NhbFJlc291cmNlT3ZlcnJp ZGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRp b25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZVJlbW92ZUxvY2FsUmVzb3VyY2VPdmVy cmlkZSwgdGhpcyk7CiAgICAgICAgICAgICAgICAgdGhpcy5fcmVtb3ZlTG9jYWxSZXNvdXJjZU92 ZXJyaWRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdh dGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgICAgIH0gZWxzZSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29w ZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGVi MmZmNmZjNmE5Li40Yzk0ODlhMDEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRl dGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTQ1Myw3ICs0NTMsNyBAQCBXSS5TY29wZUNoYWluRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsIGV4 dGVuZHMgVwogICAgICAgICBpZiAob2JqZWN0VHJlZUVsZW1lbnQucGFyZW50ICE9PSBvYmplY3RU cmVlRWxlbWVudC50cmVlT3V0bGluZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBj b250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJSZW1vdmUgV2F0Y2ggRXhwcmVzc2lv biIpLCAoKSA9PiB7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmco IkRlbGV0ZSBXYXRjaCBFeHByZXNzaW9uIiksICgpID0+IHsKICAgICAgICAgICAgIGxldCBleHBy ZXNzaW9uID0gb2JqZWN0VHJlZUVsZW1lbnQucHJvcGVydHkubmFtZTsKICAgICAgICAgICAgIHRo aXMuX3JlbW92ZVdhdGNoRXhwcmVzc2lvbihleHByZXNzaW9uKTsKICAgICAgICAgfSk7Cg==