205102 2019-12-10 21:50:15 -0800 Web Inspector: REGRESSION: Console: unable to switch execution contexts 2019-12-11 17:39:06 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1597505 0 hi 2019-12-10 21:50:15 -0800 # STEPS TO REPRODUCE: 1. inspect any page with an `<iframe>` 2. attempt to switch execution contexts in the left of the Console prompt => clicking on the "Auto - ..." text doesn't do anything 1597506 1 hi 2019-12-10 21:50:24 -0800 <rdar://problem/57748393> 1597508 2 385345 hi 2019-12-10 21:51:14 -0800 Created attachment 385345 Patch 1597825 3 385345 bburg 2019-12-11 15:42:16 -0800 Comment on attachment 385345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385345&action=review r=me > Source/WebInspectorUI/ChangeLog:25 > + When the execution context of the main frame changes, recreate the main exexution context Nit: 'execution' 1597869 4 385460 hi 2019-12-11 16:54:48 -0800 Created attachment 385460 Patch Stusid exexution concexts T.T 1597893 5 385460 commit-queue 2019-12-11 17:39:04 -0800 Comment on attachment 385460 Patch Clearing flags on attachment: 385460 Committed r253411: <https://trac.webkit.org/changeset/253411> 1597894 6 commit-queue 2019-12-11 17:39:06 -0800 All reviewed patches have been landed. Closing bug. 385345 2019-12-10 21:51:14 -0800 2019-12-11 16:54:48 -0800 Patch 205102.diff text/plain 5884 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE1MGY3YTliMmNmLi5iYzc5YzAxODA3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMTItMTAgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJF R1JFU1NJT046IENvbnNvbGU6IHVuYWJsZSB0byBzd2l0Y2ggZXhlY3V0aW9uIGNvbnRleHRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUxMDIKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3NzQ4MzkzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNv bGUuanM6CisgICAgICAgIChXSS5RdWlja0NvbnNvbGUpOgorICAgICAgICBXYWl0IHRvIGluaXRp YWxpemUgdGhlIG1haW4gZXhlY3V0aW9uIGNvbnRleHQgcGF0aCBjb21wb25lbnQgdW50aWwgd2Ug YWN0dWFsbHkgaGF2ZSBhIG1haW4KKyAgICAgICAgZXhlY3V0aW9uIGNvbnRleHQuCisKKyAgICAg ICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3BhZ2VUYXJnZXRUcmFuc2l0aW9uZWQpOgor ICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZHVwbGljYXRlIGVhcmx5IHJldHVybi4KKworICAg ICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5faW5pdGlhbGl6ZU1haW5FeGVjdXRpb25D b250ZXh0UGF0aENvbXBvbmVudCk6CisgICAgICAgIFJlc3RvcmUgdGhlIGxpbmsgdG8gdGhlIG5l eHQgcGF0aCBjb21wb25lbnQgaWYgdGhlIG1haW4gZXhlY3V0aW9uIGNvbnRleHQgcGF0aCBjb21w b25lbnQgaXMKKyAgICAgICAgcmVjcmVhdGVkIHdoZW4gdGhlcmUgYWxyZWFkeSBleGlzdCBvdGhl ciBleGVjdXRpb24gY29udGV4dHMuCisKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5 cGUuX3NlbGVjdEV4ZWN1dGlvbkNvbnRleHQpOgorICAgICAgICBSZW1vdmUgdW5uZWNlc3Nhcnkg YXNzZXJ0aW9uLgorCisgICAgICAgIChXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLl9yZW1vdmVF eGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudEZvckZyYW1lKToKKyAgICAgICAgV2hlbiB0aGUg ZXhlY3V0aW9uIGNvbnRleHQgb2YgdGhlIG1haW4gZnJhbWUgY2hhbmdlcywgcmVjcmVhdGUgdGhl IG1haW4gZXhleHV0aW9uIGNvbnRleHQKKyAgICAgICAgcGF0aCBjb21wb25lbnQgc28gaXQgaGFz IHRoZSByaWdodCBgcmVwcmVzZW50ZWRPYmplY3RgLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9IaWVyYXJjaGljYWxQYXRoTmF2aWdhdGlvbkl0ZW0uanM6CisgICAgICAgIChXSS5I aWVyYXJjaGljYWxQYXRoTmF2aWdhdGlvbkl0ZW0ucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAg IE9ubHkgaGlkZSB0aGUgdG9vbHRpcCBpZiB3ZSdyZSBub3QgYHNpemVUb0ZpdGAgYXMgb3RoZXJ3 aXNlIHdlIG5ldmVyIHVuaGlkZSBpdCBkdWUgdG8gYW4KKyAgICAgICAgZWFybHkgcmV0dXJuIChg c2l6ZVRvRml0YCBqdXN0IG1ha2VzIGV2ZXJ5dGhpbmcgdmlzaWJsZSkuCisKIDIwMTktMTItMDYg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFVuY2F1Z2h0IEV4Y2VwdGlvbjogTWlzc2luZyBub2RlIGZvciBnaXZlbiBub2RlSWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hpZXJh cmNoaWNhbFBhdGhOYXZpZ2F0aW9uSXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0hpZXJhcmNoaWNhbFBhdGhOYXZpZ2F0aW9uSXRlbS5qcwppbmRleCA3 NTI2ZGFjMWZjMC4uZDIwNWY1YzM5ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hpZXJhcmNoaWNhbFBhdGhOYXZpZ2F0aW9uSXRlbS5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IaWVyYXJjaGlj YWxQYXRoTmF2aWdhdGlvbkl0ZW0uanMKQEAgLTExNCwxNyArMTE0LDE5IEBAIFdJLkhpZXJhcmNo aWNhbFBhdGhOYXZpZ2F0aW9uSXRlbSA9IGNsYXNzIEhpZXJhcmNoaWNhbFBhdGhOYXZpZ2F0aW9u SXRlbSBleHRlbmRzCiAgICAgICAgICAgICB0aGlzLl9jb2xsYXBzZWRDb21wb25lbnQgPSBudWxs OwogICAgICAgICB9CiAKKyAgICAgICAgbGV0IHNpemVzVG9GaXQgPSBuYXZpZ2F0aW9uQmFyLnNp emVzVG9GaXQ7CisKICAgICAgICAgLy8gRXhwYW5kIG91ciBjb21wb25lbnRzIHRvIGZ1bGwgd2lk dGggdG8gdGVzdCBpZiB0aGUgaXRlbXMgY2FuIGZpdCBhdCBmdWxsIHdpZHRoLgogICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2NvbXBvbmVudHMubGVuZ3RoOyArK2kpIHsKICAgICAg ICAgICAgIHRoaXMuX2NvbXBvbmVudHNbaV0uaGlkZGVuID0gZmFsc2U7CiAgICAgICAgICAgICB0 aGlzLl9jb21wb25lbnRzW2ldLmZvcmNlZFdpZHRoID0gbnVsbDsKLSAgICAgICAgICAgIHRoaXMu X2NvbXBvbmVudHNbaV0uaGlkZVRvb2x0aXAgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fY29t cG9uZW50c1tpXS5oaWRlVG9vbHRpcCA9ICFzaXplc1RvRml0OwogICAgICAgICB9CiAKICAgICAg ICAgaWYgKG9wdGlvbnMuZXhwYW5kT25seSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICBpZiAobmF2aWdhdGlvbkJhci5zaXplc1RvRml0KQorICAgICAgICBpZiAoc2l6ZXNUb0ZpdCkK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAvLyBJdGVyYXRlIG92ZXIgYWxsIHRoZSBv dGhlciBuYXZpZ2F0aW9uIGl0ZW1zIGluIHRoZSBiYXIgYW5kIGNhbGN1bGF0ZSB0aGVpciB3aWR0 aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1F1aWNrQ29uc29sZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1F1aWNrQ29uc29sZS5qcwppbmRleCBhMmY5ODM2YmU0ZS4uNjlmMzA1ZTVjOTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29u c29sZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9R dWlja0NvbnNvbGUuanMKQEAgLTY5LDggKzY5LDYgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3Mg UXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLl9leGVjdXRpb25Db250 ZXh0U2VsZWN0b3JEaXZpZGVyID0gbmV3IFdJLkRpdmlkZXJOYXZpZ2F0aW9uSXRlbTsKICAgICAg ICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGROYXZpZ2F0aW9uSXRlbSh0aGlzLl9leGVjdXRpb25D b250ZXh0U2VsZWN0b3JEaXZpZGVyKTsKIAotICAgICAgICB0aGlzLl9pbml0aWFsaXplTWFpbkV4 ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KCk7Ci0KICAgICAgICAgV0kuc2V0dGluZ3MuY29u c29sZVNhdmVkUmVzdWx0QWxpYXMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNo YW5nZWQsIHRoaXMuX3VwZGF0ZUF1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 VG9vbHRpcCwgdGhpcyk7CiAKICAgICAgICAgV0kuY29uc29sZURyYXdlci50b2dnbGVCdXR0b25T aG9ydGN1dFRvb2x0aXAodGhpcy5fdG9nZ2xlT3JGb2N1c0tleWJvYXJkU2hvcnRjdXQpOwpAQCAt OTAsNiArODgsMTAgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVu ZHMgV0kuVmlldwogICAgICAgICBXSS5kb21NYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuRE9N TWFuYWdlci5FdmVudC5JbnNwZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5faGFuZGxlSW5zcGVjdGVk Tm9kZUNoYW5nZWQsIHRoaXMpOwogCiAgICAgICAgIFdJLlRhYkJyb3dzZXIuYWRkRXZlbnRMaXN0 ZW5lcihXSS5UYWJCcm93c2VyLkV2ZW50LlNlbGVjdGVkVGFiQ29udGVudFZpZXdEaWRDaGFuZ2Us IHRoaXMuX3VwZGF0ZVN0eWxlcywgdGhpcyk7CisKKyAgICAgICAgV0kud2hlblRhcmdldHNBdmFp bGFibGUoKS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYWxpemVNYWluRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQoKTsKKyAgICAgICAgfSk7CiAgICAgfQogCiAgICAg Ly8gUHVibGljCkBAIC0xMTQsOCArMTE2LDYgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVp Y2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogCiAgICAgX3BhZ2VUYXJnZXRUcmFuc2l0aW9uZWQo KQogICAgIHsKLSAgICAgICAgaWYgKFdJLm1haW5UYXJnZXQgaW5zdGFuY2VvZiBXSS5NdWx0aXBs ZXhpbmdCYWNrZW5kVGFyZ2V0KQotICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9p bml0aWFsaXplTWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50KCk7CiAgICAgfQogCkBA IC0xMjQsOCArMTI0LDExIEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBl eHRlbmRzIFdJLlZpZXcKICAgICAgICAgaWYgKCFXSS5tYWluVGFyZ2V0IHx8IFdJLm1haW5UYXJn ZXQgaW5zdGFuY2VvZiBXSS5NdWx0aXBsZXhpbmdCYWNrZW5kVGFyZ2V0KQogICAgICAgICAgICAg cmV0dXJuOwogCisgICAgICAgIGxldCBuZXh0U2libGluZyA9IHRoaXMuX21haW5FeGVjdXRpb25D b250ZXh0UGF0aENvbXBvbmVudCA/IHRoaXMuX21haW5FeGVjdXRpb25Db250ZXh0UGF0aENvbXBv bmVudC5uZXh0U2libGluZyA6IG51bGw7CisKICAgICAgICAgdGhpcy5fbWFpbkV4ZWN1dGlvbkNv bnRleHRQYXRoQ29tcG9uZW50ID0gdGhpcy5fY3JlYXRlRXhlY3V0aW9uQ29udGV4dFBhdGhDb21w b25lbnQoV0kubWFpblRhcmdldC5leGVjdXRpb25Db250ZXh0KTsKICAgICAgICAgdGhpcy5fbWFp bkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50LnByZXZpb3VzU2libGluZyA9IHRoaXMuX2F1 dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50OworICAgICAgICB0aGlzLl9tYWlu RXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQubmV4dFNpYmxpbmcgPSBuZXh0U2libGluZzsK IAogICAgICAgICB0aGlzLl9hdXRvbWF0aWNFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudC5u ZXh0U2libGluZyA9IHRoaXMuX21haW5FeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudDsKIApA QCAtMTY2LDcgKzE2OSw2IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBl eHRlbmRzIFdJLlZpZXcKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGNvbnNv bGUuYXNzZXJ0KGV4ZWN1dGlvbkNvbnRleHQpOwogICAgICAgICBpZiAoIWV4ZWN1dGlvbkNvbnRl eHQpCiAgICAgICAgICAgICBleGVjdXRpb25Db250ZXh0ID0gV0kubWFpblRhcmdldC5leGVjdXRp b25Db250ZXh0OwogCkBAIC0zODQsNiArMzg2LDcgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3Mg UXVpY2tDb25zb2xlIGV4dGVuZHMgV0kuVmlldwogICAgIHsKICAgICAgICAgaWYgKGZyYW1lLmlz TWFpbkZyYW1lKCkpIHsKICAgICAgICAgICAgIHRoaXMuX3Nob3VsZEF1dG9tYXRpY2FsbHlTZWxl Y3RFeGVjdXRpb25Db250ZXh0ID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYWxpemVN YWluRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQoKTsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCg== 385460 2019-12-11 16:54:48 -0800 2019-12-11 17:39:04 -0800 Patch 205102.diff text/plain 5880 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE1MGY3YTliMmNmLi5iYzc5YzAxODA3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMTItMTEgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJF R1JFU1NJT046IENvbnNvbGU6IHVuYWJsZSB0byBzd2l0Y2ggZXhlY3V0aW9uIGNvbnRleHRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUxMDIKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3NzQ4MzkzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEJy aWFuIEJ1cmcuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5q czoKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZSk6CisgICAgICAgIFdhaXQgdG8gaW5pdGlhbGl6 ZSB0aGUgbWFpbiBleGVjdXRpb24gY29udGV4dCBwYXRoIGNvbXBvbmVudCB1bnRpbCB3ZSBhY3R1 YWxseSBoYXZlIGEgbWFpbgorICAgICAgICBleGVjdXRpb24gY29udGV4dC4KKworICAgICAgICAo V0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5fcGFnZVRhcmdldFRyYW5zaXRpb25lZCk6CisgICAg ICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBkdXBsaWNhdGUgZWFybHkgcmV0dXJuLgorCisgICAgICAg IChXSS5RdWlja0NvbnNvbGUucHJvdG90eXBlLl9pbml0aWFsaXplTWFpbkV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50KToKKyAgICAgICAgUmVzdG9yZSB0aGUgbGluayB0byB0aGUgbmV4dCBw YXRoIGNvbXBvbmVudCBpZiB0aGUgbWFpbiBleGVjdXRpb24gY29udGV4dCBwYXRoIGNvbXBvbmVu dCBpcworICAgICAgICByZWNyZWF0ZWQgd2hlbiB0aGVyZSBhbHJlYWR5IGV4aXN0IG90aGVyIGV4 ZWN1dGlvbiBjb250ZXh0cy4KKworICAgICAgICAoV0kuUXVpY2tDb25zb2xlLnByb3RvdHlwZS5f c2VsZWN0RXhlY3V0aW9uQ29udGV4dCk6CisgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBhc3Nl cnRpb24uCisKKyAgICAgICAgKFdJLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuX3JlbW92ZUV4ZWN1 dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Rm9yRnJhbWUpOgorICAgICAgICBXaGVuIHRoZSBleGVj dXRpb24gY29udGV4dCBvZiB0aGUgbWFpbiBmcmFtZSBjaGFuZ2VzLCByZWNyZWF0ZSB0aGUgbWFp biBleGVjdXRpb24gY29udGV4dAorICAgICAgICBwYXRoIGNvbXBvbmVudCBzbyBpdCBoYXMgdGhl IHJpZ2h0IGByZXByZXNlbnRlZE9iamVjdGAuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0hpZXJhcmNoaWNhbFBhdGhOYXZpZ2F0aW9uSXRlbS5qczoKKyAgICAgICAgKFdJLkhpZXJh cmNoaWNhbFBhdGhOYXZpZ2F0aW9uSXRlbS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgT25s eSBoaWRlIHRoZSB0b29sdGlwIGlmIHdlJ3JlIG5vdCBgc2l6ZVRvRml0YCBhcyBvdGhlcndpc2Ug d2UgbmV2ZXIgdW5oaWRlIGl0IGR1ZSB0byBhbgorICAgICAgICBlYXJseSByZXR1cm4gKGBzaXpl VG9GaXRgIGp1c3QgbWFrZXMgZXZlcnl0aGluZyB2aXNpYmxlKS4KKwogMjAxOS0xMi0wNiAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog VW5jYXVnaHQgRXhjZXB0aW9uOiBNaXNzaW5nIG5vZGUgZm9yIGdpdmVuIG5vZGVJZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGllcmFyY2hp Y2FsUGF0aE5hdmlnYXRpb25JdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvSGllcmFyY2hpY2FsUGF0aE5hdmlnYXRpb25JdGVtLmpzCmluZGV4IDc1MjZk YWMxZmMwLi5kMjA1ZjVjMzlmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvSGllcmFyY2hpY2FsUGF0aE5hdmlnYXRpb25JdGVtLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hpZXJhcmNoaWNhbFBh dGhOYXZpZ2F0aW9uSXRlbS5qcwpAQCAtMTE0LDE3ICsxMTQsMTkgQEAgV0kuSGllcmFyY2hpY2Fs UGF0aE5hdmlnYXRpb25JdGVtID0gY2xhc3MgSGllcmFyY2hpY2FsUGF0aE5hdmlnYXRpb25JdGVt IGV4dGVuZHMKICAgICAgICAgICAgIHRoaXMuX2NvbGxhcHNlZENvbXBvbmVudCA9IG51bGw7CiAg ICAgICAgIH0KIAorICAgICAgICBsZXQgc2l6ZXNUb0ZpdCA9IG5hdmlnYXRpb25CYXIuc2l6ZXNU b0ZpdDsKKwogICAgICAgICAvLyBFeHBhbmQgb3VyIGNvbXBvbmVudHMgdG8gZnVsbCB3aWR0aCB0 byB0ZXN0IGlmIHRoZSBpdGVtcyBjYW4gZml0IGF0IGZ1bGwgd2lkdGguCiAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdGhpcy5fY29tcG9uZW50cy5sZW5ndGg7ICsraSkgewogICAgICAgICAg ICAgdGhpcy5fY29tcG9uZW50c1tpXS5oaWRkZW4gPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMu X2NvbXBvbmVudHNbaV0uZm9yY2VkV2lkdGggPSBudWxsOwotICAgICAgICAgICAgdGhpcy5fY29t cG9uZW50c1tpXS5oaWRlVG9vbHRpcCA9IHRydWU7CisgICAgICAgICAgICB0aGlzLl9jb21wb25l bnRzW2ldLmhpZGVUb29sdGlwID0gIXNpemVzVG9GaXQ7CiAgICAgICAgIH0KIAogICAgICAgICBp ZiAob3B0aW9ucy5leHBhbmRPbmx5KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlm IChuYXZpZ2F0aW9uQmFyLnNpemVzVG9GaXQpCisgICAgICAgIGlmIChzaXplc1RvRml0KQogICAg ICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIC8vIEl0ZXJhdGUgb3ZlciBhbGwgdGhlIG90aGVy IG5hdmlnYXRpb24gaXRlbXMgaW4gdGhlIGJhciBhbmQgY2FsY3VsYXRlIHRoZWlyIHdpZHRoLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVp Y2tDb25zb2xlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UXVpY2tDb25zb2xlLmpzCmluZGV4IGEyZjk4MzZiZTRlLi42OWYzMDVlNWM5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xl LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNr Q29uc29sZS5qcwpAQCAtNjksOCArNjksNiBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlj a0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkNvbnRleHRT ZWxlY3RvckRpdmlkZXIgPSBuZXcgV0kuRGl2aWRlck5hdmlnYXRpb25JdGVtOwogICAgICAgICB0 aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2V4ZWN1dGlvbkNvbnRl eHRTZWxlY3RvckRpdmlkZXIpOwogCi0gICAgICAgIHRoaXMuX2luaXRpYWxpemVNYWluRXhlY3V0 aW9uQ29udGV4dFBhdGhDb21wb25lbnQoKTsKLQogICAgICAgICBXSS5zZXR0aW5ncy5jb25zb2xl U2F2ZWRSZXN1bHRBbGlhcy5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdl ZCwgdGhpcy5fdXBkYXRlQXV0b21hdGljRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnRUb29s dGlwLCB0aGlzKTsKIAogICAgICAgICBXSS5jb25zb2xlRHJhd2VyLnRvZ2dsZUJ1dHRvblNob3J0 Y3V0VG9vbHRpcCh0aGlzLl90b2dnbGVPckZvY3VzS2V5Ym9hcmRTaG9ydGN1dCk7CkBAIC05MCw2 ICs4OCwxMCBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0ZW5kcyBX SS5WaWV3CiAgICAgICAgIFdJLmRvbU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01NYW5h Z2VyLkV2ZW50Lkluc3BlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9oYW5kbGVJbnNwZWN0ZWROb2Rl Q2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgV0kuVGFiQnJvd3Nlci5hZGRFdmVudExpc3RlbmVy KFdJLlRhYkJyb3dzZXIuRXZlbnQuU2VsZWN0ZWRUYWJDb250ZW50Vmlld0RpZENoYW5nZSwgdGhp cy5fdXBkYXRlU3R5bGVzLCB0aGlzKTsKKworICAgICAgICBXSS53aGVuVGFyZ2V0c0F2YWlsYWJs ZSgpLnRoZW4oKCkgPT4geworICAgICAgICAgICAgdGhpcy5faW5pdGlhbGl6ZU1haW5FeGVjdXRp b25Db250ZXh0UGF0aENvbXBvbmVudCgpOworICAgICAgICB9KTsKICAgICB9CiAKICAgICAvLyBQ dWJsaWMKQEAgLTExNCw4ICsxMTYsNiBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0Nv bnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBfcGFnZVRhcmdldFRyYW5zaXRpb25lZCgpCiAg ICAgewotICAgICAgICBpZiAoV0kubWFpblRhcmdldCBpbnN0YW5jZW9mIFdJLk11bHRpcGxleGlu Z0JhY2tlbmRUYXJnZXQpCi0gICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2luaXRp YWxpemVNYWluRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQoKTsKICAgICB9CiAKQEAgLTEy NCw4ICsxMjQsMTEgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVu ZHMgV0kuVmlldwogICAgICAgICBpZiAoIVdJLm1haW5UYXJnZXQgfHwgV0kubWFpblRhcmdldCBp bnN0YW5jZW9mIFdJLk11bHRpcGxleGluZ0JhY2tlbmRUYXJnZXQpCiAgICAgICAgICAgICByZXR1 cm47CiAKKyAgICAgICAgbGV0IG5leHRTaWJsaW5nID0gdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRl eHRQYXRoQ29tcG9uZW50ID8gdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50 Lm5leHRTaWJsaW5nIDogbnVsbDsKKwogICAgICAgICB0aGlzLl9tYWluRXhlY3V0aW9uQ29udGV4 dFBhdGhDb21wb25lbnQgPSB0aGlzLl9jcmVhdGVFeGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVu dChXSS5tYWluVGFyZ2V0LmV4ZWN1dGlvbkNvbnRleHQpOwogICAgICAgICB0aGlzLl9tYWluRXhl Y3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQucHJldmlvdXNTaWJsaW5nID0gdGhpcy5fYXV0b21h dGljRXhlY3V0aW9uQ29udGV4dFBhdGhDb21wb25lbnQ7CisgICAgICAgIHRoaXMuX21haW5FeGVj dXRpb25Db250ZXh0UGF0aENvbXBvbmVudC5uZXh0U2libGluZyA9IG5leHRTaWJsaW5nOwogCiAg ICAgICAgIHRoaXMuX2F1dG9tYXRpY0V4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50Lm5leHRT aWJsaW5nID0gdGhpcy5fbWFpbkV4ZWN1dGlvbkNvbnRleHRQYXRoQ29tcG9uZW50OwogCkBAIC0x NjYsNyArMTY5LDYgQEAgV0kuUXVpY2tDb25zb2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVu ZHMgV0kuVmlldwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgY29uc29sZS5h c3NlcnQoZXhlY3V0aW9uQ29udGV4dCk7CiAgICAgICAgIGlmICghZXhlY3V0aW9uQ29udGV4dCkK ICAgICAgICAgICAgIGV4ZWN1dGlvbkNvbnRleHQgPSBXSS5tYWluVGFyZ2V0LmV4ZWN1dGlvbkNv bnRleHQ7CiAKQEAgLTM4NCw2ICszODYsNyBAQCBXSS5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlj a0NvbnNvbGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgewogICAgICAgICBpZiAoZnJhbWUuaXNNYWlu RnJhbWUoKSkgewogICAgICAgICAgICAgdGhpcy5fc2hvdWxkQXV0b21hdGljYWxseVNlbGVjdEV4 ZWN1dGlvbkNvbnRleHQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5faW5pdGlhbGl6ZU1haW5F eGVjdXRpb25Db250ZXh0UGF0aENvbXBvbmVudCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CiAK