145546 2015-06-01 21:16:27 -0700 Web Inspector: ⌘F no longer brings up the find-in-page bar after typing in the quick console 2016-09-07 21:48:15 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck aestes commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1098717 0 joepeck 2015-06-01 21:16:27 -0700 * SUMMARY: In the Resources and Debugger tabs, ⌘F no longer brings up find-in-page bar once I start using the quick console. * STEPS TO REPRODUCE 1. Open a file in the Resources tab. 2. Press ⌘F and observe that a find-in-page bar appears. Click the Done button. 3. Select the quick console and type `window`. Observe that the window object is logged. 4. Return the cursor to the source code editor and press ⌘F again. => The find-in-page bar no longer appears. 1098718 1 joepeck 2015-06-01 21:17:10 -0700 <rdar://problem/21189167> 1098723 2 254048 joepeck 2015-06-01 21:35:01 -0700 Created attachment 254048 [PATCH] Proposed Fix 1098728 3 254048 timothy 2015-06-01 21:54:36 -0700 Comment on attachment 254048 [PATCH] Proposed Fix We don't need to toggle disabled if they are scoped. 1098733 4 254048 joepeck 2015-06-01 22:08:43 -0700 Comment on attachment 254048 [PATCH] Proposed Fix Ahh, I agree. We should still enable/disable keyboard shortcuts for the findBanner, but we won't need to for the ContentBrowser. I'll update the patch once the other, conflicting part, lands. 1098813 5 254076 joepeck 2015-06-02 12:01:52 -0700 Created attachment 254076 [PATCH] For Landing 1098845 6 commit-queue 2015-06-02 13:01:05 -0700 The commit-queue encountered the following flaky tests while processing attachment 254076: The commit-queue is continuing to process your patch. 1098849 7 commit-queue 2015-06-02 13:01:43 -0700 The commit-queue encountered the following flaky tests while processing attachment 254076: transitions/default-timing-function.html bug 138901 (author: simon.fraser@apple.com) The commit-queue is continuing to process your patch. 1098895 8 254076 commit-queue 2015-06-02 14:14:49 -0700 Comment on attachment 254076 [PATCH] For Landing Clearing flags on attachment: 254076 Committed r185121: <http://trac.webkit.org/changeset/185121> 254048 2015-06-01 21:35:01 -0700 2015-06-01 22:08:43 -0700 [PATCH] Proposed Fix scope-events.patch text/plain 4424 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBmMmJlNjkuLmRmMmY3ODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA2LTAxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog4oyYRiBu byBsb25nZXIgYnJpbmdzIHVwIHRoZSBmaW5kLWluLXBhZ2UgYmFyIGFmdGVyIHR5cGluZyBpbiB0 aGUgcXVpY2sgY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ1NTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgU2NvcGUgQ29udGVudEJyb3dzZXIga2V5Ym9hcmQgZXZlbnRzIHdpdGhpbiB0aGUg Q29udGVudEJyb3dzZXIgaW5zdGVhZAorICAgICAgICBvZiBnbG9iYWwsIHdoZXJlIHRoZXkgbWln aHQgY29uZmxpY3QgYmV0d2VlbiBDb250ZW50QnJvd3NlcnMuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnRlbnRCcm93c2VyKToKKyAgICAgICAgU2NvcGUgdGhlIGtleWJvYXJkIHNob3J0Y3V0cy4KKwor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5oaWRkZW4pOgor ICAgICAgICBUaGlzIHNob3VsZCBoYXZlIGJlZW4gZGlzYWJsaW5nLgorCiAyMDE1LTA1LTI5ICBU b2JpYXMgUmVpc3MgIDx0b2JpK3dlYmtpdEBiYXNlY29kZS5kZT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBBY3Rpdml0eSBWaWV3ZXIgZG9lcyBub3QgdXBkYXRlIG9uICJjbGVhciBhbGwgY29u c29sZSBtZXNzYWdlcyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKaW5kZXggZjlhZjlhOS4uMWU5YTBm NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEJyb3dzZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKQEAgLTQyLDE3ICs0MiwxNyBAQCBXZWJJbnNwZWN0 b3IuQ29udGVudEJyb3dzZXIgPSBmdW5jdGlvbihlbGVtZW50LCBkZWxlZ2F0ZSwgZGlzYWJsZUJh Y2tGb3J3YXJkKQogICAgIHRoaXMuX2ZpbmRCYW5uZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRmluZEJhbm5lci5FdmVudC5EaWRTaG93LCB0aGlzLl9maW5kQmFubmVyRGlkU2hvdywg dGhpcyk7CiAgICAgdGhpcy5fZmluZEJhbm5lci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5GaW5kQmFubmVyLkV2ZW50LkRpZEhpZGUsIHRoaXMuX2ZpbmRCYW5uZXJEaWRIaWRlLCB0aGlz KTsKIAotICAgIHRoaXMuX2ZpbmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNv bW1hbmRPckNvbnRyb2wsICJGIiwgdGhpcy5fc2hvd0ZpbmRCYW5uZXIuYmluZCh0aGlzKSk7Ci0g ICAgdGhpcy5fc2F2ZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9y Q29udHJvbCwgIlMiLCB0aGlzLl9zYXZlLmJpbmQodGhpcykpOwotICAgIHRoaXMuX3NhdmVBc0tl eWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQgfCBXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiUyIsIHRoaXMuX3NhdmVB cy5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLl9maW5kS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRiIsIHRoaXMuX3Nob3dGaW5kQmFubmVyLmJpbmQo dGhpcyksIHRoaXMuX2VsZW1lbnQpOworICAgIHRoaXMuX3NhdmVLZXlib2FyZFNob3J0Y3V0ID0g bmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJTIiwgdGhpcy5fc2F2ZS5iaW5kKHRo aXMpLCB0aGlzLl9lbGVtZW50KTsKKyAgICB0aGlzLl9zYXZlQXNLZXlib2FyZFNob3J0Y3V0ID0g bmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0IHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9k aWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIlMiLCB0aGlzLl9zYXZlQXMuYmluZCh0aGlzKSwgdGhp cy5fZWxlbWVudCk7CiAKICAgICB0aGlzLl9maW5kS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9 IHRydWU7CiAgICAgdGhpcy5fc2F2ZUtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwog ICAgIHRoaXMuX3NhdmVBc0tleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwogCiAgICAg aWYgKCFkaXNhYmxlQmFja0ZvcndhcmQpIHsKLSAgICAgICAgdGhpcy5fYmFja0tleWJvYXJkU2hv cnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LktleS5MZWZ0LCB0aGlzLl9iYWNrQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKLSAg ICAgICAgdGhpcy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29t bWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNv bnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5SaWdodCwgdGhpcy5fZm9y d2FyZEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX2JhY2tLZXlib2Fy ZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5LZXkuTGVmdCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwg dGhpcy5fZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0ID0g bmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5L ZXkuUmlnaHQsIHRoaXMuX2ZvcndhcmRCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIHRoaXMuX2Vs ZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0g dHJ1ZTsKICAgICAgICAgdGhpcy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0 cnVlOwpAQCAtMjk0LDcgKzI5NCw3IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmhpZGRlbigpOwog CiAgICAgICAgIGlmICh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dCkKLSAgICAgICAgICAgIHRo aXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7CisgICAgICAgICAgICB0 aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CiAgICAgICAgIGlmICh0 aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dCkKICAgICAgICAgICAgIHRoaXMuX2ZvcndhcmRL ZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKIAo= 254076 2015-06-02 12:01:52 -0700 2015-06-02 14:14:49 -0700 [PATCH] For Landing better-5.patch text/plain 5652 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ4MWEzOGEuLjBmYjg1NGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA2LTAyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog4oyYRiBu byBsb25nZXIgYnJpbmdzIHVwIHRoZSBmaW5kLWluLXBhZ2UgYmFyIGFmdGVyIHR5cGluZyBpbiB0 aGUgcXVpY2sgY29uc29sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ1NTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgor CisgICAgICAgIFNjb3BlIENvbnRlbnRCcm93c2VyIGtleWJvYXJkIGV2ZW50cyB3aXRoaW4gdGhl IENvbnRlbnRCcm93c2VyIGluc3RlYWQKKyAgICAgICAgb2YgZ2xvYmFsLCB3aGVyZSB0aGV5IG1p Z2h0IGNvbmZsaWN0IGJldHdlZW4gQ29udGVudEJyb3dzZXJzLiBUaGUgc2NvcGVkCisgICAgICAg IHNob3J0Y3V0cyBub3cgbm8gbG9uZ2VyIG5lZWQgdG8gYmUgZW5hYmxlZC9kaXNhYmxlZC4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIpOgorICAgICAgICBTY29wZSB0aGUga2V5Ym9h cmQgc2hvcnRjdXRzLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJv dG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90 b3R5cGUuaGlkZGVuKToKKyAgICAgICAgTm8gbG9uZ2VyIG5lZWQgdG8gY29udHJvbCBlbmFibGlu ZyAvIGRpc2FibGluZyB0aGVzZSBub24tZ2xvYmFsIHNob3J0Y3V0cy4KKwogMjAxNS0wNi0wMSAg Sm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogVHlwZSB0b2tlbiB0ZXh0IGRlc2NlbmRlcnMgdG91Y2ggYm90dG9tIG9mIGNvbnRhaW5lcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCBmNmYwOTA2Li45ZjQ4NDNhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3Nlci5qcwpAQCAtNDIsMjAgKzQyLDEzIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nl ciA9IGZ1bmN0aW9uKGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAg dGhpcy5fZmluZEJhbm5lci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GaW5kQmFubmVy LkV2ZW50LkRpZFNob3csIHRoaXMuX2ZpbmRCYW5uZXJEaWRTaG93LCB0aGlzKTsKICAgICB0aGlz Ll9maW5kQmFubmVyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIuRXZl bnQuRGlkSGlkZSwgdGhpcy5fZmluZEJhbm5lckRpZEhpZGUsIHRoaXMpOwogCi0gICAgdGhpcy5f ZmluZEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQo V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwg IkYiLCB0aGlzLl9zaG93RmluZEJhbm5lci5iaW5kKHRoaXMpKTsKLSAgICB0aGlzLl9zYXZlS2V5 Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiUyIsIHRo aXMuX3NhdmUuYmluZCh0aGlzKSk7Ci0gICAgdGhpcy5fc2F2ZUFzS2V5Ym9hcmRTaG9ydGN1dCA9 IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJTIiwgdGhpcy5fc2F2ZUFzLmJpbmQodGhpcykpOwot Ci0gICAgdGhpcy5fZmluZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwotICAgIHRo aXMuX3NhdmVLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKLSAgICB0aGlzLl9zYXZl QXNLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKKyAgICB0aGlzLl9maW5kS2V5Ym9h cmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRiIsIHRoaXMu X3Nob3dGaW5kQmFubmVyLmJpbmQodGhpcyksIHRoaXMuX2VsZW1lbnQpOworICAgIHRoaXMuX3Nh dmVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJT IiwgdGhpcy5fc2F2ZS5iaW5kKHRoaXMpLCB0aGlzLl9lbGVtZW50KTsKKyAgICB0aGlzLl9zYXZl QXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0IHwgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIlMiLCB0aGlzLl9z YXZlQXMuYmluZCh0aGlzKSwgdGhpcy5fZWxlbWVudCk7CiAKICAgICBpZiAoIWRpc2FibGVCYWNr Rm9yd2FyZCkgewotICAgICAgICB0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuQ29udHJvbCwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LkxlZnQs IHRoaXMuX2JhY2tCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9mb3J3 YXJkS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJvbCwgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LlJpZ2h0LCB0aGlzLl9mb3J3YXJkQnV0dG9uQ2xpY2tl ZC5iaW5kKHRoaXMpKTsKLQotICAgICAgICB0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNh YmxlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0LmRpc2Fi bGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5MZWZ0 LCB0aGlzLl9iYWNrQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCB0aGlzLl9lbGVtZW50KTsKKyAg ICAgICAgdGhpcy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29t bWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNv bnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5SaWdodCwgdGhpcy5fZm9y d2FyZEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgdGhpcy5fZWxlbWVudCk7CiAKICAgICAgICAg dGhpcy5fYmFja0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25O YXZpZ2F0aW9uSXRlbSgiYmFjayIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQmFjayAoJXMpIiku Zm9ybWF0KHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9C YWNrQXJyb3cuc3ZnIiwgOCwgMTMpOwogICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlv bkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0u RXZlbnQuQ2xpY2tlZCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQsIHRoaXMpOwpAQCAtMjc3LDE1 ICsyNzAsNiBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuc2hvd24oKTsKIAotICAgICAg ICBpZiAodGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQpCi0gICAgICAgICAgICB0aGlzLl9iYWNr S2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOwotICAgICAgICBpZiAodGhpcy5fZm9y d2FyZEtleWJvYXJkU2hvcnRjdXQpCi0gICAgICAgICAgICB0aGlzLl9mb3J3YXJkS2V5Ym9hcmRT aG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOwotCi0gICAgICAgIHRoaXMuX2ZpbmRLZXlib2FyZFNo b3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX3NhdmVLZXlib2FyZFNob3J0 Y3V0LmRpc2FibGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX3NhdmVBc0tleWJvYXJkU2hvcnRj dXQuZGlzYWJsZWQgPSBmYWxzZTsKLQogICAgICAgICB0aGlzLl9maW5kQmFubmVyLmVuYWJsZUtl eWJvYXJkU2hvcnRjdXRzKCk7CiAgICAgfSwKIApAQCAtMjkzLDE1ICsyNzcsNiBAQCBXZWJJbnNw ZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5f Y29udGVudFZpZXdDb250YWluZXIuaGlkZGVuKCk7CiAKLSAgICAgICAgaWYgKHRoaXMuX2JhY2tL ZXlib2FyZFNob3J0Y3V0KQotICAgICAgICAgICAgdGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQu ZGlzYWJsZWQgPSBmYWxzZTsKLSAgICAgICAgaWYgKHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0 Y3V0KQotICAgICAgICAgICAgdGhpcy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQg PSB0cnVlOwotCi0gICAgICAgIHRoaXMuX2ZpbmRLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0g dHJ1ZTsKLSAgICAgICAgdGhpcy5fc2F2ZUtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVl OwotICAgICAgICB0aGlzLl9zYXZlQXNLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsK LQogICAgICAgICB0aGlzLl9maW5kQmFubmVyLmRpc2FibGVLZXlib2FyZFNob3J0Y3V0cygpOwog ICAgIH0sCiAK