97440 2012-09-24 02:18:19 -0700 Web Inspector: Disable persistence of master switches in the "Overrides" settings tab 2012-09-24 04:52:57 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 726480 0 apavlov 2012-09-24 02:18:19 -0700 This introduces user confusion, so all overrides enablements (but not their values) should be reset when the Inspector is re-opened. Patch to follow. 726527 1 165349 apavlov 2012-09-24 04:04:03 -0700 Created attachment 165349 Patch 726559 2 apavlov 2012-09-24 04:52:57 -0700 Committed r129347: <http://trac.webkit.org/changeset/129347> 165349 2012-09-24 04:04:03 -0700 2012-09-24 04:43:28 -0700 Patch bug-97440-20120924150323.patch text/plain 15028 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzkwYjlkZWE5Yjk2ZThh OGEyY2EwOWQ2Y2E5NmZkNmUyMzdiNjg4Yi4uYmIzOTNiMGRjNGM1MGE3NjI0ZmRiNGNiYWNiYWY1 MzA2MTczNmE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTI0ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogRGlzYWJsZSBwZXJzaXN0ZW5jZSBvZiBtYXN0ZXIgc3dpdGNoZXMgaW4gdGhlICJPdmVy cmlkZXMiIHNldHRpbmdzIHRhYgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTc0NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBEaXNhYmxlcyBlbmZvcmNlbWVudCBvZiBkZXZpY2UgbWV0cmljcywgZ2VvbG9j YXRpb24sIGFuZCBkZXZpY2Ugb3JpZW50YXRpb24gb3ZlcnJpZGVzIG9uIFdlYiBJbnNwZWN0b3Ig c3RhcnQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6cmVzdG9yZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Vc2VyQWdlbnRTZXR0aW5nc1RhYi5wcm90b3R5cGUuX29uTWV0cmljc0NoZWNrYm94Q2xp Y2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVXNlckFnZW50U2V0dGluZ3NUYWIucHJvdG90 eXBlLl9vbkdlb2xvY2F0aW9uT3ZlcnJpZGVDaGVja2JveENsaWNrZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnByb3RvdHlwZS5fb25EZXZpY2VPcmllbnRh dGlvbk92ZXJyaWRlQ2hlY2tib3hDbGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1VzZXJBZ2VudFN1cHBvcnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVXNlckFnZW50 U3VwcG9ydCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVXNlckFnZW50U3VwcG9ydC5wcm90b3R5 cGUudG9nZ2xlRGV2aWNlTWV0cmljc092ZXJyaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5V c2VyQWdlbnRTdXBwb3J0LnByb3RvdHlwZS50b2dnbGVHZW9sb2NhdGlvblBvc2l0aW9uT3ZlcnJp ZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQucHJvdG90eXBlLnRv Z2dsZURldmljZU9yaWVudGF0aW9uT3ZlcnJpZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvZXh0ZXJucy5qczoKKwogMjAxMi0wOS0yNCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgQml0TG9ja2VyU2tpYS4gSXQn cyBhcHBhcmVudGx5IG5vdCB1c2VkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUGFnZUFnZW50LmNwcAppbmRleCBmYTIzYWFhZjliZWQwZjU0ODRjMTU3MGVjMzZmMmQz ZTkwZmNjOGRhLi5lZjM5ZTZmMTM5MzA1Y2ZhYjhkYTgxOGUzYTExZDA5NmYzOGY2YzY0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAt MzQ5LDEzICszNDksNiBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6cmVzdG9yZSgpCiAgICAg ICAgIEVycm9yU3RyaW5nIGVycm9yOwogICAgICAgICBlbmFibGUoJmVycm9yKTsKIAotICAgICAg ICAvLyBXaGVuIHJlc3RvcmluZyB0aGUgYWdlbnQsIG92ZXJyaWRlIHZhbHVlcyBhcmUgcmVzdG9y ZWQgaW50byB0aGUgRnJhbWVWaWV3LgotICAgICAgICBpbnQgd2lkdGggPSBzdGF0aWNfY2FzdDxp bnQ+KG1fc3RhdGUtPmdldExvbmcoUGFnZUFnZW50U3RhdGU6OnBhZ2VBZ2VudFNjcmVlbldpZHRo T3ZlcnJpZGUpKTsKLSAgICAgICAgaW50IGhlaWdodCA9IHN0YXRpY19jYXN0PGludD4obV9zdGF0 ZS0+Z2V0TG9uZyhQYWdlQWdlbnRTdGF0ZTo6cGFnZUFnZW50U2NyZWVuSGVpZ2h0T3ZlcnJpZGUp KTsKLSAgICAgICAgZG91YmxlIGZvbnRTY2FsZUZhY3RvciA9IG1fc3RhdGUtPmdldERvdWJsZShQ YWdlQWdlbnRTdGF0ZTo6cGFnZUFnZW50Rm9udFNjYWxlRmFjdG9yT3ZlcnJpZGUpOwotICAgICAg ICBib29sIGZpdFdpbmRvdyA9IG1fc3RhdGUtPmdldEJvb2xlYW4oUGFnZUFnZW50U3RhdGU6OnBh Z2VBZ2VudEZpdFdpbmRvdyk7Ci0gICAgICAgIHVwZGF0ZVZpZXdNZXRyaWNzKHdpZHRoLCBoZWln aHQsIGZvbnRTY2FsZUZhY3RvciwgZml0V2luZG93KTsKLQogICAgICAgICBpZiAobV9pbnNwZWN0 b3JBZ2VudC0+ZGlkQ29tbWl0TG9hZEZpcmVkKCkpCiAgICAgICAgICAgICBmcmFtZU5hdmlnYXRl ZChtX3BhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSk7CiAjaWYg RU5BQkxFKFRPVUNIX0VWRU5UUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IDcyODM4OWM3Zjc2NGFkZjExZTcyOGE5 ZGI3MjVlOTNjNjFjODkyMGMuLjFjOThlM2U0MDZjNzBjYjJlOGVmNThjZjgwMDMxMDRlYzE1YTZh MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3NTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5nc1NjcmVlbi5qcwpAQCAtNTQxLDcgKzU0MSw3IEBAIFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRT ZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbnN0IGNoZWNrYm94RWxlbWVudCA9 IGxhYmVsRWxlbWVudC5jcmVhdGVDaGlsZCgiaW5wdXQiKTsKICAgICAgICAgY2hlY2tib3hFbGVt ZW50LmlkID0gIm1ldHJpY3Mtb3ZlcnJpZGUtY2hlY2tib3giOwogICAgICAgICBjaGVja2JveEVs ZW1lbnQudHlwZSA9ICJjaGVja2JveCI7Ci0gICAgICAgIGNoZWNrYm94RWxlbWVudC5jaGVja2Vk ID0gIW1ldHJpY3MgfHwgKG1ldHJpY3Mud2lkdGggJiYgbWV0cmljcy5oZWlnaHQgJiYgbWV0cmlj cy5mb250U2NhbGVGYWN0b3IpOworICAgICAgICBjaGVja2JveEVsZW1lbnQuY2hlY2tlZCA9IGZh bHNlOwogICAgICAgICBjaGVja2JveEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9vbk1ldHJpY3NDaGVja2JveENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAg ICB0aGlzLl9tZXRyaWNzQ2hlY2tib3hFbGVtZW50ID0gY2hlY2tib3hFbGVtZW50OwogICAgICAg ICBsYWJlbEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJEZXZpY2UgbWV0cmljcyIpKSk7CkBAIC01NDksOCArNTQ5LDcgQEAg V2ViSW5zcGVjdG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAg Y29uc3QgbWV0cmljc1NlY3Rpb25FbGVtZW50ID0gdGhpcy5fY3JlYXRlRGV2aWNlTWV0cmljc0Vs ZW1lbnQobWV0cmljcyk7CiAgICAgICAgIHAuYXBwZW5kQ2hpbGQobWV0cmljc1NlY3Rpb25FbGVt ZW50KTsKICAgICAgICAgdGhpcy5fbWV0cmljc1NlY3Rpb25FbGVtZW50ID0gbWV0cmljc1NlY3Rp b25FbGVtZW50OwotCi0gICAgICAgIHRoaXMuX3NldERldmljZU1ldHJpY3NPdmVycmlkZShtZXRy aWNzLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX29uTWV0cmljc0NoZWNrYm94Q2xpY2tl ZCgpOwogCiAgICAgICAgIHJldHVybiBwOwogICAgIH0sCkBAIC01NjQsMTYgKzU2MywxOCBAQCBX ZWJJbnNwZWN0b3IuVXNlckFnZW50U2V0dGluZ3NUYWIucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9zd2FwRGltZW5zaW9uc0VsZW1lbnQuZGlzYWJsZWQgPSBjb250cm9sc0Rpc2FibGVkOwog ICAgICAgICB0aGlzLl9maXRXaW5kb3dDaGVja2JveEVsZW1lbnQuZGlzYWJsZWQgPSBjb250cm9s c0Rpc2FibGVkOwogCi0gICAgICAgIGlmICh0aGlzLl9tZXRyaWNzQ2hlY2tib3hFbGVtZW50LmNo ZWNrZWQpIHsKLSAgICAgICAgICAgIHZhciBtZXRyaWNzID0gV2ViSW5zcGVjdG9yLlVzZXJBZ2Vu dFN1cHBvcnQuRGV2aWNlTWV0cmljcy5wYXJzZVVzZXJJbnB1dCh0aGlzLl93aWR0aE92ZXJyaWRl RWxlbWVudC52YWx1ZSwgdGhpcy5faGVpZ2h0T3ZlcnJpZGVFbGVtZW50LnZhbHVlLCB0aGlzLl9m b250U2NhbGVGYWN0b3JPdmVycmlkZUVsZW1lbnQudmFsdWUpOwotICAgICAgICAgICAgaWYgKG1l dHJpY3MgJiYgbWV0cmljcy5pc1ZhbGlkKCkgJiYgbWV0cmljcy53aWR0aCAmJiBtZXRyaWNzLmhl aWdodCkKLSAgICAgICAgICAgICAgICB0aGlzLl9zZXREZXZpY2VNZXRyaWNzT3ZlcnJpZGUobWV0 cmljcywgZmFsc2UsIGZhbHNlKTsKLSAgICAgICAgICAgIGlmICghdGhpcy5fd2lkdGhPdmVycmlk ZUVsZW1lbnQudmFsdWUpCi0gICAgICAgICAgICAgICAgdGhpcy5fd2lkdGhPdmVycmlkZUVsZW1l bnQuZm9jdXMoKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MuZGV2aWNlTWV0cmljcy5nZXQoKSkKLSAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MuZGV2aWNlTWV0cmljcy5zZXQoIiIpOworICAgICAgICBpZiAoY29udHJv bHNEaXNhYmxlZCkgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnVzZXJBZ2VudFN1cHBvcnQu dG9nZ2xlRGV2aWNlTWV0cmljc092ZXJyaWRlKGZhbHNlKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCisgICAgICAgIHZhciBtZXRyaWNzID0gV2ViSW5zcGVjdG9yLlVzZXJBZ2Vu dFN1cHBvcnQuRGV2aWNlTWV0cmljcy5wYXJzZVVzZXJJbnB1dCh0aGlzLl93aWR0aE92ZXJyaWRl RWxlbWVudC52YWx1ZSwgdGhpcy5faGVpZ2h0T3ZlcnJpZGVFbGVtZW50LnZhbHVlLCB0aGlzLl9m b250U2NhbGVGYWN0b3JPdmVycmlkZUVsZW1lbnQudmFsdWUpOworICAgICAgICBpZiAobWV0cmlj cyAmJiBtZXRyaWNzLmlzVmFsaWQoKSAmJiBtZXRyaWNzLndpZHRoICYmIG1ldHJpY3MuaGVpZ2h0 KSB7CisgICAgICAgICAgICB0aGlzLl9zZXREZXZpY2VNZXRyaWNzT3ZlcnJpZGUobWV0cmljcywg ZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci51c2VyQWdlbnRTdXBwb3J0 LnRvZ2dsZURldmljZU1ldHJpY3NPdmVycmlkZSh0cnVlKTsKICAgICAgICAgfQorICAgICAgICBp ZiAoIXRoaXMuX3dpZHRoT3ZlcnJpZGVFbGVtZW50LnZhbHVlKQorICAgICAgICAgICAgdGhpcy5f d2lkdGhPdmVycmlkZUVsZW1lbnQuZm9jdXMoKTsKICAgICB9LAogCiAgICAgX2FwcGx5RGV2aWNl TWV0cmljc1VzZXJJbnB1dDogZnVuY3Rpb24oKQpAQCAtNjc1LDcgKzY3Niw3IEBAIFdlYkluc3Bl Y3Rvci5Vc2VyQWdlbnRTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjaGVj a2JveEVsZW1lbnQgPSBsYWJlbEVsZW1lbnQuY3JlYXRlQ2hpbGQoImlucHV0Iik7CiAgICAgICAg IGNoZWNrYm94RWxlbWVudC5pZCA9ICJnZW9sb2NhdGlvbi1vdmVycmlkZS1jaGVja2JveCI7CiAg ICAgICAgIGNoZWNrYm94RWxlbWVudC50eXBlID0gImNoZWNrYm94IjsKLSAgICAgICAgY2hlY2ti b3hFbGVtZW50LmNoZWNrZWQgPSAhZ2VvbG9jYXRpb24gfHwgKCgodHlwZW9mIGdlb2xvY2F0aW9u LmxhdGl0dWRlID09PSAibnVtYmVyIikgJiYgKHR5cGVvZiBnZW9sb2NhdGlvbi5sb25naXR1ZGUg PT09ICJudW1iZXIiKSkgfHwgZ2VvbG9jYXRpb24uZXJyb3IpOworICAgICAgICBjaGVja2JveEVs ZW1lbnQuY2hlY2tlZCA9IGZhbHNlOwogICAgICAgICBjaGVja2JveEVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCB0aGlzLl9vbkdlb2xvY2F0aW9uT3ZlcnJpZGVDaGVja2JveENsaWNr ZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICB0aGlzLl9nZW9sb2NhdGlvbk92ZXJyaWRl Q2hlY2tib3hFbGVtZW50ID0gY2hlY2tib3hFbGVtZW50OwogICAgICAgICBsYWJlbEVsZW1lbnQu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJPdmVycmlkZSBHZW9sb2NhdGlvbiIpKSk7CkBAIC02ODMsNyArNjg0LDcgQEAgV2ViSW5zcGVj dG9yLlVzZXJBZ2VudFNldHRpbmdzVGFiLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGdlb2xv Y2F0aW9uU2VjdGlvbkVsZW1lbnQgPSB0aGlzLl9jcmVhdGVHZW9sb2NhdGlvbk92ZXJyaWRlRWxl bWVudChnZW9sb2NhdGlvbik7CiAgICAgICAgIHAuYXBwZW5kQ2hpbGQoZ2VvbG9jYXRpb25TZWN0 aW9uRWxlbWVudCk7CiAgICAgICAgIHRoaXMuX2dlb2xvY2F0aW9uU2VjdGlvbkVsZW1lbnQgPSBn ZW9sb2NhdGlvblNlY3Rpb25FbGVtZW50OwotICAgICAgICB0aGlzLl9zZXRHZW9sb2NhdGlvblBv c2l0aW9uKGdlb2xvY2F0aW9uLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX29uR2VvbG9j YXRpb25PdmVycmlkZUNoZWNrYm94Q2xpY2tlZCgpOwogICAgICAgICByZXR1cm4gcDsKICAgICB9 LAogCkBAIC02OTQsMTQgKzY5NSwxOCBAQCBXZWJJbnNwZWN0b3IuVXNlckFnZW50U2V0dGluZ3NU YWIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9sb25naXR1ZGVFbGVtZW50LmRpc2FibGVk ID0gY29udHJvbHNEaXNhYmxlZDsKICAgICAgICAgdGhpcy5fZ2VvbG9jYXRpb25FcnJvckVsZW1l bnQuZGlzYWJsZWQgPSBjb250cm9sc0Rpc2FibGVkOwogCi0gICAgICAgIGlmICh0aGlzLl9nZW9s b2NhdGlvbk92ZXJyaWRlQ2hlY2tib3hFbGVtZW50LmNoZWNrZWQpIHsKLSAgICAgICAgICAgIHZh ciBnZW9sb2NhdGlvbiA9IFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTdXBwb3J0Lkdlb2xvY2F0aW9u UG9zaXRpb24ucGFyc2VVc2VySW5wdXQodGhpcy5fbGF0aXR1ZGVFbGVtZW50LnZhbHVlLCB0aGlz Ll9sb25naXR1ZGVFbGVtZW50LnZhbHVlLCB0aGlzLl9nZW9sb2NhdGlvbkVycm9yRWxlbWVudC5j aGVja2VkKTsKLSAgICAgICAgICAgIGlmIChnZW9sb2NhdGlvbikKLSAgICAgICAgICAgICAgICB0 aGlzLl9zZXRHZW9sb2NhdGlvblBvc2l0aW9uKGdlb2xvY2F0aW9uLCBmYWxzZSwgZmFsc2UpOwot ICAgICAgICAgICAgaWYgKCF0aGlzLl9sYXRpdHVkZUVsZW1lbnQudmFsdWUpCi0gICAgICAgICAg ICAgICAgdGhpcy5fbGF0aXR1ZGVFbGVtZW50LmZvY3VzKCk7Ci0gICAgICAgIH0gZWxzZQotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQuR2VvbG9jYXRpb25Qb3NpdGlv bi5jbGVhckdlb2xvY2F0aW9uT3ZlcnJpZGUoKTsKKyAgICAgICAgaWYgKGNvbnRyb2xzRGlzYWJs ZWQpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci51c2VyQWdlbnRTdXBwb3J0LnRvZ2dsZUdl b2xvY2F0aW9uUG9zaXRpb25PdmVycmlkZShmYWxzZSk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKworICAgICAgICB2YXIgZ2VvbG9jYXRpb24gPSBXZWJJbnNwZWN0b3IuVXNlckFn ZW50U3VwcG9ydC5HZW9sb2NhdGlvblBvc2l0aW9uLnBhcnNlVXNlcklucHV0KHRoaXMuX2xhdGl0 dWRlRWxlbWVudC52YWx1ZSwgdGhpcy5fbG9uZ2l0dWRlRWxlbWVudC52YWx1ZSwgdGhpcy5fZ2Vv bG9jYXRpb25FcnJvckVsZW1lbnQuY2hlY2tlZCk7CisgICAgICAgIGlmIChnZW9sb2NhdGlvbikg eworICAgICAgICAgICAgdGhpcy5fc2V0R2VvbG9jYXRpb25Qb3NpdGlvbihnZW9sb2NhdGlvbiwg ZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci51c2VyQWdlbnRTdXBwb3J0 LnRvZ2dsZUdlb2xvY2F0aW9uUG9zaXRpb25PdmVycmlkZSh0cnVlKTsKKyAgICAgICAgfQorICAg ICAgICBpZiAoIXRoaXMuX2xhdGl0dWRlRWxlbWVudC52YWx1ZSkKKyAgICAgICAgICAgIHRoaXMu X2xhdGl0dWRlRWxlbWVudC5mb2N1cygpOwogICAgIH0sCiAKICAgICBfYXBwbHlHZW9sb2NhdGlv blVzZXJJbnB1dDogZnVuY3Rpb24oKQpAQCAtNzc0LDcgKzc3OSw3IEBAIFdlYkluc3BlY3Rvci5V c2VyQWdlbnRTZXR0aW5nc1RhYi5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjaGVja2JveEVs ZW1lbnQgPSBsYWJlbEVsZW1lbnQuY3JlYXRlQ2hpbGQoImlucHV0Iik7CiAgICAgICAgIGNoZWNr Ym94RWxlbWVudC5pZCA9ICJkZXZpY2Utb3JpZW50YXRpb24tb3ZlcnJpZGUtY2hlY2tib3giOwog ICAgICAgICBjaGVja2JveEVsZW1lbnQudHlwZSA9ICJjaGVja2JveCI7Ci0gICAgICAgIGNoZWNr Ym94RWxlbWVudC5jaGVja2VkID0gIWRldmljZU9yaWVudGF0aW9uOworICAgICAgICBjaGVja2Jv eEVsZW1lbnQuY2hlY2tlZCA9IGZhbHNlOwogICAgICAgICBjaGVja2JveEVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9vbkRldmljZU9yaWVudGF0aW9uT3ZlcnJpZGVDaGVj a2JveENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICB0aGlzLl9kZXZpY2VPcmll bnRhdGlvbk92ZXJyaWRlQ2hlY2tib3hFbGVtZW50ID0gY2hlY2tib3hFbGVtZW50OwogICAgICAg ICBsYWJlbEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJPdmVycmlkZSBEZXZpY2UgT3JpZW50YXRpb24iKSkpOwpAQCAtNzgy LDkgKzc4Nyw3IEBAIFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTZXR0aW5nc1RhYi5wcm90b3R5cGUg PSB7CiAgICAgICAgIHZhciBkZXZpY2VPcmllbnRhdGlvblNlY3Rpb25FbGVtZW50ID0gdGhpcy5f Y3JlYXRlRGV2aWNlT3JpZW50YXRpb25PdmVycmlkZUVsZW1lbnQoZGV2aWNlT3JpZW50YXRpb24p OwogICAgICAgICBwLmFwcGVuZENoaWxkKGRldmljZU9yaWVudGF0aW9uU2VjdGlvbkVsZW1lbnQp OwogICAgICAgICB0aGlzLl9kZXZpY2VPcmllbnRhdGlvblNlY3Rpb25FbGVtZW50ID0gZGV2aWNl T3JpZW50YXRpb25TZWN0aW9uRWxlbWVudDsKLQotICAgICAgICB0aGlzLl9zZXREZXZpY2VPcmll bnRhdGlvbihkZXZpY2VPcmllbnRhdGlvbiwgZmFsc2UsIHRydWUpOwotCisgICAgICAgIHRoaXMu X29uRGV2aWNlT3JpZW50YXRpb25PdmVycmlkZUNoZWNrYm94Q2xpY2tlZCgpOwogICAgICAgICBy ZXR1cm4gcDsKICAgICB9LAogCkBAIC03OTUsMTQgKzc5OCwxOCBAQCBXZWJJbnNwZWN0b3IuVXNl ckFnZW50U2V0dGluZ3NUYWIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9iZXRhRWxlbWVu dC5kaXNhYmxlZCA9IGNvbnRyb2xzRGlzYWJsZWQ7CiAgICAgICAgIHRoaXMuX2dhbW1hRWxlbWVu dC5kaXNhYmxlZCA9IGNvbnRyb2xzRGlzYWJsZWQ7CiAKLSAgICAgICAgaWYgKHRoaXMuX2Rldmlj ZU9yaWVudGF0aW9uT3ZlcnJpZGVDaGVja2JveEVsZW1lbnQuY2hlY2tlZCkgewotICAgICAgICAg ICAgdmFyIGRldmljZU9yaWVudGF0aW9uID0gV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQu RGV2aWNlT3JpZW50YXRpb24ucGFyc2VVc2VySW5wdXQodGhpcy5fYWxwaGFFbGVtZW50LnZhbHVl LCB0aGlzLl9iZXRhRWxlbWVudC52YWx1ZSwgdGhpcy5fZ2FtbWFFbGVtZW50LnZhbHVlKTsKLSAg ICAgICAgICAgIGlmIChkZXZpY2VPcmllbnRhdGlvbikKLSAgICAgICAgICAgICAgICB0aGlzLl9z ZXREZXZpY2VPcmllbnRhdGlvbihkZXZpY2VPcmllbnRhdGlvbiwgZmFsc2UsIGZhbHNlKTsKLSAg ICAgICAgICAgIGlmICghdGhpcy5fYWxwaGFFbGVtZW50LnZhbHVlKQotICAgICAgICAgICAgICAg IHRoaXMuX2FscGhhRWxlbWVudC5mb2N1cygpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTdXBwb3J0LkRldmljZU9yaWVudGF0aW9uLmNsZWFyRGV2 aWNlT3JpZW50YXRpb25PdmVycmlkZSgpOworICAgICAgICBpZiAoY29udHJvbHNEaXNhYmxlZCkg eworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnVzZXJBZ2VudFN1cHBvcnQudG9nZ2xlRGV2aWNl T3JpZW50YXRpb25PdmVycmlkZShmYWxzZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICB2YXIgZGV2aWNlT3JpZW50YXRpb24gPSBXZWJJbnNwZWN0b3IuVXNlckFn ZW50U3VwcG9ydC5EZXZpY2VPcmllbnRhdGlvbi5wYXJzZVVzZXJJbnB1dCh0aGlzLl9hbHBoYUVs ZW1lbnQudmFsdWUsIHRoaXMuX2JldGFFbGVtZW50LnZhbHVlLCB0aGlzLl9nYW1tYUVsZW1lbnQu dmFsdWUpOworICAgICAgICBpZiAoZGV2aWNlT3JpZW50YXRpb24pIHsKKyAgICAgICAgICAgIHRo aXMuX3NldERldmljZU9yaWVudGF0aW9uKGRldmljZU9yaWVudGF0aW9uLCBmYWxzZSwgZmFsc2Up OworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnVzZXJBZ2VudFN1cHBvcnQudG9nZ2xlRGV2aWNl T3JpZW50YXRpb25PdmVycmlkZSh0cnVlKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoIXRoaXMu X2FscGhhRWxlbWVudC52YWx1ZSkKKyAgICAgICAgICAgIHRoaXMuX2FscGhhRWxlbWVudC5mb2N1 cygpOwogICAgIH0sCiAKICAgICBfYXBwbHlEZXZpY2VPcmllbnRhdGlvblVzZXJJbnB1dDogZnVu Y3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V c2VyQWdlbnRTdXBwb3J0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V c2VyQWdlbnRTdXBwb3J0LmpzCmluZGV4IDc5NGQxMWE5NjlhODc0MWMyNDVkNDQ0MTMxMmQ0NjBh Y2RlNzJlOTUuLmViZWQ4MDc5Y2U4NjYzMGIzYzc1YjFlOWM4NDI2YTE1OGM5ZmJiMDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVXNlckFnZW50U3VwcG9y dC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VzZXJBZ2VudFN1 cHBvcnQuanMKQEAgLTMzLDggKzMzLDEwIEBACiAgKi8KIFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRT dXBwb3J0ID0gZnVuY3Rpb24oKQogewotICAgIGlmIChXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGV2 aWNlTWV0cmljcy5nZXQoKSkKLSAgICAgICAgdGhpcy5fZGV2aWNlTWV0cmljc0NoYW5nZWQoKTsK KyAgICB0aGlzLl9kZXZpY2VNZXRyaWNzT3ZlcnJpZGVFbmFibGVkID0gZmFsc2U7CisgICAgdGhp cy5fZ2VvbG9jYXRpb25Qb3NpdGlvbk92ZXJyaWRlRW5hYmxlZCA9IGZhbHNlOworICAgIHRoaXMu X2RldmljZU9yaWVudGF0aW9uT3ZlcnJpZGVFbmFibGVkID0gZmFsc2U7CisKICAgICBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MuZGV2aWNlTWV0cmljcy5hZGRDaGFuZ2VMaXN0ZW5lcih0aGlzLl9kZXZp Y2VNZXRyaWNzQ2hhbmdlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmRldmlj ZUZpdFdpbmRvdy5hZGRDaGFuZ2VMaXN0ZW5lcih0aGlzLl9kZXZpY2VNZXRyaWNzQ2hhbmdlZCwg dGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmdlb2xvY2F0aW9uT3ZlcnJpZGUuYWRk Q2hhbmdlTGlzdGVuZXIodGhpcy5fZ2VvbG9jYXRpb25Qb3NpdGlvbkNoYW5nZWQsIHRoaXMpOwpA QCAtMzA1LDE1ICszMDcsNDMgQEAgV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQuRGV2aWNl T3JpZW50YXRpb24uY2xlYXJEZXZpY2VPcmllbnRhdGlvbk92ZXJyaWRlID0KIH0KIAogV2ViSW5z cGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQucHJvdG90eXBlID0geworICAgIHRvZ2dsZURldmljZU1l dHJpY3NPdmVycmlkZTogZnVuY3Rpb24oZW5hYmxlZCkKKyAgICB7CisgICAgICAgIGlmIChlbmFi bGVkID09PSB0aGlzLl9kZXZpY2VNZXRyaWNzT3ZlcnJpZGVFbmFibGVkKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl9kZXZpY2VNZXRyaWNzT3ZlcnJpZGVFbmFibGVkID0gZW5h YmxlZDsKKyAgICAgICAgdGhpcy5fZGV2aWNlTWV0cmljc0NoYW5nZWQoKTsKKyAgICB9LAorCisg ICAgdG9nZ2xlR2VvbG9jYXRpb25Qb3NpdGlvbk92ZXJyaWRlOiBmdW5jdGlvbihlbmFibGVkKQor ICAgIHsKKyAgICAgICAgaWYgKGVuYWJsZWQgPT09IHRoaXMuX2dlb2xvY2F0aW9uUG9zaXRpb25P dmVycmlkZUVuYWJsZWQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2dlb2xv Y2F0aW9uUG9zaXRpb25PdmVycmlkZUVuYWJsZWQgPSBlbmFibGVkOworICAgICAgICB0aGlzLl9n ZW9sb2NhdGlvblBvc2l0aW9uQ2hhbmdlZCgpOworICAgIH0sCisKKyAgICB0b2dnbGVEZXZpY2VP cmllbnRhdGlvbk92ZXJyaWRlOiBmdW5jdGlvbihlbmFibGVkKQorICAgIHsKKyAgICAgICAgaWYg KGVuYWJsZWQgPT09IHRoaXMuX2RldmljZU9yaWVudGF0aW9uT3ZlcnJpZGVFbmFibGVkKQorICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl9kZXZpY2VPcmllbnRhdGlvbk92ZXJyaWRl RW5hYmxlZCA9IGVuYWJsZWQ7CisgICAgICAgIHRoaXMuX2RldmljZU9yaWVudGF0aW9uQ2hhbmdl ZCgpOworICAgIH0sCisKICAgICBfZGV2aWNlTWV0cmljc0NoYW5nZWQ6IGZ1bmN0aW9uKCkKICAg ICB7Ci0gICAgICAgIHZhciBtZXRyaWNzID0gV2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnQu RGV2aWNlTWV0cmljcy5wYXJzZVNldHRpbmcoV2ViSW5zcGVjdG9yLnNldHRpbmdzLmRldmljZU1l dHJpY3MuZ2V0KCkpOworICAgICAgICB2YXIgbWV0cmljcyA9IFdlYkluc3BlY3Rvci5Vc2VyQWdl bnRTdXBwb3J0LkRldmljZU1ldHJpY3MucGFyc2VTZXR0aW5nKHRoaXMuX2RldmljZU1ldHJpY3NP dmVycmlkZUVuYWJsZWQgPyBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGV2aWNlTWV0cmljcy5nZXQo KSA6ICIiKTsKICAgICAgICAgaWYgKG1ldHJpY3MuaXNWYWxpZCgpKQogICAgICAgICAgICAgUGFn ZUFnZW50LnNldERldmljZU1ldHJpY3NPdmVycmlkZShtZXRyaWNzLndpZHRoLCBtZXRyaWNzLmhl aWdodCwgbWV0cmljcy5mb250U2NhbGVGYWN0b3IsIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZXZp Y2VGaXRXaW5kb3cuZ2V0KCkpOwogICAgIH0sCiAKICAgICBfZ2VvbG9jYXRpb25Qb3NpdGlvbkNo YW5nZWQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fZ2VvbG9jYXRpb25Q b3NpdGlvbk92ZXJyaWRlRW5hYmxlZCkgeworICAgICAgICAgICAgUGFnZUFnZW50LmNsZWFyR2Vv bG9jYXRpb25PdmVycmlkZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAg ICAgIHZhciBnZW9sb2NhdGlvbiA9IFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTdXBwb3J0Lkdlb2xv Y2F0aW9uUG9zaXRpb24ucGFyc2VTZXR0aW5nKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5nZW9sb2Nh dGlvbk92ZXJyaWRlLmdldCgpKTsKICAgICAgICAgaWYgKGdlb2xvY2F0aW9uLmVycm9yKQogICAg ICAgICAgICAgUGFnZUFnZW50LnNldEdlb2xvY2F0aW9uT3ZlcnJpZGUoKTsKQEAgLTMyMSwxMSAr MzUxLDEyIEBAIFdlYkluc3BlY3Rvci5Vc2VyQWdlbnRTdXBwb3J0LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIFBhZ2VBZ2VudC5zZXRHZW9sb2NhdGlvbk92ZXJyaWRlKGdlb2xvY2F0aW9uLmxh dGl0dWRlLCBnZW9sb2NhdGlvbi5sb25naXR1ZGUsIDE1MCk7CiAgICAgfSwKIAotICAgIC8qKgot ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAotICAgICAqLwotICAgIF9k ZXZpY2VPcmllbnRhdGlvbkNoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9kZXZpY2VPcmll bnRhdGlvbkNoYW5nZWQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fZGV2 aWNlT3JpZW50YXRpb25PdmVycmlkZUVuYWJsZWQpIHsKKyAgICAgICAgICAgIFBhZ2VBZ2VudC5j bGVhckRldmljZU9yaWVudGF0aW9uT3ZlcnJpZGUoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQogICAgICAgICB2YXIgZGV2aWNlT3JpZW50YXRpb24gPSBXZWJJbnNwZWN0b3IuVXNl ckFnZW50U3VwcG9ydC5EZXZpY2VPcmllbnRhdGlvbi5wYXJzZVNldHRpbmcoV2ViSW5zcGVjdG9y LnNldHRpbmdzLmRldmljZU9yaWVudGF0aW9uT3ZlcnJpZGUuZ2V0KCkpOwogICAgICAgICBQYWdl QWdlbnQuc2V0RGV2aWNlT3JpZW50YXRpb25PdmVycmlkZShkZXZpY2VPcmllbnRhdGlvbi5hbHBo YSwgZGV2aWNlT3JpZW50YXRpb24uYmV0YSwgZGV2aWNlT3JpZW50YXRpb24uZ2FtbWEpOwogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJu cy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcwppbmRl eCA4Y2Y1M2QyNmM1Zjc1N2VlMWNjZjIwNWQxMTBmZDI1MDliOWQyMmFkLi4yMWQ2MWEwMGEzNTY2 ODNmMDNhOTI3NjIxNmNmYjA1OTkyNTQ1NTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCkBAIC0yNjIsNiArMjYyLDExIEBAIFdlYkluc3BlY3Rv ci5zaG93UGFuZWwgPSBmdW5jdGlvbihwYW5lbCkKICAqLwogV2ViSW5zcGVjdG9yLmluc3BlY3Rl ZFBhZ2VEb21haW47CiAKKy8qKgorICogQHR5cGUge1dlYkluc3BlY3Rvci5Vc2VyQWdlbnRTdXBw b3J0fSAKKyAqLworV2ViSW5zcGVjdG9yLnVzZXJBZ2VudFN1cHBvcnQ7CisKIFdlYkluc3BlY3Rv ci5pc0NvbXBhY3RNb2RlID0gZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfQogCiBXZWJJbnNw ZWN0b3IuU291cmNlSmF2YVNjcmlwdFRva2VuaXplciA9IHt9Cg==