61689 2011-05-28 11:52:31 -0700 Mouse clicks propagate outside full-screen media controls. 2011-06-03 14:02:15 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble ademar oldest_to_newest 411874 0 jer.noble 2011-05-28 11:52:31 -0700 Mouse clicks propagate outside full-screen media controls. 411879 1 95267 jer.noble 2011-05-28 12:01:33 -0700 Created attachment 95267 Patch 411880 2 95267 mjs 2011-05-28 12:39:04 -0700 Comment on attachment 95267 Patch r=me 411881 3 jer.noble 2011-05-28 12:41:24 -0700 Committed r87622: <http://trac.webkit.org/changeset/87622> 415165 4 ademar 2011-06-03 14:02:15 -0700 Revision r87622 cherry-picked into qtwebkit-2.2 with commit 926adc6 <http://gitorious.org/webkit/qtwebkit/commit/926adc6> 95267 2011-05-28 12:01:33 -0700 2011-05-28 12:39:03 -0700 Patch bug-61689-20110528120132.patch text/plain 18860 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODc2MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNzlkYzcwY2ZhOWZmMDUx M2MwNTliNWQ2MTVlMTVkNjk0ZDBjZDUwLi42NzM4YWE0YjRjNjg4NTRhOGNmNTA2NjA2MDA0OTRj N2JiNThmMzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDUtMjggIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTW91c2UgY2xpY2tzIHByb3BhZ2F0ZSBvdXRzaWRlIGZ1bGwt c2NyZWVuIG1lZGlhIGNvbnRyb2xzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjE2ODkKKworICAgICAgICBNb3VzZSBjbGljayBldmVudHMgYXJlIHBy b3BhZ2F0aW5nIG91dCBvZiB0aGUgbWVkaWEgY29udHJvbHMsIHNvIG1vdXNlIGNsaWNrCisgICAg ICAgIGxpc3RlbmVycyByZWdpc3RlcmVkIG9uIHRoZSB2aWRlbyBlbGVtZW50IGFyZSBnZXR0aW5n IGZpcmVkIHdoZW4gdGhlIHVzZXIKKyAgICAgICAgY2xpY2tzIG9uIG1lZGlhIGNvbnRyb2xsZXIg YnV0dG9ucy4gIEJ5IGRlZmF1bHQsIGJsb2NrIHByb3BhZ2F0aW9uIG9mIGNsaWNrIAorICAgICAg ICBldmVudHMgZnJvbSBNZWRpYUNvbnRyb2xFbGVtZW50cyBieSBvdmVycmlkaW5nIHByZURpc3Bh dGNoRXZlbnRIYW5kbGVyLCBhbmQKKyAgICAgICAgY29udmVydCBhbGwgaW5zdGFuY2VzIG9mIGRl ZmF1bHRFdmVudEhhbmRsZXIgLT4gcHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIuICBDaGFuZ2UKKyAg ICAgICAgYWxsIGNhbGxzIG9mIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpIHRvIGV2ZW50LT5z dG9wUHJvcGFnYXRpb24oKS4KKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVs ZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbEVsZW1lbnQ6OnByZURp c3BhdGNoRXZlbnRIYW5kbGVyKTogQWRkZWQuICBCbG9jayAKKyAgICAgICAgICAgIHByb3BhZ2F0 aW9uIG9mIGFsbCBtb3VzZSBjbGljayBldmVudHMuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxl cik6CisgICAgICAgICAgICBSZW5hbWVkIGZyb20gc2V0RGVmYXVsdEhhbmRsZWQuCisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xNdXRlQnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0Y2hFdmVu dEhhbmRsZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsTXV0 ZUJ1dHRvbkVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0Y2hFdmVu dEhhbmRsZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFNlZWtCdXR0 b25FbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcik6IERpdHRvLgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0Y2hFdmVudEhh bmRsZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJldHVyblRvUmVh bHRpbWVCdXR0b25FbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcik6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVt ZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcik6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6 cHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcik6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1p bkJ1dHRvbkVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxlbWVudDo6 cHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIpOiBEaXR0by4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5oOgorCiAyMDExLTA1LTI4ICBUb25pcyBUaWlnaSAgPHRvbmlz dGlpZ2lAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50 cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5j cHAKaW5kZXggNDVhMTU3NzkwY2U2YTdmZmJiNjViNGU5YWNmNjM2OTcwMjExMDhlZS4uMDEzNmE2 YmRjNGRmMGQyOWVmOGI1ZWY5YTEzMmI5Njk5YzZkZTk4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAtNzUsNiArNzUs MTQgQEAgTWVkaWFDb250cm9sRWxlbWVudDo6TWVkaWFDb250cm9sRWxlbWVudChIVE1MTWVkaWFF bGVtZW50KiBtZWRpYUVsZW1lbnQpCiB7CiB9CiAKK3ZvaWQqIE1lZGlhQ29udHJvbEVsZW1lbnQ6 OnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKK3sKKyAgICBpZiAoZXZlbnQt PnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCkKKyAgICAgICAgZXZlbnQtPnN0b3BQ cm9wYWdhdGlvbigpOworICAgIAorICAgIHJldHVybiAwOworfQorCiBzdGF0aWMgY29uc3QgU3Ry aW5nJiBkaXNwbGF5U3RyaW5nKCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywg cywgKCJkaXNwbGF5IikpOwpAQCAtMTkxLDIwICsxOTksMjEgQEAgUmVuZGVyT2JqZWN0KiBNZWRp YUNvbnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5k ZXJBcmUKICAgICByZXR1cm4gbmV3IChhcmVuYSkgUmVuZGVyTWVkaWFWb2x1bWVTbGlkZXJDb250 YWluZXIodGhpcyk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyQ29udGFpbmVy RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCit2b2lkKiBNZWRpYUNv bnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxl cihFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKCFldmVudC0+aXNNb3VzZUV2ZW50KCkgfHwgZXZl bnQtPnR5cGUoKSAhPSBldmVudE5hbWVzKCkubW91c2VvdXRFdmVudCkKLSAgICAgICAgcmV0dXJu OworICAgICAgICByZXR1cm4gMDsKIAogICAgIC8vIFBvb3IgbWFuJ3MgbW91c2VsZWF2ZSBldmVu dCBkZXRlY3Rpb24uCiAgICAgTW91c2VFdmVudCogbW91c2VFdmVudCA9IHN0YXRpY19jYXN0PE1v dXNlRXZlbnQqPihldmVudCk7CiAgICAgaWYgKCFtb3VzZUV2ZW50LT5yZWxhdGVkVGFyZ2V0KCkg fHwgIW1vdXNlRXZlbnQtPnJlbGF0ZWRUYXJnZXQoKS0+dG9Ob2RlKCkpCi0gICAgICAgIHJldHVy bjsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAodGhpcy0+Y29udGFpbnNJbmNsdWRpbmdT aGFkb3dET00obW91c2VFdmVudC0+cmVsYXRlZFRhcmdldCgpLT50b05vZGUoKSkpCi0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICBoaWRlKCk7CisgICAgcmV0dXJuIDA7 CiB9CiAKIApAQCAtMzIwLDE0ICszMjksMTQgQEAgaW5saW5lIE1lZGlhQ29udHJvbE11dGVCdXR0 b25FbGVtZW50OjpNZWRpYUNvbnRyb2xNdXRlQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGUKIHsK IH0KIAotdm9pZCBNZWRpYUNvbnRyb2xNdXRlQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFu ZGxlcihFdmVudCogZXZlbnQpCit2b2lkKiBNZWRpYUNvbnRyb2xNdXRlQnV0dG9uRWxlbWVudDo6 cHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogewogICAgIGlmIChldmVudC0+ dHlwZSgpID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50KSB7CiAgICAgICAgIG1lZGlhRWxlbWVu dCgpLT5zZXRNdXRlZCghbWVkaWFFbGVtZW50KCktPm11dGVkKCkpOwotICAgICAgICBldmVudC0+ c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgZXZlbnQtPnN0b3BQcm9wYWdhdGlvbigpOwog ICAgIH0KIAotICAgIEhUTUxJbnB1dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQp OworICAgIHJldHVybiAwOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50 OjpjaGFuZ2VkTXV0ZSgpCkBAIC0zNTcsMTIgKzM2NiwxMyBAQCBQYXNzUmVmUHRyPE1lZGlhQ29u dHJvbFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVs ZW1lbgogICAgIHJldHVybiBidXR0b24ucmVsZWFzZSgpOwogfQogCi12b2lkIE1lZGlhQ29udHJv bFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50 KQordm9pZCogTWVkaWFDb250cm9sUGFuZWxNdXRlQnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0Y2hF dmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogewogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCkKICAgICAgICAgbV9jb250cm9scy0+c2hvd1ZvbHVt ZVNsaWRlcigpOwogCiAgICAgTWVkaWFDb250cm9sTXV0ZUJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRF dmVudEhhbmRsZXIoZXZlbnQpOworICAgIHJldHVybiAwOwogfQogCiBjb25zdCBBdG9taWNTdHJp bmcmIE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkg Y29uc3QKQEAgLTQwNSwxNCArNDE1LDE0IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUGxheUJ1 dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVtZW50OjpjcmVhdGUoCiAgICAg cmV0dXJuIGJ1dHRvbi5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sUGxheUJ1dHRv bkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQordm9pZCogTWVkaWFD b250cm9sUGxheUJ1dHRvbkVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50KiBl dmVudCkKIHsKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVu dCkgewogICAgICAgICBtZWRpYUVsZW1lbnQoKS0+dG9nZ2xlUGxheVN0YXRlKCk7CiAgICAgICAg IHVwZGF0ZURpc3BsYXlUeXBlKCk7Ci0gICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgp OworICAgICAgICBldmVudC0+c3RvcFByb3BhZ2F0aW9uKCk7CiAgICAgfQotICAgIEhUTUxJbnB1 dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOworICAgIHJldHVybiAwOwogfQog CiB2b2lkIE1lZGlhQ29udHJvbFBsYXlCdXR0b25FbGVtZW50Ojp1cGRhdGVEaXNwbGF5VHlwZSgp CkBAIC00MzYsNyArNDQ2LDcgQEAgaW5saW5lIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50 OjpNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGUKIHsKIH0KIAotdm9p ZCBNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVu dCogZXZlbnQpCit2b2lkKiBNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0 Y2hFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogewogICAgIGlmIChldmVudC0+dHlwZSgpID09 IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCkgewogICAgICAgICBpZiAoRnJhbWUqIGZyYW1l ID0gZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewpAQCAtNDQ1LDcgKzQ1NSw3IEBAIHZvaWQgTWVkaWFD b250cm9sU2Vla0J1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50 KQogICAgICAgICB9CiAgICAgICAgIG1lZGlhRWxlbWVudCgpLT5wYXVzZShldmVudC0+ZnJvbVVz ZXJHZXN0dXJlKCkpOwogICAgICAgICBtX3NlZWtUaW1lci5zdGFydFJlcGVhdGluZyhjU2Vla1Jl cGVhdERlbGF5KTsKLSAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAgICAg IGV2ZW50LT5zdG9wUHJvcGFnYXRpb24oKTsKICAgICB9IGVsc2UgaWYgKGV2ZW50LT50eXBlKCkg PT0gZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCkgewogICAgICAgICBpZiAobV9jYXB0dXJpbmcp CiAgICAgICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewpA QCAtNDYwLDEwICs0NzAsMTAgQEAgdm9pZCBNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudDo6 ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICBtX3NlZWtUaW1lci5zdG9wKCk7CiAgICAgICAgICAgICBtX3NlZWtpbmcgPSBmYWxzZTsK LSAgICAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOworICAgICAgICAgICAgZXZl bnQtPnN0b3BQcm9wYWdhdGlvbigpOwogICAgICAgICB9CiAgICAgfQotICAgIEhUTUxJbnB1dEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOworICAgIHJldHVybiAwOwogfQogCiB2 b2lkIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50OjpzZWVrVGltZXJGaXJlZChUaW1lcjxN ZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudD4qKQpAQCAtNTM3LDEzICs1NDcsMTMgQEAgUGFz c1JlZlB0cjxNZWRpYUNvbnRyb2xSZXdpbmRCdXR0b25FbGVtZW50PiBNZWRpYUNvbnRyb2xSZXdp bmRCdXR0b25FbGVtZW50OjpjcmUKICAgICByZXR1cm4gYnV0dG9uLnJlbGVhc2UoKTsKIH0KIAot dm9pZCBNZWRpYUNvbnRyb2xSZXdpbmRCdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVy KEV2ZW50KiBldmVudCkKK3ZvaWQqIE1lZGlhQ29udHJvbFJld2luZEJ1dHRvbkVsZW1lbnQ6OnBy ZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICBpZiAoZXZlbnQtPnR5 cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCkgewogICAgICAgICBtZWRpYUVsZW1lbnQo KS0+cmV3aW5kKDMwKTsKLSAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAg ICAgIGV2ZW50LT5zdG9wUHJvcGFnYXRpb24oKTsKICAgICB9ICAgIAotICAgIEhUTUxJbnB1dEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOworICAgIHJldHVybiAwOwogfQogCiBj b25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFJld2luZEJ1dHRvbkVsZW1lbnQ6OnNoYWRv d1BzZXVkb0lkKCkgY29uc3QKQEAgLTU2NywxMyArNTc3LDEzIEBAIFBhc3NSZWZQdHI8TWVkaWFD b250cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFJldHVyblRv UmVhbHRpCiAgICAgcmV0dXJuIGJ1dHRvbi5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgTWVkaWFDb250 cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZl bnQqIGV2ZW50KQordm9pZCogTWVkaWFDb250cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1l bnQ6OnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICBpZiAoZXZl bnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCkgewogICAgICAgICBtZWRpYUVs ZW1lbnQoKS0+cmV0dXJuVG9SZWFsdGltZSgpOwotICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhh bmRsZWQoKTsKKyAgICAgICAgZXZlbnQtPnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0KLSAgICBI VE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKKyAgICByZXR1cm4g MDsKIH0KIAogY29uc3QgQXRvbWljU3RyaW5nJiBNZWRpYUNvbnRyb2xSZXR1cm5Ub1JlYWx0aW1l QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdApAQCAtNTk3LDE2ICs2MDcsMTYg QEAgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1l bnQ+IE1lZGlhQ29udHJvbFRvZ2dsZUNsb3MKICAgICByZXR1cm4gYnV0dG9uLnJlbGVhc2UoKTsK IH0KIAotdm9pZCBNZWRpYUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQordm9pZCogTWVkaWFDb250cm9sVG9n Z2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcihF dmVudCogZXZlbnQpCiB7CiAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmNs aWNrRXZlbnQpIHsKICAgICAgICAgbWVkaWFFbGVtZW50KCktPnNldENsb3NlZENhcHRpb25zVmlz aWJsZSghbWVkaWFFbGVtZW50KCktPmNsb3NlZENhcHRpb25zVmlzaWJsZSgpKTsKICAgICAgICAg c2V0Q2hlY2tlZChtZWRpYUVsZW1lbnQoKS0+Y2xvc2VkQ2FwdGlvbnNWaXNpYmxlKCkpOwogICAg ICAgICB1cGRhdGVEaXNwbGF5VHlwZSgpOwotICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRs ZWQoKTsKKyAgICAgICAgZXZlbnQtPnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0KIAotICAgIEhU TUxJbnB1dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOworICAgIHJldHVybiAw OwogfQogCiB2b2lkIE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25zQnV0dG9uRWxlbWVu dDo6dXBkYXRlRGlzcGxheVR5cGUoKQpAQCAtNjM4LDE0ICs2NDgsMTQgQEAgUGFzc1JlZlB0cjxN ZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ+IE1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6 Y3JlYXRlKEhUTUwKICAgICByZXR1cm4gdGltZWxpbmUucmVsZWFzZSgpOwogfQogCi12b2lkIE1l ZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZl bnQpCit2b2lkKiBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRI YW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICAvLyBMZWZ0IGJ1dHRvbiBpcyAwLiBSZWplY3Rz IG1vdXNlIGV2ZW50cyBub3QgZnJvbSBsZWZ0IGJ1dHRvbi4KICAgICBpZiAoZXZlbnQtPmlzTW91 c2VFdmVudCgpICYmIHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCktPmJ1dHRvbigpKQot ICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiAwOwogCiAgICAgaWYgKCFhdHRhY2hlZCgp KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiAwOwogCiAgICAgaWYgKGV2ZW50LT50 eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50KQogICAgICAgICBtZWRpYUVsZW1l bnQoKS0+YmVnaW5TY3J1YmJpbmcoKTsKQEAgLTY1Myw3ICs2NjMsNyBAQCB2b2lkIE1lZGlhQ29u dHJvbFRpbWVsaW5lRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAg ICAgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsK IAogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCB8 fCBldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW91dEV2ZW50IHx8IGV2ZW50LT50 eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50KQotICAgICAgICByZXR1cm47Cisg ICAgICAgIHJldHVybiAwOwogCiAgICAgZmxvYXQgdGltZSA9IG5hcnJvd1ByZWNpc2lvblRvRmxv YXQodmFsdWUoKS50b0RvdWJsZSgpKTsKICAgICBpZiAodGltZSAhPSBtZWRpYUVsZW1lbnQoKS0+ Y3VycmVudFRpbWUoKSkgewpAQCAtNjY4LDYgKzY3OCw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGlt ZWxpbmVFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKIAogICAgIGlm IChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQpCiAgICAgICAgIG1l ZGlhRWxlbWVudCgpLT5lbmRTY3J1YmJpbmcoKTsKKyAgICByZXR1cm4gMDsKIH0KIAogdm9pZCBN ZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ6OnNldFBvc2l0aW9uKGZsb2F0IGN1cnJlbnRUaW1l KSAKQEAgLTcwNCwxOSArNzE1LDE5IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sVm9sdW1lU2xp ZGVyRWxlbWVudD4gTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6Y3JlCiAgICAgcmV0 dXJuIHNsaWRlci5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVy RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCit2b2lkKiBNZWRpYUNv bnRyb2xWb2x1bWVTbGlkZXJFbGVtZW50OjpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcihFdmVudCog ZXZlbnQpCiB7CiAgICAgLy8gTGVmdCBidXR0b24gaXMgMC4gUmVqZWN0cyBtb3VzZSBldmVudHMg bm90IGZyb20gbGVmdCBidXR0b24uCiAgICAgaWYgKGV2ZW50LT5pc01vdXNlRXZlbnQoKSAmJiBz dGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5idXR0b24oKSkKLSAgICAgICAgcmV0dXJu OworICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmICghYXR0YWNoZWQoKSkKLSAgICAgICAgcmV0 dXJuOworICAgICAgICByZXR1cm4gMDsKIAogICAgIE1lZGlhQ29udHJvbElucHV0RWxlbWVudDo6 ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBl dmVudE5hbWVzKCkubW91c2VvdmVyRXZlbnQgfHwgZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVz KCkubW91c2VvdXRFdmVudCB8fCBldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW1v dmVFdmVudCkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gMDsKIAogICAgIGZsb2F0 IHZvbHVtZSA9IG5hcnJvd1ByZWNpc2lvblRvRmxvYXQodmFsdWUoKS50b0RvdWJsZSgpKTsKICAg ICBpZiAodm9sdW1lICE9IG1lZGlhRWxlbWVudCgpLT52b2x1bWUoKSkgewpAQCAtNzI0LDYgKzcz NSw3IEBAIHZvaWQgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6ZGVmYXVsdEV2ZW50 SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgIG1lZGlhRWxlbWVudCgpLT5zZXRWb2x1bWUo dm9sdW1lLCBlYyk7CiAgICAgICAgIEFTU0VSVCghZWMpOwogICAgIH0KKyAgICByZXR1cm4gMDsK IH0KIAogdm9pZCBNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJFbGVtZW50OjpzZXRWb2x1bWUoZmxv YXQgdm9sdW1lKQpAQCAtNzc5LDcgKzc5MSw3IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sRnVs bHNjcmVlbkJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtCiAg ICAgcmV0dXJuIGJ1dHRvbi5yZWxlYXNlKCk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sRnVsbHNj cmVlbkJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQordm9p ZCogTWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRI YW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5h bWVzKCkuY2xpY2tFdmVudCkgewogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKQEAgLTc5OSw5 ICs4MTEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50OjpkZWZh dWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAgICAgfSBlbHNlCiAjZW5kaWYKICAg ICAgICAgICAgIG1lZGlhRWxlbWVudCgpLT5lbnRlckZ1bGxzY3JlZW4oKTsKLSAgICAgICAgZXZl bnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CisgICAgICAgIGV2ZW50LT5zdG9wUHJvcGFnYXRpb24o KTsKICAgICB9Ci0gICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVu dCk7CisgICAgcmV0dXJuIDA7CiB9CiAKIGNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9s RnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKQEAgLTgyNCwx NCArODM2LDE0IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1 dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5WCiAgICAgcmV0dXJuIGJ1dHRvbi5y ZWxlYXNlKCk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1dHRv bkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQordm9pZCogTWVkaWFD b250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1dHRvbkVsZW1lbnQ6OnByZURpc3BhdGNoRXZlbnRI YW5kbGVyKEV2ZW50KiBldmVudCkKIHsKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5h bWVzKCkuY2xpY2tFdmVudCkgewogICAgICAgICBFeGNlcHRpb25Db2RlIGNvZGUgPSAwOwogICAg ICAgICBtZWRpYUVsZW1lbnQoKS0+c2V0Vm9sdW1lKDAsIGNvZGUpOwotICAgICAgICBldmVudC0+ c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgZXZlbnQtPnN0b3BQcm9wYWdhdGlvbigpOwog ICAgIH0KLSAgICBIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsK KyAgICByZXR1cm4gMDsKIH0KIAogY29uc3QgQXRvbWljU3RyaW5nJiBNZWRpYUNvbnRyb2xGdWxs c2NyZWVuVm9sdW1lTWluQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdApAQCAt ODU0LDE0ICs4NjYsMTQgQEAgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1l TWF4QnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9sRnVsbHNjcmVlblYKICAgICByZXR1cm4gYnV0 dG9uLnJlbGVhc2UoKTsKIH0KIAotdm9pZCBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4 QnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCit2b2lkKiBN ZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxlbWVudDo6cHJlRGlzcGF0Y2hF dmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogewogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5jbGlja0V2ZW50KSB7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgY29kZSA9IDA7 CiAgICAgICAgIG1lZGlhRWxlbWVudCgpLT5zZXRWb2x1bWUoMSwgY29kZSk7Ci0gICAgICAgIGV2 ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOworICAgICAgICBldmVudC0+c3RvcFByb3BhZ2F0aW9u KCk7CiAgICAgfQotICAgIEhUTUxJbnB1dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZl bnQpOworICAgIHJldHVybiAwOwogfQogCiBjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJv bEZ1bGxzY3JlZW5Wb2x1bWVNYXhCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVt ZW50cy5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMu aAppbmRleCBkYjMxNThiMjk0YmFhOTc0OTEwZjE3YjAxOGU4ZTI5Y2FjOTM1Mjk2Li5mNzViNDQ4 MzVhMjVmOWYzY2RmOTQ4NGY1Zjk1MzliNzcwNDVmZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKQEAgLTg3LDYgKzg3LDcgQEAg cHJvdGVjdGVkOgogICAgIE1lZGlhQ29udHJvbEVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwog CiBwcml2YXRlOgorICAgIHZpcnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZl bnQqKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNNZWRpYUNvbnRyb2xFbGVtZW50KCkgY29uc3QgeyBy ZXR1cm4gdHJ1ZTsgfQogCiAgICAgSFRNTE1lZGlhRWxlbWVudCogbV9tZWRpYUVsZW1lbnQ7ICAg CkBAIC0xMjYsNyArMTI3LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xW b2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50KEhUTUxNZWRpYUVsZW1lbnQqKTsKICAgICB2aXJ0 dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqLCBSZW5kZXJTdHls ZSopOwotICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50Kik7CisgICAg dmlydHVhbCB2b2lkICpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcihFdmVudCopOwogICAgIHZpcnR1 YWwgTWVkaWFDb250cm9sRWxlbWVudFR5cGUgZGlzcGxheVR5cGUoKSBjb25zdDsKICAgICB2aXJ0 dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKIH07CkBAIC0x ODIsNyArMTgzLDcgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgTWVkaWFDb250cm9sTXV0 ZUJ1dHRvbkVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCosIE1lZGlhQ29udHJvbEVsZW1lbnRUeXBl KTsKLSAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopOworICAgIHZp cnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZlbnQqKTsKIAogCiBwcml2YXRl OgpAQCAtMTk4LDcgKzE5OSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9s UGFuZWxNdXRlQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGVtZW50KiwgTWVkaWFDb250cm9scyop OwogCi0gICAgdmlydHVhbCB2b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKyAgICB2 aXJ0dWFsIHZvaWQgKnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50Kik7CiAgICAgdmlydHVh bCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Q7CiAKICAgICBNZWRp YUNvbnRyb2xzKiBtX2NvbnRyb2xzOwpAQCAtMjIzLDcgKzIyNCw3IEBAIGNsYXNzIE1lZGlhQ29u dHJvbFBsYXlCdXR0b25FbGVtZW50IDogcHVibGljIE1lZGlhQ29udHJvbElucHV0RWxlbWVudCB7 CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUGxheUJ1dHRvbkVs ZW1lbnQ+IGNyZWF0ZShIVE1MTWVkaWFFbGVtZW50Kik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGVm YXVsdEV2ZW50SGFuZGxlcihFdmVudCopOworICAgIHZpcnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hF dmVudEhhbmRsZXIoRXZlbnQqKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRGlzcGxheVR5cGUo KTsKIAogcHJpdmF0ZToKQEAgLTIzNiw3ICsyMzcsNyBAQCBwcml2YXRlOgogCiBjbGFzcyBNZWRp YUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudCA6IHB1YmxpYyBNZWRpYUNvbnRyb2xJbnB1dEVsZW1l bnQgewogcHVibGljOgotICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50 Kik7CisgICAgdmlydHVhbCB2b2lkICpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcihFdmVudCopOwog CiBwcm90ZWN0ZWQ6CiAgICAgTWVkaWFDb250cm9sU2Vla0J1dHRvbkVsZW1lbnQoSFRNTE1lZGlh RWxlbWVudCosIE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlKTsKQEAgLTI4NCw3ICsyODUsNyBAQCBj bGFzcyBNZWRpYUNvbnRyb2xSZXdpbmRCdXR0b25FbGVtZW50IDogcHVibGljIE1lZGlhQ29udHJv bElucHV0RWxlbWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFDb250 cm9sUmV3aW5kQnV0dG9uRWxlbWVudD4gY3JlYXRlKEhUTUxNZWRpYUVsZW1lbnQqKTsKIAotICAg IHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50Kik7CisgICAgdmlydHVhbCB2 b2lkICpwcmVEaXNwYXRjaEV2ZW50SGFuZGxlcihFdmVudCopOwogCiBwcml2YXRlOgogICAgIE1l ZGlhQ29udHJvbFJld2luZEJ1dHRvbkVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwpAQCAtMjk4 LDcgKzI5OSw3IEBAIGNsYXNzIE1lZGlhQ29udHJvbFJldHVyblRvUmVhbHRpbWVCdXR0b25FbGVt ZW50IDogcHVibGljIE1lZGlhQ29udHJvbElucHV0RWxlbWVuCiBwdWJsaWM6CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ+IGNy ZWF0ZShIVE1MTWVkaWFFbGVtZW50Kik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50 SGFuZGxlcihFdmVudCopOworICAgIHZpcnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hFdmVudEhhbmRs ZXIoRXZlbnQqKTsKIAogcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xSZXR1cm5Ub1JlYWx0aW1l QnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGVtZW50Kik7CkBAIC0zMTIsNyArMzEzLDcgQEAgY2xh c3MgTWVkaWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50IDogcHVibGlj IE1lZGlhQ29udHJvbElucHV0RWwKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRp YUNvbnRyb2xUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQ+IGNyZWF0ZShIVE1MTWVk aWFFbGVtZW50Kik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVu dCopOworICAgIHZpcnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZlbnQqKTsK ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRGlzcGxheVR5cGUoKTsKIAogcHJpdmF0ZToKQEAgLTMy Nyw3ICszMjgsNyBAQCBjbGFzcyBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQgOiBwdWJsaWMg TWVkaWFDb250cm9sSW5wdXRFbGVtZW50IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ+IGNyZWF0ZShIVE1MTWVkaWFFbGVtZW50Kiwg TWVkaWFDb250cm9scyopOwogCi0gICAgdmlydHVhbCB2b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIo RXZlbnQqKTsKKyAgICB2aXJ0dWFsIHZvaWQgKnByZURpc3BhdGNoRXZlbnRIYW5kbGVyKEV2ZW50 Kik7CiAgICAgdm9pZCBzZXRQb3NpdGlvbihmbG9hdCk7CiAgICAgdm9pZCBzZXREdXJhdGlvbihm bG9hdCk7CiAKQEAgLTM0NSw3ICszNDYsNyBAQCBjbGFzcyBNZWRpYUNvbnRyb2xWb2x1bWVTbGlk ZXJFbGVtZW50IDogcHVibGljIE1lZGlhQ29udHJvbElucHV0RWxlbWVudCB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudD4gY3Jl YXRlKEhUTUxNZWRpYUVsZW1lbnQqKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRI YW5kbGVyKEV2ZW50Kik7CisgICAgdmlydHVhbCB2b2lkICpwcmVEaXNwYXRjaEV2ZW50SGFuZGxl cihFdmVudCopOwogICAgIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KTsKIAogcHJvdGVjdGVkOgpAQCAt MzYxLDcgKzM2Miw3IEBAIGNsYXNzIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50 IDogcHVibGljIE1lZGlhQ29udHJvbElucHV0RWxlbWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGlj IFBhc3NSZWZQdHI8TWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ+IGNyZWF0ZShI VE1MTWVkaWFFbGVtZW50KiwgTWVkaWFDb250cm9scyopOwogCi0gICAgdmlydHVhbCB2b2lkIGRl ZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKTsKKyAgICB2aXJ0dWFsIHZvaWQgKnByZURpc3BhdGNo RXZlbnRIYW5kbGVyKEV2ZW50Kik7CiAKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sRnVsbHNj cmVlbkJ1dHRvbkVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCosIE1lZGlhQ29udHJvbHMqKTsKQEAg LTM4OSw3ICszOTAsNyBAQCBjbGFzcyBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWluQnV0 dG9uRWxlbWVudCA6IHB1YmxpYyBNZWRpYUNvbnRyb2xJbnB1dEVsZQogcHVibGljOgogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNaW5CdXR0b25FbGVt ZW50PiBjcmVhdGUoSFRNTE1lZGlhRWxlbWVudCopOwogICAgIAotICAgIHZpcnR1YWwgdm9pZCBk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50Kik7CisgICAgdmlydHVhbCB2b2lkICpwcmVEaXNwYXRj aEV2ZW50SGFuZGxlcihFdmVudCopOwogICAgIAogcHJpdmF0ZToKICAgICBNZWRpYUNvbnRyb2xG dWxsc2NyZWVuVm9sdW1lTWluQnV0dG9uRWxlbWVudChIVE1MTWVkaWFFbGVtZW50Kik7CkBAIC00 MDMsNyArNDA0LDcgQEAgY2xhc3MgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1heEJ1dHRv bkVsZW1lbnQgOiBwdWJsaWMgTWVkaWFDb250cm9sSW5wdXRFbGUKIHB1YmxpYzoKICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxlbWVu dD4gY3JlYXRlKEhUTUxNZWRpYUVsZW1lbnQqKTsKICAgICAKLSAgICB2aXJ0dWFsIHZvaWQgZGVm YXVsdEV2ZW50SGFuZGxlcihFdmVudCopOworICAgIHZpcnR1YWwgdm9pZCAqcHJlRGlzcGF0Y2hF dmVudEhhbmRsZXIoRXZlbnQqKTsKICAgICAKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sRnVs bHNjcmVlblZvbHVtZU1heEJ1dHRvbkVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCopOwo=