174368 2017-07-11 10:15:21 -0700 Build broken when !ENABLE(VIDEO) 2017-07-11 11:07:29 -0700 1 1 1 Unclassified WebKit Media Other Other Linux RESOLVED FIXED P2 Normal --- 1 timothy timothy achristensen commit-queue dino joepeck jonlee oldest_to_newest 1327545 0 timothy 2017-07-11 10:15:21 -0700 There are various build failures that happen when ENABLE_VIDEO is disabled. Patch to follow. 1327547 1 315122 timothy 2017-07-11 10:17:45 -0700 Created attachment 315122 Patch 1327568 2 315122 achristensen 2017-07-11 10:43:26 -0700 Comment on attachment 315122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315122&action=review > Source/WebCore/testing/Internals.h:445 > #if ENABLE(VIDEO) > + Vector<String> mediaResponseSources(HTMLMediaElement&); Can we make these [Conditional=VIDEO] too? I think we're trying to move away from using the C preprocessor on IDL files. 1327571 3 315122 timothy 2017-07-11 10:45:33 -0700 Comment on attachment 315122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315122&action=review >> Source/WebCore/testing/Internals.h:445 >> + Vector<String> mediaResponseSources(HTMLMediaElement&); > > Can we make these [Conditional=VIDEO] too? I think we're trying to move away from using the C preprocessor on IDL files. This isn't the IDL file. I did change Internals.idl to use [Conditional=VIDEO]. 1327574 4 315122 achristensen 2017-07-11 10:46:27 -0700 Comment on attachment 315122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315122&action=review >>> Source/WebCore/testing/Internals.h:445 >>> + Vector<String> mediaResponseSources(HTMLMediaElement&); >> >> Can we make these [Conditional=VIDEO] too? I think we're trying to move away from using the C preprocessor on IDL files. > > This isn't the IDL file. I did change Internals.idl to use [Conditional=VIDEO]. Woah, you're right. 1327590 5 315122 commit-queue 2017-07-11 11:07:28 -0700 Comment on attachment 315122 Patch Clearing flags on attachment: 315122 Committed r219343: <http://trac.webkit.org/changeset/219343> 1327591 6 commit-queue 2017-07-11 11:07:29 -0700 All reviewed patches have been landed. Closing bug. 315122 2017-07-11 10:17:45 -0700 2017-07-11 11:07:28 -0700 Patch bug-174368-20170711101742.patch text/plain 11896 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzUyNzgwYjljODNlNjg1 MzVlODc3ZjcwMWFmM2M5MjAxNDE3OWNkNi4uNzBkNzA1YTQ4NTAxZDdiOWQ1MTU1NzRlNTY4Mjcz YzYyZDkxNjc3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA3LTExICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGhhdGNoZXIubmFtZT4KKworICAgICAgICBGaXggYnJva2Vu IGJ1aWxkIHdoZW4gRU5BQkxFX1ZJREVPIGlzIGRpc2FibGVkLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MzY4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg ICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6dGV4U3ViSW1hZ2UyRCk6CisgICAg ICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjp0ZXhJbWFnZTJEKToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmg6CisgICAgICAg ICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5pZGw6CisgICAgICAgICog dGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjptZWRp YVJlc3BvbnNlU291cmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6Om1lZGlhUmVz cG9uc2VDb250ZW50UmFuZ2VzKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAg ICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAxNy0wNy0xMSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlZHVjZSBVUkwgc2l6 ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggNWNkYzZlZDIyMTk2MjVjODMwZjU0NzFjZGM2 M2NkYTUzYWZiYjBkYy4uODIyZjIxYWM5NzcyMGZmMzk2ZTQyNWMyMjEyMjA4OGQ0YzM5ZjRmNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xODgsNiArMTg4LDcgQEAKICNpbmNsdWRlICJU cmFuc2Zvcm1Tb3VyY2UuaCIKICNpbmNsdWRlICJUcmVlV2Fsa2VyLmgiCiAjaW5jbHVkZSAiVmFs aWRhdGlvbk1lc3NhZ2VDbGllbnQuaCIKKyNpbmNsdWRlICJWaXNpYmlsaXR5Q2hhbmdlQ2xpZW50 LmgiCiAjaW5jbHVkZSAiVmlzaXRlZExpbmtTdGF0ZS5oIgogI2luY2x1ZGUgIldoZWVsRXZlbnQu aCIKICNpbmNsdWRlICJXaW5kb3dGZWF0dXJlcy5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAppbmRleCBiOTc1 NTBkNzBmYmE5MThjZmNkM2QzNTgyYmEzNTA3M2ZlOTRkMDU0Li45YjFjY2EwZjhhMWIwMjkzN2U3 YjU0OTVhZGIxMjUxMWJiOWEzMmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcApAQCAtMzYyMSw3ICszNjIx LDkgQEAgRXhjZXB0aW9uT3I8dm9pZD4gV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6dGV4U3Vi SW1hZ2UyRChHQzNEZW51bSB0YXJnZXQsIEdDM0QKICAgICAgICAgZWxzZQogICAgICAgICAgICAg dGV4U3ViSW1hZ2UyREltcGwodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwgZm9ybWF0 LCB0eXBlLCBjYW52YXMtPmNvcGllZEltYWdlKCksIEdyYXBoaWNzQ29udGV4dDNEOjpIdG1sRG9t Q2FudmFzLCBtX3VucGFja0ZsaXBZLCBtX3VucGFja1ByZW11bHRpcGx5QWxwaGEpOwogICAgICAg ICByZXR1cm4geyB9OwotICAgIH0sIFsmXShjb25zdCBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4m IHZpZGVvKSAtPiBFeGNlcHRpb25Pcjx2b2lkPiB7CisgICAgfQorI2lmIEVOQUJMRShWSURFTykK KyAgICAsIFsmXShjb25zdCBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4mIHZpZGVvKSAtPiBFeGNl cHRpb25Pcjx2b2lkPiB7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAgICBp ZiAoaXNDb250ZXh0TG9zdE9yUGVuZGluZygpIHx8ICF2YWxpZGF0ZUhUTUxWaWRlb0VsZW1lbnQo InRleFN1YkltYWdlMkQiLCB2aWRlby5nZXQoKSwgZWMpKQogICAgICAgICAgICAgcmV0dXJuIGVj ID8gRXhjZXB0aW9uIHsgZWMgfSA6IEV4Y2VwdGlvbk9yPHZvaWQ+IHsgfTsKQEAgLTM2NDQsNyAr MzY0Niw5IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6OnRl eFN1YkltYWdlMkQoR0MzRGVudW0gdGFyZ2V0LCBHQzNECiAgICAgICAgICAgICByZXR1cm4geyB9 OwogICAgICAgICB0ZXhTdWJJbWFnZTJESW1wbCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0LCB5b2Zm c2V0LCBmb3JtYXQsIHR5cGUsIGltYWdlLmdldCgpLCBHcmFwaGljc0NvbnRleHQzRDo6SHRtbERv bVZpZGVvLCBtX3VucGFja0ZsaXBZLCBtX3VucGFja1ByZW11bHRpcGx5QWxwaGEpOwogICAgICAg ICByZXR1cm4geyB9OwotICAgIH0pOworICAgIH0KKyNlbmRpZgorICAgICk7CiAKICAgICByZXR1 cm4gV1RGOjp2aXNpdCh2aXNpdG9yLCBzb3VyY2UudmFsdWUoKSk7CiB9CkBAIC00MTMxLDcgKzQx MzUsOSBAQCBFeGNlcHRpb25Pcjx2b2lkPiBXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlOjp0ZXhJ bWFnZTJEKEdDM0RlbnVtIHRhcmdldCwgR0MzRGludAogICAgICAgICBlbHNlCiAgICAgICAgICAg ICB0ZXhJbWFnZTJESW1wbCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgZm9ybWF0LCB0 eXBlLCBjYW52YXMtPmNvcGllZEltYWdlKCksIEdyYXBoaWNzQ29udGV4dDNEOjpIdG1sRG9tQ2Fu dmFzLCBtX3VucGFja0ZsaXBZLCBtX3VucGFja1ByZW11bHRpcGx5QWxwaGEpOwogICAgICAgICBy ZXR1cm4geyB9OwotICAgIH0sIFsmXShjb25zdCBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4mIHZp ZGVvKSAtPiBFeGNlcHRpb25Pcjx2b2lkPiB7CisgICAgfQorI2lmIEVOQUJMRShWSURFTykKKyAg ICAsIFsmXShjb25zdCBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4mIHZpZGVvKSAtPiBFeGNlcHRp b25Pcjx2b2lkPiB7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAgICBpZiAo aXNDb250ZXh0TG9zdE9yUGVuZGluZygpIHx8ICF2YWxpZGF0ZUhUTUxWaWRlb0VsZW1lbnQoInRl eEltYWdlMkQiLCB2aWRlby5nZXQoKSwgZWMpCiAgICAgICAgICAgICB8fCAhdmFsaWRhdGVUZXhG dW5jKCJ0ZXhJbWFnZTJEIiwgVGV4SW1hZ2UsIFNvdXJjZUhUTUxWaWRlb0VsZW1lbnQsIHRhcmdl dCwgbGV2ZWwsIGludGVybmFsZm9ybWF0LCB2aWRlby0+dmlkZW9XaWR0aCgpLCB2aWRlby0+dmlk ZW9IZWlnaHQoKSwgMCwgZm9ybWF0LCB0eXBlLCAwLCAwKSkKQEAgLTQxNjEsNyArNDE2Nyw5IEBA IEV4Y2VwdGlvbk9yPHZvaWQ+IFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U6OnRleEltYWdlMkQo R0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50CiAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAg ICB0ZXhJbWFnZTJESW1wbCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgZm9ybWF0LCB0 eXBlLCBpbWFnZS5nZXQoKSwgR3JhcGhpY3NDb250ZXh0M0Q6Okh0bWxEb21WaWRlbywgbV91bnBh Y2tGbGlwWSwgbV91bnBhY2tQcmVtdWx0aXBseUFscGhhKTsKICAgICAgICAgcmV0dXJuIHsgfTsK LSAgICB9KTsKKyAgICB9CisjZW5kaWYKKyAgICApOwogCiAgICAgcmV0dXJuIFdURjo6dmlzaXQo dmlzaXRvciwgc291cmNlLnZhbHVlKCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5oCmluZGV4IDNiMzUwYjYyMjE4 MWI3MjQ3NWU3MzQ1ZTg2NzQ1NTljZjIwMjQ3OTYuLjEyM2UzZjYwNDdhYmQzZTk3NmI4YmRiZDIz YmFiYjhjMzNiMmUzZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmgKQEAgLTU2LDcgKzU2LDYgQEAgY2xhc3MgRVhU U2hhZGVyVGV4dHVyZUxPRDsKIGNsYXNzIEVYVHNSR0I7CiBjbGFzcyBFWFRGcmFnRGVwdGg7CiBj bGFzcyBIVE1MSW1hZ2VFbGVtZW50OwotY2xhc3MgSFRNTFZpZGVvRWxlbWVudDsKIGNsYXNzIElt YWdlRGF0YTsKIGNsYXNzIEludFNpemU7CiBjbGFzcyBPRVNTdGFuZGFyZERlcml2YXRpdmVzOwpA QCAtODQsNiArODMsMTAgQEAgY2xhc3MgV2ViR0xTaGFyZWRPYmplY3Q7CiBjbGFzcyBXZWJHTFNo YWRlclByZWNpc2lvbkZvcm1hdDsKIGNsYXNzIFdlYkdMVW5pZm9ybUxvY2F0aW9uOwogCisjaWYg RU5BQkxFKFZJREVPKQorY2xhc3MgSFRNTFZpZGVvRWxlbWVudDsKKyNlbmRpZgorCiBpbmxpbmUg dm9pZCBjbGlwMUQoR0MzRGludCBzdGFydCwgR0MzRHNpemVpIHJhbmdlLCBHQzNEc2l6ZWkgc291 cmNlUmFuZ2UsIEdDM0RpbnQqIGNsaXBwZWRTdGFydCwgR0MzRHNpemVpKiBjbGlwcGVkUmFuZ2Up CiB7CiAgICAgQVNTRVJUKGNsaXBwZWRTdGFydCAmJiBjbGlwcGVkUmFuZ2UpOwpAQCAtMjQyLDcg KzI0NSwxMiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHRleEltYWdlMkQoR0MzRGVudW0gdGFyZ2V0 LCBHQzNEaW50IGxldmVsLCBHQzNEZW51bSBpbnRlcm5hbGZvcm1hdCwgR0MzRHNpemVpIHdpZHRo LCBHQzNEc2l6ZWkgaGVpZ2h0LCBHQzNEaW50IGJvcmRlciwgR0MzRGVudW0gZm9ybWF0LCBHQzNE ZW51bSB0eXBlLCBSZWZQdHI8QXJyYXlCdWZmZXJWaWV3PiYmKTsKIAorI2lmIEVOQUJMRShWSURF TykKICAgICB1c2luZyBUZXhJbWFnZVNvdXJjZSA9IFdURjo6VmFyaWFudDxSZWZQdHI8SW1hZ2VE YXRhPiwgUmVmUHRyPEhUTUxJbWFnZUVsZW1lbnQ+LCBSZWZQdHI8SFRNTENhbnZhc0VsZW1lbnQ+ LCBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4+OworI2Vsc2UKKyAgICB1c2luZyBUZXhJbWFnZVNv dXJjZSA9IFdURjo6VmFyaWFudDxSZWZQdHI8SW1hZ2VEYXRhPiwgUmVmUHRyPEhUTUxJbWFnZUVs ZW1lbnQ+LCBSZWZQdHI8SFRNTENhbnZhc0VsZW1lbnQ+PjsKKyNlbmRpZgorCiAgICAgRXhjZXB0 aW9uT3I8dm9pZD4gdGV4SW1hZ2UyRChHQzNEZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdD M0RlbnVtIGludGVybmFsZm9ybWF0LCBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIHN0 ZDo6b3B0aW9uYWw8VGV4SW1hZ2VTb3VyY2U+KTsKIAogICAgIHZvaWQgdGV4UGFyYW1ldGVyZihH QzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIHBuYW1lLCBHQzNEZmxvYXQgcGFyYW0pOwpAQCAtNjgz LDcgKzY5MSw5IEBAIHByb3RlY3RlZDoKICAgICAgICAgU291cmNlSW1hZ2VEYXRhLAogICAgICAg ICBTb3VyY2VIVE1MSW1hZ2VFbGVtZW50LAogICAgICAgICBTb3VyY2VIVE1MQ2FudmFzRWxlbWVu dCwKKyNpZiBFTkFCTEUoVklERU8pCiAgICAgICAgIFNvdXJjZUhUTUxWaWRlb0VsZW1lbnQsCisj ZW5kaWYKICAgICB9OwogCiAgICAgLy8gSGVscGVyIGZ1bmN0aW9uIGZvciB0ZXh7U3VifUltYWdl MkQgdG8gY2hlY2sgaWYgdGhlIGlucHV0IGZvcm1hdC90eXBlL2xldmVsL3RhcmdldC93aWR0aC9o ZWlnaHQvYm9yZGVyL3hvZmZzZXQveW9mZnNldCBhcmUgdmFsaWQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmlkbCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuaWRsCmlu ZGV4IDVlNzdiYzQxNTRjMGM4YWYwMTIzZDM2YjMwMDQwNzdkNzdhNjc3YzUuLmNiYmE1N2UyYzRl MWYwODc1YjI1OTZmNmYwMTNiMDNhMzkyMzFlMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuaWRsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuaWRsCkBAIC00Miw3 ICs0MiwxMSBAQCB0eXBlZGVmIChGbG9hdDMyQXJyYXkgb3Igc2VxdWVuY2U8R0xmbG9hdD4pIEZs b2F0MzJMaXN0OwogdHlwZWRlZiAoSW50MzJBcnJheSBvciBzZXF1ZW5jZTxHTGludD4pIEludDMy TGlzdDsKIAogLy8gRklYTUU6IFNob3VsZCBhbGxvdyBJbWFnZUJpdG1hcCB0b28uCisjaWZkZWYg RU5BQkxFX1ZJREVPCiB0eXBlZGVmIChJbWFnZURhdGEgb3IgSFRNTEltYWdlRWxlbWVudCBvciBI VE1MQ2FudmFzRWxlbWVudCBvciBIVE1MVmlkZW9FbGVtZW50KSBUZXhJbWFnZVNvdXJjZTsKKyNl bHNlCit0eXBlZGVmIChJbWFnZURhdGEgb3IgSFRNTEltYWdlRWxlbWVudCBvciBIVE1MQ2FudmFz RWxlbWVudCkgVGV4SW1hZ2VTb3VyY2U7CisjZW5kaWYKIAogWwogICAgIENvbmRpdGlvbmFsPVdF QkdMLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDI4ZjY4MzNmOWI5NGNl NzMzNmQxMzQwN2ZkZDU3YzNiOTBlM2UzOWIuLjc2MjdhZjhiMjk0YWQ0NmMyMWQ4ZDNmOTFmNzhj YjVmMjQyOTBhYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTY0Nywz MCArNjQ3LDYgQEAgU3RyaW5nIEludGVybmFsczo6eGhyUmVzcG9uc2VTb3VyY2UoWE1MSHR0cFJl cXVlc3QmIHJlcXVlc3QpCiAgICAgcmV0dXJuIHJlc3BvbnNlU291cmNlVG9TdHJpbmcocmVxdWVz dC5yZXNvdXJjZVJlc3BvbnNlKCkpOwogfQogCi1WZWN0b3I8U3RyaW5nPiBJbnRlcm5hbHM6Om1l ZGlhUmVzcG9uc2VTb3VyY2VzKEhUTUxNZWRpYUVsZW1lbnQmIG1lZGlhKQotewotICAgIGF1dG8q IHJlc291cmNlTG9hZGVyID0gbWVkaWEubGFzdE1lZGlhUmVzb3VyY2VMb2FkZXJGb3JUZXN0aW5n KCk7Ci0gICAgaWYgKCFyZXNvdXJjZUxvYWRlcikKLSAgICAgICAgcmV0dXJuIHsgfTsKLSAgICBW ZWN0b3I8U3RyaW5nPiByZXN1bHQ7Ci0gICAgYXV0byByZXNwb25zZXMgPSByZXNvdXJjZUxvYWRl ci0+cmVzcG9uc2VzRm9yVGVzdGluZygpOwotICAgIGZvciAoYXV0byYgcmVzcG9uc2UgOiByZXNw b25zZXMpCi0gICAgICAgIHJlc3VsdC5hcHBlbmQocmVzcG9uc2VTb3VyY2VUb1N0cmluZyhyZXNw b25zZSkpOwotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KLVZlY3RvcjxTdHJpbmc+IEludGVybmFs czo6bWVkaWFSZXNwb25zZUNvbnRlbnRSYW5nZXMoSFRNTE1lZGlhRWxlbWVudCYgbWVkaWEpCi17 Ci0gICAgYXV0byogcmVzb3VyY2VMb2FkZXIgPSBtZWRpYS5sYXN0TWVkaWFSZXNvdXJjZUxvYWRl ckZvclRlc3RpbmcoKTsKLSAgICBpZiAoIXJlc291cmNlTG9hZGVyKQotICAgICAgICByZXR1cm4g eyB9OwotICAgIFZlY3RvcjxTdHJpbmc+IHJlc3VsdDsKLSAgICBhdXRvIHJlc3BvbnNlcyA9IHJl c291cmNlTG9hZGVyLT5yZXNwb25zZXNGb3JUZXN0aW5nKCk7Ci0gICAgZm9yIChhdXRvJiByZXNw b25zZSA6IHJlc3BvbnNlcykKLSAgICAgICAgcmVzdWx0LmFwcGVuZChyZXNwb25zZS5odHRwSGVh ZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnRSYW5nZSkpOwotICAgIHJldHVybiByZXN1 bHQ7Ci19Ci0KIGJvb2wgSW50ZXJuYWxzOjppc1NoYXJpbmdTdHlsZVNoZWV0Q29udGVudHMoSFRN TExpbmtFbGVtZW50JiBhLCBIVE1MTGlua0VsZW1lbnQmIGIpCiB7CiAgICAgaWYgKCFhLnNoZWV0 KCkgfHwgIWIuc2hlZXQoKSkKQEAgLTMwNTksNiArMzAzNSwzMCBAQCBTdHJpbmcgSW50ZXJuYWxz OjpnZXRJbWFnZVNvdXJjZVVSTChFbGVtZW50JiBlbGVtZW50KQogCiAjaWYgRU5BQkxFKFZJREVP KQogCitWZWN0b3I8U3RyaW5nPiBJbnRlcm5hbHM6Om1lZGlhUmVzcG9uc2VTb3VyY2VzKEhUTUxN ZWRpYUVsZW1lbnQmIG1lZGlhKQoreworICAgIGF1dG8qIHJlc291cmNlTG9hZGVyID0gbWVkaWEu bGFzdE1lZGlhUmVzb3VyY2VMb2FkZXJGb3JUZXN0aW5nKCk7CisgICAgaWYgKCFyZXNvdXJjZUxv YWRlcikKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICBWZWN0b3I8U3RyaW5nPiByZXN1bHQ7Cisg ICAgYXV0byByZXNwb25zZXMgPSByZXNvdXJjZUxvYWRlci0+cmVzcG9uc2VzRm9yVGVzdGluZygp OworICAgIGZvciAoYXV0byYgcmVzcG9uc2UgOiByZXNwb25zZXMpCisgICAgICAgIHJlc3VsdC5h cHBlbmQocmVzcG9uc2VTb3VyY2VUb1N0cmluZyhyZXNwb25zZSkpOworICAgIHJldHVybiByZXN1 bHQ7Cit9CisKK1ZlY3RvcjxTdHJpbmc+IEludGVybmFsczo6bWVkaWFSZXNwb25zZUNvbnRlbnRS YW5nZXMoSFRNTE1lZGlhRWxlbWVudCYgbWVkaWEpCit7CisgICAgYXV0byogcmVzb3VyY2VMb2Fk ZXIgPSBtZWRpYS5sYXN0TWVkaWFSZXNvdXJjZUxvYWRlckZvclRlc3RpbmcoKTsKKyAgICBpZiAo IXJlc291cmNlTG9hZGVyKQorICAgICAgICByZXR1cm4geyB9OworICAgIFZlY3RvcjxTdHJpbmc+ IHJlc3VsdDsKKyAgICBhdXRvIHJlc3BvbnNlcyA9IHJlc291cmNlTG9hZGVyLT5yZXNwb25zZXNG b3JUZXN0aW5nKCk7CisgICAgZm9yIChhdXRvJiByZXNwb25zZSA6IHJlc3BvbnNlcykKKyAgICAg ICAgcmVzdWx0LmFwcGVuZChyZXNwb25zZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6 OkNvbnRlbnRSYW5nZSkpOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIHZvaWQgSW50ZXJuYWxz OjpzaW11bGF0ZUF1ZGlvSW50ZXJydXB0aW9uKEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpCiB7 CiAjaWYgVVNFKEdTVFJFQU1FUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IDhh MWMxNTE4MmY2ZmU4MzYyNGM3NGIxMTcwNmQ5ZjBhMDJiNDhmNGMuLjJlY2U4OWQ0N2I5YWQ2MzA1 YjE0ODQ3ZTQzNmQxNjE0NTA3OTg2M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApA QCAtMTA0LDggKzEwNCw2IEBAIHB1YmxpYzoKICAgICBib29sIGlzUHJlbG9hZGVkKGNvbnN0IFN0 cmluZyYgdXJsKTsKICAgICBib29sIGlzTG9hZGluZ0Zyb21NZW1vcnlDYWNoZShjb25zdCBTdHJp bmcmIHVybCk7CiAgICAgU3RyaW5nIHhoclJlc3BvbnNlU291cmNlKFhNTEh0dHBSZXF1ZXN0Jik7 Ci0gICAgVmVjdG9yPFN0cmluZz4gbWVkaWFSZXNwb25zZVNvdXJjZXMoSFRNTE1lZGlhRWxlbWVu dCYpOwotICAgIFZlY3RvcjxTdHJpbmc+IG1lZGlhUmVzcG9uc2VDb250ZW50UmFuZ2VzKEhUTUxN ZWRpYUVsZW1lbnQmKTsKICAgICBib29sIGlzU2hhcmluZ1N0eWxlU2hlZXRDb250ZW50cyhIVE1M TGlua0VsZW1lbnQmLCBIVE1MTGlua0VsZW1lbnQmKTsKICAgICBib29sIGlzU3R5bGVTaGVldExv YWRpbmdTdWJyZXNvdXJjZXMoSFRNTExpbmtFbGVtZW50Jik7CiAgICAgZW51bSBjbGFzcyBDYWNo ZVBvbGljeSB7IFVzZVByb3RvY29sQ2FjaGVQb2xpY3ksIFJlbG9hZElnbm9yaW5nQ2FjaGVEYXRh LCBSZXR1cm5DYWNoZURhdGFFbHNlTG9hZCwgUmV0dXJuQ2FjaGVEYXRhRG9udExvYWQgfTsKQEAg LTQ0NCw2ICs0NDIsOCBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIGdldEltYWdlU291cmNlVVJMKEVs ZW1lbnQmKTsKIAogI2lmIEVOQUJMRShWSURFTykKKyAgICBWZWN0b3I8U3RyaW5nPiBtZWRpYVJl c3BvbnNlU291cmNlcyhIVE1MTWVkaWFFbGVtZW50Jik7CisgICAgVmVjdG9yPFN0cmluZz4gbWVk aWFSZXNwb25zZUNvbnRlbnRSYW5nZXMoSFRNTE1lZGlhRWxlbWVudCYpOwogICAgIHZvaWQgc2lt dWxhdGVBdWRpb0ludGVycnVwdGlvbihIVE1MTWVkaWFFbGVtZW50Jik7CiAgICAgRXhjZXB0aW9u T3I8Ym9vbD4gbWVkaWFFbGVtZW50SGFzQ2hhcmFjdGVyaXN0aWMoSFRNTE1lZGlhRWxlbWVudCYs IGNvbnN0IFN0cmluZyYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwK aW5kZXggMDY5NTZhZTEzOWM0NDExMmQ3NjlkYTc3NDU4ZmZlMWVjMDRjODY0ZC4uOGMwZDc5YWEx ZGRhZjgxMjk0YmJkNjVkMjAxNTMyZWI5N2Q5MGNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmlkbApAQCAtOTcsOCArOTcsNiBAQCBlbnVtIEV2ZW50VGhyb3R0bGluZ0JlaGF2aW9y IHsKICAgICBib29sZWFuIGlzUHJlbG9hZGVkKERPTVN0cmluZyB1cmwpOwogICAgIGJvb2xlYW4g aXNMb2FkaW5nRnJvbU1lbW9yeUNhY2hlKERPTVN0cmluZyB1cmwpOwogICAgIERPTVN0cmluZyB4 aHJSZXNwb25zZVNvdXJjZShYTUxIdHRwUmVxdWVzdCB4aHIpOwotICAgIHNlcXVlbmNlPERPTVN0 cmluZz4gbWVkaWFSZXNwb25zZVNvdXJjZXMoSFRNTE1lZGlhRWxlbWVudCBtZWRpYSk7Ci0gICAg c2VxdWVuY2U8RE9NU3RyaW5nPiBtZWRpYVJlc3BvbnNlQ29udGVudFJhbmdlcyhIVE1MTWVkaWFF bGVtZW50IG1lZGlhKTsKICAgICBib29sZWFuIGlzU2hhcmluZ1N0eWxlU2hlZXRDb250ZW50cyhI VE1MTGlua0VsZW1lbnQgYSwgSFRNTExpbmtFbGVtZW50IGIpOwogICAgIGJvb2xlYW4gaXNTdHls ZVNoZWV0TG9hZGluZ1N1YnJlc291cmNlcyhIVE1MTGlua0VsZW1lbnQgbGluayk7CiAgICAgdm9p ZCBjbGVhck1lbW9yeUNhY2hlKCk7CkBAIC00MDYsNiArNDA0LDggQEAgZW51bSBFdmVudFRocm90 dGxpbmdCZWhhdmlvciB7CiAKICAgICB2b2lkIGVuYWJsZUF1dG9TaXplTW9kZShib29sZWFuIGVu YWJsZWQsIGxvbmcgbWluaW11bVdpZHRoLCBsb25nIG1pbmltdW1IZWlnaHQsIGxvbmcgbWF4aW11 bVdpZHRoLCBsb25nIG1heGltdW1IZWlnaHQpOwogCisgICAgW0NvbmRpdGlvbmFsPVZJREVPXSBz ZXF1ZW5jZTxET01TdHJpbmc+IG1lZGlhUmVzcG9uc2VTb3VyY2VzKEhUTUxNZWRpYUVsZW1lbnQg bWVkaWEpOworICAgIFtDb25kaXRpb25hbD1WSURFT10gc2VxdWVuY2U8RE9NU3RyaW5nPiBtZWRp YVJlc3BvbnNlQ29udGVudFJhbmdlcyhIVE1MTWVkaWFFbGVtZW50IG1lZGlhKTsKICAgICBbQ29u ZGl0aW9uYWw9VklERU9dIHZvaWQgc2ltdWxhdGVBdWRpb0ludGVycnVwdGlvbihIVE1MTWVkaWFF bGVtZW50IGVsZW1lbnQpOwogICAgIFtDb25kaXRpb25hbD1WSURFTywgTWF5VGhyb3dFeGNlcHRp b25dIGJvb2xlYW4gbWVkaWFFbGVtZW50SGFzQ2hhcmFjdGVyaXN0aWMoSFRNTE1lZGlhRWxlbWVu dCBlbGVtZW50LCBET01TdHJpbmcgY2hhcmFjdGVyaXN0aWMpOwogCg==