207628 2020-02-12 06:08:46 -0800 [GStreamer][EME] Fix build with ENCRYPTED_MEDIA=OFF 2020-02-12 07:49:14 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206730 P2 Normal --- 1 cturner cturner bugs-noreply calvaris cgarcia commit-queue eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez oldest_to_newest 1617947 0 cturner 2020-02-12 06:08:46 -0800 [GStreamer][EME] Fix build with ENCRYPTED_MEDIA=OFF 1617948 1 390509 cturner 2020-02-12 06:10:53 -0800 Created attachment 390509 Patch Fixes build issues on bots without a defined ENCRYPTED_MEDIA 1618001 2 commit-queue 2020-02-12 07:48:38 -0800 The commit-queue encountered the following flaky tests while processing attachment 390509: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1618002 3 390509 commit-queue 2020-02-12 07:49:12 -0800 Comment on attachment 390509 Patch Clearing flags on attachment: 390509 Committed r256436: <https://trac.webkit.org/changeset/256436> 1618003 4 commit-queue 2020-02-12 07:49:14 -0800 All reviewed patches have been landed. Closing bug. 390509 2020-02-12 06:10:53 -0800 2020-02-12 07:49:12 -0800 Patch bug-207628-20200212141052.patch text/plain 4787 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc4YWM1NzEyYzE2MDVk MzdlNjk0N2UyNzNjNzIyODZjMzdjN2FhNi4uYTNhMjQ1MjkxMWUxZjIxZTE1NTFhZmZmMWE2NWVh MmNjZGNmMjJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAyLTEyICBDaGFy bGVzIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtF TUVdIEZpeCBidWlsZCB3aXRoIEVOQ1JZUFRFRF9NRURJQT1PRkYKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzYyOAorCisgICAgICAgIFVucmV2aWV3 ZWQgYnVpbGQgZml4LgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6cGFyc2VJbml0RGF0YUZyb21Qcm90ZWN0aW9uTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OndhaXRGb3JDRE1BdHRhY2htZW50KToKKwog MjAyMC0wMi0xMiAgQ2hhcmxpZSBUdXJuZXIgIDxjdHVybmVyQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0VNRV1bR1N0cmVhbWVyXSBJbnRyb2R1Y2UgQ0RNUHJveHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggOTg5ZjFmMjE2Y2RiNzUyMTRk Mjc5ODQxOGFjMWE2NDk3ZmY1MzYzOC4uNTUzZDhlZTNlYjQ1NTY5OTEyM2JiYWJkNTlkZjNhMjRl MDM5ZThiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKQEAgLTE3ODksNTAgKzE3ODksNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6c2V0UGlwZWxpbmUoR3N0RWxlbWVudCogcGlwZWxpbmUpCiAgICAgfSwgdGhpcywgbnVs bHB0cik7CiB9CiAKLUluaXREYXRhIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGFyc2VJ bml0RGF0YUZyb21Qcm90ZWN0aW9uTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQotewotICAg IEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwotCi0gICAgSW5pdERhdGEgaW5pdERhdGE7Ci0gICAg ewotICAgICAgICBMb2NrSG9sZGVyIGxvY2sobV9wcm90ZWN0aW9uTXV0ZXgpOwotICAgICAgICBQ cm90ZWN0aW9uU3lzdGVtRXZlbnRzIHByb3RlY3Rpb25TeXN0ZW1FdmVudHMobWVzc2FnZSk7Ci0g ICAgICAgIEdTVF9UUkFDRV9PQkpFQ1QocGlwZWxpbmUoKSwgImZvdW5kICV6dSBwcm90ZWN0aW9u IGV2ZW50cywgJXp1IGRlY3J5cHRvcnMgYXZhaWxhYmxlIiwgcHJvdGVjdGlvblN5c3RlbUV2ZW50 cy5ldmVudHMoKS5zaXplKCksIHByb3RlY3Rpb25TeXN0ZW1FdmVudHMuYXZhaWxhYmxlU3lzdGVt cygpLnNpemUoKSk7Ci0KLSAgICAgICAgZm9yIChhdXRvJiBldmVudCA6IHByb3RlY3Rpb25TeXN0 ZW1FdmVudHMuZXZlbnRzKCkpIHsKLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIGV2ZW50S2V5U3lz dGVtSWQgPSBudWxscHRyOwotICAgICAgICAgICAgR3N0QnVmZmVyKiBkYXRhID0gbnVsbHB0cjsK LSAgICAgICAgICAgIGdzdF9ldmVudF9wYXJzZV9wcm90ZWN0aW9uKGV2ZW50LmdldCgpLCAmZXZl bnRLZXlTeXN0ZW1JZCwgJmRhdGEsIG51bGxwdHIpOwotCi0gICAgICAgICAgICBpbml0RGF0YS5h cHBlbmQoe2V2ZW50S2V5U3lzdGVtSWQsIGRhdGF9KTsKLSAgICAgICAgICAgIG1faGFuZGxlZFBy b3RlY3Rpb25FdmVudHMuYWRkKEdTVF9FVkVOVF9TRVFOVU0oZXZlbnQuZ2V0KCkpKTsKLSAgICAg ICAgfQotICAgIH0KLQotICAgIHJldHVybiBpbml0RGF0YTsKLX0KLQotYm9vbCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OndhaXRGb3JDRE1BdHRhY2htZW50KCkKLXsKLSAgICBpZiAoaXNN YWluVGhyZWFkKCkpIHsKLSAgICAgICAgR1NUX0VSUk9SX09CSkVDVChwaXBlbGluZSgpLCAiY2Fu J3QgYmxvY2sgdGhlIG1haW4gdGhyZWFkIHdhaXRpbmcgZm9yIGEgQ0RNIGluc3RhbmNlIik7Ci0g ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fQotCi0gICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJ3YWl0aW5nIGZvciBhIENETSBp bnN0YW5jZSIpOwotCi0gICAgYm9vbCBkaWRDRE1BdHRhY2ggPSBmYWxzZTsKLSAgICB7Ci0gICAg ICAgIGF1dG8gY2RtQXR0YWNobWVudExvY2tlciA9IGhvbGRMb2NrKG1fY2RtQXR0YWNobWVudE11 dGV4KTsKLSAgICAgICAgZGlkQ0RNQXR0YWNoID0gbV9jZG1BdHRhY2htZW50Q29uZGl0aW9uLndh aXRGb3IobV9jZG1BdHRhY2htZW50TXV0ZXgsIDRfcywgW3RoaXNdKCkgewotICAgICAgICAgICAg cmV0dXJuIGlzQ0RNQXR0YWNoZWQoKTsKLSAgICAgICAgfSk7Ci0gICAgfQotCi0gICAgcmV0dXJu IGRpZENETUF0dGFjaDsKLX0KLQogYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Omhh bmRsZVN5bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiB7CiAgICAgaWYgKEdTVF9NRVNT QUdFX1RZUEUobWVzc2FnZSkgPT0gR1NUX01FU1NBR0VfU1RSRUFNX0NPTExFQ1RJT04gJiYgIW1f aXNMZWdhY3lQbGF5YmluKSB7CkBAIC0zNzAyLDYgKzM2NTgsNTAgQEAgT3B0aW9uYWw8VmlkZW9Q bGF5YmFja1F1YWxpdHlNZXRyaWNzPiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVv UGxheWJhY2sKIH0KIAogI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEpCitJbml0RGF0YSBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBhcnNlSW5pdERhdGFGcm9tUHJvdGVjdGlvbk1lc3Nh Z2UoR3N0TWVzc2FnZSogbWVzc2FnZSkKK3sKKyAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsK KworICAgIEluaXREYXRhIGluaXREYXRhOworICAgIHsKKyAgICAgICAgTG9ja0hvbGRlciBsb2Nr KG1fcHJvdGVjdGlvbk11dGV4KTsKKyAgICAgICAgUHJvdGVjdGlvblN5c3RlbUV2ZW50cyBwcm90 ZWN0aW9uU3lzdGVtRXZlbnRzKG1lc3NhZ2UpOworICAgICAgICBHU1RfVFJBQ0VfT0JKRUNUKHBp cGVsaW5lKCksICJmb3VuZCAlenUgcHJvdGVjdGlvbiBldmVudHMsICV6dSBkZWNyeXB0b3JzIGF2 YWlsYWJsZSIsIHByb3RlY3Rpb25TeXN0ZW1FdmVudHMuZXZlbnRzKCkuc2l6ZSgpLCBwcm90ZWN0 aW9uU3lzdGVtRXZlbnRzLmF2YWlsYWJsZVN5c3RlbXMoKS5zaXplKCkpOworCisgICAgICAgIGZv ciAoYXV0byYgZXZlbnQgOiBwcm90ZWN0aW9uU3lzdGVtRXZlbnRzLmV2ZW50cygpKSB7CisgICAg ICAgICAgICBjb25zdCBjaGFyKiBldmVudEtleVN5c3RlbUlkID0gbnVsbHB0cjsKKyAgICAgICAg ICAgIEdzdEJ1ZmZlciogZGF0YSA9IG51bGxwdHI7CisgICAgICAgICAgICBnc3RfZXZlbnRfcGFy c2VfcHJvdGVjdGlvbihldmVudC5nZXQoKSwgJmV2ZW50S2V5U3lzdGVtSWQsICZkYXRhLCBudWxs cHRyKTsKKworICAgICAgICAgICAgaW5pdERhdGEuYXBwZW5kKHtldmVudEtleVN5c3RlbUlkLCBk YXRhfSk7CisgICAgICAgICAgICBtX2hhbmRsZWRQcm90ZWN0aW9uRXZlbnRzLmFkZChHU1RfRVZF TlRfU0VRTlVNKGV2ZW50LmdldCgpKSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4g aW5pdERhdGE7Cit9CisKK2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp3YWl0Rm9y Q0RNQXR0YWNobWVudCgpCit7CisgICAgaWYgKGlzTWFpblRocmVhZCgpKSB7CisgICAgICAgIEdT VF9FUlJPUl9PQkpFQ1QocGlwZWxpbmUoKSwgImNhbid0IGJsb2NrIHRoZSBtYWluIHRocmVhZCB3 YWl0aW5nIGZvciBhIENETSBpbnN0YW5jZSIpOworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIEdTVF9JTkZPX09CSkVDVChw aXBlbGluZSgpLCAid2FpdGluZyBmb3IgYSBDRE0gaW5zdGFuY2UiKTsKKworICAgIGJvb2wgZGlk Q0RNQXR0YWNoID0gZmFsc2U7CisgICAgeworICAgICAgICBhdXRvIGNkbUF0dGFjaG1lbnRMb2Nr ZXIgPSBob2xkTG9jayhtX2NkbUF0dGFjaG1lbnRNdXRleCk7CisgICAgICAgIGRpZENETUF0dGFj aCA9IG1fY2RtQXR0YWNobWVudENvbmRpdGlvbi53YWl0Rm9yKG1fY2RtQXR0YWNobWVudE11dGV4 LCA0X3MsIFt0aGlzXSgpIHsKKyAgICAgICAgICAgIHJldHVybiBpc0NETUF0dGFjaGVkKCk7Cisg ICAgICAgIH0pOworICAgIH0KKworICAgIHJldHVybiBkaWRDRE1BdHRhY2g7Cit9CisKIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJl ZChJbml0RGF0YSYmIGluaXREYXRhKQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwo=