190645 2018-10-16 15:20:10 -0700 Web Inspector: ⌃G to jump to line in CSS file wipes the line 2018-10-16 23:27:28 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1469909 0 joepeck 2018-10-16 15:20:10 -0700 ⌃G to jump to line in CSS file wipes the line Steps to Reproduce: 1. Inspect <http://bogojoker.com/shell/> 2. Show "print.css" in the Resources tab 3. ⌃G to show the go to line dialog 4. Type "20" and press return => Line 20 is suddenly empty and cursor is on line 21 1469948 1 352516 joepeck 2018-10-16 16:44:40 -0700 Created attachment 352516 [PATCH] Proposed Fix 1469955 2 352520 joepeck 2018-10-16 16:54:39 -0700 Created attachment 352520 [PATCH] Proposed Fix 1469964 3 352520 mattbaker 2018-10-16 17:08:23 -0700 Comment on attachment 352520 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=352520&action=review r=me > Source/WebInspectorUI/ChangeLog:14 > + it is clear this is only on a successful value and not an invalid valid. Wording: "an invalid valid" > Source/WebInspectorUI/ChangeLog:23 > + Prevent defaut on the event whenever we dismiss the dialog. defaut -> default 1469988 4 352532 joepeck 2018-10-16 18:17:25 -0700 Created attachment 352532 [PATCH] Proposed Fix 1469993 5 352532 commit-queue 2018-10-16 18:53:36 -0700 Comment on attachment 352532 [PATCH] Proposed Fix Clearing flags on attachment: 352532 Committed r237212: <https://trac.webkit.org/changeset/237212> 1470045 6 webkit-bug-importer 2018-10-16 23:27:28 -0700 <rdar://problem/45330064> 352516 2018-10-16 16:44:40 -0700 2018-10-16 16:54:39 -0700 [PATCH] Proposed Fix dialog-3.patch text/plain 5817 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyOTU3YjY3MGM1Li45YjBkMDViNjdkYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMTAtMTYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiDijINHIHRvIGp1bXAgdG8gbGluZSBpbiBDU1MgZmlsZSB3aXBlcyB0aGUgbGluZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNjQ1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RpYWxvZy5qczoK KyAgICAgICAgKFdJLkRpYWxvZy5wcm90b3R5cGUuZGlzbWlzcyk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdJLlNvdXJj ZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS5kaWFsb2dXYXNEaXNtaXNzZWQpOiBEZWxldGVkLgor ICAgICAgICBSZW5hbWUgdGhlIGhhbmRsZXIgd2hlbiBkaXNtaXNzaW5nIGEgZGlhbG9nIHdpdGgg YSB2YWx1ZSBzbyB0aGF0CisgICAgICAgIGl0IGlzIGNsZWFyIHRoaXMgaXMgb25seSBvbiBhIHN1 Y2Nlc3NmdWwgdmFsdWUgYW5kIG5vdCBhbiBpbnZhbGlkIHZhbGlkLgorICAgICAgICBEaWFsb2cg bm93IG9ubHkgY2FsbHMgdGhpcyBkZWxlZ2F0ZSB3aXRoIGEgdmFsaWQgdmFsdWUuIFRoaXMgYWRk cmVzc2VzCisgICAgICAgIGV4Y2VwdGlvbnMgc2VlbiB3aGVuIHRoZSBHb1RvTGluZURpYWxvZyB3 YXMgZGltaXNzZWQgdmlhIEVzY2FwZSBhbmQKKyAgICAgICAgYW4gdW5leHBlY3RlZCBgbnVsbGAg dmFsdWUgd2FzIGJlaW5nIGhhbmRsZWQgaW4gdGhlIGRlbGVnYXRlLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qczoKKyAgICAgICAgKFdJLkdvVG9MaW5l RGlhbG9nLnByb3RvdHlwZS5faGFuZGxlS2V5ZG93bkV2ZW50KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qczoKKyAgICAgICAgKFdJLk9wZW5SZXNv dXJjZURpYWxvZy5wcm90b3R5cGUuX2hhbmRsZUtleWRvd25FdmVudCk6CisgICAgICAgIFByZXZl bnQgZGVmYXV0IG9uIHRoZSBldmVudCB3aGVuZXZlciB3ZSBkaXNtaXNzIHRoZSBkaWFsb2cuCisg ICAgICAgIFdpdGhvdXQgdGhpcywgdGhlIGtleSBldmVudCB3YXMgYWxzbyBiZWluZyBzZW50IHRv IHRoZSBlZGl0b3IuCisgICAgICAgIEluIHRoaXMgY2FzZSwgdGhhdCBtZWFudCBhbiAiRW50ZXIi IGtleSB3YXMgcmVwbGFjaW5nIHRoZSBuZXcKKyAgICAgICAgc2VsZWN0aW9uIGluIHRoZSBUZXh0 RWRpdG9yIHdpdGggYSBuZXdsaW5lIQorCiAyMDE4LTEwLTE2ICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogT3BlbiBRdWlja2x5 IGRpYWxvZyBkb2Vzbid0IHNob3cgbmFtZWQgc2NyaXB0cyB0aGF0IGFwcGVhciBpbiB0aGUgZGVi dWdnZXIgc2lkZWJhcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzCmluZGV4IDVlOWM1NWIxY2JlLi41NGZlYTAxOWVhMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMjcwMyw3 ICsyNzAzLDcgQEAgV0kuYXNzdW1pbmdNYWluVGFyZ2V0ID0gZnVuY3Rpb24oKQogCiAvLyBPcGVu UmVzb3VyY2VEaWFsb2cgZGVsZWdhdGUKIAotV0kuZGlhbG9nV2FzRGlzbWlzc2VkID0gZnVuY3Rp b24oZGlhbG9nKQorV0kuZGlhbG9nV2FzRGlzbWlzc2VkV2l0aFJlcHJlc2VudGVkT2JqZWN0ID0g ZnVuY3Rpb24oZGlhbG9nKQogewogICAgIGxldCByZXByZXNlbnRlZE9iamVjdCA9IGRpYWxvZy5y ZXByZXNlbnRlZE9iamVjdDsKICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGlhbG9nLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGlhbG9nLmpzCmluZGV4 IGYwNGVlMGFiOTc0Li5mODMyMzYxMDY3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGlhbG9nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RpYWxvZy5qcwpAQCAtNzAsOCArNzAsMTAgQEAgV0ku RGlhbG9nID0gY2xhc3MgRGlhbG9nIGV4dGVuZHMgV0kuVmlldwogCiAgICAgICAgIHRoaXMuZWxl bWVudC5yZW1vdmUoKTsKIAotICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9mIHRo aXMuX2RlbGVnYXRlLmRpYWxvZ1dhc0Rpc21pc3NlZCA9PT0gImZ1bmN0aW9uIikKLSAgICAgICAg ICAgIHRoaXMuX2RlbGVnYXRlLmRpYWxvZ1dhc0Rpc21pc3NlZCh0aGlzKTsKKyAgICAgICAgaWYg KHRoaXMucmVwcmVzZW50ZWRPYmplY3RJc1ZhbGlkKHRoaXMuX3JlcHJlc2VudGVkT2JqZWN0KSkg eworICAgICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0 ZS5kaWFsb2dXYXNEaXNtaXNzZWRXaXRoUmVwcmVzZW50ZWRPYmplY3QgPT09ICJmdW5jdGlvbiIp CisgICAgICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuZGlhbG9nV2FzRGlzbWlzc2VkV2l0aFJl cHJlc2VudGVkT2JqZWN0KHRoaXMpOworICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fZGlzbWlz c2luZyA9IGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0dvVG9MaW5lRGlhbG9nLmpzCmluZGV4IDliYjIzNDhmYjNjLi5j YzZlNzExNWE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKQEAgLTg5LDkgKzg5LDEwIEBAIFdJ LkdvVG9MaW5lRGlhbG9nID0gY2xhc3MgR29Ub0xpbmVEaWFsb2cgZXh0ZW5kcyBXSS5EaWFsb2cK ICAgICBfaGFuZGxlS2V5ZG93bkV2ZW50KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKGV2ZW50 LmtleUNvZGUgPT09IFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LkVzY2FwZS5rZXlDb2RlKSB7Ci0g ICAgICAgICAgICBpZiAodGhpcy5faW5wdXQudmFsdWUgPT09ICIiKQorICAgICAgICAgICAgaWYg KHRoaXMuX2lucHV0LnZhbHVlID09PSAiIikgewogICAgICAgICAgICAgICAgIHRoaXMuZGlzbWlz cygpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZh dWx0KCk7CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0aGlzLl9jbGVhcigp OwogCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwpAQCAtMTAwLDEwICsxMDEs MTEgQEAgV0kuR29Ub0xpbmVEaWFsb2cgPSBjbGFzcyBHb1RvTGluZURpYWxvZyBleHRlbmRzIFdJ LkRpYWxvZwogCiAgICAgICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdElzVmFsaWQo dmFsdWUpKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5kaXNtaXNzKHZhbHVlKTsKKyAgICAgICAg ICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy5faW5wdXRFbGVtZW50LnNlbGVjdCgp OworICAgICAgICAgICAgdGhpcy5faW5wdXQuc2VsZWN0KCk7CiAKICAgICAgICAgICAgIEluc3Bl Y3RvckZyb250ZW5kSG9zdC5iZWVwKCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURp YWxvZy5qcwppbmRleCA5Nzc5N2I4YjBlZC4uZDMzZjBkOTFmNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PcGVuUmVz b3VyY2VEaWFsb2cuanMKQEAgLTE2NSw5ICsxNjUsMTAgQEAgV0kuT3BlblJlc291cmNlRGlhbG9n ID0gY2xhc3MgT3BlblJlc291cmNlRGlhbG9nIGV4dGVuZHMgV0kuRGlhbG9nCiAgICAgX2hhbmRs ZUtleWRvd25FdmVudChldmVudCkKICAgICB7CiAgICAgICAgIGlmIChldmVudC5rZXlDb2RlID09 PSBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5Fc2NhcGUua2V5Q29kZSkgewotICAgICAgICAgICAg aWYgKHRoaXMuX2lucHV0RWxlbWVudC52YWx1ZSA9PT0gIiIpCisgICAgICAgICAgICBpZiAodGhp cy5faW5wdXRFbGVtZW50LnZhbHVlID09PSAiIikgewogICAgICAgICAgICAgICAgIHRoaXMuZGlz bWlzcygpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGV2ZW50LnByZXZlbnRE ZWZhdWx0KCk7CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0aGlzLl9jbGVh cigpOwogCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRF ZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3Vy Y2VDb2RlVGV4dEVkaXRvci5qcwppbmRleCAyYTg1YjliYWY5Yi4uMGVjOTQxYWM1YTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNv ZGVUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCkBAIC0yNzUsNyArMjc1LDcgQEAgV0kuU291 cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBleHRlbmRzIFdJ LlRleHRFZGl0b3IKICAgICAgICAgcmV0dXJuICFpc05hTihsaW5lTnVtYmVyKSAmJiBsaW5lTnVt YmVyID4gMCAmJiBsaW5lTnVtYmVyIDw9IHRoaXMubGluZUNvdW50OwogICAgIH0KIAotICAgIGRp YWxvZ1dhc0Rpc21pc3NlZChnb1RvTGluZURpYWxvZykKKyAgICBkaWFsb2dXYXNEaXNtaXNzZWRX aXRoUmVwcmVzZW50ZWRPYmplY3QoZ29Ub0xpbmVEaWFsb2cpCiAgICAgewogICAgICAgICBsZXQg bGluZU51bWJlciA9IGdvVG9MaW5lRGlhbG9nLnJlcHJlc2VudGVkT2JqZWN0OwogICAgICAgICBs ZXQgcG9zaXRpb24gPSBuZXcgV0kuU291cmNlQ29kZVBvc2l0aW9uKGxpbmVOdW1iZXIgLSAxLCAw KTsK 352520 2018-10-16 16:54:39 -0700 2018-10-16 18:17:35 -0700 [PATCH] Proposed Fix dialog-4.patch text/plain 5967 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyOTU3YjY3MGM1Li45YjBkMDViNjdkYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMTAtMTYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiDijINHIHRvIGp1bXAgdG8gbGluZSBpbiBDU1MgZmlsZSB3aXBlcyB0aGUgbGluZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNjQ1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RpYWxvZy5qczoK KyAgICAgICAgKFdJLkRpYWxvZy5wcm90b3R5cGUuZGlzbWlzcyk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdJLlNvdXJj ZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS5kaWFsb2dXYXNEaXNtaXNzZWQpOiBEZWxldGVkLgor ICAgICAgICBSZW5hbWUgdGhlIGhhbmRsZXIgd2hlbiBkaXNtaXNzaW5nIGEgZGlhbG9nIHdpdGgg YSB2YWx1ZSBzbyB0aGF0CisgICAgICAgIGl0IGlzIGNsZWFyIHRoaXMgaXMgb25seSBvbiBhIHN1 Y2Nlc3NmdWwgdmFsdWUgYW5kIG5vdCBhbiBpbnZhbGlkIHZhbGlkLgorICAgICAgICBEaWFsb2cg bm93IG9ubHkgY2FsbHMgdGhpcyBkZWxlZ2F0ZSB3aXRoIGEgdmFsaWQgdmFsdWUuIFRoaXMgYWRk cmVzc2VzCisgICAgICAgIGV4Y2VwdGlvbnMgc2VlbiB3aGVuIHRoZSBHb1RvTGluZURpYWxvZyB3 YXMgZGltaXNzZWQgdmlhIEVzY2FwZSBhbmQKKyAgICAgICAgYW4gdW5leHBlY3RlZCBgbnVsbGAg dmFsdWUgd2FzIGJlaW5nIGhhbmRsZWQgaW4gdGhlIGRlbGVnYXRlLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qczoKKyAgICAgICAgKFdJLkdvVG9MaW5l RGlhbG9nLnByb3RvdHlwZS5faGFuZGxlS2V5ZG93bkV2ZW50KToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxvZy5qczoKKyAgICAgICAgKFdJLk9wZW5SZXNv dXJjZURpYWxvZy5wcm90b3R5cGUuX2hhbmRsZUtleWRvd25FdmVudCk6CisgICAgICAgIFByZXZl bnQgZGVmYXV0IG9uIHRoZSBldmVudCB3aGVuZXZlciB3ZSBkaXNtaXNzIHRoZSBkaWFsb2cuCisg ICAgICAgIFdpdGhvdXQgdGhpcywgdGhlIGtleSBldmVudCB3YXMgYWxzbyBiZWluZyBzZW50IHRv IHRoZSBlZGl0b3IuCisgICAgICAgIEluIHRoaXMgY2FzZSwgdGhhdCBtZWFudCBhbiAiRW50ZXIi IGtleSB3YXMgcmVwbGFjaW5nIHRoZSBuZXcKKyAgICAgICAgc2VsZWN0aW9uIGluIHRoZSBUZXh0 RWRpdG9yIHdpdGggYSBuZXdsaW5lIQorCiAyMDE4LTEwLTE2ICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogT3BlbiBRdWlja2x5 IGRpYWxvZyBkb2Vzbid0IHNob3cgbmFtZWQgc2NyaXB0cyB0aGF0IGFwcGVhciBpbiB0aGUgZGVi dWdnZXIgc2lkZWJhcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzCmluZGV4IDVlOWM1NWIxY2JlLi4zZGNkYmM1Y2IwZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMjcwMyw5 ICsyNzAzLDggQEAgV0kuYXNzdW1pbmdNYWluVGFyZ2V0ID0gZnVuY3Rpb24oKQogCiAvLyBPcGVu UmVzb3VyY2VEaWFsb2cgZGVsZWdhdGUKIAotV0kuZGlhbG9nV2FzRGlzbWlzc2VkID0gZnVuY3Rp b24oZGlhbG9nKQorV0kuZGlhbG9nV2FzRGlzbWlzc2VkV2l0aFJlcHJlc2VudGVkT2JqZWN0ID0g ZnVuY3Rpb24oZGlhbG9nLCByZXByZXNlbnRlZE9iamVjdCkKIHsKLSAgICBsZXQgcmVwcmVzZW50 ZWRPYmplY3QgPSBkaWFsb2cucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAgaWYgKCFyZXByZXNlbnRl ZE9iamVjdCkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EaWFsb2cuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EaWFsb2cuanMKaW5kZXggZjA0ZWUwYWI5NzQuLjlhZTFk YWFmMWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGlhbG9nLmpzCkBAIC03MCw4ICs3MCwxMCBAQCBXSS5EaWFsb2cgPSBjbGFzcyBEaWFs b2cgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZSgpOwogCi0g ICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuZGlhbG9n V2FzRGlzbWlzc2VkID09PSAiZnVuY3Rpb24iKQotICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUu ZGlhbG9nV2FzRGlzbWlzc2VkKHRoaXMpOworICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9i amVjdElzVmFsaWQodGhpcy5fcmVwcmVzZW50ZWRPYmplY3QpKSB7CisgICAgICAgICAgICBpZiAo dGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuX2RlbGVnYXRlLmRpYWxvZ1dhc0Rpc21pc3Nl ZFdpdGhSZXByZXNlbnRlZE9iamVjdCA9PT0gImZ1bmN0aW9uIikKKyAgICAgICAgICAgICAgICB0 aGlzLl9kZWxlZ2F0ZS5kaWFsb2dXYXNEaXNtaXNzZWRXaXRoUmVwcmVzZW50ZWRPYmplY3QodGhp cywgdGhpcy5fcmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICB9CiAKICAgICAgICAgdGhpcy5f ZGlzbWlzc2luZyA9IGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dvVG9MaW5lRGlhbG9nLmpzCmluZGV4IDliYjIzNDhm YjNjLi5jYzZlNzExNWE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKQEAgLTg5LDkgKzg5LDEw IEBAIFdJLkdvVG9MaW5lRGlhbG9nID0gY2xhc3MgR29Ub0xpbmVEaWFsb2cgZXh0ZW5kcyBXSS5E aWFsb2cKICAgICBfaGFuZGxlS2V5ZG93bkV2ZW50KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYg KGV2ZW50LmtleUNvZGUgPT09IFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LkVzY2FwZS5rZXlDb2Rl KSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5faW5wdXQudmFsdWUgPT09ICIiKQorICAgICAgICAg ICAgaWYgKHRoaXMuX2lucHV0LnZhbHVlID09PSAiIikgewogICAgICAgICAgICAgICAgIHRoaXMu ZGlzbWlzcygpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0aGlzLl9j bGVhcigpOwogCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwpAQCAtMTAwLDEw ICsxMDEsMTEgQEAgV0kuR29Ub0xpbmVEaWFsb2cgPSBjbGFzcyBHb1RvTGluZURpYWxvZyBleHRl bmRzIFdJLkRpYWxvZwogCiAgICAgICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdElz VmFsaWQodmFsdWUpKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5kaXNtaXNzKHZhbHVlKTsKKyAg ICAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy5faW5wdXRFbGVtZW50LnNl bGVjdCgpOworICAgICAgICAgICAgdGhpcy5faW5wdXQuc2VsZWN0KCk7CiAKICAgICAgICAgICAg IEluc3BlY3RvckZyb250ZW5kSG9zdC5iZWVwKCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURpYWxv Zy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNv dXJjZURpYWxvZy5qcwppbmRleCA5Nzc5N2I4YjBlZC4uZDMzZjBkOTFmNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09wZW5SZXNvdXJjZURp YWxvZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9P cGVuUmVzb3VyY2VEaWFsb2cuanMKQEAgLTE2NSw5ICsxNjUsMTAgQEAgV0kuT3BlblJlc291cmNl RGlhbG9nID0gY2xhc3MgT3BlblJlc291cmNlRGlhbG9nIGV4dGVuZHMgV0kuRGlhbG9nCiAgICAg X2hhbmRsZUtleWRvd25FdmVudChldmVudCkKICAgICB7CiAgICAgICAgIGlmIChldmVudC5rZXlD b2RlID09PSBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5Fc2NhcGUua2V5Q29kZSkgewotICAgICAg ICAgICAgaWYgKHRoaXMuX2lucHV0RWxlbWVudC52YWx1ZSA9PT0gIiIpCisgICAgICAgICAgICBp ZiAodGhpcy5faW5wdXRFbGVtZW50LnZhbHVlID09PSAiIikgewogICAgICAgICAgICAgICAgIHRo aXMuZGlzbWlzcygpOwotICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGV2ZW50LnBy ZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICB0aGlz Ll9jbGVhcigpOwogCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29k ZVRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcwppbmRleCAyYTg1YjliYWY5Yi4uYzU3YTg5NzJmYjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nv dXJjZUNvZGVUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCkBAIC0yNzUsOSArMjc1LDggQEAg V0kuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBleHRl bmRzIFdJLlRleHRFZGl0b3IKICAgICAgICAgcmV0dXJuICFpc05hTihsaW5lTnVtYmVyKSAmJiBs aW5lTnVtYmVyID4gMCAmJiBsaW5lTnVtYmVyIDw9IHRoaXMubGluZUNvdW50OwogICAgIH0KIAot ICAgIGRpYWxvZ1dhc0Rpc21pc3NlZChnb1RvTGluZURpYWxvZykKKyAgICBkaWFsb2dXYXNEaXNt aXNzZWRXaXRoUmVwcmVzZW50ZWRPYmplY3QoZ29Ub0xpbmVEaWFsb2csIGxpbmVOdW1iZXIpCiAg ICAgewotICAgICAgICBsZXQgbGluZU51bWJlciA9IGdvVG9MaW5lRGlhbG9nLnJlcHJlc2VudGVk T2JqZWN0OwogICAgICAgICBsZXQgcG9zaXRpb24gPSBuZXcgV0kuU291cmNlQ29kZVBvc2l0aW9u KGxpbmVOdW1iZXIgLSAxLCAwKTsKICAgICAgICAgbGV0IHJhbmdlID0gbmV3IFdJLlRleHRSYW5n ZShsaW5lTnVtYmVyIC0gMSwgMCwgbGluZU51bWJlciwgMCk7CiAK 352532 2018-10-16 18:17:25 -0700 2018-10-16 18:53:36 -0700 [PATCH] Proposed Fix dialog-5.patch text/plain 5966 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyOTU3YjY3MGM1Li5lMjczZDUwYjgyNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMTAtMTYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiDijINHIHRvIGp1bXAgdG8gbGluZSBpbiBDU1MgZmlsZSB3aXBlcyB0aGUgbGluZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNjQ1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL01haW4uanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EaWFsb2cuanM6Cisg ICAgICAgIChXSS5EaWFsb2cucHJvdG90eXBlLmRpc21pc3MpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXSS5Tb3VyY2VD b2RlVGV4dEVkaXRvci5wcm90b3R5cGUuZGlhbG9nV2FzRGlzbWlzc2VkKTogRGVsZXRlZC4KKyAg ICAgICAgUmVuYW1lIHRoZSBoYW5kbGVyIHdoZW4gZGlzbWlzc2luZyBhIGRpYWxvZyB3aXRoIGEg dmFsdWUgc28gdGhhdAorICAgICAgICBpdCBpcyBjbGVhciB0aGlzIGlzIG9ubHkgb24gYSBzdWNj ZXNzZnVsIHZhbHVlIGFuZCBub3QgYW4gaW52YWxpZCB2YWx1ZS4KKyAgICAgICAgRGlhbG9nIG5v dyBvbmx5IGNhbGxzIHRoaXMgZGVsZWdhdGUgd2l0aCBhIHZhbGlkIHZhbHVlLiBUaGlzIGFkZHJl c3NlcworICAgICAgICBleGNlcHRpb25zIHNlZW4gd2hlbiB0aGUgR29Ub0xpbmVEaWFsb2cgd2Fz IGRpbWlzc2VkIHZpYSBFc2NhcGUgYW5kCisgICAgICAgIGFuIHVuZXhwZWN0ZWQgYG51bGxgIHZh bHVlIHdhcyBiZWluZyBoYW5kbGVkIGluIHRoZSBkZWxlZ2F0ZS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanM6CisgICAgICAgIChXSS5Hb1RvTGluZURp YWxvZy5wcm90b3R5cGUuX2hhbmRsZUtleWRvd25FdmVudCk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9PcGVuUmVzb3VyY2VEaWFsb2cuanM6CisgICAgICAgIChXSS5PcGVuUmVzb3Vy Y2VEaWFsb2cucHJvdG90eXBlLl9oYW5kbGVLZXlkb3duRXZlbnQpOgorICAgICAgICBQcmV2ZW50 IGRlZmF1bHQgb24gdGhlIGV2ZW50IHdoZW5ldmVyIHdlIGRpc21pc3MgdGhlIGRpYWxvZy4KKyAg ICAgICAgV2l0aG91dCB0aGlzLCB0aGUga2V5IGV2ZW50IHdhcyBhbHNvIGJlaW5nIHNlbnQgdG8g dGhlIGVkaXRvci4KKyAgICAgICAgSW4gdGhpcyBjYXNlLCB0aGF0IG1lYW50IGFuICJFbnRlciIg a2V5IHdhcyByZXBsYWNpbmcgdGhlIG5ldworICAgICAgICBzZWxlY3Rpb24gaW4gdGhlIFRleHRF ZGl0b3Igd2l0aCBhIG5ld2xpbmUhCisKIDIwMTgtMTAtMTYgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBPcGVuIFF1aWNrbHkg ZGlhbG9nIGRvZXNuJ3Qgc2hvdyBuYW1lZCBzY3JpcHRzIHRoYXQgYXBwZWFyIGluIHRoZSBkZWJ1 Z2dlciBzaWRlYmFyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKaW5kZXggNWU5YzU1YjFjYmUuLjNkY2RiYzVjYjBkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0yNzAzLDkg KzI3MDMsOCBAQCBXSS5hc3N1bWluZ01haW5UYXJnZXQgPSBmdW5jdGlvbigpCiAKIC8vIE9wZW5S ZXNvdXJjZURpYWxvZyBkZWxlZ2F0ZQogCi1XSS5kaWFsb2dXYXNEaXNtaXNzZWQgPSBmdW5jdGlv bihkaWFsb2cpCitXSS5kaWFsb2dXYXNEaXNtaXNzZWRXaXRoUmVwcmVzZW50ZWRPYmplY3QgPSBm dW5jdGlvbihkaWFsb2csIHJlcHJlc2VudGVkT2JqZWN0KQogewotICAgIGxldCByZXByZXNlbnRl ZE9iamVjdCA9IGRpYWxvZy5yZXByZXNlbnRlZE9iamVjdDsKICAgICBpZiAoIXJlcHJlc2VudGVk T2JqZWN0KQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RpYWxvZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RpYWxvZy5qcwppbmRleCBmMDRlZTBhYjk3NC4uOWFlMWRh YWYxZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RpYWxvZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EaWFsb2cuanMKQEAgLTcwLDggKzcwLDEwIEBAIFdJLkRpYWxvZyA9IGNsYXNzIERpYWxv ZyBleHRlbmRzIFdJLlZpZXcKIAogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlKCk7CiAKLSAg ICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5kaWFsb2dX YXNEaXNtaXNzZWQgPT09ICJmdW5jdGlvbiIpCi0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5k aWFsb2dXYXNEaXNtaXNzZWQodGhpcyk7CisgICAgICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0SXNWYWxpZCh0aGlzLl9yZXByZXNlbnRlZE9iamVjdCkpIHsKKyAgICAgICAgICAgIGlmICh0 aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuZGlhbG9nV2FzRGlzbWlzc2Vk V2l0aFJlcHJlc2VudGVkT2JqZWN0ID09PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgICAgIHRo aXMuX2RlbGVnYXRlLmRpYWxvZ1dhc0Rpc21pc3NlZFdpdGhSZXByZXNlbnRlZE9iamVjdCh0aGlz LCB0aGlzLl9yZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9k aXNtaXNzaW5nID0gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0dvVG9MaW5lRGlhbG9nLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR29Ub0xpbmVEaWFsb2cuanMKaW5kZXggOWJiMjM0OGZi M2MuLmNjNmU3MTE1YTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Hb1RvTGluZURpYWxvZy5qcwpAQCAtODksOSArODksMTAg QEAgV0kuR29Ub0xpbmVEaWFsb2cgPSBjbGFzcyBHb1RvTGluZURpYWxvZyBleHRlbmRzIFdJLkRp YWxvZwogICAgIF9oYW5kbGVLZXlkb3duRXZlbnQoZXZlbnQpCiAgICAgewogICAgICAgICBpZiAo ZXZlbnQua2V5Q29kZSA9PT0gV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuRXNjYXBlLmtleUNvZGUp IHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9pbnB1dC52YWx1ZSA9PT0gIiIpCisgICAgICAgICAg ICBpZiAodGhpcy5faW5wdXQudmFsdWUgPT09ICIiKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5k aXNtaXNzKCk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKKyAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHRoaXMuX2Ns ZWFyKCk7CiAKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CkBAIC0xMDAsMTAg KzEwMSwxMSBAQCBXSS5Hb1RvTGluZURpYWxvZyA9IGNsYXNzIEdvVG9MaW5lRGlhbG9nIGV4dGVu ZHMgV0kuRGlhbG9nCiAKICAgICAgICAgICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0SXNW YWxpZCh2YWx1ZSkpIHsKICAgICAgICAgICAgICAgICB0aGlzLmRpc21pc3ModmFsdWUpOworICAg ICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICB0aGlzLl9pbnB1dEVsZW1lbnQuc2Vs ZWN0KCk7CisgICAgICAgICAgICB0aGlzLl9pbnB1dC5zZWxlY3QoKTsKIAogICAgICAgICAgICAg SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmJlZXAoKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3BlblJlc291cmNlRGlhbG9n LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3BlblJlc291 cmNlRGlhbG9nLmpzCmluZGV4IDk3Nzk3YjhiMGVkLi5kMzNmMGQ5MWY0ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3BlblJlc291cmNlRGlh bG9nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09w ZW5SZXNvdXJjZURpYWxvZy5qcwpAQCAtMTY1LDkgKzE2NSwxMCBAQCBXSS5PcGVuUmVzb3VyY2VE aWFsb2cgPSBjbGFzcyBPcGVuUmVzb3VyY2VEaWFsb2cgZXh0ZW5kcyBXSS5EaWFsb2cKICAgICBf aGFuZGxlS2V5ZG93bkV2ZW50KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKGV2ZW50LmtleUNv ZGUgPT09IFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LkVzY2FwZS5rZXlDb2RlKSB7Ci0gICAgICAg ICAgICBpZiAodGhpcy5faW5wdXRFbGVtZW50LnZhbHVlID09PSAiIikKKyAgICAgICAgICAgIGlm ICh0aGlzLl9pbnB1dEVsZW1lbnQudmFsdWUgPT09ICIiKSB7CiAgICAgICAgICAgICAgICAgdGhp cy5kaXNtaXNzKCk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZXZlbnQucHJl dmVudERlZmF1bHQoKTsKKyAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHRoaXMu X2NsZWFyKCk7CiAKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2Rl VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCmluZGV4IDJhODViOWJhZjliLi5jNTdhODk3MmZiMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291 cmNlQ29kZVRleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKQEAgLTI3NSw5ICsyNzUsOCBAQCBX SS5Tb3VyY2VDb2RlVGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVu ZHMgV0kuVGV4dEVkaXRvcgogICAgICAgICByZXR1cm4gIWlzTmFOKGxpbmVOdW1iZXIpICYmIGxp bmVOdW1iZXIgPiAwICYmIGxpbmVOdW1iZXIgPD0gdGhpcy5saW5lQ291bnQ7CiAgICAgfQogCi0g ICAgZGlhbG9nV2FzRGlzbWlzc2VkKGdvVG9MaW5lRGlhbG9nKQorICAgIGRpYWxvZ1dhc0Rpc21p c3NlZFdpdGhSZXByZXNlbnRlZE9iamVjdChnb1RvTGluZURpYWxvZywgbGluZU51bWJlcikKICAg ICB7Ci0gICAgICAgIGxldCBsaW5lTnVtYmVyID0gZ29Ub0xpbmVEaWFsb2cucmVwcmVzZW50ZWRP YmplY3Q7CiAgICAgICAgIGxldCBwb3NpdGlvbiA9IG5ldyBXSS5Tb3VyY2VDb2RlUG9zaXRpb24o bGluZU51bWJlciAtIDEsIDApOwogICAgICAgICBsZXQgcmFuZ2UgPSBuZXcgV0kuVGV4dFJhbmdl KGxpbmVOdW1iZXIgLSAxLCAwLCBsaW5lTnVtYmVyLCAwKTsKIAo=