162753 2016-09-29 14:24:47 -0700 Web Inspector: Make debugger stepping highlights work in inline <script>s 2016-09-30 17:41:28 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 161658 1 joepeck joepeck bburg ggaren joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1234974 0 joepeck 2016-09-29 14:24:47 -0700 Summary: Make debugger stepping highlights work in inline <script>s Test: <script> debugger; if (true) { 1; } </script> Current highlight on if statement line: if (|true) {| Expected highlight on if statement line: if (|true|) { Notes: - Works in external scripts via bug 161658, this is about getting it to work in inline scripts. 1234975 1 webkit-bug-importer 2016-09-29 14:25:05 -0700 <rdar://problem/28551332> 1234978 2 290244 joepeck 2016-09-29 14:28:12 -0700 Created attachment 290244 [PATCH] Proposed Fix Won't apply due to other patches awaiting review. 1235333 3 290244 bburg 2016-09-30 12:16:31 -0700 Comment on attachment 290244 [PATCH] Proposed Fix r=me, Good catch! 1235350 4 joepeck 2016-09-30 12:37:37 -0700 <https://trac.webkit.org/changeset/206655> 290244 2016-09-29 14:28:12 -0700 2016-09-30 12:16:31 -0700 [PATCH] Proposed Fix inline-1.patch text/plain 10281 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc5N2ZhZGIuLmMwN2FhMWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA5LTI5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBk ZWJ1Z2dlciBzdGVwcGluZyBoaWdobGlnaHRzIHdvcmsgaW4gaW5saW5lIDxzY3JpcHQ+cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNzUzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yODU1MTMzMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1RleHRSYW5nZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmFuZ2UucHJvdG90eXBlLmNvbnRhaW5zKToK KyAgICAgICAgQ2hlY2sgaWYgYSBnaXZlbiBsaW5lL2NvbHVtbiBmYWxscyB3aXRoaW4gdGhpcyBy YW5nZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0 b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90 eXBlLl9nZXRBc3NvY2lhdGVkU2NyaXB0KToKKyAgICAgICAgSWYgd2UgYXJlIGluIGEgRG9jdW1l bnQgcmVzb3VyY2UgZmluZCB0aGUgYXNzb2NpYXRlZCBzY3JpcHQgYXQgYSBnaXZlbiBwb3NpdGlv bi4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlw ZS50ZXh0RWRpdG9yRXhlY3V0aW9uSGlnaGxpZ2h0UmFuZ2UpOgorICAgICAgICBXaGVuIGNvbXBh cmluZyBvZmZzZXRzIHRvIFN5bnRheFRyZWUgb2Zmc2V0cywgdGhlIFN5bnRheFRyZWUncyBvZmZz ZXQgb2YgMCBpcyB0aGUKKyAgICAgICAgZmlyc3QgY2hhcmFjdGVyIG9mIHRoZSBTY3JpcHQsIHdo aWNoIGRpZmZlcnMgZnJvbSB0aGUgY3VycmVudCBTb3VyY2VDb2RlJ3Mgb2Zmc2V0LgorICAgICAg ICBBZGp1c3QgdGhlIG9mZnNldCBieSB0aGUgU2NyaXB0J3Mgc3RhcnRPZmZzZXQuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuY3VycmVudFBvc2l0aW9uVG9PcmlnaW5hbFBvc2l0 aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5fdXBkYXRl RXhlY3V0aW9uUmFuZ2VIaWdobGlnaHQpOgorICAgICAgICBQYXNzIGJvdGggdGhlIG9yaWdpbmFs IG9mZnNldCBhbmQgb3JpZ2luYWwgcG9zaXRpb24gdG8gdGhlIGRlbGVnYXRlLgorCiAyMDE2LTA5 LTI4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogU3RlcHBpbmcgdGhyb3VnaCBgYSgpOyBiKCk7IGMoKTtgIGl0IGlzIHVuY2xl YXIgd2hlcmUgd2UgYXJlIGFuZCB3aGF0IGlzIGFib3V0IHRvIGV4ZWN1dGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Zvcm1hdHRl clNvdXJjZU1hcC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0Zvcm1hdHRlclNvdXJjZU1hcC5qcwppbmRleCA1YjQyMWYxLi5lMzIwYmExIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9G b3JtYXR0ZXJTb3VyY2VNYXAuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvRm9ybWF0dGVyU291cmNlTWFwLmpzCkBAIC01NSw3ICs1NSw2IEBA IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZXJTb3VyY2VNYXAgPSBjbGFzcyBGb3JtYXR0ZXJTb3VyY2VN YXAgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIHJldHVybiB0aGlzLl9wb3NpdGlvblRv TG9jYXRpb24odGhpcy5fZm9ybWF0dGVkTGluZUVuZGluZ3MsIGZvcm1hdHRlZFBvc2l0aW9uKTsK ICAgICB9CiAKLQogICAgIGZvcm1hdHRlZFRvT3JpZ2luYWwobGluZU51bWJlciwgY29sdW1uTnVt YmVyKQogICAgIHsKICAgICAgICAgdmFyIG9yaWdpbmFsUG9zaXRpb24gPSB0aGlzLmZvcm1hdHRl ZFRvT3JpZ2luYWxPZmZzZXQobGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UZXh0UmFuZ2UuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGV4dFJhbmdlLmpz CmluZGV4IGQ5Y2MwYjYuLjY0ZmU3MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9UZXh0UmFuZ2UuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RleHRSYW5nZS5qcwpAQCAtOTYsNCArOTYsMTgg QEAgV2ViSW5zcGVjdG9yLlRleHRSYW5nZSA9IGNsYXNzIFRleHRSYW5nZSBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplY3QKIAogICAgICAgICB0aGlzLl9lbmRPZmZzZXQgPSBsYXN0TmV3TGluZU9m ZnNldCArIHRoaXMuX2VuZENvbHVtbjsKICAgICB9CisKKyAgICBjb250YWlucyhsaW5lLCBjb2x1 bW4pCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydCghaXNOYU4odGhpcy5fc3RhcnRMaW5l KSwgIlRleHRSYW5nZSBuZWVkcyBsaW5lL2NvbHVtbiBkYXRhIik7CisKKyAgICAgICAgaWYgKGxp bmUgPCB0aGlzLl9zdGFydExpbmUgfHwgbGluZSA+IHRoaXMuX2VuZExpbmUpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChsaW5lID09PSB0aGlzLl9zdGFydExpbmUgJiYg Y29sdW1uIDwgdGhpcy5fc3RhcnRDb2x1bW4pCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIGlmIChsaW5lID09PSB0aGlzLl9lbmRMaW5lICYmIGNvbHVtbiA+IHRoaXMuX2VuZENv bHVtbikKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcwppbmRleCA3MmVhODZi Li42MjkwYzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcwpAQCAtMTIxMCwx NCArMTIxMCwyMyBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBT b3VyY2VDb2RlVGV4dEVkaXRvciBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICB0aGlzLl9yZWlu c2VydEFsbElzc3VlcygpOwogICAgIH0KIAotICAgIHRleHRFZGl0b3JFeGVjdXRpb25IaWdobGln aHRSYW5nZShvZmZzZXQsIGNhbGxiYWNrKQorICAgIHRleHRFZGl0b3JFeGVjdXRpb25IaWdobGln aHRSYW5nZShvZmZzZXQsIHBvc2l0aW9uLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIGxldCBz Y3JpcHQgPSB0aGlzLl9nZXRBc3NvY2lhdGVkU2NyaXB0KCk7CisgICAgICAgIGxldCBzY3JpcHQg PSB0aGlzLl9nZXRBc3NvY2lhdGVkU2NyaXB0KHBvc2l0aW9uKTsKICAgICAgICAgaWYgKCFzY3Jp cHQpIHsKICAgICAgICAgICAgIGNhbGxiYWNrKG51bGwpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgLy8gSWYgdGhpcyBpcyBhbiBpbmxpbmUgc2NyaXB0LCB0aGVu IGNvbnZlcnQgdG8gb2Zmc2V0IHdpdGhpbiB0aGUgaW5saW5lIHNjcmlwdC4KKyAgICAgICAgbGV0 IGFkanVzdG1lbnQgPSBzY3JpcHQucmFuZ2Uuc3RhcnRPZmZzZXQgfHwgMDsKKyAgICAgICAgb2Zm c2V0ID0gb2Zmc2V0IC0gYWRqdXN0bWVudDsKKworICAgICAgICAvLyBXaGVuIHJldHVybmluZyBv ZmZzZXRzLCBjb252ZXJ0IHRvIG9mZnNldHMgd2l0aGluIHRoZSBTb3VyY2VDb2RlIGJlaW5nIHZp ZXdlZC4KKyAgICAgICAgZnVuY3Rpb24gY29udmVydFJhbmdlT2Zmc2V0c1RvU291cmNlQ29kZU9m ZnNldHMocmFuZ2UpIHsKKyAgICAgICAgICAgIHJldHVybiByYW5nZS5tYXAoKG9mZnNldCkgPT4g b2Zmc2V0ICsgYWRqdXN0bWVudCk7CisgICAgICAgIH0KKwogICAgICAgICBzY3JpcHQucmVxdWVz dFNjcmlwdFN5bnRheFRyZWUoKHN5bnRheFRyZWUpID0+IHsKICAgICAgICAgICAgIGxldCBub2Rl cyA9IHN5bnRheFRyZWUuY29udGFpbmVyc09mT2Zmc2V0KG9mZnNldCk7CiAgICAgICAgICAgICBp ZiAoIW5vZGVzLmxlbmd0aCkgewpAQCAtMTIyOSw3ICsxMjM4LDcgQEAgV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBX ZWJJbnNwZWMKICAgICAgICAgICAgIGZvciAobGV0IG5vZGUgb2Ygbm9kZXMpIHsKICAgICAgICAg ICAgICAgICBsZXQgc3RhcnRPZmZzZXQgPSBub2RlLnJhbmdlWzBdOwogICAgICAgICAgICAgICAg IGlmIChzdGFydE9mZnNldCA9PT0gb2Zmc2V0KSB7Ci0gICAgICAgICAgICAgICAgICAgIGNhbGxi YWNrKG5vZGUucmFuZ2UpOworICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhjb252ZXJ0UmFu Z2VPZmZzZXRzVG9Tb3VyY2VDb2RlT2Zmc2V0cyhub2RlLnJhbmdlKSk7CiAgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKHN0 YXJ0T2Zmc2V0ID4gb2Zmc2V0KQpAQCAtMTI0NSw3ICsxMjU0LDcgQEAgV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBX ZWJJbnNwZWMKICAgICAgICAgICAgICAgICBpZiAoZW5kT2Zmc2V0ID09PSBvZmZzZXQpIHsKICAg ICAgICAgICAgICAgICAgICAgaWYgKG5vZGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5 bnRheFRyZWUuTm9kZVR5cGUuQmxvY2tTdGF0ZW1lbnQpIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIENsb3NpbmcgYnJhY2Ugb2YgYSBibG9jaywgb25seSBoaWdobGlnaHQgdGhlIGNsb3Np bmcgYnJhY2UgY2hhcmFjdGVyLgotICAgICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2soW29m ZnNldCAtIDEsIG9mZnNldF0pOworICAgICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2soY29u dmVydFJhbmdlT2Zmc2V0c1RvU291cmNlQ29kZU9mZnNldHMoW29mZnNldCAtIDEsIG9mZnNldF0p KTsKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0KQEAgLTEyNjcsNyArMTI3Niw3IEBAIFdlYkluc3BlY3Rvci5T b3VyY2VDb2RlVGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMg V2ViSW5zcGVjCiAgICAgICAgICAgICAgICAgLy8gSW4gYSBmdW5jdGlvbiBjYWxsLgogICAgICAg ICAgICAgICAgIGlmIChub2RlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVl Lk5vZGVUeXBlLkNhbGxFeHByZXNzaW9uCiAgICAgICAgICAgICAgICAgICAgIHx8IG5vZGUudHlw ZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9kZVR5cGUuTmV3RXhwcmVzc2lv bikgewotICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhub2RlLnJhbmdlKTsKKyAgICAgICAg ICAgICAgICAgICAgY2FsbGJhY2soY29udmVydFJhbmdlT2Zmc2V0c1RvU291cmNlQ29kZU9mZnNl dHMobm9kZS5yYW5nZSkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICAgICAgfQogCkBAIC0xMjc2LDEwICsxMjg1LDEwIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2Rl VGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgICAgICAgICAgICAgIHx8IG5vZGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlw dFN5bnRheFRyZWUuTm9kZVR5cGUuSWRlbnRpZmllckV4cHJlc3Npb24pIHsKICAgICAgICAgICAg ICAgICAgICAgbGV0IG5leHROb2RlID0gbm9kZXNbaSArIDFdOwogICAgICAgICAgICAgICAgICAg ICBpZiAobmV4dE5vZGUgJiYgbmV4dE5vZGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5 bnRheFRyZWUuTm9kZVR5cGUuTWVtYmVyRXhwcmVzc2lvbikgewotICAgICAgICAgICAgICAgICAg ICAgICAgY2FsbGJhY2sobmV4dE5vZGUucmFuZ2UpOworICAgICAgICAgICAgICAgICAgICAgICAg Y2FsbGJhY2soY29udmVydFJhbmdlT2Zmc2V0c1RvU291cmNlQ29kZU9mZnNldHMobmV4dE5vZGUu cmFuZ2UpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayhub2RlLnJhbmdlKTsKKyAgICAg ICAgICAgICAgICAgICAgY2FsbGJhY2soY29udmVydFJhbmdlT2Zmc2V0c1RvU291cmNlQ29kZU9m ZnNldHMobm9kZS5yYW5nZSkpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgfQpAQCAtMTg1MiwxNCArMTg2MSwyNyBAQCBXZWJJbnNw ZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBl eHRlbmRzIFdlYkluc3BlYwogICAgICAgICBXZWJJbnNwZWN0b3IuZW5hYmxlQ29udHJvbEZsb3dQ cm9maWxlclNldHRpbmcudmFsdWUgPSBzaG91bGRBY3RpdmF0ZTsKICAgICB9CiAKLSAgICBfZ2V0 QXNzb2NpYXRlZFNjcmlwdCgpCisgICAgX2dldEFzc29jaWF0ZWRTY3JpcHQocG9zaXRpb24pCiAg ICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gbnVsbDsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMg bmVlZHMgdG8gbWUgbW9kaWZpZWQgdG8gd29yayB3aXRoIEhUTUwgZmlsZXMgd2l0aCBpbmxpbmUg c2NyaXB0IHRhZ3MuCisgICAgICAgIGxldCBzY3JpcHQgPSBudWxsOworCiAgICAgICAgIGlmICh0 aGlzLl9zb3VyY2VDb2RlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCkKICAgICAgICAg ICAgIHNjcmlwdCA9IHRoaXMuX3NvdXJjZUNvZGU7Ci0gICAgICAgIGVsc2UgaWYgKHRoaXMuX3Nv dXJjZUNvZGUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgJiYgdGhpcy5fc291cmNl Q29kZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TY3JpcHQgJiYgdGhpcy5f c291cmNlQ29kZS5zY3JpcHRzLmxlbmd0aCkKLSAgICAgICAgICAgIHNjcmlwdCA9IHRoaXMuX3Nv dXJjZUNvZGUuc2NyaXB0c1swXTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5fc291cmNlQ29kZSBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSAmJiB0aGlzLl9zb3VyY2VDb2RlLnNjcmlw dHMubGVuZ3RoKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fc291cmNlQ29kZS50eXBlID09PSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TY3JpcHQpCisgICAgICAgICAgICAgICAgc2NyaXB0 ID0gdGhpcy5fc291cmNlQ29kZS5zY3JpcHRzWzBdOworICAgICAgICAgICAgZWxzZSBpZiAodGhp cy5fc291cmNlQ29kZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5Eb2N1bWVu dCAmJiBwb3NpdGlvbikgeworICAgICAgICAgICAgICAgIGZvciAobGV0IGlubGluZVNjcmlwdCBv ZiB0aGlzLl9zb3VyY2VDb2RlLnNjcmlwdHMpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlu bGluZVNjcmlwdC5yYW5nZS5jb250YWlucyhwb3NpdGlvbi5saW5lTnVtYmVyLCBwb3NpdGlvbi5j b2x1bW5OdW1iZXIpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXNOYU4oaW5saW5l U2NyaXB0LnJhbmdlLnN0YXJ0T2Zmc2V0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bmxpbmVTY3JpcHQucmFuZ2UucmVzb2x2ZU9mZnNldHModGhpcy5fc291cmNlQ29kZS5jb250ZW50 KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNjcmlwdCA9IGlubGluZVNjcmlwdDsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisKICAgICAgICAgcmV0dXJuIHNj cmlwdDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCmluZGV4IGQ3NGIyYjcuLmIyYzZkNzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0 b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4 dEVkaXRvci5qcwpAQCAtNzA4LDYgKzcwOCwxNSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9 IGNsYXNzIFRleHRFZGl0b3IgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICByZXR1 cm4gb2Zmc2V0OwogICAgIH0KIAorICAgIGN1cnJlbnRQb3NpdGlvblRvT3JpZ2luYWxQb3NpdGlv bihwb3NpdGlvbikKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZm9ybWF0dGVyU291cmNlTWFw KQorICAgICAgICAgICAgcmV0dXJuIHBvc2l0aW9uOworCisgICAgICAgIGxldCBsb2NhdGlvbiA9 IHRoaXMuX2Zvcm1hdHRlclNvdXJjZU1hcC5mb3JtYXR0ZWRUb09yaWdpbmFsKHBvc2l0aW9uLmxp bmUsIHBvc2l0aW9uLmNoKTsKKyAgICAgICAgcmV0dXJuIHtsaW5lOiBsb2NhdGlvbi5saW5lTnVt YmVyLCBjaDogbG9jYXRpb24uY29sdW1uTnVtYmVyfTsKKyAgICB9CisKICAgICBjdXJyZW50UG9z aXRpb25Ub0N1cnJlbnRPZmZzZXQocG9zaXRpb24pCiAgICAgewogICAgICAgICByZXR1cm4gdGhp cy5fY29kZU1pcnJvci5nZXREb2MoKS5pbmRleEZyb21Qb3MocG9zaXRpb24pOwpAQCAtMTIyNSw5 ICsxMjM0LDEyIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yID0gY2xhc3MgVGV4dEVkaXRvciBl eHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIGlmIChpc05hTih0aGlzLl9leGVjdXRp b25MaW5lTnVtYmVyKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBsZXQgb2Zmc2V0 ID0gdGhpcy5jdXJyZW50UG9zaXRpb25Ub09yaWdpbmFsT2Zmc2V0KHtsaW5lOiB0aGlzLl9leGVj dXRpb25MaW5lTnVtYmVyLCBjaDogdGhpcy5fZXhlY3V0aW9uQ29sdW1uTnVtYmVyfSk7CisgICAg ICAgIGxldCBjdXJyZW50UG9zaXRpb24gPSB7bGluZTogdGhpcy5fZXhlY3V0aW9uTGluZU51bWJl ciwgY2g6IHRoaXMuX2V4ZWN1dGlvbkNvbHVtbk51bWJlcn07CisgICAgICAgIGxldCBvcmlnaW5h bE9mZnNldCA9IHRoaXMuY3VycmVudFBvc2l0aW9uVG9PcmlnaW5hbE9mZnNldChjdXJyZW50UG9z aXRpb24pOworICAgICAgICBsZXQgb3JpZ2luYWxDb2RlTWlycm9yUG9zaXRpb24gPSB0aGlzLmN1 cnJlbnRQb3NpdGlvblRvT3JpZ2luYWxQb3NpdGlvbihjdXJyZW50UG9zaXRpb24pOworICAgICAg ICBsZXQgb3JpZ2luYWxQb3NpdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVBvc2l0 aW9uKG9yaWdpbmFsQ29kZU1pcnJvclBvc2l0aW9uLmxpbmUsIG9yaWdpbmFsQ29kZU1pcnJvclBv c2l0aW9uLmNoKTsKIAotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS50ZXh0RWRpdG9yRXhlY3V0aW9u SGlnaGxpZ2h0UmFuZ2Uob2Zmc2V0LCAocmFuZ2UpID0+IHsKKyAgICAgICAgdGhpcy5fZGVsZWdh dGUudGV4dEVkaXRvckV4ZWN1dGlvbkhpZ2hsaWdodFJhbmdlKG9yaWdpbmFsT2Zmc2V0LCBvcmln aW5hbFBvc2l0aW9uLCAocmFuZ2UpID0+IHsKICAgICAgICAgICAgIGxldCBzdGFydCwgZW5kOwog ICAgICAgICAgICAgaWYgKCFyYW5nZSkgewogICAgICAgICAgICAgICAgIC8vIEhpZ2hsaWdodCB0 aGUgcmVzdCBvZiB0aGUgbGluZS4K