143918 2015-04-18 11:41:49 -0700 Web Inspector: Disable global keyboard shortcuts for background tabs 2015-09-14 10:53:41 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1086559 0 timothy 2015-04-18 11:41:49 -0700 The shortcuts should be inactive if a tab is in the background. 1086560 1 251093 timothy 2015-04-18 11:43:55 -0700 Created attachment 251093 Patch 1088635 2 timothy 2015-04-25 18:36:04 -0700 r183322 – r183342 http://trac.webkit.org/log/?revs=183322-183342 1125625 3 251093 ossy 2015-09-14 10:53:41 -0700 Comment on attachment 251093 Patch Cleared review? from attachment 251093 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 251093 2015-04-18 11:43:55 -0700 2015-09-14 10:53:41 -0700 Patch bug-143918-20150418114254.patch text/plain 8417 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy NjNlZmM5ZTU0MDEyZmZkZWYzNTAxZGU3NGQ2NmExNjU0NTYzMjVmLi4zOTBlMmMwZGFiZTY0ODBh ZWRkMmVjZTNjOWVjM2ZiODljYjk3OGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNS0wNC0xOCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGlzYWJsZSBnbG9iYWwga2V5Ym9hcmQgc2hv cnRjdXRzIGZvciBiYWNrZ3JvdW5kIHRhYnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzkxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLnNob3duKTogQWRkZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLmhpZGRlbik6IEFkZGVkLgor ICAgICAgICBEaXNhYmxlIHNob3J0Y3V0cyBvbiB0aGUgYnJvd3NlciBhbmQgZmluZCBiYW5uZXIu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50 Vmlldy5wcm90b3R5cGUuc2hvd24pOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250 ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4pOiBBZGRlZC4KKyAgICAg ICAgVGVsbCB0aGUgY29udGVudCBicm93c2VyIHdlIHdlcmUgc2hvd24gb3IgaGlkZGVuLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbmRCYW5uZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIu cHJvdG90eXBlLnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIucHJvdG90 eXBlLmVuYWJsZUtleWJvYXJkU2hvcnRjdXRzKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuRmluZEJhbm5lci5wcm90b3R5cGUuZGlzYWJsZUtleWJvYXJkU2hvcnRjdXRzKTogQWRkZWQu CisgICAgICAgIFN1cHBvcnQgZGlzYWJsaW5nIG9yIGVuYWJsaW5nIHRoZSBrZXlib2FyZCBzaG9y dGN1dHMuCisKIDIwMTUtMDQtMTcgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEhhdmUgYmV0dGVyIGluYWN0aXZlIHdpbmRvdyBj b2xvciBmb3IgcGl4ZWwgYm9yZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCAyZTczZDFj NGI4ZWQ3NjkxZDc4NWU3ZTIyODEyMWZkZGFhZmQxY2UzLi42N2EwNGJiOTc3NTcyZTQ0MTE2NGZl ZGQxMmI3N2NlOTU5OGM2NzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtMzksMTcgKzM5 LDI0IEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9uKGVsZW1lbnQsIGRl bGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5lbGVtZW50KTsKIAogICAgIHRoaXMuX2ZpbmRC YW5uZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIodGhpcyk7Ci0gICAgdGhpcy5fZmlu ZEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIkYi LCB0aGlzLl9zaG93RmluZEJhbm5lci5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9maW5kQmFubmVy LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIuRXZlbnQuRGlkU2hvdywg dGhpcy5fZmluZEJhbm5lckRpZFNob3csIHRoaXMpOwogICAgIHRoaXMuX2ZpbmRCYW5uZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5FdmVudC5EaWRIaWRlLCB0aGlz Ll9maW5kQmFubmVyRGlkSGlkZSwgdGhpcyk7CiAKKyAgICB0aGlzLl9maW5kS2V5Ym9hcmRTaG9y dGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRiIsIHRoaXMuX3Nob3dG aW5kQmFubmVyLmJpbmQodGhpcykpOwogICAgIHRoaXMuX3NhdmVLZXlib2FyZFNob3J0Y3V0ID0g bmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJTIiwgdGhpcy5fc2F2ZS5iaW5kKHRo aXMpKTsKICAgICB0aGlzLl9zYXZlQXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVy LlNoaWZ0IHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9y Q29udHJvbCwgIlMiLCB0aGlzLl9zYXZlQXMuYmluZCh0aGlzKSk7CiAKKyAgICB0aGlzLl9maW5k S2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgdGhpcy5fc2F2ZUtleWJvYXJk U2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOworICAgIHRoaXMuX3NhdmVBc0tleWJvYXJkU2hvcnRj dXQuZGlzYWJsZWQgPSB0cnVlOworCiAgICAgaWYgKCFkaXNhYmxlQmFja0ZvcndhcmQpIHsKICAg ICAgICAgdGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFu ZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRy b2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5MZWZ0LCB0aGlzLl9iYWNrQnV0 dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fZm9yd2FyZEtleWJvYXJkU2hv cnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LktleS5SaWdodCwgdGhpcy5fZm9yd2FyZEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7 CiAKKyAgICAgICAgdGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwor ICAgICAgICB0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisK ICAgICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93OwogICAgICAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmlzTGVnYWN5TWFjT1MpIHsKICAgICAgICAgICAgIGZvcndhcmRBcnJv dyA9IHtzcmM6ICJJbWFnZXMvTGVnYWN5L0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDogOSwgaGVp Z2h0OiA5fTsKQEAgLTI3MSw2ICsyNzgsMzggQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy LnByb3RvdHlwZSA9IHsKICAgICAgICAgY3VycmVudENvbnRlbnRWaWV3LnJldmVhbE5leHRTZWFy Y2hSZXN1bHQoIWZpbmRCYW5uZXIuc2hvd2luZyk7CiAgICAgfSwKIAorICAgIHNob3duOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5zaG93bigp OworCisgICAgICAgIGlmICh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dCkKKyAgICAgICAgICAg IHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7CisgICAgICAgIGlm ICh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dCkKKyAgICAgICAgICAgIHRoaXMuX2Zvcndh cmRLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7CisKKyAgICAgICAgdGhpcy5fZmlu ZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fc2F2ZUtl eWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fc2F2ZUFzS2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworCisgICAgICAgIHRoaXMuX2ZpbmRCYW5u ZXIuZW5hYmxlS2V5Ym9hcmRTaG9ydGN1dHMoKTsKKyAgICB9LAorCisgICAgaGlkZGVuOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5oaWRkZW4o KTsKKworICAgICAgICBpZiAodGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQpCisgICAgICAgICAg ICB0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworICAgICAgICBp ZiAodGhpcy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQpCisgICAgICAgICAgICB0aGlzLl9mb3J3 YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisKKyAgICAgICAgdGhpcy5fZmlu ZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOworICAgICAgICB0aGlzLl9zYXZlS2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3NhdmVBc0tleWJv YXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOworCisgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIu ZGlzYWJsZUtleWJvYXJkU2hvcnRjdXRzKCk7CisgICAgfSwKKwogICAgIC8vIFByaXZhdGUKIAog ICAgIF9iYWNrQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwppbmRleCA4MjE4Njc0YTJkZGMzMjA1Njhj NzYzNTU3NmU1ZDBkZjQ3MDQxYzNkLi43YmYxMWMzZGI4MDU1NGIxZWFhNTU1OTU2YWM1MzQ4MWEw ZGFmNDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcu anMKQEAgLTg3LDYgKzg3LDIwIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRlbnRCcm93c2Vy OwogICAgIH0sCiAKKyAgICBzaG93bjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5z cGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bi5jYWxsKHRoaXMpOworCisgICAg ICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLnNob3duKCk7CisgICAgfSwKKworICAgIGhpZGRlbjog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5oaWRkZW4uY2FsbCh0aGlzKTsKKworICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nl ci5oaWRkZW4oKTsKKyAgICB9LAorCiAgICAgY2xvc2VkOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmNsb3NlZC5jYWxsKHRo aXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRmluZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuanMKaW5kZXggNmY3NzQwZGVjN2Y1MTQ2OWY0N2FhYjNiZDQyZDg5MGI2 NWNmNjQ4MC4uNmJiNGVlY2RjYTllYTRiZDY1YTg1MjJmMTAxZWYyOTBjMTk1ZWNjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5l ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5k QmFubmVyLmpzCkBAIC04Niw2ICs4Niw4IEBAIFdlYkluc3BlY3Rvci5GaW5kQmFubmVyID0gY2xh c3MgRmluZEJhbm5lciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5f ZmluZE5leHRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRy b2wsICJHIiwgdGhpcy5fbmV4dFJlc3VsdEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAg ICAgIHRoaXMuX2ZpbmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu U2hpZnQgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JD b250cm9sLCAiRyIsIHRoaXMuX3ByZXZpb3VzUmVzdWx0QnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMp KTsKIAorICAgICAgICB0aGlzLmRpc2FibGVLZXlib2FyZFNob3J0Y3V0cygpOworCiAgICAgICAg IHRoaXMuX2dlbmVyYXRlQnV0dG9uc0dseXBoc0lmTmVlZGVkKCk7CiAgICAgfQogCkBAIC0yMDUs NyArMjA3LDcgQEAgV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4 dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB9CiAKICAgICAgICAgLy8gRGVsYXkg YWRkaW5nIHRoZSBjbGFzc2VzIGluIGNhc2UgdGhlIHRhcmdldCBlbGVtZW50IGFuZC9vciB0aGUg ZmluZCBiYW5uZXIgd2VyZSBqdXN0IGFkZGVkIHRvCi0gICAgICAgIC8vIHRoZSBkb2N1bWVudC4g QWRkaW5nIHRoZSBjbGFzcyByaWdodCBhd2F5IHdpbGwgcHJldmVudCB0aGUgYW5pbWF0aW9uIGZy b20gd29ya2luZyB0aGUgZmlycyB0aW1lLgorICAgICAgICAvLyB0aGUgZG9jdW1lbnQuIEFkZGlu ZyB0aGUgY2xhc3MgcmlnaHQgYXdheSB3aWxsIHByZXZlbnQgdGhlIGFuaW1hdGlvbiBmcm9tIHdv cmtpbmcgdGhlIGZpcnN0IHRpbWUuCiAgICAgICAgIHNldFRpbWVvdXQoZGVsYXllZFdvcmsuYmlu ZCh0aGlzKSwgMCk7CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkZpbmRCYW5uZXIuRXZlbnQuRGlkU2hvdyk7CkBAIC0yMjUsNiArMjI3LDIwIEBA IFdlYkluc3BlY3Rvci5GaW5kQmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkZpbmRCYW5uZXIuRXZlbnQuRGlkSGlkZSk7CiAgICAgfQogCisgICAgZW5hYmxl S2V5Ym9hcmRTaG9ydGN1dHMoKQorICAgIHsKKyAgICAgICAgdGhpcy5fcG9wdWxhdGVGaW5kS2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9maW5kTmV4dEtl eWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fZmluZFByZXZp b3VzS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOworICAgIH0KKworICAgIGRpc2Fi bGVLZXlib2FyZFNob3J0Y3V0cygpCisgICAgeworICAgICAgICB0aGlzLl9wb3B1bGF0ZUZpbmRL ZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fZmluZE5leHRL ZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fZmluZFByZXZp b3VzS2V5Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgfQorCiAgICAgLy8gUHJp dmF0ZQogCiAgICAgX2lucHV0RmllbGRLZXlEb3duKGV2ZW50KQo=