53136 2011-01-25 15:57:14 -0800 Reduce ref-count churn in shadowPseudoId. 2011-01-26 15:26:45 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53122 48698 53190 1 dglazkov dglazkov commit-queue darin oldest_to_newest 339987 0 dglazkov 2011-01-25 15:57:14 -0800 Reduce ref-count churn in shadowPseudoId. 339991 1 80142 dglazkov 2011-01-25 15:59:27 -0800 Created attachment 80142 Patch 340146 2 80142 tkent 2011-01-25 21:57:50 -0800 Comment on attachment 80142 Patch loooks good though the patch isn't applied cleanly. 340251 3 dglazkov 2011-01-26 07:00:50 -0800 (In reply to comment #2) > (From update of attachment 80142 [details]) > loooks good though the patch isn't applied cleanly. Yup. The patch is from the future -- needs the one in bug 48698 landed first :) 340500 4 dglazkov 2011-01-26 14:59:47 -0800 Since the patch in bug 53122 got rolled out, I will land this as a smaller change (without MediaControlElements.cpp parts). 340518 5 dglazkov 2011-01-26 15:26:45 -0800 Committed r76727: <http://trac.webkit.org/changeset/76727> 80142 2011-01-25 15:59:27 -0800 2011-01-26 14:48:35 -0800 Patch bug-53136-20110125155926.patch text/plain 13495 dglazkov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNjI2ZGE5MTA3M2ZmZGRjYmQ1MzYzMDhiOGNjOWQ0Mjk0MjVjMDUzLi4z NGE0NGRlNzU0OTUyM2FmYWFlYWViOTA1MjYzNWRjZjRhMzdiM2U4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0y LDYgKzIsMzYgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAg ICAgICBSZWR1Y2UgcmVmLWNvdW50IGNodXJuIGluIHNoYWRvd1BzZXVkb0lkLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMxMzYKKworICAgICAgICBS ZWZhY3RvcmluZywgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuaDoK KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogQ2hhbmdlZCBzaWdu YXR1cmUgdG8gdXNlIGNvbnN0IEF0b21pY1N0cmluZyYKKyAgICAgICAgKiBodG1sL1ZhbGlkYXRp b25NZXNzYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRXaXRoUHNldWRvSWQ6OnNo YWRvd1BzZXVkb0lkKTogRGl0dG8uCisgICAgICAgICogaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNsaWRlclRodW1iRWxlbWVudDo6c2hhZG93 UHNldWRvSWQpOiBEaXR0bywgcGx1cyBtb3ZlZCBmcm9tIHRoZSBoZWFkZXIgZmlsZS4KKyAgICAg ICAgKiBodG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuaDogRGl0dG8uCisgICAgICAgICog cmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVm9sdW1lU2xpZGVyTXV0ZUJ1dHRvbkVsZW1lbnQ6 OnNoYWRvd1BzZXVkb0lkKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQ bGF5QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhQ29udHJvbFNlZWtGb3J3YXJkQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFNlZWtCYWNrQnV0dG9uRWxl bWVudDo6c2hhZG93UHNldWRvSWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29u dHJvbFJld2luZEJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uRWxlbWVudDo6c2hh ZG93UHNldWRvSWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRvZ2ds ZUNsb3NlZENhcHRpb25zQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6c2hhZG93UHNldWRv SWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckVs ZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xGdWxsc2NyZWVuQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEaXR0by4KKyAg ICAgICAgKiByZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuaDogRGl0dG8uCisKKzIwMTEt MDEtMjUgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBDaGFuZ2UgSFRNTElucHV0 RWxlbWVudC1kZXJpdmVkIHBhcnRzIG9mIG1lZGlhIGVsZW1lbnQgc2hhZG93IERPTSB0byB1c2Ug c2hhZG93UHNldWRvSWQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MzEyMgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCA0NTEwNDc4N2Y2ZDZmNmFjZTM4 MGIzNzQ2MGY1YmIyNzhlYWMwYmM4Li5kZTQyYTVmOTk1MDNkYWQxNjcyODA5YWZkNGJjZWY2YTYy NzdmYmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTIzMiw3ICsyMzIsNyBAQCBwdWJsaWM6CiAK ICAgICBOb2RlKiBzaGFkb3dSb290KCk7CiAgICAgdm9pZCBzZXRTaGFkb3dSb290KFBhc3NSZWZQ dHI8Tm9kZT4pOwotICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIHNoYWRvd1BzZXVkb0lkKCkgY29u c3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29u c3Q7CiAKICAgICBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IE5PUFNFVURP KTsKIApAQCAtNTEwLDkgKzUxMCw5IEBAIGlubGluZSB2b2lkIEVsZW1lbnQ6OnNldElkQXR0cmli dXRlKGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUpCiAgICAgc2V0QXR0cmlidXRlKGRvY3VtZW50 KCktPmlkQXR0cmlidXRlTmFtZSgpLCB2YWx1ZSk7CiB9CiAKLWlubGluZSBBdG9taWNTdHJpbmcg RWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAoraW5saW5lIGNvbnN0IEF0b21pY1N0cmlu ZyYgRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogewotICAgIHJldHVybiBBdG9taWNT dHJpbmcoKTsKKyAgICByZXR1cm4gbnVsbEF0b207CiB9CiAKIH0gLy8gbmFtZXNwYWNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1ZhbGlkYXRpb25NZXNzYWdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuY3BwCmluZGV4IDJjNDQxYzc0NDcwMGY0 OTljZDgyNDE3MDk3NWQ1YzRiZWQ0YmVhYjQuLmY3NzJiOTI0MjhkY2JkZTJiMDg4N2I2YTMyY2Y0 Zjc4MTA4MzYxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVmFsaWRhdGlvbk1l c3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVmFsaWRhdGlvbk1lc3NhZ2UuY3Bw CkBAIC0xMDUsNyArMTA1LDcgQEAgcHJvdGVjdGVkOgogICAgIEVsZW1lbnRXaXRoUHNldWRvSWQo RG9jdW1lbnQqIGRvYywgY29uc3QgQXRvbWljU3RyaW5nJiBwc2V1ZG9OYW1lKQogICAgICAgICA6 IEhUTUxFbGVtZW50KGRpdlRhZywgZG9jKQogICAgICAgICAsIG1fcHNldWRvTmFtZShwc2V1ZG9O YW1lKSB7IH07Ci0gICAgdmlydHVhbCBBdG9taWNTdHJpbmcgc2hhZG93UHNldWRvSWQoKSBjb25z dCB7IHJldHVybiBtX3BzZXVkb05hbWU7IH0KKyAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmlu ZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCB7IHJldHVybiBtX3BzZXVkb05hbWU7IH0KIAogcHJp dmF0ZToKICAgICBBdG9taWNTdHJpbmcgbV9wc2V1ZG9OYW1lOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAKaW5kZXggNzYyZWRkYTQ0OWI1 N2FlNzZmNjEwZWM2NGNiYTdkY2IxNWVlM2FmNy4uODMxNDhkMGM1ZTk2MGFlMTY2ZGU4YTI1MTBi Yjc3NmNkNzgyOGY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xp ZGVyVGh1bWJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9TbGlk ZXJUaHVtYkVsZW1lbnQuY3BwCkBAIC0xODQsNSArMTg0LDExIEBAIHZvaWQgU2xpZGVyVGh1bWJF bGVtZW50OjpkZXRhY2goKQogICAgIEhUTUxEaXZFbGVtZW50OjpkZXRhY2goKTsKIH0KIAorY29u c3QgQXRvbWljU3RyaW5nJiBTbGlkZXJUaHVtYkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29u c3QKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgc2xpZGVyVGh1bWIs ICgiLXdlYmtpdC1zbGlkZXItdGh1bWIiKSk7CisgICAgcmV0dXJuIHNsaWRlclRodW1iOworfQor CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1i RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50 LmgKaW5kZXggMWYxYzg2OWU1MWRlODU4MzBlNTYzMzAwOTU4NDFlNjMwMGQ3MTU5MS4uN2M0YzE3 OWE2MDc3MDg5NTZmM2FiNGZkMmQwMzYzODBmMmUzMmVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50LmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVi bGljOgogICAgIHZvaWQgZHJhZ0Zyb20oY29uc3QgSW50UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZv aWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopOwogICAgIHZpcnR1YWwgdm9pZCBkZXRhY2go KTsKLSAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OworICAg IHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogCiBw cml2YXRlOgogICAgIFNsaWRlclRodW1iRWxlbWVudChEb2N1bWVudCopOwpAQCAtNzcsMTIgKzc3 LDYgQEAgaW5saW5lIFBhc3NSZWZQdHI8U2xpZGVyVGh1bWJFbGVtZW50PiBTbGlkZXJUaHVtYkVs ZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCogZG9jdW0KICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNs aWRlclRodW1iRWxlbWVudChkb2N1bWVudCkpOwogfQogCi1pbmxpbmUgQXRvbWljU3RyaW5nIFNs aWRlclRodW1iRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFRklORV9T VEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBzbGlkZXJUaHVtYiwgKCItd2Via2l0LXNsaWRlci10 aHVtYiIpKTsKLSAgICByZXR1cm4gc2xpZGVyVGh1bWI7Ci19Ci0KIGlubGluZSBTbGlkZXJUaHVt YkVsZW1lbnQqIHRvU2xpZGVyVGh1bWJFbGVtZW50KE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJU KCFub2RlIHx8IG5vZGUtPmlzSFRNTEVsZW1lbnQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAppbmRleCA5NzVjZjJiMThjZDQ5NzYw OTQzNzQ3YzJhODdjMWFmNzM5ZDAzZWU5Li5iYTdhYmQ0NjNhMzA2OWRhMDJhYzNkN2FhZGE0ZGI3 NDZjZGNhNjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTWVkaWFDb250 cm9sRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRy b2xFbGVtZW50cy5jcHAKQEAgLTQ4NCw3ICs0ODQsNyBAQCB2b2lkIE1lZGlhQ29udHJvbE11dGVC dXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICBIVE1M SW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKIH0KIAotQXRvbWljU3Ry aW5nIE1lZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0 Citjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50OjpzaGFk b3dQc2V1ZG9JZCgpIGNvbnN0CiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJp bmcsIG11dGVCdXR0b24sICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbiIpKTsK ICAgICByZXR1cm4gbXV0ZUJ1dHRvbjsKQEAgLTUwNyw3ICs1MDcsNyBAQCBQYXNzUmVmUHRyPE1l ZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVtZW50PiBNZWRpYUNvbnRyb2xWb2x1 bWVTbGlkZXJNdQogICAgIHJldHVybiBidXR0b24ucmVsZWFzZSgpOwogfQogCi1BdG9taWNTdHJp bmcgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyTXV0ZUJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVk b0lkKCkgY29uc3QKK2NvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVy TXV0ZUJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKIHsKICAgICBERUZJTkVf U1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgbXV0ZUJ1dHRvbiwgKCItd2Via2l0LW1lZGlhLWNv bnRyb2xzLXZvbHVtZS1zbGlkZXItbXV0ZS1idXR0b24iKSk7CiAgICAgcmV0dXJuIG11dGVCdXR0 b247CkBAIC01NDEsNyArNTQxLDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVu dDo6dXBkYXRlRGlzcGxheVR5cGUoKQogICAgIHNldERpc3BsYXlUeXBlKG1lZGlhRWxlbWVudCgp LT5jYW5QbGF5KCkgPyBNZWRpYVBsYXlCdXR0b24gOiBNZWRpYVBhdXNlQnV0dG9uKTsKIH0KIAot QXRvbWljU3RyaW5nIE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9J ZCgpIGNvbnN0Citjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVt ZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0CiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChB dG9taWNTdHJpbmcsIHBsYXlCdXR0b24sICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1 dHRvbiIpKTsKICAgICByZXR1cm4gcGxheUJ1dHRvbjsKQEAgLTYxOCw3ICs2MTgsNyBAQCBQYXNz UmVmUHRyPE1lZGlhQ29udHJvbFNlZWtGb3J3YXJkQnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9s U2Vla0ZvcndhcmRCdXR0b25FbAogICAgIHJldHVybiBidXR0b24ucmVsZWFzZSgpOwogfQogCi1B dG9taWNTdHJpbmcgTWVkaWFDb250cm9sU2Vla0ZvcndhcmRCdXR0b25FbGVtZW50OjpzaGFkb3dQ c2V1ZG9JZCgpIGNvbnN0Citjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFNlZWtGb3J3 YXJkQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogewogICAgIERFRklORV9T VEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBzZWVrRm9yd2FyZEJ1dHRvbiwgKCItd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXNlZWstZm9yd2FyZC1idXR0b24iKSk7CiAgICAgcmV0dXJuIHNlZWtGb3J3 YXJkQnV0dG9uOwpAQCAtNjM4LDcgKzYzOCw3IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sU2Vl a0JhY2tCdXR0b25FbGVtZW50PiBNZWRpYUNvbnRyb2xTZWVrQmFja0J1dHRvbkVsZW1lbnQ6CiAg ICAgcmV0dXJuIGJ1dHRvbi5yZWxlYXNlKCk7CiB9CiAKLUF0b21pY1N0cmluZyBNZWRpYUNvbnRy b2xTZWVrQmFja0J1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKK2NvbnN0IEF0 b21pY1N0cmluZyYgTWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1 ZG9JZCgpIGNvbnN0CiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIHNl ZWtCYWNrQnV0dG9uLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbiIp KTsKICAgICByZXR1cm4gc2Vla0JhY2tCdXR0b247CkBAIC02NjcsNyArNjY3LDcgQEAgdm9pZCBN ZWRpYUNvbnRyb2xSZXdpbmRCdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50 KiBldmVudCkKICAgICBIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50 KTsKIH0KIAotQXRvbWljU3RyaW5nIE1lZGlhQ29udHJvbFJld2luZEJ1dHRvbkVsZW1lbnQ6OnNo YWRvd1BzZXVkb0lkKCkgY29uc3QKK2NvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sUmV3 aW5kQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogewogICAgIERFRklORV9T VEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCByZXdpbmRCdXR0b24sICgiLXdlYmtpdC1tZWRpYS1j b250cm9scy1yZXdpbmQtYnV0dG9uIikpOwogICAgIHJldHVybiByZXdpbmRCdXR0b247CkBAIC02 OTYsNyArNjk2LDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uRWxl bWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQKICAgICBIVE1MSW5wdXRFbGVt ZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKIH0KIAotQXRvbWljU3RyaW5nIE1lZGlh Q29udHJvbFJldHVyblRvUmVhbHRpbWVCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNv bnN0Citjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFJldHVyblRvUmVhbHRpbWVCdXR0 b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0CiB7CiAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChBdG9taWNTdHJpbmcsIHJldHVyblRvUmVhbHRpbWVCdXR0b24sICgiLXdlYmtpdC1tZWRp YS1jb250cm9scy1yZXR1cm4tdG8tcmVhbHRpbWUtYnV0dG9uIikpOwogICAgIHJldHVybiByZXR1 cm5Ub1JlYWx0aW1lQnV0dG9uOwpAQCAtNzMxLDcgKzczMSw3IEBAIHZvaWQgTWVkaWFDb250cm9s VG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50Ojp1cGRhdGVEaXNwbGF5VHlwZSgpCiAg ICAgc2V0RGlzcGxheVR5cGUobWVkaWFFbGVtZW50KCktPmNsb3NlZENhcHRpb25zVmlzaWJsZSgp ID8gTWVkaWFIaWRlQ2xvc2VkQ2FwdGlvbnNCdXR0b24gOiBNZWRpYVNob3dDbG9zZWRDYXB0aW9u c0J1dHRvbik7CiB9CiAKLUF0b21pY1N0cmluZyBNZWRpYUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0 aW9uc0J1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKK2NvbnN0IEF0b21pY1N0 cmluZyYgTWVkaWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50OjpzaGFk b3dQc2V1ZG9JZCgpIGNvbnN0CiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJp bmcsIGNsb3NlZENhcHRpb25zQnV0dG9uLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtdG9nZ2xl LWNsb3NlZC1jYXB0aW9ucy1idXR0b24iKSk7CiAgICAgcmV0dXJuIGNsb3NlZENhcHRpb25zQnV0 dG9uOwpAQCAtNzkyLDcgKzc5Miw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50 Ojp1cGRhdGUoYm9vbCB1cGRhdGVEdXJhdGlvbikKICAgICBNZWRpYUNvbnRyb2xJbnB1dEVsZW1l bnQ6OnVwZGF0ZSgpOwogfQogCi1BdG9taWNTdHJpbmcgTWVkaWFDb250cm9sVGltZWxpbmVFbGVt ZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0Citjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29u dHJvbFRpbWVsaW5lRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogewogICAgIERFRklO RV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCB0aW1lbGluZVNsaWRlciwgKCItd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXRpbWVsaW5lIikpOwogICAgIHJldHVybiB0aW1lbGluZVNsaWRlcjsKQEAg LTg0Miw3ICs4NDIsNyBAQCB2b2lkIE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckVsZW1lbnQ6OnVw ZGF0ZSgpCiAgICAgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50Ojp1cGRhdGUoKTsKIH0KIAotQXRv bWljU3RyaW5nIE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lk KCkgY29uc3QKK2NvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxl bWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogewogICAgIERFRklORV9TVEFUSUNfTE9DQUwo QXRvbWljU3RyaW5nLCB2b2x1bWVTbGlkZXIsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1 bWUtc2xpZGVyIikpOwogICAgIHJldHVybiB2b2x1bWVTbGlkZXI7CkBAIC04ODQsNyArODg0LDcg QEAgdm9pZCBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50 SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50 SGFuZGxlcihldmVudCk7CiB9CiAKLUF0b21pY1N0cmluZyBNZWRpYUNvbnRyb2xGdWxsc2NyZWVu QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAorY29uc3QgQXRvbWljU3RyaW5n JiBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBj b25zdAogewogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBmdWxsc2NyZWVu QnV0dG9uLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24iKSk7CiAg ICAgcmV0dXJuIGZ1bGxzY3JlZW5CdXR0b247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCmluZGV4IDgwNjE1MGQ2MzE0MGMwODY4N2EzMjgzZjlk NzJlMzg5ODI5M2M5YjUuLmMzMjUzYzQyZTdlMDE1NzQ3MGUxOTUwNTM2OTQzMmVjNTJmNTk4Y2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50 cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5o CkBAIC0yMDUsNyArMjA1LDcgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVEaXNwbGF5VHlwZSgpOwotICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIHNoYWRv d1BzZXVkb0lkKCkgY29uc3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRv d1BzZXVkb0lkKCkgY29uc3Q7CiB9OwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CkBAIC0yMTcsNyArMjE3LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xW b2x1bWVTbGlkZXJNdXRlQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGVtZW50Kik7CiAKLSAgICB2 aXJ0dWFsIEF0b21pY1N0cmluZyBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OworICAgIHZpcnR1YWwg Y29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogfTsKIAogCkBAIC0y MzMsNyArMjMzLDcgQEAgcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVu dChIVE1MTWVkaWFFbGVtZW50Kik7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRGlzcGxheVR5 cGUoKTsKLSAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0Owor ICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0Owog fTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMjY2LDcgKzI2Niw3IEBA IHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sU2Vla0ZvcndhcmRCdXR0b25FbGVtZW50KEhUTUxN ZWRpYUVsZW1lbnQqKTsKIAogICAgIHZpcnR1YWwgYm9vbCBpc0ZvcndhcmRCdXR0b24oKSBjb25z dCB7IHJldHVybiB0cnVlOyB9Ci0gICAgdmlydHVhbCBBdG9taWNTdHJpbmcgc2hhZG93UHNldWRv SWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRv SWQoKSBjb25zdDsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTI3 OSw3ICsyNzksNyBAQCBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbFNlZWtCYWNrQnV0dG9uRWxl bWVudChIVE1MTWVkaWFFbGVtZW50Kik7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNGb3J3YXJkQnV0 dG9uKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyBz aGFkb3dQc2V1ZG9JZCgpIGNvbnN0OworICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBz aGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogfTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQpAQCAtMjkzLDcgKzI5Myw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgTWVkaWFDb250 cm9sUmV3aW5kQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGVtZW50Kik7CiAKLSAgICB2aXJ0dWFs IEF0b21pY1N0cmluZyBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OworICAgIHZpcnR1YWwgY29uc3Qg QXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0OwogfTsKIAogLy8gLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMzA3LDcgKzMwNyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6 CiAgICAgTWVkaWFDb250cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQoSFRNTE1lZGlh RWxlbWVudCopOwogCi0gICAgdmlydHVhbCBBdG9taWNTdHJpbmcgc2hhZG93UHNldWRvSWQoKSBj b25zdDsKKyAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBj b25zdDsKIH07ICAgIAogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0zMjIs NyArMzIyLDcgQEAgcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0aW9u c0J1dHRvbkVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwogCiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZURpc3BsYXlUeXBlKCk7Ci0gICAgdmlydHVhbCBBdG9taWNTdHJpbmcgc2hhZG93UHNldWRv SWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRv SWQoKSBjb25zdDsKIH07ICAgIAogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBA IC0zMzcsNyArMzM3LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xUaW1l bGluZUVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwogCi0gICAgdmlydHVhbCBBdG9taWNTdHJp bmcgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmlu ZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KQEAgLTM1Miw3ICszNTIsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE1lZGlh Q29udHJvbFZvbHVtZVNsaWRlckVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwogCi0gICAgdmly dHVhbCBBdG9taWNTdHJpbmcgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGNv bnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKIH07CiAKIC8vIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTM2Niw3ICszNjYsNyBAQCBwdWJsaWM6CiBwcml2 YXRlOgogICAgIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50KEhUTUxNZWRpYUVs ZW1lbnQqKTsKIAotICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIHNoYWRvd1BzZXVkb0lkKCkgY29u c3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29u c3Q7CiB9OwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCg==