224183 2021-04-05 07:04:14 -0700 [METAL ANGLE] Stencil only formats being used as the depth attachment. 2021-04-05 19:16:59 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 johncunningham webkit-unassigned dino ews-watchlist graouts johncunningham jonlee kkinnunen kondapallykalyan mjs webkit-bug-importer oldest_to_newest 1746937 0 johncunningham 2021-04-05 07:04:14 -0700 Fixes a couple of issues found when using Google Earth, specifically zooming in towards Earth. 1. Stencil only states previously only worked if combined as depth stencil, stencil only formats such as GL_STENCIL_INDEX8 were being incorrectly set as the Metal depth attachment. 2. WebGL contexts issuing many draws and updating a lot of uniforms would have the command encoder be invalidated before they were finished rendering. Previously the command encoder was restarted from an empty state, this change fixes that such that the command buffer and encoder is completely invalidated and the next draw call will set up where the previous command encoder finished. 3. 'Angle_out' transformation was being applied to the result of Angle_swizzle_ref, which may cause issues due to the different address space. I'm not exactly sure what's intended here, but the change looks reasonable and fixes Google Earth. Let the tests run and make sure this doesn't regress something else. 1746939 1 425149 johncunningham 2021-04-05 07:11:18 -0700 Created attachment 425149 Patch 1746956 2 ews-watchlist 2021-04-05 09:14:31 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1746977 3 jonlee 2021-04-05 09:39:47 -0700 rdar://76157243 1747205 4 ews-feeder 2021-04-05 18:17:51 -0700 commit-queue failed to commit attachment 425149 to WebKit repository. To retry, please set cq+ flag again. 1747209 5 425149 mjs 2021-04-05 18:27:45 -0700 Comment on attachment 425149 Patch Reflagging for CQ. The CQ error seems bogus. 1747235 6 ews-feeder 2021-04-05 19:16:58 -0700 Committed r275476: <https://commits.webkit.org/r275476> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425149. 425149 2021-04-05 07:11:18 -0700 2021-04-05 19:16:58 -0700 Patch bug-224183-20210405071118.patch text/plain 12222 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNzY5YTY4NjNhZDE4OTg4N2JiNzExNzAxYWJmNTJiYzc4YTMyNzk5Mi4uYWJkNmVjNmEwYjUw ZDVkODAxZmE3ZTAwYTZhODg2MzdmOWE1ODFhYyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA0LTA1ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3Vu bmlnaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBbTUVUQUwgQU5HTEVdIFN0ZW5jaWwgb25seSBm b3JtYXRzIGJlaW5nIHVzZWQgYXMgdGhlIGRlcHRoIGF0dGFjaG1lbnQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQxODMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9jb21waWxlci90cmFuc2xh dG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Qcm9ncmFtUHJlbHVkZS5jcHA6CisgICAgICAgICog c3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Jld3JpdGVPdXRB cmdzLmNwcDoKKyAgICAgICAgKHNoOjpSZXdyaXRlcjo6YXJnQWxyZWFkeVByb2Nlc3NlZCk6Cisg ICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwubW06CisgICAg ICAgIChyeDo6Q29udGV4dE10bDo6c2V0dXBEcmF3KToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvbXRsX2NvbW1hbmRfYnVmZmVyLmg6CisgICAgICAgICogc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL210bF9jb21tYW5kX2J1ZmZlci5tbToKKyAgICAgICAgKHJ4Ojpt dGw6OlJlbmRlckNvbW1hbmRFbmNvZGVyOjpyZXNldCk6CisgICAgICAgIChyeDo6bXRsOjpSZW5k ZXJDb21tYW5kRW5jb2Rlcjo6c2V0UmVuZGVyUGlwZWxpbmVTdGF0ZSk6CisgICAgICAgIChyeDo6 bXRsOjpSZW5kZXJDb21tYW5kRW5jb2Rlcjo6ZHJhdyk6CisgICAgICAgIChyeDo6bXRsOjpSZW5k ZXJDb21tYW5kRW5jb2Rlcjo6ZHJhd0luc3RhbmNlZCk6CisgICAgICAgIChyeDo6bXRsOjpSZW5k ZXJDb21tYW5kRW5jb2Rlcjo6ZHJhd0luZGV4ZWQpOgorICAgICAgICAocng6Om10bDo6UmVuZGVy Q29tbWFuZEVuY29kZXI6OmRyYXdJbmRleGVkSW5zdGFuY2VkKToKKyAgICAgICAgKHJ4OjptdGw6 OlJlbmRlckNvbW1hbmRFbmNvZGVyOjpkcmF3SW5kZXhlZEluc3RhbmNlZEJhc2VWZXJ0ZXgpOgor ICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfdXRpbHMubW06CisgICAg ICAgIChyeDo6bXRsOjpJbml0aWFsaXplRGVwdGhTdGVuY2lsVGV4dHVyZUNvbnRlbnRzR1BVKToK KwogMjAyMS0wMy0zMCAgS3lsZSBQaWRkaW5ndG9uICA8a3BpZGRpbmd0b25AYXBwbGUuY29tPgog CiAgICAgICAgIEVuYWJsZSBzYW1wbGVfY29tcGFyZSBvcGVyYXRpb25zIGluIE1ldGFsIEFOR0xF CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNs YXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1ZGUuY3BwIGIvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGly ZWN0L1Byb2dyYW1QcmVsdWRlLmNwcAppbmRleCA3MjRmNzliOTc0NzZhMWM4ZTAxNThkOWMzZWU1 YjdmMmMxZTY1NTFhLi40MWRkNDZlMjVkNmJkNmIwMGU1Y2YzYTNmM2RiZjIyMmRlY2JiZWIxIDEw MDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRv ci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1ZGUuY3BwCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERp cmVjdC9Qcm9ncmFtUHJlbHVkZS5jcHAKQEAgLTEyNDIsNyArMTI0Miw3IEBAIHN0cnVjdCBBTkdM RV9PdXQKICAgICB0aHJlYWQgVCAmbURlc3Q7CiAgICAgfkFOR0xFX091dCgpIHsgbURlc3QgPSBt VGVtcDsgfQogICAgIEFOR0xFX091dCh0aHJlYWQgVCAmZGVzdCkKLSAgICAgICAgOiBtRGVzdChk ZXN0KQorICAgICAgICA6IG1UZW1wKGRlc3QpLCBtRGVzdChkZXN0KQogICAgIHt9CiAgICAgb3Bl cmF0b3IgdGhyZWFkIFQgJigpIHsgcmV0dXJuIG1UZW1wOyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1l dGFsRGlyZWN0L1Jld3JpdGVPdXRBcmdzLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9SZXdyaXRlT3V0QXJn cy5jcHAKaW5kZXggOTFjMDM3ZDUyOTBhZGYyMzIyNWViODhkZDBmYjc3ODlhYWU1NGQyYS4uMGM3 M2IxYzU2OGY2MzY3ZmJjOWZmZmQxOTFkZGQxM2MwMjJlNjEyMCAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFs RGlyZWN0L1Jld3JpdGVPdXRBcmdzLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUmV3cml0ZU91dEFy Z3MuY3BwCkBAIC05MSw2ICs5MSwxOSBAQCBjbGFzcyBSZXdyaXRlciA6IHB1YmxpYyBUSW50ZXJt UmVidWlsZAogICAgICAgICA6IFRJbnRlcm1SZWJ1aWxkKGNvbXBpbGVyLCBmYWxzZSwgdHJ1ZSks IG1TeW1ib2xFbnYoc3ltYm9sRW52KQogICAgIHt9CiAKKyAgICBzdGF0aWMgYm9vbCBhcmdBbHJl YWR5UHJvY2Vzc2VkKFRJbnRlcm1UeXBlZCAqYXJnKQorICAgIHsKKyAgICAgICAgaWYgKGFyZy0+ Z2V0QXNBZ2dyZWdhdGUoKSkKKyAgICAgICAgeworICAgICAgICAgICAgY29uc3QgVEZ1bmN0aW9u ICpmdW5jID0gYXJnLT5nZXRBc0FnZ3JlZ2F0ZSgpLT5nZXRGdW5jdGlvbigpOworICAgICAgICAg ICAgaWYgKGZ1bmMgJiYgZnVuYy0+c3ltYm9sVHlwZSgpID09IFN5bWJvbFR5cGU6OkFuZ2xlSW50 ZXJuYWwgJiYgZnVuYy0+bmFtZSgpID09ICJzd2l6emxlX3JlZiIpCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIFBvc3RSZXN1bHQgdmlzaXRBZ2dyZWdh dGVQb3N0KFRJbnRlcm1BZ2dyZWdhdGUgJmFnZ3JlZ2F0ZU5vZGUpIG92ZXJyaWRlCiAgICAgewog ICAgICAgICBBU1NFUlQobVZhckJ1ZmZlci5lbXB0eSgpKTsKQEAgLTE2MSwyNSArMTc0LDI4IEBA IGNsYXNzIFJld3JpdGVyIDogcHVibGljIFRJbnRlcm1SZWJ1aWxkCiAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgVEludGVybVR5cGVkICphcmcgPSBhcmdzW2ldLT5nZXRBc1R5cGVkKCk7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKGFyZyk7Ci0gICAgICAgICAgICAgICAgY29uc3QgVFZh cmlhYmxlICp2YXIgICAgICAgPSBHZXRWYXJpYWJsZSgqYXJnKTsKLSAgICAgICAgICAgICAgICBj b25zdCBUUXVhbGlmaWVyIHBhcmFtUXVhbCA9IGdldFBhcmFtUXVhbGlmaWVyKGkpOwotCi0gICAg ICAgICAgICAgICAgaWYgKGhhc0luZGV0ZXJtaW5hdGVWYXIgfHwgbVZhckJ1ZmZlci5tdWx0aXBs aWNpdHkodmFyKSA+IDEpCisgICAgICAgICAgICAgICAgaWYgKCFhcmdBbHJlYWR5UHJvY2Vzc2Vk KGFyZykpCiAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKHBh cmFtUXVhbCkKKyAgICAgICAgICAgICAgICAgICAgY29uc3QgVFZhcmlhYmxlICp2YXIgICAgICAg PSBHZXRWYXJpYWJsZSgqYXJnKTsKKyAgICAgICAgICAgICAgICAgICAgY29uc3QgVFF1YWxpZmll ciBwYXJhbVF1YWwgPSBnZXRQYXJhbVF1YWxpZmllcihpKTsKKworICAgICAgICAgICAgICAgICAg ICBpZiAoaGFzSW5kZXRlcm1pbmF0ZVZhciB8fCBtVmFyQnVmZmVyLm11bHRpcGxpY2l0eSh2YXIp ID4gMSkKICAgICAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSBUUXVhbGlmaWVyOjpFdnFPdXQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJnc1tp XSA9ICZtU3ltYm9sRW52LmNhbGxGdW5jdGlvbk92ZXJsb2FkKE5hbWUoIm91dCIpLCBhcmctPmdl dFR5cGUoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKm5ldyBUSW50ZXJtU2VxdWVuY2V7YXJnfSk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgICAgICAg IGNhc2UgVFF1YWxpZmllcjo6RXZxSW5PdXQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg YXJnc1tpXSA9ICZtU3ltYm9sRW52LmNhbGxGdW5jdGlvbk92ZXJsb2FkKAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBOYW1lKCJpbm91dCIpLCBhcmctPmdldFR5cGUoKSwgKm5ldyBU SW50ZXJtU2VxdWVuY2V7YXJnfSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKHBhcmFtUXVh bCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjYXNlIFRRdWFsaWZpZXI6OkV2cU91dDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXJnc1tpXSA9ICZtU3ltYm9sRW52LmNhbGxGdW5jdGlvbk92ZXJsb2FkKE5hbWUoIm91dCIp LCBhcmctPmdldFR5cGUoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpuZXcgVEludGVybVNlcXVlbmNl e2FyZ30pOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNhc2UgVFF1YWxpZmllcjo6RXZxSW5PdXQ6CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFyZ3NbaV0gPSAmbVN5bWJvbEVudi5jYWxsRnVuY3Rp b25PdmVybG9hZCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5hbWUoImlu b3V0IiksIGFyZy0+Z2V0VHlwZSgpLCAqbmV3IFRJbnRlcm1TZXF1ZW5jZXthcmd9KTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLm1tIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwu bW0KaW5kZXggNGJlMGUxNmRlZTY3NDI2NDUwNmNjNjQ5YzU3MTBjMTIwYjQyMGVjMi4uZTRkMDJi YmZmZjQzN2JjNjE3NDgxZTAyMjY5ODZjZWZjNjRhOGIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwubW0K KysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L0NvbnRleHRNdGwubW0KQEAgLTEzMCw3ICsxMzAsNiBAQCBjbGFzcyBMaW5lTG9vcExhc3RTZWdt ZW50SGVscGVyCiAgICAgICAgIG1Db250ZXh0TXRsID0gbXRsOjpHZXRJbXBsKGNvbnRleHQpOwog CiAgICAgICAgIGluZGV4QnVmZmVyUG9vbC0+cmVsZWFzZUluRmxpZ2h0QnVmZmVycyhtQ29udGV4 dE10bCk7Ci0KICAgICAgICAgQU5HTEVfVFJZKGluZGV4QnVmZmVyUG9vbC0+YWxsb2NhdGUobUNv bnRleHRNdGwsIDIgKiBzaXplb2YodWludDMyX3QpLCBudWxscHRyLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbUxpbmVMb29wSW5kZXhCdWZmZXIsIG51bGxw dHIsIG51bGxwdHIpKTsKIApAQCAtMjIxMyw4ICsyMjEyLDE2IEBAIGFuZ2xlOjpSZXN1bHQgQ29u dGV4dE10bDo6c2V0dXBEcmF3KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICBj aGFuZ2VkUGlwZWxpbmUgPSB0cnVlOwogICAgIH0KIAotICAgIEFOR0xFX1RSWShtUHJvZ3JhbS0+ c2V0dXBEcmF3KGNvbnRleHQsICZtUmVuZGVyRW5jb2RlciwgbVJlbmRlclBpcGVsaW5lRGVzYywg Y2hhbmdlZFBpcGVsaW5lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHR1 cmVDaGFuZ2VkLCB1bmlmb3JtQnVmZmVyc0RpcnR5LCB0cmFuc2Zvcm1GZWVkYmFja0RyYXcpKTsK KyAgICBBTkdMRV9UUlkobVByb2dyYW0tPnNldHVwRHJhdyhjb250ZXh0LCAmbVJlbmRlckVuY29k ZXIsIG1SZW5kZXJQaXBlbGluZURlc2MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY2hhbmdlZFBpcGVsaW5lLCB0ZXh0dXJlQ2hhbmdlZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bmlmb3JtQnVmZmVyc0RpcnR5LCB0cmFuc2Zvcm1GZWVkYmFja0RyYXcp KTsKKworICAgIC8vIFNldHRpbmcgdXAgdGhlIGRyYXcgcmVxdWlyZWQgdXMgdG8gY2FsbCBhIGNv bW1hbmQgYnVmZmVyIGZsdXNoLCByZS1ydW4gc2V0dXBEcmF3IHdpdGggc3RhdGUgaW52YWxpYXRl ZCB0byByZXN0YXJ0IHRoZSBjb21tYW5kIGJ1ZmZlciBmcm9tIHRoZSBjdXJyZW50IGRyYXcgd2l0 aCBwcmV2aW91c2x5IHNldCBzdGF0ZQorICAgIGlmICghbUNtZEJ1ZmZlci52YWxpZCgpKQorICAg IHsKKyAgICAgICAgaW52YWxpZGF0ZVN0YXRlKGNvbnRleHQpOworICAgICAgICBBTkdMRV9UUlko c2V0dXBEcmF3KGNvbnRleHQsIG1vZGUsIGZpcnN0VmVydGV4LCB2ZXJ0ZXhPckluZGV4Q291bnQs IGluc3RhbmNlcywgaW5kZXhUeXBlT3JOb25lLCBpbmRpY2VzLCB0cmFuc2Zvcm1GZWVkYmFja0Ry YXcpKTsKKyAgICB9CiAKICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6Q29udGludWU7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvbXRsX2NvbW1hbmRfYnVmZmVyLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2NvbW1hbmRfYnVmZmVyLmgKaW5kZXggM2FhODI2 YWY2N2ZjZDIwMWI5ZjNiMmNjOGYxYThlNzdhMDExYjI1MS4uNzljYjg0MzBjZWZlYThiMjgwYTk0 NDhmZmFlMmU4ZTU5N2NhYjE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9jb21tYW5kX2J1ZmZlci5oCisrKyBiL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfY29t bWFuZF9idWZmZXIuaApAQCAtNTIyLDYgKzUyMiw4IEBAIGNsYXNzIFJlbmRlckNvbW1hbmRFbmNv ZGVyIGZpbmFsIDogcHVibGljIENvbW1hbmRFbmNvZGVyCiAgICAgZ2w6OlNoYWRlck1hcDx1aW50 OF90PiBtU2V0U2FtcGxlckNtZHM7CiAKICAgICBSZW5kZXJDb21tYW5kRW5jb2RlclN0YXRlcyBt U3RhdGVDYWNoZSA9IHt9OworCisgICAgYm9vbCBtUGlwZWxpbmVTdGF0ZVNldCA9IGZhbHNlOwog fTsKIAogY2xhc3MgQmxpdENvbW1hbmRFbmNvZGVyIGZpbmFsIDogcHVibGljIENvbW1hbmRFbmNv ZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX2NvbW1hbmRfYnVmZmVyLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9jb21tYW5kX2J1ZmZlci5tbQppbmRl eCAzZjFmY2MxN2QxMWEwMTExNjVkNzY3OTdhOTMyNWQ1ZmExZmM1MDExLi5mODNjOTdmYzlhZmZm MjE4YWY0ZjQyZDhjYTBhZjhlYTA5ODA3ODg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX2NvbW1hbmRfYnVmZmVyLm1t CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9tdGxfY29tbWFuZF9idWZmZXIubW0KQEAgLTEwMzEsNiArMTAzMSw3IEBAIHZvaWQgUmVuZGVy Q29tbWFuZEVuY29kZXI6OnJlc2V0KCkKIHsKICAgICBDb21tYW5kRW5jb2Rlcjo6cmVzZXQoKTsK ICAgICBtUmVjb3JkaW5nID0gZmFsc2U7CisgICAgbVBpcGVsaW5lU3RhdGVTZXQgPSBmYWxzZTsK ICAgICBtQ29tbWFuZHMuY2xlYXIoKTsKIH0KIApAQCAtMTI5NSw2ICsxMjk2LDcgQEAgUmVuZGVy Q29tbWFuZEVuY29kZXIgJlJlbmRlckNvbW1hbmRFbmNvZGVyOjpyZXN0YXJ0KGNvbnN0IFJlbmRl clBhc3NEZXNjICZkZXNjKQogCiBSZW5kZXJDb21tYW5kRW5jb2RlciAmUmVuZGVyQ29tbWFuZEVu Y29kZXI6OnNldFJlbmRlclBpcGVsaW5lU3RhdGUoaWQ8TVRMUmVuZGVyUGlwZWxpbmVTdGF0ZT4g c3RhdGUpCiB7CisgICAgbVBpcGVsaW5lU3RhdGVTZXQgPSB0cnVlOwogICAgIGlmIChtU3RhdGVD YWNoZS5yZW5kZXJQaXBlbGluZSA9PSBzdGF0ZSkKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhp czsKQEAgLTE2MDMsNiArMTYwNSw3IEBAIFJlbmRlckNvbW1hbmRFbmNvZGVyICZSZW5kZXJDb21t YW5kRW5jb2Rlcjo6ZHJhdyhNVExQcmltaXRpdmVUeXBlIHByaW1pdGl2ZVR5cGUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgdmVydGV4 U3RhcnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dWludDMyX3QgdmVydGV4Q291bnQpCiB7CisgICAgQVNTRVJUKG1QaXBlbGluZVN0YXRlU2V0ICYm ICJSZW5kZXIgUGlwZWxpbmUgU3RhdGUgd2FzIG5ldmVyIHNldCBhbmQgd2UndmUgaXNzdWVkIGEg ZHJhdyBjb21tYW5kLiIpOwogICAgIG1IYXNEcmF3Q2FsbHMgPSB0cnVlOwogICAgIG1Db21tYW5k cy5wdXNoKENtZFR5cGU6OkRyYXcpLnB1c2gocHJpbWl0aXZlVHlwZSkucHVzaCh2ZXJ0ZXhTdGFy dCkucHVzaCh2ZXJ0ZXhDb3VudCk7CiAKQEAgLTE2MTQsNiArMTYxNyw3IEBAIFJlbmRlckNvbW1h bmRFbmNvZGVyICZSZW5kZXJDb21tYW5kRW5jb2Rlcjo6ZHJhd0luc3RhbmNlZChNVExQcmltaXRp dmVUeXBlIHByaW1pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdWludDMyX3QgdmVydGV4Q291bnQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgaW5zdGFuY2Vz KQogeworICAgIEFTU0VSVChtUGlwZWxpbmVTdGF0ZVNldCAmJiAiUmVuZGVyIFBpcGVsaW5lIFN0 YXRlIHdhcyBuZXZlciBzZXQgYW5kIHdlJ3ZlIGlzc3VlZCBhIGRyYXcgY29tbWFuZC4iKTsKICAg ICBtSGFzRHJhd0NhbGxzID0gdHJ1ZTsKICAgICBtQ29tbWFuZHMucHVzaChDbWRUeXBlOjpEcmF3 SW5zdGFuY2VkKQogICAgICAgICAucHVzaChwcmltaXRpdmVUeXBlKQpAQCAtMTYzMCw2ICsxNjM0 LDcgQEAgUmVuZGVyQ29tbWFuZEVuY29kZXIgJlJlbmRlckNvbW1hbmRFbmNvZGVyOjpkcmF3SW5k ZXhlZChNVExQcmltaXRpdmVUeXBlIHByaW1pdGkKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgQnVmZmVyUmVmICZpbmRleEJ1ZmZl ciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2l6ZV90IGJ1ZmZlck9mZnNldCkKIHsKKyAgICBBU1NFUlQobVBpcGVsaW5lU3RhdGVTZXQg JiYgIlJlbmRlciBQaXBlbGluZSBTdGF0ZSB3YXMgbmV2ZXIgc2V0IGFuZCB3ZSd2ZSBpc3N1ZWQg YSBkcmF3IGNvbW1hbmQuIik7CiAgICAgaWYgKCFpbmRleEJ1ZmZlcikKICAgICB7CiAgICAgICAg IHJldHVybiAqdGhpczsKQEAgLTE2NTUsNiArMTY2MCw3IEBAIFJlbmRlckNvbW1hbmRFbmNvZGVy ICZSZW5kZXJDb21tYW5kRW5jb2Rlcjo6ZHJhd0luZGV4ZWRJbnN0YW5jZWQoTVRMUHJpbWl0aXZl VHlwCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNpemVfdCBidWZmZXJPZmZzZXQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGluc3Rh bmNlcykKIHsKKyAgICBBU1NFUlQobVBpcGVsaW5lU3RhdGVTZXQgJiYgIlJlbmRlciBQaXBlbGlu ZSBTdGF0ZSB3YXMgbmV2ZXIgc2V0IGFuZCB3ZSd2ZSBpc3N1ZWQgYSBkcmF3IGNvbW1hbmQuIik7 CiAgICAgaWYgKCFpbmRleEJ1ZmZlcikKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhpczsKQEAg LTE2ODMsNiArMTY4OSw3IEBAIFJlbmRlckNvbW1hbmRFbmNvZGVyICZSZW5kZXJDb21tYW5kRW5j b2Rlcjo6ZHJhd0luZGV4ZWRJbnN0YW5jZWRCYXNlVmVydGV4KAogICAgIHVpbnQzMl90IGluc3Rh bmNlcywKICAgICB1aW50MzJfdCBiYXNlVmVydGV4KQogeworICAgIEFTU0VSVChtUGlwZWxpbmVT dGF0ZVNldCAmJiAiUmVuZGVyIFBpcGVsaW5lIFN0YXRlIHdhcyBuZXZlciBzZXQgYW5kIHdlJ3Zl IGlzc3VlZCBhIGRyYXcgY29tbWFuZC4iKTsKICAgICBpZiAoIWluZGV4QnVmZmVyKQogICAgIHsK ICAgICAgICAgcmV0dXJuICp0aGlzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF91dGlscy5tbSBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfdXRpbHMubW0KaW5k ZXggYzk0YzM2YTUwMWEwMWYxZjY2YWQyNGE3MTg1ZTlhNTFmMzVmNDY2Ni4uYmRmYjNjOTQ5MTgw MjU4ZjkwN2FlMWZjYTYxMDFjMDkxOWQzMGZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF91dGlscy5tbQorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3V0 aWxzLm1tCkBAIC0zMTIsNyArMzEyLDE1IEBAIGFuZ2xlOjpSZXN1bHQgSW5pdGlhbGl6ZURlcHRo U3RlbmNpbFRleHR1cmVDb250ZW50c0dQVShjb25zdCBnbDo6Q29udGV4dCAqY29udGV4CiAgICAg dWludDMyX3QgbGF5ZXIgPSBpbmRleC5oYXNMYXllcigpID8gaW5kZXguZ2V0TGF5ZXJJbmRleCgp IDogMDsKICAgICBydE1UTC5zZXQodGV4dHVyZSwgbGV2ZWwsIGxheWVyLCB0ZXh0dXJlT2JqRm9y bWF0KTsKICAgICBtdGw6OlJlbmRlclBhc3NEZXNjIHJwRGVzYzsKLSAgICBydE1UTC50b1JlbmRl clBhc3NBdHRhY2htZW50RGVzYygmcnBEZXNjLmRlcHRoQXR0YWNobWVudCk7CisgICAgLy8gRm9y IGZvcm1hdHMgc3VjaCBhcyBNVExQaXhlbEZvcm1hdFN0ZW5jaWw4L0dMX1NURU5DSUxfSU5ERVg4 IHdlIG9ubHkgd2FudCB0byBzZXQgdGhlIHN0ZW5jaWwgYXR0YWNobWVudC4KKyAgICBpZiAoYW5n bGVGb3JtYXQuc3RlbmNpbEJpdHMgJiYgIWFuZ2xlRm9ybWF0LmRlcHRoQml0cykKKyAgICB7Cisg ICAgICAgIHJ0TVRMLnRvUmVuZGVyUGFzc0F0dGFjaG1lbnREZXNjKCZycERlc2Muc3RlbmNpbEF0 dGFjaG1lbnQpOworICAgIH0KKyAgICBlbHNlCisgICAgeworICAgICAgICBydE1UTC50b1JlbmRl clBhc3NBdHRhY2htZW50RGVzYygmcnBEZXNjLmRlcHRoQXR0YWNobWVudCk7CisgICAgfQogICAg IHJwRGVzYy5zYW1wbGVDb3VudCA9IHRleHR1cmUtPnNhbXBsZXMoKTsKICAgICBpZiAoYW5nbGVG b3JtYXQuZGVwdGhCaXRzKQogICAgIHsK