161835 2016-09-09 20:31:45 -0700 Web Inspector: Call frame is sometimes not selected in Debugger sidebar on initial pause 2016-09-14 21:56:48 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1228461 0 joepeck 2016-09-09 20:31:45 -0700 Summary: Call frame is sometimes not selected in Debugger sidebar on initial pause. It should always be selected when we pause. It is on stepping, but sometimes not on the initial pause. Steps to Reproduce: 1. Inspect <http://bogojoker.com/shell/> 2. Set a breakpoint on easySlider.min.js Line 5:35 3. Show the Debugger tab in Inspector 4. Select the easySlider.min.js resource in the sidebar 5. On the page click the down arrow under the screenshots to tigger breakpoint => Breakpoint triggered, Call frame not selected but it should be Notes: - Seems to have to do with the Script already being selected in the Debugger Sidebar. I couldn't reproduce without that step. 1228462 1 webkit-bug-importer 2016-09-09 20:32:04 -0700 <rdar://problem/28236680> 1229803 2 288885 mattbaker 2016-09-14 16:25:58 -0700 Created attachment 288885 [Patch] Proposed Fix 1229848 3 288885 joepeck 2016-09-14 17:36:35 -0700 Comment on attachment 288885 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=288885&action=review r=me! Good approach > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:-672 > - else { > - debugger; > - } Err. This else debugger is not checked in. So that may be why this patch is not applying. Probably a diff from a local change. 1229849 4 mattbaker 2016-09-14 17:38:08 -0700 (In reply to comment #3) > Comment on attachment 288885 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=288885&action=review > > r=me! Good approach > > > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:-672 > > - else { > > - debugger; > > - } > > Err. This else debugger is not checked in. So that may be why this patch is > not applying. Probably a diff from a local change. Doh! 1229852 5 288905 mattbaker 2016-09-14 17:44:06 -0700 Created attachment 288905 [Patch] For Landing 1229899 6 288905 commit-queue 2016-09-14 21:56:44 -0700 Comment on attachment 288905 [Patch] For Landing Clearing flags on attachment: 288905 Committed r205946: <http://trac.webkit.org/changeset/205946> 1229900 7 commit-queue 2016-09-14 21:56:48 -0700 All reviewed patches have been landed. Closing bug. 288885 2016-09-14 16:25:58 -0700 2016-09-14 17:44:03 -0700 [Patch] Proposed Fix bug-161835-20160914162322.patch text/plain 4087 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1OTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh OTRkZmI3ZGZmZDc5MDc1ODQ5YzQzMTIwYTVlMGMzMWFhOTZiYjFkLi5hOWI2ZTZkOTYwOTY3MGE0 ZWEwNWQ1NzRhNTJmY2YwYjUyNmRlZTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMyBAQAogMjAxNi0wOS0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FsbCBmcmFtZSBpcyBzb21ldGltZXMgbm90IHNl bGVjdGVkIGluIERlYnVnZ2VyIHNpZGViYXIgb24gaW5pdGlhbCBwYXVzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxODM1CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yODIzNjY4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY29u dGVudFRyZWVPdXRsaW5lVHJlZVNlbGVjdGlvbkRpZENoYW5nZSk6CisgICAgICAgIElmIGEgdHJl ZSBvdGhlciB0aGFuIHRoZSBuZXdseSBzZWxlY3RlZCBlbGVtZW50J3MgdHJlZSBoYXMgdGhlIHNl bGVjdGlvbiwKKyAgICAgICAgZGVzZWxlY3QgaXQgdG8gcHJldmVudCBtdWx0aXBsZSB0cmVlIHNl bGVjdGlvbnMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5w cm90b3R5cGUuc2hvdyk6IERlbGV0ZWQuCisgICAgICAgIE5vdCBuZWVkZWQgc2luY2UgdGhlIHNl bGVjdGVkIHRyZWUgaXMgbm8gbG9uZ2VyIHRyYWNrZWQuIEluY2lkZW50YWxseSwKKyAgICAgICAg U2lkZWJhclBhbmVsLnNob3cgd2FzIG9ubHkgY2FsbGVkIGJ5IFNlYXJjaFNpZGViYXJQYW5lbCwg d2hpY2ggZG9lc24ndCBuZWVkCisgICAgICAgIHRvIG1hbmFnZSBzZWxlY3Rpb24gYWNyb3NzIG11 bHRpcGxlIHRyZWUgb3V0bGluZXMuCisKKzIwMTYtMDktMTQgIE1hdHQgQmFrZXIgIDxtYXR0YmFr ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENhbGwgU3RhY2sgdHJlZSBp biB0aGUgRGVidWdnZXIgc2lkZWJhciBzaG91bGQgbWFyayB0aGUgYWN0aXZlIGNhbGwgZnJhbWUK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MTk0NQog ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjgyOTM0NTE+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcwppbmRleCAxNzhhZTI1OTg0MTZkMDM3NjMwNGVmOGM1MWZmMjYwYWM3NTUy Y2NlLi45MDYxNmI2ODk0OTI5MDBjYTdmZGYzZjMyYWY1M2ZhZGQzNjM5NjJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTM2LDcgKzM2LDYgQEAgV2ViSW5zcGVj dG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVs IGV4dGVuZHMgV2ViSW4KICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuc29vbi5fdXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93 VmlzaWJpbGl0eSk7CiAKICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5lID0gdGhpcy5j cmVhdGVDb250ZW50VHJlZU91dGxpbmUodHJ1ZSk7Ci0gICAgICAgIHRoaXMuX3NlbGVjdGVkQ29u dGVudFRyZWVPdXRsaW5lID0gbnVsbDsKIAogICAgICAgICB0aGlzLl9maWx0ZXJCYXIgPSBuZXcg V2ViSW5zcGVjdG9yLkZpbHRlckJhcjsKICAgICAgICAgdGhpcy5fZmlsdGVyQmFyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZpbHRlckJhci5FdmVudC5GaWx0ZXJEaWRDaGFuZ2UsIHRo aXMuX2ZpbHRlckRpZENoYW5nZSwgdGhpcyk7CkBAIC00MzksMjEgKzQzOCw2IEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5l bCBleHRlbmRzIFdlYkluCiAgICAgICAgIHRyZWVFbGVtZW50LmhpZGRlbiA9IHRydWU7CiAgICAg fQogCi0gICAgc2hvdygpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMucGFyZW50U2lkZWJhcikK LSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBzdXBlci5zaG93KCk7Ci0KLSAgICAgICAg bGV0IHRyZWVPdXRsaW5lID0gdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmU7Ci0gICAg ICAgIGlmICghdHJlZU91dGxpbmUgJiYgdGhpcy5fdmlzaWJsZUNvbnRlbnRUcmVlT3V0bGluZXMu bGVuZ3RoKQotICAgICAgICAgICAgdHJlZU91dGxpbmUgPSB0aGlzLl92aXNpYmxlQ29udGVudFRy ZWVPdXRsaW5lc1swXTsKLQotICAgICAgICBpZiAodHJlZU91dGxpbmUpCi0gICAgICAgICAgICB0 cmVlT3V0bGluZS5lbGVtZW50LmZvY3VzKCk7Ci0gICAgfQotCiAgICAgc2hvd24oKQogICAgIHsK ICAgICAgICAgc3VwZXIuc2hvd24oKTsKQEAgLTY2MSwxNyArNjQ1LDE3IEBAIFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBl eHRlbmRzIFdlYkluCiAgICAgICAgIGlmICghc2VsZWN0ZWRFbGVtZW50KQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIC8vIFByZXZlbnQgdHdvIHNlbGVjdGlvbnMgaW4gdGhlIHNpZGVi YXIsIGlmIHRoZSBzZWxlY3RlZCB0cmVlIG91dGxpbmUgaXMgY2hhbmdpbmcuCi0gICAgICAgIGxl dCB0cmVlT3V0bGluZSA9IHNlbGVjdGVkRWxlbWVudC50cmVlT3V0bGluZTsKLSAgICAgICAgaWYg KHRoaXMuX3NlbGVjdGVkQ29udGVudFRyZWVPdXRsaW5lICYmIHRoaXMuX3NlbGVjdGVkQ29udGVu dFRyZWVPdXRsaW5lICE9PSB0cmVlT3V0bGluZSkgewotICAgICAgICAgICAgaWYgKHRoaXMuX3Nl bGVjdGVkQ29udGVudFRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAgICAg ICAgICAgdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVu dC5kZXNlbGVjdCgpOwotICAgICAgICB9Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgZGVi dWdnZXI7Ci0gICAgICAgIH0KKyAgICAgICAgLy8gUHJldmVudCB0d28gc2VsZWN0aW9ucyBpbiB0 aGUgc2lkZWJhci4KKyAgICAgICAgbGV0IHNlbGVjdGVkVHJlZU91dGxpbmUgPSBzZWxlY3RlZEVs ZW1lbnQudHJlZU91dGxpbmU7CisgICAgICAgIGZvciAobGV0IHRyZWVPdXRsaW5lIG9mIHRoaXMu X3Zpc2libGVDb250ZW50VHJlZU91dGxpbmVzKSB7CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRU cmVlT3V0bGluZSA9PT0gdHJlZU91dGxpbmUpCisgICAgICAgICAgICAgICAgY29udGludWU7CiAK LSAgICAgICAgdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmUgPSB0cmVlT3V0bGluZTsK KyAgICAgICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KSB7CisgICAg ICAgICAgICAgICAgdHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQog CiAgICAgX2NoZWNrRm9yU3RhbGVSZXNvdXJjZXNJZk5lZWRlZCgpCg== 288905 2016-09-14 17:44:06 -0700 2016-09-14 21:56:44 -0700 [Patch] For Landing bug-161835-20160914174129.patch text/plain 4138 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1OTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh OTRkZmI3ZGZmZDc5MDc1ODQ5YzQzMTIwYTVlMGMzMWFhOTZiYjFkLi5hYzQ4YTc5NTM5MzBiNTU3 Y2FhNTA4MGExOTZkOGQ1ZWE5NmI4OTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMyBAQAogMjAxNi0wOS0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FsbCBmcmFtZSBpcyBzb21ldGltZXMgbm90IHNl bGVjdGVkIGluIERlYnVnZ2VyIHNpZGViYXIgb24gaW5pdGlhbCBwYXVzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxODM1CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yODIzNjY4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jh cm8uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2Nv bnRlbnRUcmVlT3V0bGluZVRyZWVTZWxlY3Rpb25EaWRDaGFuZ2UpOgorICAgICAgICBJZiBhIHRy ZWUgb3RoZXIgdGhhbiB0aGUgbmV3bHkgc2VsZWN0ZWQgZWxlbWVudCdzIHRyZWUgaGFzIHRoZSBz ZWxlY3Rpb24sCisgICAgICAgIGRlc2VsZWN0IGl0IHRvIHByZXZlbnQgbXVsdGlwbGUgdHJlZSBz ZWxlY3Rpb25zLgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwu cHJvdG90eXBlLnNob3cpOiBEZWxldGVkLgorICAgICAgICBOb3QgbmVlZGVkIHNpbmNlIHRoZSBz ZWxlY3RlZCB0cmVlIGlzIG5vIGxvbmdlciB0cmFja2VkLiBJbmNpZGVudGFsbHksCisgICAgICAg IFNpZGViYXJQYW5lbC5zaG93IHdhcyBvbmx5IGNhbGxlZCBieSBTZWFyY2hTaWRlYmFyUGFuZWws IHdoaWNoIGRvZXNuJ3QgbmVlZAorICAgICAgICB0byBtYW5hZ2Ugc2VsZWN0aW9uIGFjcm9zcyBt dWx0aXBsZSB0cmVlIG91dGxpbmVzLgorCisyMDE2LTA5LTE0ICBNYXR0IEJha2VyICA8bWF0dGJh a2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYWxsIFN0YWNrIHRyZWUg aW4gdGhlIERlYnVnZ2VyIHNpZGViYXIgc2hvdWxkIG1hcmsgdGhlIGFjdGl2ZSBjYWxsIGZyYW1l CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE5NDUK ICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4MjkzNDUxPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25T aWRlYmFyUGFuZWwuanMKaW5kZXggOTkwZTJlYzA2ZTAyMGJiYWIyNjdkMDRhYWViOGY1NzQ5MjI4 NWY2YS4uMzRhN2U0NDViMzkwYTFkMmYyZmQ3ODI2ZjI4N2RjYWI0NjZkNjQ2NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0zNiw3ICszNiw2IEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5l bCBleHRlbmRzIFdlYkluCiAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLnNvb24uX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRv d1Zpc2liaWxpdHkpOwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSA9IHRoaXMu Y3JlYXRlQ29udGVudFRyZWVPdXRsaW5lKHRydWUpOwotICAgICAgICB0aGlzLl9zZWxlY3RlZENv bnRlbnRUcmVlT3V0bGluZSA9IG51bGw7CiAKICAgICAgICAgdGhpcy5fZmlsdGVyQmFyID0gbmV3 IFdlYkluc3BlY3Rvci5GaWx0ZXJCYXI7CiAgICAgICAgIHRoaXMuX2ZpbHRlckJhci5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5GaWx0ZXJCYXIuRXZlbnQuRmlsdGVyRGlkQ2hhbmdlLCB0 aGlzLl9maWx0ZXJEaWRDaGFuZ2UsIHRoaXMpOwpAQCAtNDQwLDIxICs0MzksNiBAQCBXZWJJbnNw ZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFu ZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICB0cmVlRWxlbWVudC5oaWRkZW4gPSB0cnVlOwogICAg IH0KIAotICAgIHNob3coKQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLnBhcmVudFNpZGViYXIp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgc3VwZXIuc2hvdygpOwotCi0gICAgICAg IGxldCB0cmVlT3V0bGluZSA9IHRoaXMuX3NlbGVjdGVkQ29udGVudFRyZWVPdXRsaW5lOwotICAg ICAgICBpZiAoIXRyZWVPdXRsaW5lICYmIHRoaXMuX3Zpc2libGVDb250ZW50VHJlZU91dGxpbmVz Lmxlbmd0aCkKLSAgICAgICAgICAgIHRyZWVPdXRsaW5lID0gdGhpcy5fdmlzaWJsZUNvbnRlbnRU cmVlT3V0bGluZXNbMF07Ci0KLSAgICAgICAgaWYgKHRyZWVPdXRsaW5lKQotICAgICAgICAgICAg dHJlZU91dGxpbmUuZWxlbWVudC5mb2N1cygpOwotICAgIH0KLQogICAgIHNob3duKCkKICAgICB7 CiAgICAgICAgIHN1cGVyLnNob3duKCk7CkBAIC02NzgsMTUgKzY2MiwxNyBAQCBXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwg ZXh0ZW5kcyBXZWJJbgogICAgICAgICBpZiAoIXNlbGVjdGVkRWxlbWVudCkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICAvLyBQcmV2ZW50IHR3byBzZWxlY3Rpb25zIGluIHRoZSBzaWRl YmFyLCBpZiB0aGUgc2VsZWN0ZWQgdHJlZSBvdXRsaW5lIGlzIGNoYW5naW5nLgotICAgICAgICBs ZXQgdHJlZU91dGxpbmUgPSBzZWxlY3RlZEVsZW1lbnQudHJlZU91dGxpbmU7Ci0gICAgICAgIGlm ICh0aGlzLl9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSAmJiB0aGlzLl9zZWxlY3RlZENvbnRl bnRUcmVlT3V0bGluZSAhPT0gdHJlZU91dGxpbmUpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9z ZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KQotICAgICAgICAg ICAgICAgIHRoaXMuX3NlbGVjdGVkQ29udGVudFRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1l bnQuZGVzZWxlY3QoKTsKLSAgICAgICAgfQorICAgICAgICAvLyBQcmV2ZW50IHR3byBzZWxlY3Rp b25zIGluIHRoZSBzaWRlYmFyLgorICAgICAgICBsZXQgc2VsZWN0ZWRUcmVlT3V0bGluZSA9IHNl bGVjdGVkRWxlbWVudC50cmVlT3V0bGluZTsKKyAgICAgICAgZm9yIChsZXQgdHJlZU91dGxpbmUg b2YgdGhpcy5fdmlzaWJsZUNvbnRlbnRUcmVlT3V0bGluZXMpIHsKKyAgICAgICAgICAgIGlmIChz ZWxlY3RlZFRyZWVPdXRsaW5lID09PSB0cmVlT3V0bGluZSkKKyAgICAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICB0cmVlT3V0bGluZVtXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5QcmV2aW91c1NlbGVjdGVkVHJlZUVsZW1lbnRTeW1ib2xdID0gbnVsbDsKLSAgICAg ICAgdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmUgPSB0cmVlT3V0bGluZTsKKyAgICAg ICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KSB7CisgICAgICAgICAg ICAgICAgdHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOworICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogCiAgICAg X2NoZWNrRm9yU3RhbGVSZXNvdXJjZXNJZk5lZWRlZCgpCg==