223915 2021-03-30 01:15:10 -0700 Address post-commit comments on r275180 2021-03-30 15:02:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield kkinnunen webkit-bug-importer oldest_to_newest 1745050 0 mmaxfield 2021-03-30 01:15:10 -0700 Address post-review comments on r275180 1745051 1 424620 mmaxfield 2021-03-30 01:15:45 -0700 Created attachment 424620 Patch 1745053 2 424620 kkinnunen 2021-03-30 01:21:37 -0700 Comment on attachment 424620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424620&action=review > Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:184 > + return m_getImageDataSemaphore->waitFor(timeout.secondsUntilDeadline()); waitFor(timeout) 1745352 3 mmaxfield 2021-03-30 15:01:49 -0700 Committed r275240 (235930@main): <https://commits.webkit.org/235930@main> 1745355 4 webkit-bug-importer 2021-03-30 15:02:39 -0700 <rdar://problem/76023839> 424620 2021-03-30 01:15:45 -0700 2021-03-30 01:15:45 -0700 Patch bug-223915-20210330011544.patch text/plain 11777 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDllZmZlMWEyM2RkZWIwNjAw Nzc4ODdjNDY1ZGQyMjg2NGU0NWRkM2EuLjVmM2MyNWVmOWFmNGQ2ZjkwYWNlZjVmYWUzYzc4NmQ0 ZmNmNjcxMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDMtMzAgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRyZXNzIHBvc3Qt Y29tbWl0IGNvbW1lbnRzIG9uIHIyNzUxODAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzkxNQorCisgICAgICAgIFVucmV2aWV3ZWQuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5Lmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3 YWl0Rm9yRGlkQ3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kKToKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3YWl0Rm9yRGlkRmx1c2gpOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnNoYXJlZE1lbW9yeUZvckdldEltYWdl RGF0YSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6d2Fp dEZvckdldEltYWdlRGF0YVRvQ29tcGxldGUpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHk6OmdldERhdGFVUkxGb3JJbWFnZUJ1ZmZlcik6CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z2V0RGF0YUZvckltYWdlQnVmZmVy KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpnZXRCR1JB RGF0YUZvckltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5OjpnZXRTaGFyZWFibGVCaXRtYXApOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oOgorCiAyMDIxLTAzLTI5ICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0Jp ZyBTdXIgYXJtNjRdIFRlc3RXZWJLaXRBUEkuV2ViS2l0LkFjY2Vzc2liaWxpdHlSZWR1Y2VNb3Rp b24gaXMgYSBmbGFreSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAppbmRleCBlMjUz ZWRkYmYxZmEwODUxMGI0MTY0OGZkZjJlNDA1MDg0NjQzZTdhLi5iZjRjZTViNmY2NmU5YzE2Zjcz NjkzNWFjNDFmNjdhZDczZjdmNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApAQCAt MjAxLDcgKzIwMSw4IEBAIHByb3RlY3RlZDoKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgICAgICBzaXplX3QgZGF0YVNpemUgPSBpbWFnZURhdGEtPmRhdGEoKS0+Ynl0ZUxlbmd0aCgp OwogCi0gICAgICAgIFNoYXJlZE1lbW9yeSogc2hhcmVkTWVtb3J5ID0gbV9yZW1vdGVSZW5kZXJp bmdCYWNrZW5kUHJveHktPnNoYXJlZE1lbW9yeUZvckdldEltYWdlRGF0YShkYXRhU2l6ZSk7Cisg ICAgICAgIElQQzo6VGltZW91dCB0aW1lb3V0ID0gNV9zOworICAgICAgICBTaGFyZWRNZW1vcnkq IHNoYXJlZE1lbW9yeSA9IG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LT5zaGFyZWRNZW1v cnlGb3JHZXRJbWFnZURhdGEoZGF0YVNpemUsIHRpbWVvdXQpOwogICAgICAgICBpZiAoIXNoYXJl ZE1lbW9yeSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC0yMDksNyArMjEwLDcg QEAgcHJvdGVjdGVkOgogICAgICAgICBtdXRhYmxlVGhpcy5tX2RyYXdpbmdDb250ZXh0LnJlY29y ZGVyKCkuZ2V0SW1hZ2VEYXRhKG91dHB1dEZvcm1hdCwgc3JjUmVjdCk7CiAgICAgICAgIG11dGFi bGVUaGlzLmZsdXNoRHJhd2luZ0NvbnRleHRBc3luYygpOwogCi0gICAgICAgIGlmIChtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS0+d2FpdEZvckdldEltYWdlRGF0YVRvQ29tcGxldGUoKSkK KyAgICAgICAgaWYgKG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LT53YWl0Rm9yR2V0SW1h Z2VEYXRhVG9Db21wbGV0ZSh0aW1lb3V0KSkKICAgICAgICAgICAgIG1lbWNweShpbWFnZURhdGEt PmRhdGEoKS0+ZGF0YSgpLCBzaGFyZWRNZW1vcnktPmRhdGEoKSwgZGF0YVNpemUpOwogICAgICAg ICBlbHNlCiAgICAgICAgICAgICBtZW1zZXQoaW1hZ2VEYXRhLT5kYXRhKCktPmRhdGEoKSwgMCwg ZGF0YVNpemUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw aGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCmluZGV4 IGQ1MDgzOTAyOGVkODg5Y2Q3NmU0NTEwY2EzZTNjZTIzMDkxYWU2NWUuLjdjMWI3ZDQ4YTYzNTg4 MGM3ZGNkN2NiOTMyY2QzYTlmOWM3YTE3NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jcHAKQEAgLTQxLDkgKzQxLDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgY29uc3RleHByIFNlY29uZHMgbG9uZ0lQ Q1RpbWVvdXQgPSA1X3M7Ci1zdGF0aWMgY29uc3RleHByIFNlY29uZHMgc2hvcnRJUENUaW1lb3V0 ID0gMV9zOwotCiBzdGQ6OnVuaXF1ZV9wdHI8UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5PiBS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNyZWF0ZSgpCiB7CiAgICAgcmV0dXJuIHN0ZDo6 dW5pcXVlX3B0cjxSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk+KG5ldyBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kUHJveHkoKSk7CkBAIC0xMTAsNyArMTA3LDcgQEAgdWludDY0X3QgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5OjptZXNzYWdlU2VuZGVyRGVzdGluYXRpb25JRCgpIGNvbnN0CiBS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OkRpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1 bHQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3YWl0Rm9yRGlkQ3JlYXRlSW1hZ2VCdWZm ZXJCYWNrZW5kKCkKIHsKICAgICBSZWY8SVBDOjpDb25uZWN0aW9uPiBjb25uZWN0aW9uID0gV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0 aW9uKCk7Ci0gICAgaWYgKCFjb25uZWN0aW9uLT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVs eTxNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpEaWRDcmVhdGVJbWFnZUJ1 ZmZlckJhY2tlbmQ+KG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIHNob3J0SVBDVGltZW91 dCwgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2 ZXMpKQorICAgIGlmICghY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8 TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkQ3JlYXRlSW1hZ2VCdWZm ZXJCYWNrZW5kPihtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCAxX3MsIElQQzo6V2FpdEZv ck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKSkKICAgICAgICAg cmV0dXJuIERpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1bHQ6OlRpbWVvdXRPcklQQ0ZhaWx1 cmU7CiAgICAgcmV0dXJuIERpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1bHQ6OlJlY2VpdmVk QW55UmVzcG9uc2U7CiB9CkBAIC0xMTgsNyArMTE1LDcgQEAgUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5OjpEaWRSZWNlaXZlQmFja2VuZENyZWF0aW9uUmVzdWx0IFJlbW90ZVJlbmRlcmluZ0Jh Y2sKIGJvb2wgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3YWl0Rm9yRGlkRmx1c2goKQog ewogICAgIFJlZjxJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rpb24gPSBXZWJQcm9jZXNzOjpzaW5n bGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKTsKLSAgICBy ZXR1cm4gY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6 OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkRmx1c2g+KG1fcmVuZGVyaW5nQmFja2Vu ZElkZW50aWZpZXIsIHNob3J0SVBDVGltZW91dCwgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1 cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2ZXMpOworICAgIHJldHVybiBjb25uZWN0aW9uLT53 YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5OjpEaWRGbHVzaD4obV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciwgMV9zLCBJ UEM6OldhaXRGb3JPcHRpb246OkludGVycnVwdFdhaXRpbmdJZlN5bmNNZXNzYWdlQXJyaXZlcyk7 CiB9CiAKIFJlZlB0cjxJbWFnZUJ1ZmZlcj4gUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojpj cmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFNpemUmIHNpemUsIFJlbmRlcmluZ01vZGUgcmVu ZGVyaW5nTW9kZSwgZmxvYXQgcmVzb2x1dGlvblNjYWxlLCBEZXN0aW5hdGlvbkNvbG9yU3BhY2Ug Y29sb3JTcGFjZSwgUGl4ZWxGb3JtYXQgcGl4ZWxGb3JtYXQpCkBAIC0xNDYsNyArMTQzLDcgQEAg UmVmUHRyPEltYWdlQnVmZmVyPiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNyZWF0ZUlt YWdlQnVmZmVyKGNvbnN0IEZsb2F0U2kKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotU2hhcmVk TWVtb3J5KiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnNoYXJlZE1lbW9yeUZvckdldElt YWdlRGF0YShzaXplX3QgZGF0YVNpemUpCitTaGFyZWRNZW1vcnkqIFJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eTo6c2hhcmVkTWVtb3J5Rm9yR2V0SW1hZ2VEYXRhKHNpemVfdCBkYXRhU2l6ZSwg SVBDOjpUaW1lb3V0IHRpbWVvdXQpCiB7CiAgICAgc2VuZERlZmVycmVkV2FrZXVwTWVzc2FnZUlm TmVlZGVkKCk7CiAKQEAgLTE2MCwxMSArMTU3LDExIEBAIFNoYXJlZE1lbW9yeSogUmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5OjpzaGFyZWRNZW1vcnlGb3JHZXRJbWFnZURhdGEoc2l6ZV90IGRh CiAgICAgSVBDOjpTZW1hcGhvcmUgc2VtYXBob3JlOwogCiAgICAgaWYgKG5lZWRzU2hhcmVkTWVt b3J5ICYmIG5lZWRzU2VtYXBob3JlKQotICAgICAgICBzZW5kU3luYyhNZXNzYWdlczo6UmVtb3Rl UmVuZGVyaW5nQmFja2VuZDo6VXBkYXRlU2hhcmVkTWVtb3J5QW5kU2VtYXBob3JlRm9yR2V0SW1h Z2VEYXRhKGRhdGFTaXplKSwgTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OlVwZGF0 ZVNoYXJlZE1lbW9yeUFuZFNlbWFwaG9yZUZvckdldEltYWdlRGF0YTo6UmVwbHkoaGFuZGxlLCBz ZW1hcGhvcmUpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCBzaG9ydElQQ1RpbWVvdXQs IElQQzo6U2VuZFN5bmNPcHRpb246Ok1haW50YWluT3JkZXJpbmdXaXRoQXN5bmNNZXNzYWdlcyk7 CisgICAgICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpVcGRh dGVTaGFyZWRNZW1vcnlBbmRTZW1hcGhvcmVGb3JHZXRJbWFnZURhdGEoZGF0YVNpemUpLCBNZXNz YWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6VXBkYXRlU2hhcmVkTWVtb3J5QW5kU2VtYXBo b3JlRm9yR2V0SW1hZ2VEYXRhOjpSZXBseShoYW5kbGUsIHNlbWFwaG9yZSksIG1fcmVuZGVyaW5n QmFja2VuZElkZW50aWZpZXIsIHRpbWVvdXQsIElQQzo6U2VuZFN5bmNPcHRpb246Ok1haW50YWlu T3JkZXJpbmdXaXRoQXN5bmNNZXNzYWdlcyk7CiAgICAgZWxzZSBpZiAobmVlZHNTaGFyZWRNZW1v cnkpCi0gICAgICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpV cGRhdGVTaGFyZWRNZW1vcnlGb3JHZXRJbWFnZURhdGEoZGF0YVNpemUpLCBNZXNzYWdlczo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6VXBkYXRlU2hhcmVkTWVtb3J5Rm9yR2V0SW1hZ2VEYXRhOjpS ZXBseShoYW5kbGUpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCBzaG9ydElQQ1RpbWVv dXQsIElQQzo6U2VuZFN5bmNPcHRpb246Ok1haW50YWluT3JkZXJpbmdXaXRoQXN5bmNNZXNzYWdl cyk7CisgICAgICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpV cGRhdGVTaGFyZWRNZW1vcnlGb3JHZXRJbWFnZURhdGEoZGF0YVNpemUpLCBNZXNzYWdlczo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6VXBkYXRlU2hhcmVkTWVtb3J5Rm9yR2V0SW1hZ2VEYXRhOjpS ZXBseShoYW5kbGUpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCB0aW1lb3V0LCBJUEM6 OlNlbmRTeW5jT3B0aW9uOjpNYWludGFpbk9yZGVyaW5nV2l0aEFzeW5jTWVzc2FnZXMpOwogICAg IGVsc2UgaWYgKG5lZWRzU2VtYXBob3JlKQotICAgICAgICBzZW5kU3luYyhNZXNzYWdlczo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6U2VtYXBob3JlRm9yR2V0SW1hZ2VEYXRhKCksIE1lc3NhZ2Vz OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpTZW1hcGhvcmVGb3JHZXRJbWFnZURhdGE6OlJlcGx5 KHNlbWFwaG9yZSksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIHNob3J0SVBDVGltZW91 dCk7CisgICAgICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpT ZW1hcGhvcmVGb3JHZXRJbWFnZURhdGEoKSwgTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tl bmQ6OlNlbWFwaG9yZUZvckdldEltYWdlRGF0YTo6UmVwbHkoc2VtYXBob3JlKSwgbV9yZW5kZXJp bmdCYWNrZW5kSWRlbnRpZmllciwgdGltZW91dCk7CiAKICAgICBpZiAoIWhhbmRsZS5oYW5kbGUu aXNOdWxsKCkpIHsKICAgICAgICAgbV9nZXRJbWFnZURhdGFTaGFyZWRNZW1vcnkgPSBTaGFyZWRN ZW1vcnk6Om1hcChoYW5kbGUuaGFuZGxlLCBTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRP bmx5KTsKQEAgLTE4MCwxMSArMTc3LDExIEBAIFNoYXJlZE1lbW9yeSogUmVtb3RlUmVuZGVyaW5n QmFja2VuZFByb3h5OjpzaGFyZWRNZW1vcnlGb3JHZXRJbWFnZURhdGEoc2l6ZV90IGRhCiAgICAg cmV0dXJuIG1fZ2V0SW1hZ2VEYXRhU2hhcmVkTWVtb3J5LmdldCgpOwogfQogCi1ib29sIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6d2FpdEZvckdldEltYWdlRGF0YVRvQ29tcGxldGUoKQor Ym9vbCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OndhaXRGb3JHZXRJbWFnZURhdGFUb0Nv bXBsZXRlKElQQzo6VGltZW91dCB0aW1lb3V0KQogewogICAgIEFTU0VSVChtX2dldEltYWdlRGF0 YVNlbWFwaG9yZSk7CiAjaWYgT1MoREFSV0lOKQotICAgIHJldHVybiBtX2dldEltYWdlRGF0YVNl bWFwaG9yZS0+d2FpdEZvcihsb25nSVBDVGltZW91dCk7CisgICAgcmV0dXJuIG1fZ2V0SW1hZ2VE YXRhU2VtYXBob3JlLT53YWl0Rm9yKHRpbWVvdXQuc2Vjb25kc1VudGlsRGVhZGxpbmUoKSk7CiAj ZWxzZQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCkBAIC0yMDEsNyArMTk4LDcgQEAgU3RyaW5n IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z2V0RGF0YVVSTEZvckltYWdlQnVmZmVyKGNv bnN0IFN0cmluZyYgbWltZVQKICAgICBzZW5kRGVmZXJyZWRXYWtldXBNZXNzYWdlSWZOZWVkZWQo KTsKIAogICAgIFN0cmluZyB1cmxTdHJpbmc7Ci0gICAgc2VuZFN5bmMoTWVzc2FnZXM6OlJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQ6OkdldERhdGFVUkxGb3JJbWFnZUJ1ZmZlcihtaW1lVHlwZSwgcXVh bGl0eSwgcHJlc2VydmVSZXNvbHV0aW9uLCByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpLCBN ZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6R2V0RGF0YVVSTEZvckltYWdlQnVmZmVy OjpSZXBseSh1cmxTdHJpbmcpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCBzaG9ydElQ Q1RpbWVvdXQpOworICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpHZXREYXRhVVJMRm9ySW1hZ2VCdWZmZXIobWltZVR5cGUsIHF1YWxpdHksIHByZXNlcnZlUmVz b2x1dGlvbiwgcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKSwgTWVzc2FnZXM6OlJlbW90ZVJl bmRlcmluZ0JhY2tlbmQ6OkdldERhdGFVUkxGb3JJbWFnZUJ1ZmZlcjo6UmVwbHkodXJsU3RyaW5n KSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciwgMV9zKTsKICAgICByZXR1cm4gdXJsU3Ry aW5nOwogfQogCkBAIC0yMTAsNyArMjA3LDcgQEAgVmVjdG9yPHVpbnQ4X3Q+IFJlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eTo6Z2V0RGF0YUZvckltYWdlQnVmZmVyKGNvbnN0IFN0cmluZyYKICAg ICBzZW5kRGVmZXJyZWRXYWtldXBNZXNzYWdlSWZOZWVkZWQoKTsKIAogICAgIFZlY3Rvcjx1aW50 OF90PiBkYXRhOwotICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpHZXREYXRhRm9ySW1hZ2VCdWZmZXIobWltZVR5cGUsIHF1YWxpdHksIHJlbmRlcmluZ1Jlc291 cmNlSWRlbnRpZmllciksIE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpHZXREYXRh Rm9ySW1hZ2VCdWZmZXI6OlJlcGx5KGRhdGEpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVy LCBzaG9ydElQQ1RpbWVvdXQpOworICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJp bmdCYWNrZW5kOjpHZXREYXRhRm9ySW1hZ2VCdWZmZXIobWltZVR5cGUsIHF1YWxpdHksIHJlbmRl cmluZ1Jlc291cmNlSWRlbnRpZmllciksIE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpHZXREYXRhRm9ySW1hZ2VCdWZmZXI6OlJlcGx5KGRhdGEpLCBtX3JlbmRlcmluZ0JhY2tlbmRJ ZGVudGlmaWVyLCAxX3MpOwogICAgIHJldHVybiBkYXRhOwogfQogCkBAIC0yMTksNyArMjE2LDcg QEAgVmVjdG9yPHVpbnQ4X3Q+IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z2V0QkdSQURh dGFGb3JJbWFnZUJ1ZmZlcihSZW5kZXJpbmcKICAgICBzZW5kRGVmZXJyZWRXYWtldXBNZXNzYWdl SWZOZWVkZWQoKTsKIAogICAgIFZlY3Rvcjx1aW50OF90PiBkYXRhOwotICAgIHNlbmRTeW5jKE1l c3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpHZXRCR1JBRGF0YUZvckltYWdlQnVmZmVy KHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciksIE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdC YWNrZW5kOjpHZXRCR1JBRGF0YUZvckltYWdlQnVmZmVyOjpSZXBseShkYXRhKSwgbV9yZW5kZXJp bmdCYWNrZW5kSWRlbnRpZmllciwgc2hvcnRJUENUaW1lb3V0KTsKKyAgICBzZW5kU3luYyhNZXNz YWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6R2V0QkdSQURhdGFGb3JJbWFnZUJ1ZmZlcihy ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpLCBNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZDo6R2V0QkdSQURhdGFGb3JJbWFnZUJ1ZmZlcjo6UmVwbHkoZGF0YSksIG1fcmVuZGVyaW5n QmFja2VuZElkZW50aWZpZXIsIDFfcyk7CiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKQEAgLTIyOCw3 ICsyMjUsNyBAQCBSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHk6OmdldFNoYXJlYWJsZUJpdG1hcChSZW5kZXJpbgogICAgIHNlbmREZWZlcnJlZFdha2V1 cE1lc3NhZ2VJZk5lZWRlZCgpOwogCiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUgaGFuZGxl OwotICAgIGF1dG8gc2VuZFJlc3VsdCA9IHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJp bmdCYWNrZW5kOjpHZXRTaGFyZWFibGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlciwg cHJlc2VydmVSZXNvbHV0aW9uKSwgTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6Okdl dFNoYXJlYWJsZUJpdG1hcEZvckltYWdlQnVmZmVyOjpSZXBseShoYW5kbGUpLCBtX3JlbmRlcmlu Z0JhY2tlbmRJZGVudGlmaWVyLCBzaG9ydElQQ1RpbWVvdXQpOworICAgIGF1dG8gc2VuZFJlc3Vs dCA9IHNlbmRTeW5jKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpHZXRTaGFyZWFi bGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlciwgcHJlc2VydmVSZXNvbHV0aW9uKSwg TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkdldFNoYXJlYWJsZUJpdG1hcEZvcklt YWdlQnVmZmVyOjpSZXBseShoYW5kbGUpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyLCAx X3MpOwogICAgIGlmIChoYW5kbGUuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAgICAg QVNTRVJUX1VOVVNFRChzZW5kUmVzdWx0LCBzZW5kUmVzdWx0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eS5oCmluZGV4IGU4NzVhMGE2YTAzYTRlOWY3MmNlZTI2OGY0ZGFhY2Rk YTFkMTE2MTYuLjMzNjdmMDE0ZTZmMWQ0YmIzYTlmM2FhNjI1NzI0MjkxZjkyYTczOGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw aGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaApAQCAtNzYsOCArNzYsOCBAQCBwdWJs aWM6CiAgICAgdm9pZCB3aWxsQXBwZW5kSXRlbShXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlk ZW50aWZpZXIpOwogICAgIHZvaWQgc2VuZERlZmVycmVkV2FrZXVwTWVzc2FnZUlmTmVlZGVkKCk7 CiAKLSAgICBTaGFyZWRNZW1vcnkqIHNoYXJlZE1lbW9yeUZvckdldEltYWdlRGF0YShzaXplX3Qg ZGF0YVNpemUpOwotICAgIGJvb2wgd2FpdEZvckdldEltYWdlRGF0YVRvQ29tcGxldGUoKTsKKyAg ICBTaGFyZWRNZW1vcnkqIHNoYXJlZE1lbW9yeUZvckdldEltYWdlRGF0YShzaXplX3QgZGF0YVNp emUsIElQQzo6VGltZW91dCk7CisgICAgYm9vbCB3YWl0Rm9yR2V0SW1hZ2VEYXRhVG9Db21wbGV0 ZShJUEM6OlRpbWVvdXQpOwogICAgIHZvaWQgZGVzdHJveUdldEltYWdlRGF0YVNoYXJlZE1lbW9y eSgpOwogCiAgICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyLgo=