195732 2019-03-13 20:19:37 -0700 Web Inspector: REGRESSION: Canvas: the first processed action should be selected as soon as it's available if no previous selected action exists 2019-03-14 13:48:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 173807 175485 1 hi hi commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1516361 0 hi 2019-03-13 20:19:37 -0700 # STEPS TO REPRODUCE: 1. inspect any page with a <canvas> 2. take a multi-frame recording (or a single frame that is very very long) 3. stop the recording 4. wait for the recording content view to appear and the recording actions to start processing => no action is initially selected, which means that there is no preview in the main content area 1516363 1 webkit-bug-importer 2019-03-13 20:20:43 -0700 <rdar://problem/48875214> 1516365 2 364619 hi 2019-03-13 20:23:32 -0700 Created attachment 364619 Patch 1516366 3 364620 hi 2019-03-13 20:25:18 -0700 Created attachment 364620 Patch 1516555 4 364620 mattbaker 2019-03-14 11:43:11 -0700 Comment on attachment 364620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364620&action=review r=me > Source/WebInspectorUI/ChangeLog:11 > + Rather than wait till the entire recording is ready, set the selected action as soon as the s/till/until > Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js:581 > + this.action = action; So `action` here is equivalent to this._recording.actions[0], if the recording were ready? 1516606 5 364620 hi 2019-03-14 13:17:58 -0700 Comment on attachment 364620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364620&action=review >> Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js:581 >> + this.action = action; > > So `action` here is equivalent to this._recording.actions[0], if the recording were ready? Yes, but not if the recording is ready. This event listener is only fired when processing actions, so this check is basically saying "when we process an action, if we haven't set a selected action yet, use this action". Although it's effectively impossible (unless some funky stuff happens, or this is changed in the future) for this if to be hit by anything other than the first action, I'll change it to `this._recording.actions[0]` just in case. 1516607 6 364679 hi 2019-03-14 13:21:10 -0700 Created attachment 364679 Patch 1516626 7 364679 commit-queue 2019-03-14 13:48:44 -0700 Comment on attachment 364679 Patch Clearing flags on attachment: 364679 Committed r242962: <https://trac.webkit.org/changeset/242962> 1516627 8 commit-queue 2019-03-14 13:48:45 -0700 All reviewed patches have been landed. Closing bug. 364619 2019-03-13 20:23:32 -0700 2019-03-13 20:25:17 -0700 Patch bug-195732-20190313202331.patch text/plain 2524 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDllNGFmYTU4MTU4YmI3NDQ3Yzk5NWIxY2ZkNGFj YjY4NTcxMGExOGUuLjAxNTYxNjJiYmVhYWQ5MTE2NjlhZmQ5OTMzODQwYmExYmVlMWMyNWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAzLTEzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OOiBDYW52YXM6IHRoZSBJbml0aWFsIFN0YXRlIHNob3VsZCBiZSBzZWxlY3RlZCBh cyBzb29uIGFzIGl0J3MgYXZhaWxhYmxlIGlmIG5vIHByZXZpb3VzIHNlbGVjdGlvbiBleGlzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTczMgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg4NzUyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1Np ZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5cGUu X2hhbmRsZVJlY29yZGluZ1Byb2Nlc3NlZEFjdGlvbik6CisgICAgICAgIFJhdGhlciB0aGFuIHdh aXQgdGlsbCB0aGUgZW50aXJlIHJlY29yZGluZyBpcyByZWFkeSwgc2V0IHRoZSBzZWxlY3RlZCBh Y3Rpb24gYXMgc29vbiBhcyB0aGUKKyAgICAgICAgIkluaXRpYWwgU3RhdGUiIGFjdGlvbiBpcyBy ZWFkeSAoYXNzdW1pbmcgdGhlcmUgaXNuJ3QgYWxyZWFkeSBhIHNlbGVjdGVkIGFjdGlvbikuCisK IDIwMTktMDMtMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyOiBwYXVzaW5nIGluIGFuIGlubGluZSBzY3JpcHQgb24g YSBwYWdlIHdpdGggYSBVUkwgcXVlcnkgY3JlYXRlcyBhbiBFeHRyYSBTY3JpcHQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGVi YXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nh bnZhc1NpZGViYXJQYW5lbC5qcwppbmRleCBjMzdmMGZhYTMzNDdlYjI3NGQwZTNkOTJhNzc2YjY5 YzhlNjdlNWM0Li5kZjAzYjZmNmY3NDM1MDg5ZDk0MjBmZWRjMmRiNTNkMDJkYzEwYjYzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNT aWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCkBAIC01NzcsMTIgKzU3NywxMiBAQCBXSS5DYW52 YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZp Z2F0aW9uU2lkZWJhclBhbgogICAgICAgICBjb25zb2xlLmFzc2VydChpc0luaXRpYWxTdGF0ZUFj dGlvbiB8fCB0aGlzLl9yZWNvcmRpbmdUcmVlT3V0bGluZS5jaGlsZHJlbi5sYXN0VmFsdWUgaW5z dGFuY2VvZiBXSS5Gb2xkZXJUcmVlRWxlbWVudCwgIlRoZXJlIHNob3VsZCBiZSBhIFdJLkZvbGRl clRyZWVFbGVtZW50IGZvciB0aGUgZnJhbWUgZm9yIHRoaXMgYWN0aW9uLiIpOwogICAgICAgICB0 aGlzLl9jcmVhdGVSZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVudChhY3Rpb24sIGluZGV4LCBpc0lu aXRpYWxTdGF0ZUFjdGlvbiA/IHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lIDogdGhpcy5fcmVj b3JkaW5nVHJlZU91dGxpbmUuY2hpbGRyZW4ubGFzdFZhbHVlKTsKIAorICAgICAgICBpZiAoaXNJ bml0aWFsU3RhdGVBY3Rpb24gJiYgIXRoaXMuX3JlY29yZGluZ1tXSS5DYW52YXNTaWRlYmFyUGFu ZWwuU2VsZWN0ZWRBY3Rpb25TeW1ib2xdKQorICAgICAgICAgICAgdGhpcy5hY3Rpb24gPSB0aGlz Ll9yZWNvcmRpbmcuYWN0aW9uc1swXTsKKwogICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nLnJl YWR5KSB7CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmcucmVtb3ZlRXZlbnRMaXN0ZW5lcihu dWxsLCBudWxsLCB0aGlzKTsKIAotICAgICAgICAgICAgaWYgKCF0aGlzLl9yZWNvcmRpbmdbV0ku Q2FudmFzU2lkZWJhclBhbmVsLlNlbGVjdGVkQWN0aW9uU3ltYm9sXSkKLSAgICAgICAgICAgICAg ICB0aGlzLmFjdGlvbiA9IHRoaXMuX3JlY29yZGluZy5hY3Rpb25zWzBdOwotCiAgICAgICAgICAg ICBpZiAodGhpcy5fcmVjb3JkaW5nUHJvY2Vzc2luZ09wdGlvbnNDb250YWluZXIpIHsKICAgICAg ICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdQcm9jZXNzaW5nT3B0aW9uc0NvbnRhaW5lci5yZW1v dmUoKTsKICAgICAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdQcm9jZXNzaW5nT3B0aW9uc0Nv bnRhaW5lciA9IG51bGw7Cg== 364620 2019-03-13 20:25:18 -0700 2019-03-14 13:21:07 -0700 Patch bug-195732-20190313202517.patch text/plain 2485 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDllNGFmYTU4MTU4YmI3NDQ3Yzk5NWIxY2ZkNGFj YjY4NTcxMGExOGUuLjBjNDQ1ZDQ1NDNjMThhZDMyNGQ2N2YxOWQwYTEwYThkOWM4YTFlOGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAzLTEzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OOiBDYW52YXM6IHRoZSBmaXJzdCBwcm9jZXNzZWQgYWN0aW9uIHNob3VsZCBiZSBz ZWxlY3RlZCBhcyBzb29uIGFzIGl0J3MgYXZhaWxhYmxlIGlmIG5vIHByZXZpb3VzIHNlbGVjdGVk IGFjdGlvbiBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NTczMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg4NzUyMTQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQ YW5lbC5wcm90b3R5cGUuX2hhbmRsZVJlY29yZGluZ1Byb2Nlc3NlZEFjdGlvbik6CisgICAgICAg IFJhdGhlciB0aGFuIHdhaXQgdGlsbCB0aGUgZW50aXJlIHJlY29yZGluZyBpcyByZWFkeSwgc2V0 IHRoZSBzZWxlY3RlZCBhY3Rpb24gYXMgc29vbiBhcyB0aGUKKyAgICAgICAgZmlyc3QgYWN0aW9u IGlzIHJlYWR5IChhc3N1bWluZyB0aGVyZSBpc24ndCBhbHJlYWR5IGEgc2VsZWN0ZWQgYWN0aW9u KS4KKwogMjAxOS0wMy0xMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdnZXI6IHBhdXNpbmcgaW4gYW4gaW5saW5lIHNjcmlw dCBvbiBhIHBhZ2Ugd2l0aCBhIFVSTCBxdWVyeSBjcmVhdGVzIGFuIEV4dHJhIFNjcmlwdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFz U2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCmluZGV4IGMzN2YwZmFhMzM0N2ViMjc0ZDBlM2Q5MmE3 NzZiNjljOGU2N2U1YzQuLmZkYzFhNTNlMThmMGQxYTk3YjlhY2MzNmRiYzdlZTZhYWU1NWVmMTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nh bnZhc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKQEAgLTU3NywxMiArNTc3LDEyIEBAIFdJ LkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJ Lk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlzSW5pdGlhbFN0 YXRlQWN0aW9uIHx8IHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmNoaWxkcmVuLmxhc3RWYWx1 ZSBpbnN0YW5jZW9mIFdJLkZvbGRlclRyZWVFbGVtZW50LCAiVGhlcmUgc2hvdWxkIGJlIGEgV0ku Rm9sZGVyVHJlZUVsZW1lbnQgZm9yIHRoZSBmcmFtZSBmb3IgdGhpcyBhY3Rpb24uIik7CiAgICAg ICAgIHRoaXMuX2NyZWF0ZVJlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50KGFjdGlvbiwgaW5kZXgs IGlzSW5pdGlhbFN0YXRlQWN0aW9uID8gdGhpcy5fcmVjb3JkaW5nVHJlZU91dGxpbmUgOiB0aGlz Ll9yZWNvcmRpbmdUcmVlT3V0bGluZS5jaGlsZHJlbi5sYXN0VmFsdWUpOwogCisgICAgICAgIGlm ICghdGhpcy5fcmVjb3JkaW5nW1dJLkNhbnZhc1NpZGViYXJQYW5lbC5TZWxlY3RlZEFjdGlvblN5 bWJvbF0pCisgICAgICAgICAgICB0aGlzLmFjdGlvbiA9IGFjdGlvbjsKKwogICAgICAgICBpZiAo dGhpcy5fcmVjb3JkaW5nLnJlYWR5KSB7CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmcucmVt b3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKIAotICAgICAgICAgICAgaWYgKCF0 aGlzLl9yZWNvcmRpbmdbV0kuQ2FudmFzU2lkZWJhclBhbmVsLlNlbGVjdGVkQWN0aW9uU3ltYm9s XSkKLSAgICAgICAgICAgICAgICB0aGlzLmFjdGlvbiA9IHRoaXMuX3JlY29yZGluZy5hY3Rpb25z WzBdOwotCiAgICAgICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nUHJvY2Vzc2luZ09wdGlvbnND b250YWluZXIpIHsKICAgICAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdQcm9jZXNzaW5nT3B0 aW9uc0NvbnRhaW5lci5yZW1vdmUoKTsKICAgICAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdQ cm9jZXNzaW5nT3B0aW9uc0NvbnRhaW5lciA9IG51bGw7Cg== 364679 2019-03-14 13:21:10 -0700 2019-03-14 13:48:44 -0700 Patch bug-195732-20190314132109.patch text/plain 2553 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI1Njk1NjBlODhlZWI0NmFmYzgyYTU5ZGFlZTU2 MDIzYjE3OTRjZjYuLmNjNjJiYzRiM2VkMjMwOWZmY2JmY2FlZTBmOGEzMDAyMzUxMTIxMGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAzLTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OOiBDYW52YXM6IHRoZSBmaXJzdCBwcm9jZXNzZWQgYWN0aW9uIHNob3VsZCBiZSBz ZWxlY3RlZCBhcyBzb29uIGFzIGl0J3MgYXZhaWxhYmxlIGlmIG5vIHByZXZpb3VzIHNlbGVjdGVk IGFjdGlvbiBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NTczMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg4NzUyMTQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWF0dCBCYWtlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuQ2FudmFzU2lkZWJhclBhbmVs LnByb3RvdHlwZS5faGFuZGxlUmVjb3JkaW5nUHJvY2Vzc2VkQWN0aW9uKToKKyAgICAgICAgUmF0 aGVyIHRoYW4gd2FpdCB1bnRpbCB0aGUgZW50aXJlIHJlY29yZGluZyBpcyByZWFkeSwgc2V0IHRo ZSBzZWxlY3RlZCBhY3Rpb24gYXMgc29vbiBhcyB0aGUKKyAgICAgICAgZmlyc3QgYWN0aW9uIGlz IHJlYWR5IChhc3N1bWluZyB0aGVyZSBpc24ndCBhbHJlYWR5IGEgc2VsZWN0ZWQgYWN0aW9uKS4K KwogMjAxOS0wMy0xNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQ29uc29sZTogZ2V0RXZlbnRMaXN0ZW5lcnMgc2hvdWxkIHdvcmsg Zm9yIGFueSBFdmVudFRhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCmluZGV4IGMz N2YwZmFhMzM0N2ViMjc0ZDBlM2Q5MmE3NzZiNjljOGU2N2U1YzQuLjAwYmM4MTcwODhjMzIzY2Iz NDJkOTIzZjc3NjgwNWQ3ZDk3N2U1MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMK QEAgLTU3NywxMiArNTc3LDE0IEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZh c1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KGlzSW5pdGlhbFN0YXRlQWN0aW9uIHx8IHRoaXMuX3JlY29yZGluZ1RyZWVP dXRsaW5lLmNoaWxkcmVuLmxhc3RWYWx1ZSBpbnN0YW5jZW9mIFdJLkZvbGRlclRyZWVFbGVtZW50 LCAiVGhlcmUgc2hvdWxkIGJlIGEgV0kuRm9sZGVyVHJlZUVsZW1lbnQgZm9yIHRoZSBmcmFtZSBm b3IgdGhpcyBhY3Rpb24uIik7CiAgICAgICAgIHRoaXMuX2NyZWF0ZVJlY29yZGluZ0FjdGlvblRy ZWVFbGVtZW50KGFjdGlvbiwgaW5kZXgsIGlzSW5pdGlhbFN0YXRlQWN0aW9uID8gdGhpcy5fcmVj b3JkaW5nVHJlZU91dGxpbmUgOiB0aGlzLl9yZWNvcmRpbmdUcmVlT3V0bGluZS5jaGlsZHJlbi5s YXN0VmFsdWUpOwogCisgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nW1dJLkNhbnZhc1NpZGVi YXJQYW5lbC5TZWxlY3RlZEFjdGlvblN5bWJvbF0pIHsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KGFjdGlvbiA9PT0gdGhpcy5fcmVjb3JkaW5nLmFjdGlvbnNbMF0pOworICAgICAgICAgICAg dGhpcy5hY3Rpb24gPSB0aGlzLl9yZWNvcmRpbmcuYWN0aW9uc1swXTsKKyAgICAgICAgfQorCiAg ICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmcucmVhZHkpIHsKICAgICAgICAgICAgIHRoaXMuX3Jl Y29yZGluZy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwogCi0gICAgICAg ICAgICBpZiAoIXRoaXMuX3JlY29yZGluZ1tXSS5DYW52YXNTaWRlYmFyUGFuZWwuU2VsZWN0ZWRB Y3Rpb25TeW1ib2xdKQotICAgICAgICAgICAgICAgIHRoaXMuYWN0aW9uID0gdGhpcy5fcmVjb3Jk aW5nLmFjdGlvbnNbMF07Ci0KICAgICAgICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmdQcm9jZXNz aW5nT3B0aW9uc0NvbnRhaW5lcikgewogICAgICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ1By b2Nlc3NpbmdPcHRpb25zQ29udGFpbmVyLnJlbW92ZSgpOwogICAgICAgICAgICAgICAgIHRoaXMu X3JlY29yZGluZ1Byb2Nlc3NpbmdPcHRpb25zQ29udGFpbmVyID0gbnVsbDsK