194915 2019-02-21 13:18:35 -0800 Update some media logging 2019-02-22 07:45:01 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue dino ews-watchlist jer.noble lforschler thiago.lacerda webkit-bug-importer oldest_to_newest 1508633 0 eric.carlson 2019-02-21 13:18:35 -0800 Clean up some media logging. 1508641 1 362639 eric.carlson 2019-02-21 13:30:12 -0800 Created attachment 362639 Patch 1508642 2 ews-watchlist 2019-02-21 13:33:06 -0800 Attachment 362639 did not pass style-queue: ERROR: Source/WebCore/html/MediaElementSession.cpp:988: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1508981 3 362639 commit-queue 2019-02-22 05:52:24 -0800 Comment on attachment 362639 Patch Clearing flags on attachment: 362639 Committed r241945: <https://trac.webkit.org/changeset/241945> 1508982 4 commit-queue 2019-02-22 05:52:25 -0800 All reviewed patches have been landed. Closing bug. 1508991 5 webkit-bug-importer 2019-02-22 07:45:01 -0800 <rdar://problem/48311310> 362639 2019-02-21 13:30:12 -0800 2019-02-22 05:52:24 -0800 Patch bug-194915-20190221163010.patch text/plain 15605 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZkYTUzZmU4ZTA0YWQ3 OWRkMDZjMTE3YzQxMGEwNDBiMmI5N2U3Ni4uNmVjMjI3ZTc5YjE2ZWUwMTQzMGZiZTJlZGQ0MGVl NzhlNmFjYTQ0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE5LTAyLTIxICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBzb21l IG1lZGlhIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NDkxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gZnVuY3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT b3VyY2VCdWZmZXI6OmV2aWN0Q29kZWRGcmFtZXMpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNl QnVmZmVyOjpwcm92aWRlTWVkaWFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZl cjo6dHJ5U2lnbmFsQWxsU2FtcGxlc0luVHJhY2tFbnF1ZXVlZCk6CisKKyAgICAgICAgKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6Y2hlY2tQbGF5YmFja1RhcmdldENvbXBhdGFibGl0eSk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6dXBkYXRlQWN0aXZlVGV4dFRyYWNrQ3Vlcyk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpjYW5UcmFuc2l0aW9uRnJvbUF1dG9wbGF5VG9QbGF5IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNlZWtUYXNrKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBsYXlJbnRlcm5hbCk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwYXVzZUludGVybmFsKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldExvb3ApOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6c2V0Q29udHJvbHMpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxl bWVudDo6c291cmNlV2FzUmVtb3ZlZCk6CisKKyAgICAgICAgKiBodG1sL01lZGlhRWxlbWVudFNl c3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydEVudW1lcmF0aW9uVG9TdHJpbmcp OgorCisgICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmg6CisgICAgICAgIChXVEY6 OkxvZ0FyZ3VtZW50PFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb24+Ojp0b1N0cmlu Zyk6CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3Vy Y2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZl clByaXZhdGVBVkZPYmpDOjplbnF1ZXVlU2FtcGxlKToKKwogMjAxOS0wMi0xOSAgQ29tbWl0IFF1 ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjI0MTcyMi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU291cmNlQnVmZmVyLmNwcAppbmRleCA0ZTgzNTUxODZjNmFjMjE4N2NlZTFmODUxYTc3 NmUwOTU0YjNjMTUwLi5mMzczMjdmZjE5NGFjZTdkMjYyNzgyNjkyYmU5ZmZiNWVhNjllNmQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZm ZXIuY3BwCkBAIC05OTAsNyArOTkwLDcgQEAgdm9pZCBTb3VyY2VCdWZmZXI6OmV2aWN0Q29kZWRG cmFtZXMoc2l6ZV90IG5ld0RhdGFTaXplKQogICAgIHNpemVfdCBjdXJyZW50VGltZVJhbmdlID0g YnVmZmVyZWQuZmluZChjdXJyZW50VGltZSk7CiAgICAgaWYgKGN1cnJlbnRUaW1lUmFuZ2UgPT0g bm90Rm91bmQgfHwgY3VycmVudFRpbWVSYW5nZSA9PSBidWZmZXJlZC5sZW5ndGgoKSAtIDEpIHsK ICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJ RVIsICJldmljdGVkICIsIGluaXRpYWxCdWZmZXJlZFNpemUgLSBleHRyYU1lbW9yeUNvc3QoKSwg IiBieXRlcyBidXQgRkFJTEVEIHRvIGZyZWUgZW5vdWdoIik7CisgICAgICAgIEVSUk9SX0xPRyhM T0dJREVOVElGSUVSLCAiRkFJTEVEIHRvIGZyZWUgZW5vdWdoIGFmdGVyIGV2aWN0aW5nICIsIGlu aXRpYWxCdWZmZXJlZFNpemUgLSBleHRyYU1lbW9yeUNvc3QoKSk7CiAjZW5kaWYKICAgICAgICAg cmV0dXJuOwogICAgIH0KQEAgLTEwMjUsNyArMTAyNSw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjpl dmljdENvZGVkRnJhbWVzKHNpemVfdCBuZXdEYXRhU2l6ZSkKIAogI2lmICFSRUxFQVNFX0xPR19E SVNBQkxFRAogICAgIGlmIChtX2J1ZmZlckZ1bGwpCi0gICAgICAgIEVSUk9SX0xPRyhMT0dJREVO VElGSUVSLCAiZXZpY3RlZCAiLCBpbml0aWFsQnVmZmVyZWRTaXplIC0gZXh0cmFNZW1vcnlDb3N0 KCksICIgYnV0IEZBSUxFRCB0byBmcmVlIGVub3VnaCIpOworICAgICAgICBFUlJPUl9MT0coTE9H SURFTlRJRklFUiwgIkZBSUxFRCB0byBmcmVlIGVub3VnaCBhZnRlciBldmljdGluZyAiLCBpbml0 aWFsQnVmZmVyZWRTaXplIC0gZXh0cmFNZW1vcnlDb3N0KCkpOwogICAgIGVsc2UKICAgICAgICAg REVCVUdfTE9HKExPR0lERU5USUZJRVIsICJldmljdGVkICIsIGluaXRpYWxCdWZmZXJlZFNpemUg LSBleHRyYU1lbW9yeUNvc3QoKSk7CiAjZW5kaWYKQEAgLTIwNDMsNyArMjA0Myw3IEBAIHZvaWQg U291cmNlQnVmZmVyOjpwcm92aWRlTWVkaWFEYXRhKFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZlciwg Y29uc3QgQXRvbWljU3RyaW5nCiAgICAgfQogCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0g ICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJFbnF1ZXVlZCAiLCBlbnF1ZXVlZFNhbXBsZXMs ICIgc2FtcGxlcywgIiwgc3RhdGljX2Nhc3Q8c2l6ZV90Pih0cmFja0J1ZmZlci5kZWNvZGVRdWV1 ZS5zaXplKCkpLCAiIHJlbWFpbmluZyIpOworICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAi ZW5xdWV1ZWQgIiwgZW5xdWV1ZWRTYW1wbGVzLCAiIHNhbXBsZXMsICIsIHN0YXRpY19jYXN0PHNp emVfdD4odHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuc2l6ZSgpKSwgIiByZW1haW5pbmciKTsKICNl bmRpZgogCiAgICAgdHJ5U2lnbmFsQWxsU2FtcGxlc0luVHJhY2tFbnF1ZXVlZCh0cmFja0lEKTsK QEAgLTIwNTIsNyArMjA1Miw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjpwcm92aWRlTWVkaWFEYXRh KFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZlciwgY29uc3QgQXRvbWljU3RyaW5nCiB2b2lkIFNvdXJj ZUJ1ZmZlcjo6dHJ5U2lnbmFsQWxsU2FtcGxlc0luVHJhY2tFbnF1ZXVlZChjb25zdCBBdG9taWNT dHJpbmcmIHRyYWNrSUQpCiB7CiAgICAgaWYgKG1fc291cmNlLT5pc0VuZGVkKCkgJiYgbV90cmFj a0J1ZmZlck1hcC5nZXQodHJhY2tJRCkuZGVjb2RlUXVldWUuZW1wdHkoKSkgewotICAgICAgICBE RUJVR19MT0coTE9HSURFTlRJRklFUiwgIkFsbCBzYW1wbGVzIGluIHRyYWNrICIsIHRyYWNrSUQs ICIgZW5xdWV1ZWQiKTsKKyAgICAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIsICJlbnF1ZXVl ZCBhbGwgc2FtcGxlcyBmcm9tIHRyYWNrICIsIHRyYWNrSUQpOwogICAgICAgICBtX3ByaXZhdGUt PmFsbFNhbXBsZXNJblRyYWNrRW5xdWV1ZWQodHJhY2tJRCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggODhlYWUxODhhMGVhMDMyNTA4YTU3 MDA2NjM2MDFkMDM5N2E5NjBjOS4uYjNlYjdiYmMzMjE3ZjQzNGI1NjcxODM4YjJhM2Q4MDQzMzQy NmFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNy0yMDE4IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNy0yMDE5IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTEw NSw4ICsxMTA1LDExIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2NoZWR1bGVDaGVja1BsYXli YWNrVGFyZ2V0Q29tcGF0YWJpbGl0eSgpCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNoZWNrUGxh eWJhY2tUYXJnZXRDb21wYXRhYmxpdHkoKQogewogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFD S19UQVJHRVQpCisgICAgYXV0byBsb2dTaXRlSWRlbnRpZmllciA9IExPR0lERU5USUZJRVI7Cisg ICAgQUxXQVlTX0xPRyhsb2dTaXRlSWRlbnRpZmllciwgInRhc2sgc2NoZWR1bGVkIik7CiAgICAg aWYgKG1faXNQbGF5aW5nVG9XaXJlbGVzc1RhcmdldCAmJiAhbV9wbGF5ZXItPmNhblBsYXlUb1dp cmVsZXNzUGxheWJhY2tUYXJnZXQoKSkgewotICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVS LCAiY2FsbGluZyBzZXRTaG91bGRQbGF5VG9QbGF5YmFja1RhcmdldChmYWxzZSkiKTsKKyAgICAg ICAgVU5VU0VEX1BBUkFNKGxvZ1NpdGVJZGVudGlmaWVyKTsKKyAgICAgICAgSU5GT19MT0cobG9n U2l0ZUlkZW50aWZpZXIsICJjYWxsaW5nIHNldFNob3VsZFBsYXlUb1BsYXliYWNrVGFyZ2V0KGZh bHNlKSIpOwogICAgICAgICBtX2ZhaWxlZFRvUGxheVRvV2lyZWxlc3NUYXJnZXQgPSB0cnVlOwog ICAgICAgICBtX3BsYXllci0+c2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoZmFsc2UpOwog ICAgIH0KQEAgLTE1MTMsNyArMTUxNiw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bG9hZFJl c291cmNlKGNvbnN0IFVSTCYgaW5pdGlhbFVSTCwgQ29udGVudFR5cGUmIGNvbnRlbnRUCiB7CiAg ICAgQVNTRVJUKGluaXRpYWxVUkwuaXNFbXB0eSgpIHx8IGlzU2FmZVRvTG9hZFVSTChpbml0aWFs VVJMLCBDb21wbGFpbikpOwogCi0gICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgaW5pdGlhbFVS TCwgY29udGVudFR5cGUucmF3KCksIGtleVN5c3RlbSk7CisgICAgSU5GT19MT0coTE9HSURFTlRJ RklFUiwgaW5pdGlhbFVSTCwgY29udGVudFR5cGUsIGtleVN5c3RlbSk7CiAKICAgICBSZWZQdHI8 RnJhbWU+IGZyYW1lID0gZG9jdW1lbnQoKS5mcmFtZSgpOwogICAgIGlmICghZnJhbWUpIHsKQEAg LTE1NjcsNyArMTU3MCw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNv bnN0IFVSTCYgaW5pdGlhbFVSTCwgQ29udGVudFR5cGUmIGNvbnRlbnRUCiAKICAgICBpZiAocmVz b3VyY2UpIHsKICAgICAgICAgdXJsID0gQXBwbGljYXRpb25DYWNoZUhvc3Q6OmNyZWF0ZUZpbGVV UkwocmVzb3VyY2UtPnBhdGgoKSk7Ci0gICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJ3 aWxsIGxvYWQgIiwgdXJsLCAiIGZyb20gYXBwIGNhY2hlIik7CisgICAgICAgIElORk9fTE9HKExP R0lERU5USUZJRVIsICJ3aWxsIGxvYWQgZnJvbSBhcHAgY2FjaGUgIiwgdXJsKTsKICAgICB9CiAK ICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAibV9jdXJyZW50U3JjIGlzICIsIG1fY3VycmVu dFNyYyk7CkBAIC0xNzgzLDcgKzE3ODYsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0 ZUFjdGl2ZVRleHRUcmFja0N1ZXMoY29uc3QgTWVkaWFUaW1lJiBtb3ZpZVRpbWUpCiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBhdXRvIGN1cnJlbnRNZWRpYVRpbWUgPSB3 ZWFrVGhpcy0+Y3VycmVudE1lZGlhVGltZSgpOwotICAgICAgICAgICAgSU5GT19MT0coTE9HSURF TlRJRklFUiwgIiBsYW1iZGEsIGN1cnJlbnRNZWRpYVRpbWU6IiwgY3VycmVudE1lZGlhVGltZSk7 CisgICAgICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiIGxhbWJkYSwgY3VycmVudE1l ZGlhVGltZTogIiwgY3VycmVudE1lZGlhVGltZSk7CiAgICAgICAgICAgICB3ZWFrVGhpcy0+dXBk YXRlQWN0aXZlVGV4dFRyYWNrQ3VlcyhjdXJyZW50TWVkaWFUaW1lKTsKICAgICAgICAgfSwgbmV4 dEludGVyZXN0aW5nVGltZSk7CiAgICAgfQpAQCAtMjQwNSwxNyArMjQwOCw0NCBAQCB2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyUmVhZHlTdGF0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIq KQogCiBTdWNjZXNzT3I8TWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbj4gSFRNTE1lZGlhRWxlbWVu dDo6Y2FuVHJhbnNpdGlvbkZyb21BdXRvcGxheVRvUGxheSgpIGNvbnN0CiB7Ci0gICAgaWYgKGlz QXV0b3BsYXlpbmcoKQotICAgICAgICAmJiBtZWRpYVNlc3Npb24oKS5hdXRvcGxheVBlcm1pdHRl ZCgpCi0gICAgICAgICYmIHBhdXNlZCgpCi0gICAgICAgICYmIGF1dG9wbGF5KCkKLSAgICAgICAg JiYgIXBhdXNlZEZvclVzZXJJbnRlcmFjdGlvbigpCi0gICAgICAgICYmICFkb2N1bWVudCgpLmlz U2FuZGJveGVkKFNhbmRib3hBdXRvbWF0aWNGZWF0dXJlcykKLSAgICAgICAgJiYgbV9yZWFkeVN0 YXRlID09IEhBVkVfRU5PVUdIX0RBVEEpCi0gICAgICAgIHJldHVybiBtZWRpYVNlc3Npb24oKS5w bGF5YmFja1Blcm1pdHRlZCgpOworICAgIGlmIChtX3JlYWR5U3RhdGUgIT0gSEFWRV9FTk9VR0hf REFUQSkgeworICAgICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJtX3JlYWR5U3RhdGUg IT0gSEFWRV9FTk9VR0hfREFUQSIpOworICAgICAgICByZXR1cm4gTWVkaWFQbGF5YmFja0Rlbmlh bFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJlZDsKKyAgICB9CisgICAgaWYgKCFpc0F1dG9wbGF5 aW5nKCkpIHsKKyAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiIWlzQXV0b3BsYXlp bmciKTsKKyAgICAgICAgcmV0dXJuIE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlBhZ2VDb25z ZW50UmVxdWlyZWQ7CisgICAgfQorICAgIGlmICghbWVkaWFTZXNzaW9uKCkuYXV0b3BsYXlQZXJt aXR0ZWQoKSkgeworICAgICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICIhbWVkaWFTZXNz aW9uKCkuYXV0b3BsYXlQZXJtaXR0ZWQiKTsKKyAgICAgICAgcmV0dXJuIE1lZGlhUGxheWJhY2tE ZW5pYWxSZWFzb246OlBhZ2VDb25zZW50UmVxdWlyZWQ7CisgICAgfQorICAgIGlmICghcGF1c2Vk KCkpIHsKKyAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiIXBhdXNlZCIpOworICAg ICAgICByZXR1cm4gTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJl ZDsKKyAgICB9CisgICAgaWYgKCFhdXRvcGxheSgpKSB7CisgICAgICAgIEFMV0FZU19MT0coTE9H SURFTlRJRklFUiwgIiFhdXRvcGxheSIpOworICAgICAgICByZXR1cm4gTWVkaWFQbGF5YmFja0Rl bmlhbFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJlZDsKKyAgICB9CisgICAgaWYgKHBhdXNlZEZv clVzZXJJbnRlcmFjdGlvbigpKSB7CisgICAgICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwg InBhdXNlZEZvclVzZXJJbnRlcmFjdGlvbiIpOworICAgICAgICByZXR1cm4gTWVkaWFQbGF5YmFj a0RlbmlhbFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJlZDsKKyAgICB9CisgICAgaWYgKGRvY3Vt ZW50KCkuaXNTYW5kYm94ZWQoU2FuZGJveEF1dG9tYXRpY0ZlYXR1cmVzKSkgeworICAgICAgICBB TFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJpc1NhbmRib3hlZCIpOworICAgICAgICByZXR1cm4g TWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJlZDsKKyAgICB9CiAK LSAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJwYWdlIGNvbnNlbnQgcmVxdWlyZWQiKTsK LSAgICByZXR1cm4gTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6UGFnZUNvbnNlbnRSZXF1aXJl ZDsKKyAgICBhdXRvIHBlcm1pdHRlZCA9IG1lZGlhU2Vzc2lvbigpLnBsYXliYWNrUGVybWl0dGVk KCk7CisjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgaWYgKCFwZXJtaXR0ZWQpCisgICAg ICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgcGVybWl0dGVkLnZhbHVlKCkpOworICAgIGVs c2UKKyAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiY2FuIHRyYW5zaXRpb24hIik7 CisjZW5kaWYKKyAgICAKKyAgICByZXR1cm4gcGVybWl0dGVkOwogfQogCiB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OmRpc3BhdGNoUGxheVBhdXNlRXZlbnRzSWZOZWVkc1F1aXJrcygpCkBAIC0zMDk1 LDcgKzMxMjUsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNlZWtUYXNrKCkKICNlbmRpZgog CiAgICAgaWYgKG5vU2Vla1JlcXVpcmVkKSB7Ci0gICAgICAgIElORk9fTE9HKExPR0lERU5USUZJ RVIsICJzZWVrIHRvICIsIHRpbWUsICIgaWdub3JlZCIpOworICAgICAgICBJTkZPX0xPRyhMT0dJ REVOVElGSUVSLCAiaWdub3JlZCBzZWVrIHRvICIsIHRpbWUpOwogICAgICAgICBpZiAodGltZSA9 PSBub3cpIHsKICAgICAgICAgICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnNlZWtpbmdF dmVudCk7CiAgICAgICAgICAgICBzY2hlZHVsZVRpbWV1cGRhdGVFdmVudChmYWxzZSk7CkBAIC0z NTMwLDE3ICszNTYwLDE3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGxheUludGVybmFsKCkK ICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOwogCiAgICAgaWYgKGlzU3VzcGVuZGVkKCkp IHsKLSAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAiICByZXR1cm5pbmcgYmVjYXVz ZSBjb250ZXh0IGlzIHN1c3BlbmRlZCIpOworICAgICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJ RVIsICJyZXR1cm5pbmcgYmVjYXVzZSBjb250ZXh0IGlzIHN1c3BlbmRlZCIpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCiAgICAgaWYgKCFkb2N1bWVudCgpLmhhc0Jyb3dzaW5nQ29udGV4dCgp KSB7Ci0gICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICIgIHJldHVybmluZyBiZWNhdXNl IHRoZXJlIGlzIG5vIGJyb3dzaW5nIGNvbnRleHQiKTsKKyAgICAgICAgSU5GT19MT0coTE9HSURF TlRJRklFUiwgInJldHVybmluZyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJyb3dzaW5nIGNvbnRleHQi KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmICghbV9tZWRpYVNlc3Npb24tPmNs aWVudFdpbGxCZWdpblBsYXliYWNrKCkpIHsKLSAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElG SUVSLCAiICByZXR1cm5pbmcgYmVjYXVzZSBvZiBpbnRlcnJ1cHRpb24iKTsKKyAgICAgICAgQUxX QVlTX0xPRyhMT0dJREVOVElGSUVSLCAicmV0dXJuaW5nIGJlY2F1c2Ugb2YgaW50ZXJydXB0aW9u Iik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCkBAIC0zNjI3LDE3ICszNjU3LDE3IEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGF1c2VJbnRlcm5hbCgpCiAgICAgQUxXQVlTX0xPRyhM T0dJREVOVElGSUVSKTsKIAogICAgIGlmIChpc1N1c3BlbmRlZCgpKSB7Ci0gICAgICAgIEFMV0FZ U19MT0coTE9HSURFTlRJRklFUiwgIiAgcmV0dXJuaW5nIGJlY2F1c2UgY29udGV4dCBpcyBzdXNw ZW5kZWQiKTsKKyAgICAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCAicmV0dXJuaW5nIGJl Y2F1c2UgY29udGV4dCBpcyBzdXNwZW5kZWQiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGlmICghZG9jdW1lbnQoKS5oYXNCcm93c2luZ0NvbnRleHQoKSkgewotICAgICAgICBJTkZP X0xPRyhMT0dJREVOVElGSUVSLCAiICByZXR1cm5pbmcgYmVjYXVzZSB0aGVyZSBpcyBubyBicm93 c2luZyBjb250ZXh0Iik7CisgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJyZXR1cm5p bmcgYmVjYXVzZSB0aGVyZSBpcyBubyBicm93c2luZyBjb250ZXh0Iik7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKICAgICBpZiAoIW1fbWVkaWFTZXNzaW9uLT5jbGllbnRXaWxsUGF1c2VQbGF5 YmFjaygpKSB7Ci0gICAgICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgIiAgcmV0dXJuaW5n IGJlY2F1c2Ugb2YgaW50ZXJydXB0aW9uIik7CisgICAgICAgIEFMV0FZU19MT0coTE9HSURFTlRJ RklFUiwgInJldHVybmluZyBiZWNhdXNlIG9mIGludGVycnVwdGlvbiIpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC0zNjg3LDEwICszNzE3LDEwIEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVu dDo6bG9vcCgpIGNvbnN0CiAgICAgcmV0dXJuIGhhc0F0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6 YXRpb24obG9vcEF0dHIpOwogfQogCi12b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldExvb3AoYm9v bCBiKQordm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRMb29wKGJvb2wgbG9vcCkKIHsKLSAgICBJ TkZPX0xPRyhMT0dJREVOVElGSUVSLCBiKTsKLSAgICBzZXRCb29sZWFuQXR0cmlidXRlKGxvb3BB dHRyLCBiKTsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCBsb29wKTsKKyAgICBzZXRCb29s ZWFuQXR0cmlidXRlKGxvb3BBdHRyLCBsb29wKTsKIH0KIAogYm9vbCBIVE1MTWVkaWFFbGVtZW50 Ojpjb250cm9scygpIGNvbnN0CkBAIC0zNzA0LDEwICszNzM0LDEwIEBAIGJvb2wgSFRNTE1lZGlh RWxlbWVudDo6Y29udHJvbHMoKSBjb25zdAogICAgIHJldHVybiBoYXNBdHRyaWJ1dGVXaXRob3V0 U3luY2hyb25pemF0aW9uKGNvbnRyb2xzQXR0cik7CiB9CiAKLXZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6c2V0Q29udHJvbHMoYm9vbCBiKQordm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRDb250cm9s cyhib29sIGNvbnRyb2xzKQogewotICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsIGIpOwotICAg IHNldEJvb2xlYW5BdHRyaWJ1dGUoY29udHJvbHNBdHRyLCBiKTsKKyAgICBJTkZPX0xPRyhMT0dJ REVOVElGSUVSLCBjb250cm9scyk7CisgICAgc2V0Qm9vbGVhbkF0dHJpYnV0ZShjb250cm9sc0F0 dHIsIGNvbnRyb2xzKTsKIH0KIAogZG91YmxlIEhUTUxNZWRpYUVsZW1lbnQ6OnZvbHVtZSgpIGNv bnN0CkBAIC00ODAzLDcgKzQ4MzMsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNvdXJjZVdh c1JlbW92ZWQoSFRNTFNvdXJjZUVsZW1lbnQmIHNvdXJjZSkKICAgICAgICAgLy8gNC44LjggLSBE eW5hbWljYWxseSBtb2RpZnlpbmcgYSBzb3VyY2UgZWxlbWVudCBhbmQgaXRzIGF0dHJpYnV0ZSB3 aGVuIHRoZSBlbGVtZW50IGlzIGFscmVhZHkKICAgICAgICAgLy8gaW5zZXJ0ZWQgaW4gYSB2aWRl byBvciBhdWRpbyBlbGVtZW50IHdpbGwgaGF2ZSBubyBlZmZlY3QuCiAgICAgICAgIG1fY3VycmVu dFNvdXJjZU5vZGUgPSBudWxscHRyOwotICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAi bV9jdXJyZW50U291cmNlTm9kZSBzZXQgdG8gMCIpOworICAgICAgICBJTkZPX0xPRyhMT0dJREVO VElGSUVSLCAibV9jdXJyZW50U291cmNlTm9kZSBjbGVhcmVkIik7CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCA3MWFjOTk1Njg4 MzEwMjc1MmRlZjRkODc3NTAxMjI2NDAyNjQ1YTZmLi4zOTE3NDBlM2E4MGMwOWQ0MzAwMjEwNzM2 ZWU3Yzg2MDkwNDg0MjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxl bWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vz c2lvbi5jcHAKQEAgLTk3Nyw2ICs5NzcsMjIgQEAgYm9vbCBNZWRpYUVsZW1lbnRTZXNzaW9uOjph bGxvd3NQbGF5YmFja0NvbnRyb2xzRm9yQXV0b3BsYXlpbmdBdWRpbygpIGNvbnN0CiAgICAgcmV0 dXJuIHBhZ2UgJiYgcGFnZS0+YWxsb3dzUGxheWJhY2tDb250cm9sc0ZvckF1dG9wbGF5aW5nQXVk aW8oKTsKIH0KIAorU3RyaW5nIGNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nKGNvbnN0IE1lZGlh UGxheWJhY2tEZW5pYWxSZWFzb24gZW51bWVyYXRpb25WYWx1ZSkKK3sKKyAgICBzdGF0aWMgY29u c3QgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiB2YWx1ZXNbXSA9IHsKKyAgICAgICAgTUFLRV9TVEFU SUNfU1RSSU5HX0lNUEwoIlVzZXJHZXN0dXJlUmVxdWlyZWQiKSwKKyAgICAgICAgTUFLRV9TVEFU SUNfU1RSSU5HX0lNUEwoIkZ1bGxzY3JlZW5SZXF1aXJlZCIpLAorICAgICAgICBNQUtFX1NUQVRJ Q19TVFJJTkdfSU1QTCgiUGFnZUNvbnNlbnRSZXF1aXJlZCIpLAorICAgICAgICBNQUtFX1NUQVRJ Q19TVFJJTkdfSU1QTCgiSW52YWxpZFN0YXRlIiksCisgICAgfTsKKyAgICBzdGF0aWNfYXNzZXJ0 KHN0YXRpY19jYXN0PHNpemVfdD4oTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6VXNlckdlc3R1 cmVSZXF1aXJlZCkgPT0gMCwgIk1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlVzZXJHZXN0dXJl UmVxdWlyZWQgaXMgbm90IDAgYXMgZXhwZWN0ZWQiKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0YXRp Y19jYXN0PHNpemVfdD4oTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6RnVsbHNjcmVlblJlcXVp cmVkKSA9PSAxLCAiTWVkaWFQbGF5YmFja0RlbmlhbFJlYXNvbjo6RnVsbHNjcmVlblJlcXVpcmVk IGlzIG5vdCAxIGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxz aXplX3Q+KE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OlBhZ2VDb25zZW50UmVxdWlyZWQpID09 IDIsICJNZWRpYVBsYXliYWNrRGVuaWFsUmVhc29uOjpQYWdlQ29uc2VudFJlcXVpcmVkIGlzIG5v dCAyIGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+ KE1lZGlhUGxheWJhY2tEZW5pYWxSZWFzb246OkludmFsaWRTdGF0ZSkgPT0gMywgIk1lZGlhUGxh eWJhY2tEZW5pYWxSZWFzb246OkludmFsaWRTdGF0ZSBpcyBub3QgMyBhcyBleHBlY3RlZCIpOwor ICAgIEFTU0VSVChzdGF0aWNfY2FzdDxzaXplX3Q+KGVudW1lcmF0aW9uVmFsdWUpIDwgV1RGX0FS UkFZX0xFTkdUSCh2YWx1ZXMpKTsKKyAgICByZXR1cm4gdmFsdWVzW3N0YXRpY19jYXN0PHNpemVf dD4oZW51bWVyYXRpb25WYWx1ZSldOworfQorICAgIAogfQogCiAjZW5kaWYgLy8gRU5BQkxFKFZJ REVPKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9u LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uaAppbmRleCA1OTdi YTI3NzI5YWNjOGYyZTJlNzhjYWY5NjRmNWZjODA4ZTJhMDFlLi5jMWQ3ZDM4MTcwODFkMzM4ZmE3 NGZiYjhjNmY2NjNmNmMwNzE1ZGQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01l ZGlhRWxlbWVudFNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVu dFNlc3Npb24uaApAQCAtMjA2LDggKzIwNiwyNiBAQCBwcml2YXRlOgogI2VuZGlmCiB9OwogCitT dHJpbmcgY29udmVydEVudW1lcmF0aW9uVG9TdHJpbmcoY29uc3QgTWVkaWFQbGF5YmFja0Rlbmlh bFJlYXNvbik7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAorbmFtZXNwYWNlIFdURiB7Cisg ICAgCit0ZW1wbGF0ZTx0eXBlbmFtZSBUeXBlPgorc3RydWN0IExvZ0FyZ3VtZW50OworCit0ZW1w bGF0ZSA8Pgorc3RydWN0IExvZ0FyZ3VtZW50PFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tEZW5pYWxS ZWFzb24+IHsKKyAgICBzdGF0aWMgU3RyaW5nIHRvU3RyaW5nKGNvbnN0IFdlYkNvcmU6Ok1lZGlh UGxheWJhY2tEZW5pYWxSZWFzb24gcmVhc29uKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGNvbnZl cnRFbnVtZXJhdGlvblRvU3RyaW5nKHJlYXNvbik7CisgICAgfQorfTsKKyAgICAKK307IC8vIG5h bWVzcGFjZSBXVEYKKworCiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JFR0lOKFdlYkNvcmU6Ok1l ZGlhRWxlbWVudFNlc3Npb24pCiBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgV2ViQ29yZTo6UGxh dGZvcm1NZWRpYVNlc3Npb24mIHNlc3Npb24pIHsgcmV0dXJuIFdlYkNvcmU6Ok1lZGlhRWxlbWVu dFNlc3Npb246OmlzTWVkaWFFbGVtZW50U2Vzc2lvbk1lZGlhVHlwZShzZXNzaW9uLm1lZGlhVHlw ZSgpKTsgfQogU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVy UHJpdmF0ZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQppbmRleCA5OTJmNDU5 M2U0ZjU4MzljMjAzNGE0NjlkYjc2M2I3ZTIyOWNmNjU0Li5kNjZiNGRiNWJiZjE4MmY3ZjdjNWY3 N2Y5NjI0Y2M2Yjc4MjRkNjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9T b3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQpAQCAtMTExNyw3ICsxMTE3LDcgQEAgdm9pZCBT b3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6ZW5xdWV1ZVNhbXBsZShSZWY8TWVkaWFTYW1wbGU+ JiYgc2FtcGxlLCBjb25zdAogICAgIGlmIChwbGF0Zm9ybVNhbXBsZS50eXBlICE9IFBsYXRmb3Jt U2FtcGxlOjpDTVNhbXBsZUJ1ZmZlclR5cGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIERFQlVH X0xPRyhMT0dJREVOVElGSUVSLCAidHJhY2sgSUQgPSAiLCB0cmFja0lELCAic2FtcGxlID0gIiwg c2FtcGxlLmdldCgpKTsKKyAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgInRyYWNrIElEID0g IiwgdHJhY2tJRCwgIiwgc2FtcGxlID0gIiwgc2FtcGxlLmdldCgpKTsKIAogICAgIGlmICh0cmFj a0lEID09IG1fZW5hYmxlZFZpZGVvVHJhY2tJRCkgewogICAgICAgICBDTUZvcm1hdERlc2NyaXB0 aW9uUmVmIGZvcm1hdERlc2NyaXB0aW9uID0gQ01TYW1wbGVCdWZmZXJHZXRGb3JtYXREZXNjcmlw dGlvbihwbGF0Zm9ybVNhbXBsZS5zYW1wbGUuY21TYW1wbGVCdWZmZXIpOwo=