140567 2015-01-16 14:47:47 -0800 Web Inspector: Do not request Scope Chain lists if section is collapsed (mainly Global Variables) 2017-03-16 14:43:09 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1061975 0 joepeck 2015-01-16 14:47:47 -0800 * SUMMARY Do not request Scope Chain lists if section is collapsed (mainly Global Variables). The Global Variables Scope Chain section (and message to populate it) is HUGE. Its sort shows constructors before properties so I normally don't care and I collapse the section. Even if it is collapsed we still update it every pause (so every step, etc). We should avoid this work if we don't need to do it. 1061976 1 webkit-bug-importer 2015-01-16 14:48:02 -0800 <rdar://problem/19504745> 1220204 2 286108 joepeck 2016-08-15 16:02:35 -0700 Created attachment 286108 [PATCH] Proposed Fix This should make stepping through code a little faster if users haven't expanded the "Global Variables" section, which defaults to collapsed. On many pages that is a very large message, and it takes non-trivial amount of processing in InjectedScriptSource to build. 1220482 3 286108 commit-queue 2016-08-16 10:27:53 -0700 Comment on attachment 286108 [PATCH] Proposed Fix Clearing flags on attachment: 286108 Committed r204513: <http://trac.webkit.org/changeset/204513> 1220483 4 commit-queue 2016-08-16 10:27:57 -0700 All reviewed patches have been landed. Closing bug. 1288765 5 joepeck 2017-03-16 14:43:09 -0700 *** Bug 143097 has been marked as a duplicate of this bug. *** 286108 2016-08-15 16:02:35 -0700 2016-08-16 10:27:53 -0700 [PATCH] Proposed Fix lazy-expand.patch text/plain 9231 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjMuLjM1OTgyOTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE2LTA4LTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRG8gbm90 IHJlcXVlc3QgU2NvcGUgQ2hhaW4gbGlzdHMgaWYgc2VjdGlvbiBpcyBjb2xsYXBzZWQgKG1haW5s eSBHbG9iYWwgVmFyaWFibGVzKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQwNTY3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTUwNDc0NT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvTWFpbi5odG1sOgorICAgICAgICBOZXcgZmlsZSBuYW1lLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlZnJl c2hQcm9wZXJ0aWVzLmZpbGxTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2Rl RGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hQcm9wZXJ0aWVzKToKKyAgICAg ICAgQXZvaWQgZmV0Y2hpbmcgb2JqZWN0IHByb3BlcnRpZXMgdW50aWwgdGhlIHVzZXIgZXhwYW5k cyB0aGUgc2VjdGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZUNhbGxGcmFtZXNTZWN0aW9u KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUuX2dlbmVyYXRlV2F0Y2hFeHByZXNzaW9uc1NlY3Rpb24pOgorICAgICAgICBBdm9p ZCBmZXRjaGluZyBzY29wZSB2YXJpYWJsZSBwcm9wZXJ0aWVzIHVudGlsIHRoZSB1c2VyIGV4cGFu ZHMgdGhlIHNlY3Rpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFBy b3BlcnRpZXNEZXRhaWxTZWN0aW9uUm93LmpzOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25Qcm9wZXJ0aWVzUm93Lmpz LgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNEZXRhaWxTZWN0aW9uUm93 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzRGV0YWlsU2VjdGlvblJv dy5wcm90b3R5cGUuZ2V0IG9iamVjdFRyZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVj dFByb3BlcnRpZXNEZXRhaWxTZWN0aW9uUm93LnByb3RvdHlwZS5fZGV0YWlsc1NlY3Rpb25Db2xs YXBzZWRTdGF0ZUNoYW5nZWQpOgorICAgICAgICBSZW5hbWUgYW5kIHNpbXBsaWZ5IHRoZSBjbGFz cyBzaW5jZSBpdCBhbHdheXMgaGFzIGFuIE9iamVjdFRyZWVWaWV3LgorICAgICAgICBCeSBkZWZh dWx0IHRoZSBzZWN0aW9uIHdpbGwgYXV0by1leHBhbmQgdGhlIE9iamVjdFRyZWVWaWV3LCBob3dl dmVyCisgICAgICAgIGlmIHByb3ZpZGVkIGEgZGV0YWlscyBzZWN0aW9uIGdyb3VwLCBpdCB3aWxs IGRlZmVyIGV4cGFuaW9uIHVudGlsCisgICAgICAgIHRoZSBncm91cCBleHBhbmRzLgorCiAyMDE2 LTA4LTEyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBBZGQgYXBwbGljYXRpb24vdm5kLmFwaStqc29uIGFzIGEgdmFsaWQgSlNP TiBNSU1FLXR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbAppbmRleCA1MjVjZjEyLi5jMzEwMTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC00NDksNyArNDQ5LDYgQEAKICAgICA8c2NyaXB0 IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb24uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9EZXRhaWxzU2VjdGlvbkRhdGFHcmlkUm93LmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb25Hcm91cC5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNj cmlwdCBzcmM9IlZpZXdzL0RldGFpbHNTZWN0aW9uUHJvcGVydGllc1Jvdy5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxlUm93LmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb25UZXh0Um93LmpzIj48 L3NjcmlwdD4KIApAQCAtNTcwLDYgKzU2OSw3IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL05l dHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNy Yz0iVmlld3MvT2JqZWN0UHJldmlld1ZpZXcuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9PYmplY3RQcm9wZXJ0aWVzRGV0YWlsU2VjdGlvblJvdy5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCBzcmM9IlZpZXdzL09iamVjdFRyZWVBcnJheUluZGV4VHJlZUVsZW1lbnQuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9PYmplY3RUcmVlTWFwRW50cnlUcmVl RWxlbWVudC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL09iamVjdFRyZWVQ cm9wZXJ0eVRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVs LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURl dGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggOGYxMDM4Mi4uYTc4YmVkOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNT aWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTIwNyw3ICsyMDcsNyBAQCBX ZWJJbnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBET01Ob2RlRGV0 YWlsc1NpZGViYXJQYW5lbCBleHRlbgogICAgICAgICAgICAgICAgIG9iamVjdFRyZWUuc2hvd09u bHlQcm9wZXJ0aWVzKCk7CiAKICAgICAgICAgICAgICAgICB2YXIgZGV0YWlsc1NlY3Rpb24gPSBu ZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKHByb3RvdHlwZS5kZXNjcmlwdGlvbi5oYXNo ICsgIi1wcm90b3R5cGUtcHJvcGVydGllcyIsIHRpdGxlLCBudWxsLCBudWxsLCB0cnVlKTsKLSAg ICAgICAgICAgICAgICBkZXRhaWxzU2VjdGlvbi5ncm91cHNbMF0ucm93cyA9IFtuZXcgV2ViSW5z cGVjdG9yLkRldGFpbHNTZWN0aW9uUHJvcGVydGllc1JvdyhvYmplY3RUcmVlKV07CisgICAgICAg ICAgICAgICAgZGV0YWlsc1NlY3Rpb24uZ3JvdXBzWzBdLnJvd3MgPSBbbmV3IFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0aWVzRGV0YWlsU2VjdGlvblJvdyhvYmplY3RUcmVlLCBkZXRhaWxzU2Vj dGlvbildOwogCiAgICAgICAgICAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChkZXRhaWxzU2Vj dGlvbi5lbGVtZW50KTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uUHJvcGVydGllc1Jvdy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByb3Bl cnRpZXNEZXRhaWxTZWN0aW9uUm93LmpzCnNpbWlsYXJpdHkgaW5kZXggNTYlCnJlbmFtZSBmcm9t IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9u UHJvcGVydGllc1Jvdy5qcwpyZW5hbWUgdG8gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvT2JqZWN0UHJvcGVydGllc0RldGFpbFNlY3Rpb25Sb3cuanMKaW5kZXggNmMy ODAwOC4uZTA4NWExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb25Qcm9wZXJ0aWVzUm93LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByb3BlcnRpZXNEZXRhaWxT ZWN0aW9uUm93LmpzCkBAIC0yMywzNSArMjMsMzkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Qcm9wZXJ0aWVz Um93ID0gY2xhc3MgRGV0YWlsc1NlY3Rpb25Qcm9wZXJ0aWVzUm93IGV4dGVuZHMgV2ViSW5zcGVj dG9yLkRldGFpbHNTZWN0aW9uUm93CitXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc0RldGFp bFNlY3Rpb25Sb3cgPSBjbGFzcyBPYmplY3RQcm9wZXJ0aWVzRGV0YWlsU2VjdGlvblJvdyBleHRl bmRzIFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdwogewotICAgIGNvbnN0cnVjdG9yKHBy b3BlcnRpZXNTZWN0aW9uLCBlbXB0eU1lc3NhZ2UpCisgICAgY29uc3RydWN0b3Iob2JqZWN0VHJl ZSwgc2VjdGlvbkZvckRlZmVycmVkRXhwYW5kKQogICAgIHsKLSAgICAgICAgc3VwZXIoZW1wdHlN ZXNzYWdlKTsKKyAgICAgICAgc3VwZXIoKTsKIAorICAgICAgICBjb25zb2xlLmFzc2VydChvYmpl Y3RUcmVlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVWaWV3KTsKKyAgICAgICAg Y29uc29sZS5hc3NlcnQoIXNlY3Rpb25Gb3JEZWZlcnJlZEV4cGFuZCB8fCBzZWN0aW9uRm9yRGVm ZXJyZWRFeHBhbmQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24pOworCisg ICAgICAgIHRoaXMuX29iamVjdFRyZWUgPSBvYmplY3RUcmVlOworCisgICAgICAgIHRoaXMuaGlk ZUVtcHR5TWVzc2FnZSgpOwogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicHJv cGVydGllcyIsIFdlYkluc3BlY3Rvci5TeW50YXhIaWdobGlnaHRlZFN0eWxlQ2xhc3NOYW1lKTsK KyAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKG9iamVjdFRyZWUuZWxlbWVudCk7CiAK LSAgICAgICAgdGhpcy5wcm9wZXJ0aWVzU2VjdGlvbiA9IHByb3BlcnRpZXNTZWN0aW9uOworICAg ICAgICBpZiAoc2VjdGlvbkZvckRlZmVycmVkRXhwYW5kICYmIHNlY3Rpb25Gb3JEZWZlcnJlZEV4 cGFuZC5jb2xsYXBzZWQpCisgICAgICAgICAgICBzZWN0aW9uRm9yRGVmZXJyZWRFeHBhbmQuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24uRXZlbnQuQ29sbGFwc2Vk U3RhdGVDaGFuZ2VkLCB0aGlzLl9kZXRhaWxzU2VjdGlvbkNvbGxhcHNlZFN0YXRlQ2hhbmdlZCwg dGhpcyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX29iamVjdFRyZWUuZXhwYW5k KCk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCiAKLSAgICBnZXQgcHJvcGVydGllc1NlY3Rpb24o KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Byb3BlcnRpZXNTZWN0aW9uOwotICAgIH0K KyAgICBnZXQgb2JqZWN0VHJlZSgpIHsgcmV0dXJuIHRoaXMuX29iamVjdFRyZWU7IH0KKworICAg IC8vIFByaXZhdGUKIAotICAgIHNldCBwcm9wZXJ0aWVzU2VjdGlvbihwcm9wZXJ0aWVzU2VjdGlv bikKKyAgICBfZGV0YWlsc1NlY3Rpb25Db2xsYXBzZWRTdGF0ZUNoYW5nZWQoZXZlbnQpCiAgICAg ewotICAgICAgICB0aGlzLl9wcm9wZXJ0aWVzU2VjdGlvbiA9IHByb3BlcnRpZXNTZWN0aW9uIHx8 IG51bGw7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFldmVudC50YXJnZXQuY29sbGFwc2VkKTsK IAotICAgICAgICBpZiAocHJvcGVydGllc1NlY3Rpb24pIHsKLSAgICAgICAgICAgIC8vIENhbGwg ZXhwYW5kIHRvIGNhdXNlIHRoZSBzZWN0aW9uIHRvIHBvcHVsYXRlLgotICAgICAgICAgICAgcHJv cGVydGllc1NlY3Rpb24uZXhwYW5kKCk7CisgICAgICAgIHRoaXMuX29iamVjdFRyZWUuZXhwYW5k KCk7CiAKLSAgICAgICAgICAgIHRoaXMuaGlkZUVtcHR5TWVzc2FnZSgpOwotICAgICAgICAgICAg dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXNTZWN0aW9uLmVsZW1lbnQpOwotICAg ICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRoaXMuc2hvd0VtcHR5TWVzc2FnZSgpOworICAgICAg ICBldmVudC50YXJnZXQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGV0YWlsc1Nl Y3Rpb24uRXZlbnQuQ29sbGFwc2VkU3RhdGVDaGFuZ2VkLCB0aGlzLl9kZXRhaWxzU2VjdGlvbkNv bGxhcHNlZFN0YXRlQ2hhbmdlZCwgdGhpcyk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lk ZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggMmNjN2Q3Ni4uYzgzMmNjMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Nv cGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAg LTIyNCw2ICsyMjQsNyBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFu ZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbAogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICBsZXQgZGV0YWlsc1NlY3Rpb25JZGVudGlmaWVyID0gc2NvcGUudHlwZSAr ICItIiArIHNlY3Rpb25Db3VudEJ5VHlwZS5nZXQoc2NvcGUudHlwZSk7CisgICAgICAgICAgICBs ZXQgZGV0YWlsc1NlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKGRldGFp bHNTZWN0aW9uSWRlbnRpZmllciwgdGl0bGUsIG51bGwsIG51bGwsIGNvbGxhcHNlZEJ5RGVmYXVs dCk7CiAKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGp1c3QgcHV0cyB0d28gT2JqZWN0VHJl ZVZpZXdzIG5leHQgdG8gZWFjaCBvdGhlciwgYnV0IHRoYXQgbWVhbnMKICAgICAgICAgICAgIC8v IHRoYXQgcHJvcGVydGllcyBhcmUgbm90IG5pY2VseSBzb3J0ZWQgYmV0d2VlbiB0aGUgdHdvIHNl cGFyYXRlIGxpc3RzLgpAQCAtMjQ0LDEyICsyNDUsOSBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5l bAogICAgICAgICAgICAgICAgIHRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRBZGRlZCwgdGhpcy5fdHJlZUVsZW1lbnRBZGRl ZC5iaW5kKHRoaXMsIGRldGFpbHNTZWN0aW9uSWRlbnRpZmllciksIHRoaXMpOwogICAgICAgICAg ICAgICAgIHRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVPdXRs aW5lLkV2ZW50LkVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdlZCwgdGhpcy5fdHJlZUVsZW1lbnRE aXNjbG9zdXJlRGlkQ2hhbmdlLmJpbmQodGhpcywgZGV0YWlsc1NlY3Rpb25JZGVudGlmaWVyKSwg dGhpcyk7CiAKLSAgICAgICAgICAgICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzE0MDU2Nz4gV2ViIEluc3BlY3RvcjogRG8gbm90IHJlcXVlc3QgU2NvcGUgQ2hhaW4gbGlzdHMg aWYgc2VjdGlvbiBpcyBjb2xsYXBzZWQgKG1haW5seSBHbG9iYWwgVmFyaWFibGVzKQotICAgICAg ICAgICAgICAgIC8vIFRoaXMgYXV0b2V4cGFuZHMgdGhlIE9iamVjdFRyZWVWaWV3IGFuZCBmZXRj aGVzIGFsbCBwcm9wZXJ0aWVzLiBTaG91bGQgd2FpdCB0byBzZWUgaWYgd2UgYXJlIGNvbGxhcHNl ZCBvciBub3QuCi0gICAgICAgICAgICAgICAgcm93cy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuRGV0 YWlsc1NlY3Rpb25Qcm9wZXJ0aWVzUm93KG9iamVjdFRyZWUpKTsKKyAgICAgICAgICAgICAgICBy b3dzLnB1c2gobmV3IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzRGV0YWlsU2VjdGlvblJv dyhvYmplY3RUcmVlLCBkZXRhaWxzU2VjdGlvbikpOwogICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBsZXQgZGV0YWlsc1NlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9u KGRldGFpbHNTZWN0aW9uSWRlbnRpZmllciwgdGl0bGUsIG51bGwsIG51bGwsIGNvbGxhcHNlZEJ5 RGVmYXVsdCk7CiAgICAgICAgICAgICBkZXRhaWxzU2VjdGlvbi5ncm91cHNbMF0ucm93cyA9IHJv d3M7CiAgICAgICAgICAgICBkZXRhaWxzU2VjdGlvbnMucHVzaChkZXRhaWxzU2VjdGlvbik7CiAg ICAgICAgIH0KQEAgLTI5NSw3ICsyOTMsNyBAQCBXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFp bHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbAogICAg ICAgICB9CiAKICAgICAgICAgcmV0dXJuIFByb21pc2UuYWxsKHByb21pc2VzKS50aGVuKGZ1bmN0 aW9uKCkgewotICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZShuZXcgV2ViSW5zcGVj dG9yLkRldGFpbHNTZWN0aW9uUHJvcGVydGllc1JvdyhvYmplY3RUcmVlKSk7CisgICAgICAgICAg ICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGll c0RldGFpbFNlY3Rpb25Sb3cob2JqZWN0VHJlZSkpOwogICAgICAgICB9KTsKICAgICB9CiAK