190298 2018-10-04 16:35:46 -0700 Web Inspector: REGRESSION (r236766): Storage tab no longer updates after main frame navigation 2018-10-04 21:04:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1466570 0 mattbaker 2018-10-04 16:35:46 -0700 Summary: Storage tab no longer updates after main frame navigation. Steps to Reproduce: 1. Inspect any page with cookies 2. Open Storage tab 3. Reload inspected page => Storage tab content view and navigation sidebar are empty This regressed in https://trac.webkit.org/changeset/236766. Note: Prior to the patch that caused the regression, StorageSidebarPanel only listened for StorageManager.Event.Cleared (now DOMStorageManager). Cleared events from other managers were ignored. A main frame navigation causes all these managers to now broadcast Cleared events, which are interleaved with events for their respective storage objects being added. This causes the content tree in the Storage sidebar panel to get thrashed during frame navigation. 1466571 1 351641 mattbaker 2018-10-04 16:38:17 -0700 Created attachment 351641 Patch 1466572 2 webkit-bug-importer 2018-10-04 16:38:54 -0700 <rdar://problem/45026857> 1466604 3 351641 joepeck 2018-10-04 20:37:52 -0700 Comment on attachment 351641 Patch r=me, thanks for fixing this up! 1466606 4 351641 commit-queue 2018-10-04 21:04:18 -0700 Comment on attachment 351641 Patch Clearing flags on attachment: 351641 Committed r236868: <https://trac.webkit.org/changeset/236868> 1466607 5 commit-queue 2018-10-04 21:04:19 -0700 All reviewed patches have been landed. Closing bug. 351641 2018-10-04 16:38:17 -0700 2018-10-04 21:04:18 -0700 Patch bug-190298-20181004163816.patch text/plain 8232 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 YjdmN2NiMTA0NmViMmVlMjU3MjBiYjlhODNhN2E4MWI3ZmUyZjlhLi5iYTgwMDlmOWRlZDZjNWRk MzUxOGMxZTJhMjUxZGM3N2M0YmRjYjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxOC0xMC0wNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTiAocjIzNjc2Nik6IFN0b3JhZ2Ug dGFiIG5vIGxvbmdlciB1cGRhdGVzIGFmdGVyIG1haW4gZnJhbWUgbmF2aWdhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMjk4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFuZGxlIENsZWFyZWQg ZXZlbnRzIGZyb20gc3RvcmFnZSBtYW5hZ2VycyBzZXBhcmF0ZWx5LCBzbyB0aGF0IHN1Y2Nlc3Np dmUKKyAgICAgICAgZXZlbnRzIGR1cmluZyBwYWdlIGxvYWQgZG9lcyBub3QgY2F1c2UgdGhlIFN0 b3JhZ2UgdGFiIHRvIGRlc3Ryb3kgbmV3bHkKKyAgICAgICAgY3JlYXRlZCB0cmVlIGVsZW1lbnRz LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpz OgorICAgICAgICAoV0kuU3RvcmFnZVNpZGViYXJQYW5lbCk6CisgICAgICAgIChXSS5TdG9yYWdl U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY2xvc2VDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KToK KyAgICAgICAgKFdJLlN0b3JhZ2VTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9kb21TdG9yYWdlQ2xl YXJlZCk6CisgICAgICAgIChXSS5TdG9yYWdlU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYXBwbGlj YXRpb25DYWNoZUNsZWFyZWQpOgorICAgICAgICAoV0kuU3RvcmFnZVNpZGViYXJQYW5lbC5wcm90 b3R5cGUuX2luZGV4ZWREYXRhYmFzZUNsZWFyZWQpOgorICAgICAgICAoV0kuU3RvcmFnZVNpZGVi YXJQYW5lbC5wcm90b3R5cGUuX2RhdGFiYXNlQ2xlYXJlZCk6CisgICAgICAgIChXSS5TdG9yYWdl U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fc3RvcmFnZUNsZWFyZWQpOiBEZWxldGVkLgorCiAyMDE4 LTEwLTAyICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBtZXJnZSBTb3VyY2VNYXBNYW5hZ2VyIGludG8gTmV0d29ya01hbmFnZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N0b3Jh Z2VTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzCmluZGV4IGFmYTBiYmNhYzQ2ODQ1YThjN2VhMTM5 OWU5YWRkNWRkZDIxZGU4NzQuLmQxY2YxMzQyMzg1Yjc3YmE3ZThkMmJhODUwNDU2MTYwZTExZTFj MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1N0b3JhZ2VTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3RvcmFnZVNpZGViYXJQYW5lbC5qcwpAQCAtNzYsMTUgKzc2LDE1IEBA IFdJLlN0b3JhZ2VTaWRlYmFyUGFuZWwgPSBjbGFzcyBTdG9yYWdlU2lkZWJhclBhbmVsIGV4dGVu ZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQCiAgICAgICAgIFdJLmRvbVN0b3JhZ2VNYW5hZ2VyLmFk ZEV2ZW50TGlzdGVuZXIoV0kuRE9NU3RvcmFnZU1hbmFnZXIuRXZlbnQuQ29va2llU3RvcmFnZU9i amVjdFdhc0FkZGVkLCB0aGlzLl9jb29raWVTdG9yYWdlT2JqZWN0V2FzQWRkZWQsIHRoaXMpOwog ICAgICAgICBXSS5kb21TdG9yYWdlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRPTVN0b3Jh Z2VNYW5hZ2VyLkV2ZW50LkRPTVN0b3JhZ2VPYmplY3RXYXNBZGRlZCwgdGhpcy5fZG9tU3RvcmFn ZU9iamVjdFdhc0FkZGVkLCB0aGlzKTsKICAgICAgICAgV0kuZG9tU3RvcmFnZU1hbmFnZXIuYWRk RXZlbnRMaXN0ZW5lcihXSS5ET01TdG9yYWdlTWFuYWdlci5FdmVudC5ET01TdG9yYWdlT2JqZWN0 V2FzSW5zcGVjdGVkLCB0aGlzLl9kb21TdG9yYWdlT2JqZWN0V2FzSW5zcGVjdGVkLCB0aGlzKTsK LSAgICAgICAgV0kuZG9tU3RvcmFnZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01TdG9y YWdlTWFuYWdlci5FdmVudC5DbGVhcmVkLCB0aGlzLl9zdG9yYWdlQ2xlYXJlZCwgdGhpcyk7Cisg ICAgICAgIFdJLmRvbVN0b3JhZ2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9NU3RvcmFn ZU1hbmFnZXIuRXZlbnQuQ2xlYXJlZCwgdGhpcy5fZG9tU3RvcmFnZUNsZWFyZWQsIHRoaXMpOwog ICAgICAgICBXSS5kYXRhYmFzZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5EYXRhYmFzZU1h bmFnZXIuRXZlbnQuRGF0YWJhc2VXYXNBZGRlZCwgdGhpcy5fZGF0YWJhc2VXYXNBZGRlZCwgdGhp cyk7CiAgICAgICAgIFdJLmRhdGFiYXNlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkRhdGFi YXNlTWFuYWdlci5FdmVudC5EYXRhYmFzZVdhc0luc3BlY3RlZCwgdGhpcy5fZGF0YWJhc2VXYXNJ bnNwZWN0ZWQsIHRoaXMpOwotICAgICAgICBXSS5kYXRhYmFzZU1hbmFnZXIuYWRkRXZlbnRMaXN0 ZW5lcihXSS5EYXRhYmFzZU1hbmFnZXIuRXZlbnQuQ2xlYXJlZCwgdGhpcy5fc3RvcmFnZUNsZWFy ZWQsIHRoaXMpOworICAgICAgICBXSS5kYXRhYmFzZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihX SS5EYXRhYmFzZU1hbmFnZXIuRXZlbnQuQ2xlYXJlZCwgdGhpcy5fZGF0YWJhc2VDbGVhcmVkLCB0 aGlzKTsKICAgICAgICAgV0kuaW5kZXhlZERCTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLklu ZGV4ZWREQk1hbmFnZXIuRXZlbnQuSW5kZXhlZERhdGFiYXNlV2FzQWRkZWQsIHRoaXMuX2luZGV4 ZWREYXRhYmFzZVdhc0FkZGVkLCB0aGlzKTsKLSAgICAgICAgV0kuaW5kZXhlZERCTWFuYWdlci5h ZGRFdmVudExpc3RlbmVyKFdJLkluZGV4ZWREQk1hbmFnZXIuRXZlbnQuQ2xlYXJlZCwgdGhpcy5f c3RvcmFnZUNsZWFyZWQsIHRoaXMpOworICAgICAgICBXSS5pbmRleGVkREJNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV0kuSW5kZXhlZERCTWFuYWdlci5FdmVudC5DbGVhcmVkLCB0aGlzLl9pbmRl eGVkRGF0YWJhc2VDbGVhcmVkLCB0aGlzKTsKICAgICAgICAgV0kuYXBwbGljYXRpb25DYWNoZU1h bmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5BcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5FdmVudC5G cmFtZU1hbmlmZXN0QWRkZWQsIHRoaXMuX2ZyYW1lTWFuaWZlc3RBZGRlZCwgdGhpcyk7CiAgICAg ICAgIFdJLmFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQXBwbGlj YXRpb25DYWNoZU1hbmFnZXIuRXZlbnQuRnJhbWVNYW5pZmVzdFJlbW92ZWQsIHRoaXMuX2ZyYW1l TWFuaWZlc3RSZW1vdmVkLCB0aGlzKTsKLSAgICAgICAgV0kuYXBwbGljYXRpb25DYWNoZU1hbmFn ZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5BcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5FdmVudC5DbGVh cmVkLCB0aGlzLl9zdG9yYWdlQ2xlYXJlZCwgdGhpcyk7CisgICAgICAgIFdJLmFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQXBwbGljYXRpb25DYWNoZU1hbmFnZXIu RXZlbnQuQ2xlYXJlZCwgdGhpcy5fYXBwbGljYXRpb25DYWNoZUNsZWFyZWQsIHRoaXMpOwogCiAg ICAgICAgIHRoaXMuY29udGVudFRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZU91 dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzLl90cmVlU2VsZWN0aW9uRGlkQ2hh bmdlLCB0aGlzKTsKIApAQCAtMzQwLDM5ICszNDAsNjkgQEAgV0kuU3RvcmFnZVNpZGViYXJQYW5l bCA9IGNsYXNzIFN0b3JhZ2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJh clAKICAgICAgICAgcmV0dXJuIHBhcmVudEVsZW1lbnQ7CiAgICAgfQogCi0gICAgX3N0b3JhZ2VD bGVhcmVkKGV2ZW50KQorICAgIF9jbG9zZUNvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJlZUVs ZW1lbnQpCiAgICAgewotICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Q29u dGFpbmVyLmNsb3NlQWxsQ29udGVudFZpZXdzKCk7CisgICAgICAgIGNvbnN0IG9ubHlFeGlzdGlu ZyA9IHRydWU7CisgICAgICAgIGxldCBjb250ZW50VmlldyA9IHRoaXMuY29udGVudEJyb3dzZXIu Y29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCh0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9i amVjdCwgb25seUV4aXN0aW5nKTsKKyAgICAgICAgaWYgKGNvbnRlbnRWaWV3KQorICAgICAgICAg ICAgdGhpcy5jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUNvbnRlbnRW aWV3KGNvbnRlbnRWaWV3KTsKKyAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMuX2xvY2FsU3RvcmFn ZVJvb3RUcmVlRWxlbWVudCAmJiB0aGlzLl9sb2NhbFN0b3JhZ2VSb290VHJlZUVsZW1lbnQucGFy ZW50KQorICAgIF9kb21TdG9yYWdlQ2xlYXJlZChldmVudCkKKyAgICB7CisgICAgICAgIGlmICh0 aGlzLl9sb2NhbFN0b3JhZ2VSb290VHJlZUVsZW1lbnQgJiYgdGhpcy5fbG9jYWxTdG9yYWdlUm9v dFRyZWVFbGVtZW50LnBhcmVudCkgeworICAgICAgICAgICAgdGhpcy5fY2xvc2VDb250ZW50Vmll d0ZvclRyZWVFbGVtZW50KHRoaXMuX2xvY2FsU3RvcmFnZVJvb3RUcmVlRWxlbWVudCk7CiAgICAg ICAgICAgICB0aGlzLl9sb2NhbFN0b3JhZ2VSb290VHJlZUVsZW1lbnQucGFyZW50LnJlbW92ZUNo aWxkKHRoaXMuX2xvY2FsU3RvcmFnZVJvb3RUcmVlRWxlbWVudCk7CisgICAgICAgIH0KIAotICAg ICAgICBpZiAodGhpcy5fc2Vzc2lvblN0b3JhZ2VSb290VHJlZUVsZW1lbnQgJiYgdGhpcy5fc2Vz c2lvblN0b3JhZ2VSb290VHJlZUVsZW1lbnQucGFyZW50KQorICAgICAgICBpZiAodGhpcy5fc2Vz c2lvblN0b3JhZ2VSb290VHJlZUVsZW1lbnQgJiYgdGhpcy5fc2Vzc2lvblN0b3JhZ2VSb290VHJl ZUVsZW1lbnQucGFyZW50KSB7CisgICAgICAgICAgICB0aGlzLl9jbG9zZUNvbnRlbnRWaWV3Rm9y VHJlZUVsZW1lbnQodGhpcy5fc2Vzc2lvblN0b3JhZ2VSb290VHJlZUVsZW1lbnQpOwogICAgICAg ICAgICAgdGhpcy5fc2Vzc2lvblN0b3JhZ2VSb290VHJlZUVsZW1lbnQucGFyZW50LnJlbW92ZUNo aWxkKHRoaXMuX3Nlc3Npb25TdG9yYWdlUm9vdFRyZWVFbGVtZW50KTsKKyAgICAgICAgfQogCi0g ICAgICAgIGlmICh0aGlzLl9kYXRhYmFzZVJvb3RUcmVlRWxlbWVudCAmJiB0aGlzLl9kYXRhYmFz ZVJvb3RUcmVlRWxlbWVudC5wYXJlbnQpCi0gICAgICAgICAgICB0aGlzLl9kYXRhYmFzZVJvb3RU cmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5fZGF0YWJhc2VSb290VHJlZUVsZW1l bnQpOwotCi0gICAgICAgIGlmICh0aGlzLl9pbmRleGVkRGF0YWJhc2VSb290VHJlZUVsZW1lbnQg JiYgdGhpcy5faW5kZXhlZERhdGFiYXNlUm9vdFRyZWVFbGVtZW50LnBhcmVudCkKLSAgICAgICAg ICAgIHRoaXMuX2luZGV4ZWREYXRhYmFzZVJvb3RUcmVlRWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hp bGQodGhpcy5faW5kZXhlZERhdGFiYXNlUm9vdFRyZWVFbGVtZW50KTsKLQotICAgICAgICBpZiAo dGhpcy5fY29va2llU3RvcmFnZVJvb3RUcmVlRWxlbWVudCAmJiB0aGlzLl9jb29raWVTdG9yYWdl Um9vdFRyZWVFbGVtZW50LnBhcmVudCkKKyAgICAgICAgaWYgKHRoaXMuX2Nvb2tpZVN0b3JhZ2VS b290VHJlZUVsZW1lbnQgJiYgdGhpcy5fY29va2llU3RvcmFnZVJvb3RUcmVlRWxlbWVudC5wYXJl bnQpIHsKKyAgICAgICAgICAgIHRoaXMuX2Nsb3NlQ29udGVudFZpZXdGb3JUcmVlRWxlbWVudCh0 aGlzLl9jb29raWVTdG9yYWdlUm9vdFRyZWVFbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMuX2Nv b2tpZVN0b3JhZ2VSb290VHJlZUVsZW1lbnQucGFyZW50LnJlbW92ZUNoaWxkKHRoaXMuX2Nvb2tp ZVN0b3JhZ2VSb290VHJlZUVsZW1lbnQpOwotCi0gICAgICAgIGlmICh0aGlzLl9hcHBsaWNhdGlv bkNhY2hlUm9vdFRyZWVFbGVtZW50ICYmIHRoaXMuX2FwcGxpY2F0aW9uQ2FjaGVSb290VHJlZUVs ZW1lbnQucGFyZW50KQotICAgICAgICAgICAgdGhpcy5fYXBwbGljYXRpb25DYWNoZVJvb3RUcmVl RWxlbWVudC5wYXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5fYXBwbGljYXRpb25DYWNoZVJvb3RUcmVl RWxlbWVudCk7CisgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9sb2NhbFN0b3JhZ2VSb290VHJl ZUVsZW1lbnQgPSBudWxsOwogICAgICAgICB0aGlzLl9zZXNzaW9uU3RvcmFnZVJvb3RUcmVlRWxl bWVudCA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2RhdGFiYXNlUm9vdFRyZWVFbGVtZW50ID0gbnVs bDsKLSAgICAgICAgdGhpcy5fZGF0YWJhc2VIb3N0VHJlZUVsZW1lbnRNYXAuY2xlYXIoKTsKLSAg ICAgICAgdGhpcy5faW5kZXhlZERhdGFiYXNlUm9vdFRyZWVFbGVtZW50ID0gbnVsbDsKLSAgICAg ICAgdGhpcy5faW5kZXhlZERhdGFiYXNlSG9zdFRyZWVFbGVtZW50TWFwLmNsZWFyKCk7CiAgICAg ICAgIHRoaXMuX2Nvb2tpZVN0b3JhZ2VSb290VHJlZUVsZW1lbnQgPSBudWxsOworICAgIH0KKwor ICAgIF9hcHBsaWNhdGlvbkNhY2hlQ2xlYXJlZChldmVudCkKKyAgICB7CisgICAgICAgIGlmICh0 aGlzLl9hcHBsaWNhdGlvbkNhY2hlUm9vdFRyZWVFbGVtZW50ICYmIHRoaXMuX2FwcGxpY2F0aW9u Q2FjaGVSb290VHJlZUVsZW1lbnQucGFyZW50KSB7CisgICAgICAgICAgICB0aGlzLl9jbG9zZUNv bnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodGhpcy5fYXBwbGljYXRpb25DYWNoZVJvb3RUcmVlRWxl bWVudCk7CisgICAgICAgICAgICB0aGlzLl9hcHBsaWNhdGlvbkNhY2hlUm9vdFRyZWVFbGVtZW50 LnBhcmVudC5yZW1vdmVDaGlsZCh0aGlzLl9hcHBsaWNhdGlvbkNhY2hlUm9vdFRyZWVFbGVtZW50 KTsKKyAgICAgICAgfQorCiAgICAgICAgIHRoaXMuX2FwcGxpY2F0aW9uQ2FjaGVSb290VHJlZUVs ZW1lbnQgPSBudWxsOwogICAgICAgICB0aGlzLl9hcHBsaWNhdGlvbkNhY2hlVVJMVHJlZUVsZW1l bnRNYXAuY2xlYXIoKTsKICAgICB9CiAKKyAgICBfaW5kZXhlZERhdGFiYXNlQ2xlYXJlZChldmVu dCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9pbmRleGVkRGF0YWJhc2VSb290VHJlZUVsZW1l bnQgJiYgdGhpcy5faW5kZXhlZERhdGFiYXNlUm9vdFRyZWVFbGVtZW50LnBhcmVudCkgeworICAg ICAgICAgICAgdGhpcy5fY2xvc2VDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KHRoaXMuX2luZGV4 ZWREYXRhYmFzZVJvb3RUcmVlRWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9pbmRleGVkRGF0 YWJhc2VSb290VHJlZUVsZW1lbnQucGFyZW50LnJlbW92ZUNoaWxkKHRoaXMuX2luZGV4ZWREYXRh YmFzZVJvb3RUcmVlRWxlbWVudCk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9pbmRleGVk RGF0YWJhc2VSb290VHJlZUVsZW1lbnQgPSBudWxsOworICAgICAgICB0aGlzLl9pbmRleGVkRGF0 YWJhc2VIb3N0VHJlZUVsZW1lbnRNYXAuY2xlYXIoKTsKKyAgICB9CisKKyAgICBfZGF0YWJhc2VD bGVhcmVkKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2RhdGFiYXNlUm9vdFRyZWVF bGVtZW50ICYmIHRoaXMuX2RhdGFiYXNlUm9vdFRyZWVFbGVtZW50LnBhcmVudCkgeworICAgICAg ICAgICAgdGhpcy5fY2xvc2VDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KHRoaXMuX2RhdGFiYXNl Um9vdFRyZWVFbGVtZW50KTsKKyAgICAgICAgICAgIHRoaXMuX2RhdGFiYXNlUm9vdFRyZWVFbGVt ZW50LnBhcmVudC5yZW1vdmVDaGlsZCh0aGlzLl9kYXRhYmFzZVJvb3RUcmVlRWxlbWVudCk7Cisg ICAgICAgIH0KKworICAgICAgICB0aGlzLl9kYXRhYmFzZVJvb3RUcmVlRWxlbWVudCA9IG51bGw7 CisgICAgICAgIHRoaXMuX2RhdGFiYXNlSG9zdFRyZWVFbGVtZW50TWFwLmNsZWFyKCk7CisgICAg fQorCiAgICAgX3Njb3BlQmFyU2VsZWN0aW9uRGlkQ2hhbmdlKGV2ZW50KQogICAgIHsKICAgICAg ICAgdGhpcy51cGRhdGVGaWx0ZXIoKTsK