142751 2015-03-16 14:58:04 -0700 Web Inspector: Don't clear the console when navigating to a different page 2015-07-09 16:22:25 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev hi commit-queue graouts hi joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1077577 0 nvasilyev 2015-03-16 14:58:04 -0700 Steps: 0. Open console for this page 1. Right click on the console and set "Keep Log on Reload" 2. Log something, say, 1+1 3. Navigate to a different page, say http://coub.com/view/49yix Expected result: Console keeps 1+1 message in the history Actual result: Console got cleared. "Keep Log on Reload" does NOT prevent messages from being erased when navigating to another page. I find this behavior very unpleasant while debugging HTML5 history API on my personal website. 1077578 1 webkit-bug-importer 2015-03-16 14:58:27 -0700 <rdar://problem/20179772> 1108358 2 256515 hi 2015-07-09 14:10:09 -0700 Created attachment 256515 Patch 1108372 3 256515 timothy 2015-07-09 14:21:37 -0700 Comment on attachment 256515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256515&action=review > Source/WebInspectorUI/ChangeLog:9 > + (WebInspector.LogManager): No longer distinguishes from page refreshes and page navigations for console clearing. The context menu to toggle this is still called "Keep Log on Reload", so that would need to change. > Source/WebInspectorUI/UserInterface/Controllers/LogManager.js:80 > + if (!this.clearLogOnReloadSetting.value) Ditto for the setting name. 1108400 4 256528 hi 2015-07-09 15:02:16 -0700 Created attachment 256528 Patch 1108442 5 256528 commit-queue 2015-07-09 16:22:19 -0700 Comment on attachment 256528 Patch Clearing flags on attachment: 256528 Committed r186645: <http://trac.webkit.org/changeset/186645> 1108443 6 commit-queue 2015-07-09 16:22:25 -0700 All reviewed patches have been landed. Closing bug. 256515 2015-07-09 14:10:09 -0700 2015-07-09 15:02:13 -0700 Patch bug-142751-20150709140908.patch text/plain 3249 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRmYjJjYjg4NmE0Y2FmMWZkMGYwNWIyZWRlZTUx OWMwMjQxMzdkN2QuLmE3ZTI3YTdmYzA3MjE3Njc5ZWUzZDJlMTQ2ZDQwY2ViNDMzYmFiYWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE1LTA3LTA5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBE b24ndCBjbGVhciB0aGUgY29uc29sZSB3aGVuIG5hdmlnYXRpbmcgdG8gYSBkaWZmZXJlbnQgcGFn ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzUx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTG9nTWFuYWdlcik6IE5vIGxvbmdlciBkaXN0aW5ndWlzaGVzIGZyb20gcGFnZSByZWZyZXNo ZXMgYW5kIHBhZ2UgbmF2aWdhdGlvbnMgZm9yIGNvbnNvbGUgY2xlYXJpbmcuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5wcm90b3R5cGUuX2RlbGF5ZWRNZXNzYWdlc0NsZWFyZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIucHJvdG90eXBlLl9tYWluUmVzb3Vy Y2VEaWRDaGFuZ2UpOgorCisyMDE1LTA3LTA5ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxl LmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDaGVja2JveCBkaXNhcHBlYXJzIHdoZW4g dW5jaGVja2luZyBDU1MgYmFja2dyb3VuZCBzdHlsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2Nzc2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Mb2dNYW5hZ2VyLmpz CmluZGV4IDhjYjhiNTE5MDI0YzFkZWMzMTY1NGRiZjQ2NTU2ZDYwOTEwYjNjMzQuLmM0MjRiMTU3 ZDQ3NDFkOGNiNGZlZDY2MjJhNWQ1OTIwY2FiZjRjMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTG9nTWFuYWdl ci5qcwpAQCAtMzEsNyArMzEsNyBAQCBXZWJJbnNwZWN0b3IuTG9nTWFuYWdlciA9IGNsYXNzIExv Z01hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHN1cGVyKCk7CiAK ICAgICAgICAgdGhpcy5fY2xlYXJNZXNzYWdlc1JlcXVlc3RlZCA9IGZhbHNlOwotICAgICAgICB0 aGlzLl9pc1BhZ2VSZWxvYWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5faXNOZXdQYWdlT3JSZWxv YWQgPSBmYWxzZTsKIAogICAgICAgICB0aGlzLmNsZWFyTG9nT25SZWxvYWRTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjbGVhci1sb2ctb24tcmVsb2FkIiwgdHJ1ZSk7CiAKQEAg LTc0LDE0ICs3NCwxNSBAQCBXZWJJbnNwZWN0b3IuTG9nTWFuYWdlciA9IGNsYXNzIExvZ01hbmFn ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICBfZGVsYXllZE1lc3NhZ2VzQ2xl YXJlZCgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faXNQYWdlUmVsb2FkKSB7Ci0gICAgICAg ICAgICB0aGlzLl9pc1BhZ2VSZWxvYWQgPSBmYWxzZTsKLSAgICAgICAgICAgIGlmICh0aGlzLmNs ZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZhbHVlKQotICAgICAgICAgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLkV2ZW50LkNsZWFyZWQp OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gQSBmcmFtZSBuYXZpZ2F0ZWQsIGNv bnNvbGUuY2xlYXIoKSBvciBjb21tYW5kIGxpbmUgY2xlYXIoKSBoYXBwZW5lZC4KLSAgICAgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2Vy LkV2ZW50LkNsZWFyZWQpOworICAgICAgICBpZiAodGhpcy5faXNOZXdQYWdlT3JSZWxvYWQpIHsK KyAgICAgICAgICAgIHRoaXMuX2lzTmV3UGFnZU9yUmVsb2FkID0gZmFsc2U7CisKKyAgICAgICAg ICAgIGlmICghdGhpcy5jbGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZSkKKyAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICAvLyBBIGNvbnNvbGUuY2xlYXIoKSBv ciBjb21tYW5kIGxpbmUgY2xlYXIoKSBoYXBwZW5lZC4KKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuQ2xlYXJlZCk7CiAg ICAgfQogCiAgICAgbWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZChjb3VudCkKQEAgLTEwNywxMSAr MTA4LDEwIEBAIFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyID0gY2xhc3MgTG9nTWFuYWdlciBleHRl bmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgaWYgKCFldmVudC50YXJnZXQuaXNNYWlu RnJhbWUoKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoZXZlbnQuZGF0YS5v bGRNYWluUmVzb3VyY2UudXJsID09PSBldmVudC50YXJnZXQubWFpblJlc291cmNlLnVybCkgewot ICAgICAgICAgICAgdGhpcy5faXNQYWdlUmVsb2FkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5faXNO ZXdQYWdlT3JSZWxvYWQgPSB0cnVlOworCisgICAgICAgIGlmIChldmVudC5kYXRhLm9sZE1haW5S ZXNvdXJjZS51cmwgPT09IGV2ZW50LnRhcmdldC5tYWluUmVzb3VyY2UudXJsKQogICAgICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIu RXZlbnQuU2Vzc2lvblN0YXJ0ZWQpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRoaXMu X2lzUGFnZVJlbG9hZCA9IGZhbHNlOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZFJlc3VsdE1lc3NhZ2UuY2xlYXJNYXhpbXVtU2F2ZWRSZXN1bHRJbmRleCgpOwogICAgIH0K 256528 2015-07-09 15:02:16 -0700 2015-07-09 16:22:19 -0700 Patch bug-142751-20150709150115.patch text/plain 6431 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRmYjJjYjg4NmE0Y2FmMWZkMGYwNWIyZWRlZTUx OWMwMjQxMzdkN2QuLjAyOWVmNTRhNzhjYzQyNGZlZWNjNzMzMjBhZmMzOWU1ZWE0Y2M2NzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE1LTA3LTA5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBE b24ndCBjbGVhciB0aGUgY29uc29sZSB3aGVuIG5hdmlnYXRpbmcgdG8gYSBkaWZmZXJlbnQgcGFn ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzUx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9Mb2dNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkxvZ01hbmFnZXIpOiBObyBsb25nZXIgZGlzdGluZ3Vpc2hlcyBmcm9tIHBhZ2UgcmVmcmVzaGVz IGFuZCBwYWdlIG5hdmlnYXRpb25zIGZvciBjb25zb2xlIGNsZWFyaW5nLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkxvZ01hbmFnZXIucHJvdG90eXBlLl9kZWxheWVkTWVzc2FnZXNDbGVhcmVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyLnByb3RvdHlwZS5fbWFpblJlc291cmNl RGlkQ2hhbmdlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2Vz c2lvblN0YXJ0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3Rv dHlwZS5faGFuZGxlQ29udGV4dE1lbnVFdmVudCk6IENoYW5nZWQgY29udGV4dCBtZW51IGtlZXAv Y2xlYXIgbG9nIHRleHQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJv dG90eXBlLl90b2dnbGVDbGVhckxvZ09uTmF2aWdhdGVTZXR0aW5nKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuX3RvZ2dsZUNsZWFyTG9nT25SZWxvYWRT ZXR0aW5nKTogRGVsZXRlZC4KKworMjAxNS0wNy0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2hlY2tib3ggZGlzYXBwZWFycyB3 aGVuIHVuY2hlY2tpbmcgQ1NTIGJhY2tncm91bmQgc3R5bGUKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Njc3NgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwppbmRleCA3MTQ4MGJlYjg5YmZjMzAwOWZhOTE2ODYxY2Q2MTUzODk4NjVhZWEy Li44YTEyYjMxYTJiOWJmNThjOWFmMDBkNTY2ZDg5MjNmMzAzODhjMDNkIDEwMDY0NApHSVQgYmlu YXJ5IHBhdGNoCmRlbHRhIDk5CnpjbWFGJW1BVU8zXjlFXmtWTHlnTWhCQWdzaElBbFowO0thOUAr UXd5bXotPmAmY19MdG8yKVIkYmFTKSVoN18jSQpPP1JyJHZsK050JiU+d3xKUCNsOzUKCmRlbHRh IDc5CnpjbVpxcyN7QkZuXjlFXms/alZMI2g4JWBgaEQzJngkJElNUW9OKWYrNEAmeCpyPmRfQEt+ V09jcWwlKExja3w5MwpHLSNoQHU/LS04JgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Mb2dNYW5hZ2VyLmpzCmluZGV4 IDhjYjhiNTE5MDI0YzFkZWMzMTY1NGRiZjQ2NTU2ZDYwOTEwYjNjMzQuLmM3MGE3ZWExZWI4NDFj ZDFjMDZiZjhiZjdjZDNjZDc3ZGMzYTJiYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvTG9nTWFuYWdlci5qcwpA QCAtMzEsOSArMzEsOSBAQCBXZWJJbnNwZWN0b3IuTG9nTWFuYWdlciA9IGNsYXNzIExvZ01hbmFn ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHN1cGVyKCk7CiAKICAgICAg ICAgdGhpcy5fY2xlYXJNZXNzYWdlc1JlcXVlc3RlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9p c1BhZ2VSZWxvYWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5faXNOZXdQYWdlT3JSZWxvYWQgPSBm YWxzZTsKIAotICAgICAgICB0aGlzLmNsZWFyTG9nT25SZWxvYWRTZXR0aW5nID0gbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKCJjbGVhci1sb2ctb24tcmVsb2FkIiwgdHJ1ZSk7CisgICAgICAgIHRo aXMuY2xlYXJMb2dPbk5hdmlnYXRlU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygi Y2xlYXItbG9nLW9uLW5hdmlnYXRlIiwgdHJ1ZSk7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLkZy YW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJj ZURpZENoYW5nZSwgdGhpcy5fbWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKICAgICB9CkBA IC03NCwxNCArNzQsMTUgQEAgV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIgPSBjbGFzcyBMb2dNYW5h Z2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgX2RlbGF5ZWRNZXNzYWdlc0Ns ZWFyZWQoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2lzUGFnZVJlbG9hZCkgewotICAgICAg ICAgICAgdGhpcy5faXNQYWdlUmVsb2FkID0gZmFsc2U7Ci0gICAgICAgICAgICBpZiAodGhpcy5j bGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZSkKLSAgICAgICAgICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTG9nTWFuYWdlci5FdmVudC5DbGVhcmVk KTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIC8vIEEgZnJhbWUgbmF2aWdhdGVkLCBj b25zb2xlLmNsZWFyKCkgb3IgY29tbWFuZCBsaW5lIGNsZWFyKCkgaGFwcGVuZWQuCi0gICAgICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuTG9nTWFuYWdl ci5FdmVudC5DbGVhcmVkKTsKKyAgICAgICAgaWYgKHRoaXMuX2lzTmV3UGFnZU9yUmVsb2FkKSB7 CisgICAgICAgICAgICB0aGlzLl9pc05ld1BhZ2VPclJlbG9hZCA9IGZhbHNlOworCisgICAgICAg ICAgICBpZiAoIXRoaXMuY2xlYXJMb2dPbk5hdmlnYXRlU2V0dGluZy52YWx1ZSkKKyAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICAvLyBBIGNvbnNvbGUuY2xlYXIo KSBvciBjb21tYW5kIGxpbmUgY2xlYXIoKSBoYXBwZW5lZC4KKyAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkxvZ01hbmFnZXIuRXZlbnQuQ2xlYXJlZCk7 CiAgICAgfQogCiAgICAgbWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZChjb3VudCkKQEAgLTEwNywx MSArMTA4LDEwIEBAIFdlYkluc3BlY3Rvci5Mb2dNYW5hZ2VyID0gY2xhc3MgTG9nTWFuYWdlciBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgaWYgKCFldmVudC50YXJnZXQuaXNN YWluRnJhbWUoKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoZXZlbnQuZGF0 YS5vbGRNYWluUmVzb3VyY2UudXJsID09PSBldmVudC50YXJnZXQubWFpblJlc291cmNlLnVybCkg ewotICAgICAgICAgICAgdGhpcy5faXNQYWdlUmVsb2FkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5f aXNOZXdQYWdlT3JSZWxvYWQgPSB0cnVlOworCisgICAgICAgIGlmIChldmVudC5kYXRhLm9sZE1h aW5SZXNvdXJjZS51cmwgPT09IGV2ZW50LnRhcmdldC5tYWluUmVzb3VyY2UudXJsKQogICAgICAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkxvZ01hbmFn ZXIuRXZlbnQuU2Vzc2lvblN0YXJ0ZWQpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRo aXMuX2lzUGFnZVJlbG9hZCA9IGZhbHNlOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdE1lc3NhZ2UuY2xlYXJNYXhpbXVtU2F2ZWRSZXN1bHRJbmRleCgpOwogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5kZXggYjBmOWMxNTkyNzkwNTExZDE5MWZkNzc3ODcy ZTE1MTkyYTg2OTRjYS4uNTRiNTVmOTE5NDJkYWQxMWM1OTYzYjkyMWRjNmFmNjM3NjI0OGQxZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9n Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAgLTMxMSw3ICszMTEsNyBAQCBXZWJJbnNwZWN0b3Iu TG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3Nlc3Npb25TdGFydGVkOiBmdW5j dGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5j bGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZSkgeworICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LmxvZ01hbmFnZXIuY2xlYXJMb2dPbk5hdmlnYXRlU2V0dGluZy52YWx1ZSkgewogICAgICAgICAg ICAgdGhpcy5fcmVhcHBlbmRQcm92aXNpb25hbE1lc3NhZ2VzKCk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KQEAgLTM4OSw5ICszODksOSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVu dFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgTG9nIiksIHRoaXMuX2NsZWFyTG9nLmJpbmQodGhpcykp OwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKIAotICAgICAgICB2YXIg Y2xlYXJMb2dPblJlbG9hZFVJU3RyaW5nID0gV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIuY2xlYXJM b2dPblJlbG9hZFNldHRpbmcudmFsdWUgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIktlZXAgTG9n IG9uIFJlbG9hZCIpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBMb2cgb24gUmVsb2Fk Iik7CisgICAgICAgIHZhciBjbGVhckxvZ09uUmVsb2FkVUlTdHJpbmcgPSBXZWJJbnNwZWN0b3Iu bG9nTWFuYWdlci5jbGVhckxvZ09uTmF2aWdhdGVTZXR0aW5nLnZhbHVlID8gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJLZWVwIExvZyBvbiBOYXZpZ2F0aW9uIikgOiBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkNsZWFyIExvZyBvbiBOYXZpZ2F0aW9uIik7CiAKLSAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShjbGVhckxvZ09uUmVsb2FkVUlTdHJpbmcsIHRoaXMuX3RvZ2dsZUNsZWFyTG9nT25S ZWxvYWRTZXR0aW5nLmJpbmQodGhpcykpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KGNsZWFyTG9nT25SZWxvYWRVSVN0cmluZywgdGhpcy5fdG9nZ2xlQ2xlYXJMb2dPbk5hdmlnYXRl U2V0dGluZy5iaW5kKHRoaXMpKTsKIAogICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAg fSwKQEAgLTY3OSw5ICs2NzksOSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90 eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGVUYWIoKTsKICAgICB9LAog Ci0gICAgX3RvZ2dsZUNsZWFyTG9nT25SZWxvYWRTZXR0aW5nOiBmdW5jdGlvbigpCisgICAgX3Rv Z2dsZUNsZWFyTG9nT25OYXZpZ2F0ZVNldHRpbmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAg IFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmNsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZhbHVlID0g IVdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmNsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZhbHVlOwor ICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdlci5jbGVhckxvZ09uTmF2aWdhdGVTZXR0aW5n LnZhbHVlID0gIVdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLmNsZWFyTG9nT25OYXZpZ2F0ZVNldHRp bmcudmFsdWU7CiAgICAgfSwKIAogICAgIF9jbGVhckxvZzogZnVuY3Rpb24oKQo=