173092 2017-06-07 23:00:12 -0700 Take the mediaContentTypesRequiringHardwareSupport Setting into account when answering HTMLMediaElement::canPlayType() 2017-06-08 10:23:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson jonlee oldest_to_newest 1316838 0 jer.noble 2017-06-07 23:00:12 -0700 Take the mediaContentTypesRequiringHardwareSupport Setting into account when answering HTMLMediaElement::canPlayType() 1316839 1 312282 jer.noble 2017-06-07 23:02:07 -0700 Created attachment 312282 Patch 1316962 2 312282 commit-queue 2017-06-08 10:23:57 -0700 Comment on attachment 312282 Patch Clearing flags on attachment: 312282 Committed r217933: <http://trac.webkit.org/changeset/217933> 1316963 3 commit-queue 2017-06-08 10:23:58 -0700 All reviewed patches have been landed. Closing bug. 312282 2017-06-07 23:02:07 -0700 2017-06-08 10:23:57 -0700 Patch bug-173092-20170607230207.patch text/plain 10604 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3ODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRlMzgwZDA3NmYwNGVl NjE1NGY1N2RlNWUwYmNmYzM5MzI0NWZjMC4uZjU3ZDJkZjQzYjljY2YxMzZhY2NkYzI2MTcyMDVl ZmVlNzNjNGNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE3LTA2LTA3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFRha2UgdGhlIG1lZGlhQ29u dGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0IFNldHRpbmcgaW50byBhY2NvdW50IHdo ZW4gYW5zd2VyaW5nIEhUTUxNZWRpYUVsZW1lbnQ6OmNhblBsYXlUeXBlKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzA5MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgdGhlIHZhbHVlIG9mIG1l ZGlhQ29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0IGludG8gdGhlIE1lZGlhUGxh eWVyIHdoZW4gcXVlcnlpbmcgY2FuUGxheVR5cGUoKS4KKyAgICAgICAgVGhlbiwgdXNlIHRoZSBl eGlzdGluZyBjb2RlIGluIEFWQXNzZXRUcmFja1V0aWxpdGllcyB0byBrbm93IHdoZXRoZXIgdG8g YmFpbCBvdXQgZWFybHkgZnJvbSB0aGUgY29kZWMgY2hlY2suCisKKyAgICAgICAgRHJpdmUtYnkg Zml4OiBGb3VyQ0Mgd2FzIGNvbnZlcnRpbmcgU3RyaW5nIC0+IEZvdXJDQyBpbiByZXZlcnNlLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmNhblBsYXlUeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9Gb3VyQ0MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm91ckNDOjpmcm9tU3RyaW5nKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9BVkFzc2V0VHJh Y2tVdGlsaXRpZXMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9BVkFzc2V0VHJhY2tVdGlsaXRpZXMubW06CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50 VHlwZXNUb0NvZGVjcyk6CisgICAgICAgIChXZWJDb3JlOjpjb2RlY3NNZWV0SGFyZHdhcmVEZWNv ZGVSZXF1aXJlbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudFR5cGVNZWV0c0hhcmR3 YXJlRGVjb2RlUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OmFzc2V0VHJhY2tNZWV0 c0hhcmR3YXJlRGVjb2RlUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 c3VwcG9ydHNUeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW06CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnN1cHBvcnRzVHlw ZSk6CisKKzIwMTctMDYtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKICAg ICAgICAgQ2xpZW50cyBvZiB0aGUgV0syIEMtQVBJIGRvbid0IGhhdmUgdGhlaXIgbWVkaWFDb250 ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQgc2V0dGluZyBpbml0aWFsaXplZCBjb3Jy ZWN0bHkuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzMwOTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggYTY4 MmRjN2I0NGRmNGFkN2Q1YzNjMWI2YjIyYjAxNTFhNTdlYmJmNS4uYTMwYmRkM2JlMTMwZjZkYzM1 OWUwZWQyZTFhYWVkNjRkODUyMDgzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCkBAIC0xMTA5LDYgKzExMDksNyBAQCBTdHJpbmcgSFRNTE1lZGlhRWxlbWVudDo6 Y2FuUGxheVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3QKICAgICBNZWRpYUVuZ2lu ZVN1cHBvcnRQYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAgICAgQ29udGVudFR5cGUgY29udGVudFR5 cGUobWltZVR5cGUpOwogICAgIHBhcmFtZXRlcnMudHlwZSA9IGNvbnRlbnRUeXBlOworICAgIHBh cmFtZXRlcnMuY29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0ID0gbWVkaWFDb250 ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQoKTsKICAgICBNZWRpYVBsYXllcjo6U3Vw cG9ydHNUeXBlIHN1cHBvcnQgPSBNZWRpYVBsYXllcjo6c3VwcG9ydHNUeXBlKHBhcmFtZXRlcnMs IHRoaXMpOwogICAgIFN0cmluZyBjYW5QbGF5OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb3VyQ0MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm91ckNDLmNwcAppbmRleCA2MGNlMmUyOTlkZTBjODU1YjU4ZjE5NTE3YzYxMzA4 MDIwMTBiNDIzLi5kOWE4OTYyYjBiYjBlOWE3Yjg2Yzg1NzMzMDhiODVkOTcyYjVkMWFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb3VyQ0MuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvdXJDQy5jcHAKQEAgLTM2LDcgKzM2 LDcgQEAgc3RkOjpvcHRpb25hbDxGb3VyQ0M+IEZvdXJDQzo6ZnJvbVN0cmluZyhjb25zdCBTdHJp bmcmIHN0cmluZ1ZhbHVlKQogCiAgICAgY29uc3QgY2hhciogZGF0YSA9IGFzY2lpVmFsdWUuZGF0 YSgpOwogICAgIEFTU0VSVChhc2NpaVZhbHVlLmRhdGEoKSk7Ci0gICAgdWludDMyX3QgdmFsdWUg PSBkYXRhWzNdIDw8IDI0IHwgZGF0YVsyXSA8PCAxNiB8IGRhdGFbMV0gPDwgOCB8IGRhdGFbMF07 CisgICAgdWludDMyX3QgdmFsdWUgPSBkYXRhWzBdIDw8IDI0IHwgZGF0YVsxXSA8PCAxNiB8IGRh dGFbMl0gPDwgOCB8IGRhdGFbM107CiAgICAgcmV0dXJuIEZvdXJDQyh2YWx1ZSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL0FWQXNzZXRUcmFja1V0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZBc3NldFRyYWNrVXRpbGl0aWVzLmgKaW5kZXggMmI1 NzZjZWU1M2UwZDVhNjYxNGY4ZDI3OWEwMjAyNDBjMzkyY2Y2Yi4uYzE4YjFjNTFkZjg0Y2JjNjM0 MDUwY2UyZjFjZjVmZTQwZjI5YmRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZBc3NldFRyYWNrVXRpbGl0aWVzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZB c3NldFRyYWNrVXRpbGl0aWVzLmgKQEAgLTM0LDYgKzM0LDEwIEBAIE9CSkNfQ0xBU1MgQVZBc3Nl dFRyYWNrOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0cnVjdCBGb3VyQ0M7CisKK2Jvb2wg Y29kZWNzTWVldEhhcmR3YXJlRGVjb2RlUmVxdWlyZW1lbnRzKGNvbnN0IFZlY3RvcjxGb3VyQ0M+ JiwgY29uc3QgVmVjdG9yPENvbnRlbnRUeXBlPiYgY29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdh cmVEZWNvZGUpOworYm9vbCBjb250ZW50VHlwZU1lZXRzSGFyZHdhcmVEZWNvZGVSZXF1aXJlbWVu dHMoY29uc3QgQ29udGVudFR5cGUmLCBjb25zdCBWZWN0b3I8Q29udGVudFR5cGU+JiBjb250ZW50 VHlwZXNSZXF1aXJpbmdIYXJkd2FyZURlY29kZSk7CiBib29sIGFzc2V0VHJhY2tNZWV0c0hhcmR3 YXJlRGVjb2RlUmVxdWlyZW1lbnRzKEFWQXNzZXRUcmFjayAqLCBjb25zdCBWZWN0b3I8Q29udGVu dFR5cGU+JiBjb250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZURlY29kZSk7CiAKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L0FWQXNzZXRUcmFja1V0aWxpdGllcy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL0FWQXNzZXRUcmFja1V0aWxpdGllcy5tbQppbmRleCAyNGJl NzhkZDQzMzE2ZTJlOGNmMGQxZjZmNjQxMDAyY2IwNWM4ZWJiLi5hYTMzZDY3YzgwYmRmODc5YjMy MjcyZTE2ZjRlZjE4NjQzY2FlYTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9BVkFzc2V0VHJhY2tVdGlsaXRpZXMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQVZB c3NldFRyYWNrVXRpbGl0aWVzLm1tCkBAIC01NCw3ICs1NCwyNyBAQCBzdGF0aWMgYm9vbCBzeXN0 ZW1IYXNCYXR0ZXJ5KCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgYXNzZXRUcmFja01l ZXRzSGFyZHdhcmVEZWNvZGVSZXF1aXJlbWVudHMoQVZBc3NldFRyYWNrICp0cmFjaywgY29uc3Qg VmVjdG9yPENvbnRlbnRUeXBlPiYgY29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVEZWNvZGUp CitzdGF0aWMgVmVjdG9yPEZvdXJDQz4gY29udGVudFR5cGVzVG9Db2RlY3MoY29uc3QgVmVjdG9y PENvbnRlbnRUeXBlPiYgY29udGVudFR5cGVzKQoreworICAgIFZlY3RvcjxGb3VyQ0M+IGNvZGVj czsKKyAgICBmb3IgKGF1dG8mIGNvbnRlbnRUeXBlIDogY29udGVudFR5cGVzKSB7CisgICAgICAg IGF1dG8gY29kZWNTdHJpbmdzID0gY29udGVudFR5cGUuY29kZWNzKCk7CisgICAgICAgIGZvciAo YXV0byYgY29kZWNTdHJpbmcgOiBjb2RlY1N0cmluZ3MpIHsKKyAgICAgICAgICAgIC8vIGh0dHBz Oi8vdG9vbHMuaWV0Zi5vcmcvaHRtbC9yZmM2MzgxCisgICAgICAgICAgICAvLyBXaXRoaW4gYSAn Y29kZWNzJyBwYXJhbWV0ZXIgdmFsdWUsICIuIiBpcyByZXNlcnZlZCBhcyBhIGhpZXJhcmNoeSBk ZWxpbWl0ZXIKKyAgICAgICAgICAgIGF1dG8gZmlyc3RQZXJpb2QgPSBjb2RlY1N0cmluZy5maW5k KCcuJyk7CisgICAgICAgICAgICBpZiAoZmlyc3RQZXJpb2QgIT0gbm90Rm91bmQpCisgICAgICAg ICAgICAgICAgY29kZWNTdHJpbmcudHJ1bmNhdGUoZmlyc3RQZXJpb2QpOworCisgICAgICAgICAg ICBhdXRvIGNvZGVjSWRlbnRpZmllciA9IEZvdXJDQzo6ZnJvbVN0cmluZyhjb2RlY1N0cmluZy5s ZWZ0KDQpKTsKKyAgICAgICAgICAgIGlmIChjb2RlY0lkZW50aWZpZXIpCisgICAgICAgICAgICAg ICAgY29kZWNzLmFwcGVuZChjb2RlY0lkZW50aWZpZXIudmFsdWUoKSk7CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIGNvZGVjczsKK30KKworYm9vbCBjb2RlY3NNZWV0SGFyZHdhcmVEZWNv ZGVSZXF1aXJlbWVudHMoY29uc3QgVmVjdG9yPEZvdXJDQz4mIGNvZGVjcywgY29uc3QgVmVjdG9y PENvbnRlbnRUeXBlPiYgY29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVEZWNvZGUpCiB7CiAg ICAgc3RhdGljIGJvb2wgaGFzQmF0dGVyeSA9IHN5c3RlbUhhc0JhdHRlcnkoKTsKIApAQCAtNjks MzEgKzg5LDMzIEBAIGJvb2wgYXNzZXRUcmFja01lZXRzSGFyZHdhcmVEZWNvZGVSZXF1aXJlbWVu dHMoQVZBc3NldFRyYWNrICp0cmFjaywgY29uc3QgVmVjdG9yCiAgICAgaWYgKGNvbnRlbnRUeXBl c1JlcXVpcmluZ0hhcmR3YXJlRGVjb2RlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKLSAgICBWZWN0b3I8Rm91ckNDPiBoYXJkd2FyZUNvZGVjczsKLSAgICBmb3IgKGF1dG8mIGNv bnRlbnRUeXBlIDogY29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVEZWNvZGUpIHsKLSAgICAg ICAgYXV0byBjb2RlY1N0cmluZ3MgPSBjb250ZW50VHlwZS5jb2RlY3MoKTsKLSAgICAgICAgZm9y IChhdXRvJiBjb2RlY1N0cmluZyA6IGNvZGVjU3RyaW5ncykgewotICAgICAgICAgICAgYXV0byBj b2RlY0lkZW50aWZpZXIgPSBGb3VyQ0M6OmZyb21TdHJpbmcoY29kZWNTdHJpbmcpOwotICAgICAg ICAgICAgaWYgKGNvZGVjSWRlbnRpZmllcikKLSAgICAgICAgICAgICAgICBoYXJkd2FyZUNvZGVj cy5hcHBlbmQoY29kZWNJZGVudGlmaWVyLnZhbHVlKCkpOwotICAgICAgICB9CisgICAgVmVjdG9y PEZvdXJDQz4gaGFyZHdhcmVDb2RlY3MgPSBjb250ZW50VHlwZXNUb0NvZGVjcyhjb250ZW50VHlw ZXNSZXF1aXJpbmdIYXJkd2FyZURlY29kZSk7CisKKyAgICBmb3IgKGF1dG8mIGNvZGVjIDogY29k ZWNzKSB7CisgICAgICAgIGlmIChoYXJkd2FyZUNvZGVjcy5jb250YWlucyhjb2RlYykgJiYgIVZU SXNIYXJkd2FyZURlY29kZVN1cHBvcnRlZChjb2RlYy52YWx1ZSkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitib29sIGNvbnRlbnRUeXBl TWVldHNIYXJkd2FyZURlY29kZVJlcXVpcmVtZW50cyhjb25zdCBDb250ZW50VHlwZSYgY29udGVu dFR5cGUsIGNvbnN0IFZlY3RvcjxDb250ZW50VHlwZT4mIGNvbnRlbnRUeXBlc1JlcXVpcmluZ0hh cmR3YXJlRGVjb2RlKQoreworICAgIFZlY3RvcjxGb3VyQ0M+IGNvZGVjcyA9IGNvbnRlbnRUeXBl c1RvQ29kZWNzKHsgY29udGVudFR5cGUgfSk7CisgICAgcmV0dXJuIGNvZGVjc01lZXRIYXJkd2Fy ZURlY29kZVJlcXVpcmVtZW50cyhjb2RlY3MsIGNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJl RGVjb2RlKTsKK30KIAorYm9vbCBhc3NldFRyYWNrTWVldHNIYXJkd2FyZURlY29kZVJlcXVpcmVt ZW50cyhBVkFzc2V0VHJhY2sgKnRyYWNrLCBjb25zdCBWZWN0b3I8Q29udGVudFR5cGU+JiBjb250 ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZURlY29kZSkKK3sKKyAgICBWZWN0b3I8Rm91ckNDPiBj b2RlY3M7CiAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwLCBjb3VudCA9IHRyYWNrLmZvcm1hdERl c2NyaXB0aW9ucy5jb3VudDsgaSA8IGNvdW50OyArK2kpIHsKICAgICAgICAgQ01Gb3JtYXREZXNj cmlwdGlvblJlZiBkZXNjcmlwdGlvbiA9IChDTUZvcm1hdERlc2NyaXB0aW9uUmVmKXRyYWNrLmZv cm1hdERlc2NyaXB0aW9uc1tpXTsKLSAgICAgICAgaWYgKENNRm9ybWF0RGVzY3JpcHRpb25HZXRN ZWRpYVR5cGUoZGVzY3JpcHRpb24pICE9IGtDTU1lZGlhVHlwZV9WaWRlbykKLSAgICAgICAgICAg IGNvbnRpbnVlOwotCi0gICAgICAgIENNVmlkZW9Db2RlY1R5cGUgY29kZWMgPSBDTUZvcm1hdERl c2NyaXB0aW9uR2V0TWVkaWFTdWJUeXBlKGRlc2NyaXB0aW9uKTsKLSAgICAgICAgaWYgKCFoYXJk d2FyZUNvZGVjcy5jb250YWlucyhGb3VyQ0MoY29kZWMpKSkKLSAgICAgICAgICAgIGNvbnRpbnVl OwotCi0gICAgICAgIGlmICghVlRJc0hhcmR3YXJlRGVjb2RlU3VwcG9ydGVkKGNvZGVjKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKENNRm9ybWF0RGVzY3JpcHRpb25H ZXRNZWRpYVR5cGUoZGVzY3JpcHRpb24pID09IGtDTU1lZGlhVHlwZV9WaWRlbykKKyAgICAgICAg ICAgIGNvZGVjcy5hcHBlbmQoRm91ckNDKENNRm9ybWF0RGVzY3JpcHRpb25HZXRNZWRpYVN1YlR5 cGUoZGVzY3JpcHRpb24pKSk7CiAgICAgfQotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBj b2RlY3NNZWV0SGFyZHdhcmVEZWNvZGVSZXF1aXJlbWVudHMoY29kZWNzLCBjb250ZW50VHlwZXNS ZXF1aXJpbmdIYXJkd2FyZURlY29kZSk7CiB9CiAKKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDLm1tCmluZGV4IDhjYjI5OTYyYjRhZmZkNDcxYjEyMTZlMTQxYzg0OGQ3OWVkNjZkZDcu LjlhYWY5MDM5YjQ2YTFmZGZiY2EwNTZkYzJlMTljYjg5MjYzMTUyYjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbQpAQCAtMTcyOCw2ICsxNzI4LDkgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlw ZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzdXBwb3J0c1R5cGUoY29uc3QK ICAgICBpZiAocGFyYW1ldGVycy50eXBlLmNvZGVjcygpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIE1lZGlhUGxheWVyOjpNYXlCZVN1cHBvcnRlZDsKIAorICAgIGlmICghY29udGVudFR5cGVN ZWV0c0hhcmR3YXJlRGVjb2RlUmVxdWlyZW1lbnRzKHBhcmFtZXRlcnMudHlwZSwgcGFyYW1ldGVy cy5jb250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQpKQorICAgICAgICByZXR1cm4g TWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOworCiAgICAgTlNTdHJpbmcgKnR5cGVTdHJpbmcg PSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVAOyBjb2RlY3M9XCIlQFwiIiwgKE5TU3Ry aW5nICopY29udGFpbmVyVHlwZSwgKE5TU3RyaW5nICopcGFyYW1ldGVycy50eXBlLnBhcmFtZXRl cihDb250ZW50VHlwZTo6Y29kZWNzUGFyYW1ldGVyKCkpXTsKICAgICByZXR1cm4gW0FWVVJMQXNz ZXQgaXNQbGF5YWJsZUV4dGVuZGVkTUlNRVR5cGU6dHlwZVN0cmluZ10gPyBNZWRpYVBsYXllcjo6 SXNTdXBwb3J0ZWQgOiBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0ZWQ7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakMubW0KaW5kZXggZWNkMmExNWZjMTMwOGE5YTRjZjk3OThmYWRkM2Q4ODc2M2Zi NTg0NC4uYzgyNWIyZGRjOWMyM2FjNzk3MzRjZmU0OGYxMDk4NWIzOGJhMjhiNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKE1FRElB X1NPVVJDRSkgJiYgVVNFKEFWRk9VTkRBVElPTikKIAorI2ltcG9ydCAiQVZBc3NldFRyYWNrVXRp bGl0aWVzLmgiCiAjaW1wb3J0ICJBVkZvdW5kYXRpb25NSU1FVHlwZUNhY2hlLmgiCiAjaW1wb3J0 ICJBVkZvdW5kYXRpb25TUEkuaCIKICNpbXBvcnQgIkNETVNlc3Npb25BVlN0cmVhbVNlc3Npb24u aCIKQEAgLTIyNyw2ICsyMjgsOSBAQCBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c3VwcG9ydHNUeXBlKGNvbgogICAgIGlmIChb Z2V0QVZTdHJlYW1EYXRhUGFyc2VyQ2xhc3MoKSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KG91dHB1dE1JTUVDb2RlY1BhcmFtZXRlckZvcklucHV0TUlNRUNvZGVjUGFyYW1ldGVyOildKQog ICAgICAgICBvdXRwdXRDb2RlY3MgPSBbZ2V0QVZTdHJlYW1EYXRhUGFyc2VyQ2xhc3MoKSBvdXRw dXRNSU1FQ29kZWNQYXJhbWV0ZXJGb3JJbnB1dE1JTUVDb2RlY1BhcmFtZXRlcjpvdXRwdXRDb2Rl Y3NdOwogCisgICAgaWYgKCFjb250ZW50VHlwZU1lZXRzSGFyZHdhcmVEZWNvZGVSZXF1aXJlbWVu dHMocGFyYW1ldGVycy50eXBlLCBwYXJhbWV0ZXJzLmNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3 YXJlU3VwcG9ydCkpCisgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7 CisKICAgICBOU1N0cmluZyAqdHlwZVN0cmluZyA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0 OkAiJUA7IGNvZGVjcz1cIiVAXCIiLCAoTlNTdHJpbmcgKilwYXJhbWV0ZXJzLnR5cGUuY29udGFp bmVyVHlwZSgpLCAoTlNTdHJpbmcgKilvdXRwdXRDb2RlY3NdOwogICAgIHJldHVybiBbZ2V0QVZV UkxBc3NldENsYXNzKCkgaXNQbGF5YWJsZUV4dGVuZGVkTUlNRVR5cGU6dHlwZVN0cmluZ10gPyBN ZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQgOiBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0ZWQ7Owog fQo=