193010 2018-12-22 11:37:00 -0800 Rename LayerScrollCoordinationRole to ScrollCoordinationRole and make an enum class 2019-01-16 02:22:59 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser fred.wang simon.fraser webkit-bug-importer zalan oldest_to_newest 1490631 0 simon.fraser 2018-12-22 11:37:00 -0800 Rename LayerScrollCoordinationRole to ScrollCoordinationRole and make an enum class 1490632 1 358024 simon.fraser 2018-12-22 11:38:18 -0800 Created attachment 358024 Patch 1490633 2 simon.fraser 2018-12-22 11:38:45 -0800 Might conflict with the patch in bug 193009. 1491233 3 simon.fraser 2019-01-02 13:22:33 -0800 https://trac.webkit.org/r239576 1491236 4 webkit-bug-importer 2019-01-02 13:23:36 -0800 <rdar://problem/47009446> 1491619 5 358024 fred.wang 2019-01-04 06:11:47 -0800 Comment on attachment 358024 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358024&action=review > Source/WebCore/rendering/RenderLayerCompositor.h:474 > + // FIXME: make the coordinated/async terminology consistent. Can you please elaborate about this FIXME? Do you think we use "Coordinated" or "Async" scrolling everywhere? 1491706 6 simon.fraser 2019-01-04 10:10:02 -0800 (In reply to Frédéric Wang (:fredw) from comment #5) > Comment on attachment 358024 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=358024&action=review > > > Source/WebCore/rendering/RenderLayerCompositor.h:474 > > + // FIXME: make the coordinated/async terminology consistent. > > Can you please elaborate about this FIXME? Do you think we use "Coordinated" > or "Async" scrolling everywhere? I think we should pick one and stick with it, yes. 1495038 7 fred.wang 2019-01-16 02:22:59 -0800 (In reply to Simon Fraser (smfr) from comment #6) > (In reply to Frédéric Wang (:fredw) from comment #5) > > Comment on attachment 358024 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=358024&action=review > > > > > Source/WebCore/rendering/RenderLayerCompositor.h:474 > > > + // FIXME: make the coordinated/async terminology consistent. > > > > Can you please elaborate about this FIXME? Do you think we use "Coordinated" > > or "Async" scrolling everywhere? > > I think we should pick one and stick with it, yes. For the record, I've opened https://bugs.webkit.org/show_bug.cgi?id=193394 but I'm not exactly how much we want to do. 358024 2018-12-22 11:38:18 -0800 2018-12-22 11:41:53 -0800 Patch bug-193010-20181222113817.patch text/plain 17242 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FjOGY1NmVkY2RjMWZh M2M4ODVkMjAwOGRhOTcxMTY0NzkyZDJiNC4uOTMzN2I2NTQ1YmQwYzc1ZmZjMjk5YjBiNWYxZWNh YTExMGMzYTAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE4LTEyLTIyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBMYXll clNjcm9sbENvb3JkaW5hdGlvblJvbGUgdG8gU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZSBhbmQgbWFr ZSBhbiBlbnVtIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTMwMTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNb3ZlIHRoZSBlbnVtIExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZSBmcm9tIFJl bmRlckxheWVyLmggdG8gUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgsCisgICAgICAgIGFuZCBtYWtl IGl0IGFuIGVudW0gY2xhc3MuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNjcm9sbExheWVySUQgY29uc3QpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp+UmVu ZGVyTGF5ZXJCYWNraW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6 ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJh dG9yPDwpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRTdGF0dXMp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZW1vdmVGcm9tU2Ny b2xsQ29vcmRpbmF0ZWRMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6c2Nyb2xsQ29vcmRpbmF0 aW9uUm9sZUZvck5vZGVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9z aXRvcjo6YXR0YWNoU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVy KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6d2lsbFJlbW92ZVNj cm9sbGluZ0xheWVyV2l0aEJhY2tpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaDoKKwogMjAxOC0xMi0yMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBDaGFuZ2UgU2Nyb2xsaW5nTm9kZVR5cGUgdG8gYW4gZW51 bSBjbGFzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGZmNjA5NzNmOTY0MjNhODAz ZWNjODIzOThiODFkZDVlNmZhYTAzZjEuLmRmMGUxMDVhNTFlMWE4NDE5N2RmNDAwNDM3MWY4MWE2 MzFmYTNiM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTkwNSw3ICs5MDUsNyBA QCB1aW50NjRfdCBGcmFtZVZpZXc6OnNjcm9sbExheWVySUQoKSBjb25zdAogICAgIGlmICghYmFj a2luZykKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gYmFja2luZy0+c2Nyb2xsaW5n Tm9kZUlERm9yUm9sZShTY3JvbGxpbmcpOworICAgIHJldHVybiBiYWNraW5nLT5zY3JvbGxpbmdO b2RlSURGb3JSb2xlKFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlNjcm9sbGluZyk7CiB9CiAKIFNj cm9sbGFibGVBcmVhKiBGcmFtZVZpZXc6OnNjcm9sbGFibGVBcmVhRm9yU2Nyb2xsTGF5ZXJJRCh1 aW50NjRfdCBub2RlSUQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CmluZGV4IDI0ZDg3MzEzYjNhZWI1YTBhZGYyYzI2Yzc3NWI1ODA0NTU4N2Y1ZGEuLjc4ZmY2Mzhj MTk4NGFlYzc2N2QwMWY3NTFmNWQxNWJlMDc5NjBiZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5oCkBAIC0xMDcsMTEgKzEwNyw2IEBAIGVudW0gU2hvdWxkQXBwbHlSb290 T2Zmc2V0VG9GcmFnbWVudHMgewogICAgIElnbm9yZVJvb3RPZmZzZXRGb3JGcmFnbWVudHMKIH07 CiAKLWVudW0gTGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlIHsKLSAgICBWaWV3cG9ydENvbnN0 cmFpbmVkID0gMSA8PCAwLAotICAgIFNjcm9sbGluZyAgICAgICAgICAgPSAxIDw8IDEKLX07Ci0K IGVudW0gY2xhc3MgUmVxdWVzdFN0YXRlIHsKICAgICBVbmtub3duLAogICAgIERvbnRDYXJlLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRl eCBhMTc3NjU5ZmUzNjhjY2ZiNmY5MzBiZmM3N2FjYTE0MzY3OTI0MmYwLi5iZThiYmEwYTdjODZl YjE5ZTQyNGQ3NWIxYjA0MDUxZTFhZTkxNThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMjQ0LDcgKzI0NCw3IEBAIFJlbmRlckxh eWVyQmFja2luZzo6flJlbmRlckxheWVyQmFja2luZygpCiAgICAgdXBkYXRlQmFja2dyb3VuZExh eWVyKGZhbHNlKTsKICAgICB1cGRhdGVNYXNraW5nTGF5ZXIoZmFsc2UsIGZhbHNlKTsKICAgICB1 cGRhdGVTY3JvbGxpbmdMYXllcnMoZmFsc2UpOwotICAgIGRldGFjaEZyb21TY3JvbGxpbmdDb29y ZGluYXRvcih7IFNjcm9sbGluZywgVmlld3BvcnRDb25zdHJhaW5lZCB9KTsKKyAgICBkZXRhY2hG cm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoeyBTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpTY3JvbGxp bmcsIFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlZpZXdwb3J0Q29uc3RyYWluZWQgfSk7CiAgICAg ZGVzdHJveUdyYXBoaWNzTGF5ZXJzKCk7CiB9CiAKQEAgLTE3NzIsNyArMTc3Miw3IEBAIGJvb2wg UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVTY3JvbGxpbmdMYXllcnMoYm9vbCBuZWVkc1Njcm9s bGluZ0xheWVycykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvcihPcHRpb25TZXQ8TGF5ZXJTY3JvbGxD b29yZGluYXRpb25Sb2xlPiByb2xlcykKK3ZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpkZXRhY2hG cm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoT3B0aW9uU2V0PFNjcm9sbENvb3JkaW5hdGlvblJvbGU+ IHJvbGVzKQogewogICAgIGlmICghbV9zY3JvbGxpbmdOb2RlSUQgJiYgIW1fdmlld3BvcnRDb25z dHJhaW5lZE5vZGVJRCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTc4MSwxMyArMTc4MSwxMyBAQCB2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKE9w dGlvblNldDxMYXllclNjcm9sbENvbwogICAgIGlmICghc2Nyb2xsaW5nQ29vcmRpbmF0b3IpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICgocm9sZXMgJiBTY3JvbGxpbmcpICYmIG1fc2Nyb2xs aW5nTm9kZUlEKSB7CisgICAgaWYgKChyb2xlcy5jb250YWlucyhTY3JvbGxDb29yZGluYXRpb25S b2xlOjpTY3JvbGxpbmcpKSAmJiBtX3Njcm9sbGluZ05vZGVJRCkgewogICAgICAgICBMT0coQ29t cG9zaXRpbmcsICJEZXRhY2hpbmcgU2Nyb2xsaW5nIG5vZGUgJSIgUFJJdTY0LCBtX3Njcm9sbGlu Z05vZGVJRCk7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5kZXRhY2hGcm9tU3RhdGVU cmVlKG1fc2Nyb2xsaW5nTm9kZUlEKTsKICAgICAgICAgbV9zY3JvbGxpbmdOb2RlSUQgPSAwOwog ICAgIH0KICAgICAKLSAgICBpZiAoKHJvbGVzICYgVmlld3BvcnRDb25zdHJhaW5lZCkgJiYgbV92 aWV3cG9ydENvbnN0cmFpbmVkTm9kZUlEKSB7CisgICAgaWYgKChyb2xlcy5jb250YWlucyhTY3Jv bGxDb29yZGluYXRpb25Sb2xlOjpWaWV3cG9ydENvbnN0cmFpbmVkKSkgJiYgbV92aWV3cG9ydENv bnN0cmFpbmVkTm9kZUlEKSB7CiAgICAgICAgIExPRyhDb21wb3NpdGluZywgIkRldGFjaGluZyBW aWV3cG9ydENvbnN0cmFpbmVkIG5vZGUgJSIgUFJJdTY0LCBtX3ZpZXdwb3J0Q29uc3RyYWluZWRO b2RlSUQpOwogICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+ZGV0YWNoRnJvbVN0YXRlVHJl ZShtX3ZpZXdwb3J0Q29uc3RyYWluZWROb2RlSUQpOwogICAgICAgICBtX3ZpZXdwb3J0Q29uc3Ry YWluZWROb2RlSUQgPSAwOwpAQCAtMzA4Miw5ICszMDgyLDkgQEAgVGV4dFN0cmVhbSYgb3BlcmF0 b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyTGF5ZXJCYWNraW5nJiBiYWNraW5nKQog ICAgICAgICB0cyA8PCAiIHBhaW50c0ludG9Db21wb3NpdGVkQW5jZXN0b3IiOwogCiAgICAgdHMg PDwgIiBwcmltYXJ5IGxheWVyIElEICIgPDwgYmFja2luZy5ncmFwaGljc0xheWVyKCktPnByaW1h cnlMYXllcklEKCk7Ci0gICAgaWYgKGF1dG8gbm9kZUlEID0gYmFja2luZy5zY3JvbGxpbmdOb2Rl SURGb3JSb2xlKFZpZXdwb3J0Q29uc3RyYWluZWQpKQorICAgIGlmIChhdXRvIG5vZGVJRCA9IGJh Y2tpbmcuc2Nyb2xsaW5nTm9kZUlERm9yUm9sZShTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpWaWV3 cG9ydENvbnN0cmFpbmVkKSkKICAgICAgICAgdHMgPDwgIiB2aWV3cG9ydCBjb25zdHJhaW5lZCBz Y3JvbGxpbmcgbm9kZSAiIDw8IG5vZGVJRDsKLSAgICBpZiAoYXV0byBub2RlSUQgPSBiYWNraW5n LnNjcm9sbGluZ05vZGVJREZvclJvbGUoU2Nyb2xsaW5nKSkKKyAgICBpZiAoYXV0byBub2RlSUQg PSBiYWNraW5nLnNjcm9sbGluZ05vZGVJREZvclJvbGUoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6 U2Nyb2xsaW5nKSkKICAgICAgICAgdHMgPDwgIiBzY3JvbGxpbmcgbm9kZSAiIDw8IG5vZGVJRDsK ICAgICByZXR1cm4gdHM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmgKaW5kZXggZGQyMzUwNDBjOWRkOWMyNjY4NDQ3NjI3OTg1NmU3NmE5YTYxYjc2 YS4uOGQ1ZjQzYzQ4MTVkOWQ5N2FkYTRlZDdjNzE5YjQ5Mjk3YWY4NmJjYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaApAQCAtMzAsNiArMzAsNyBA QAogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyQ2xp ZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJMYXllckNv bXBvc2l0b3IuaCIKICNpbmNsdWRlICJTY3JvbGxpbmdDb29yZGluYXRvci5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CkBAIC0xMDQsMjYgKzEwNSwyNiBAQCBwdWJsaWM6CiAgICAgR3JhcGhpY3NM YXllciogc2Nyb2xsaW5nTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGluZ0xheWVyLmdl dCgpOyB9CiAgICAgR3JhcGhpY3NMYXllciogc2Nyb2xsaW5nQ29udGVudHNMYXllcigpIGNvbnN0 IHsgcmV0dXJuIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKTsgfQogCi0gICAgdm9pZCBk ZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoT3B0aW9uU2V0PExheWVyU2Nyb2xsQ29vcmRp bmF0aW9uUm9sZT4pOworICAgIHZvaWQgZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKE9w dGlvblNldDxTY3JvbGxDb29yZGluYXRpb25Sb2xlPik7CiAgICAgCi0gICAgU2Nyb2xsaW5nTm9k ZUlEIHNjcm9sbGluZ05vZGVJREZvclJvbGUoTGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlIHJv bGUpIGNvbnN0CisgICAgU2Nyb2xsaW5nTm9kZUlEIHNjcm9sbGluZ05vZGVJREZvclJvbGUoU2Ny b2xsQ29vcmRpbmF0aW9uUm9sZSByb2xlKSBjb25zdAogICAgIHsKICAgICAgICAgc3dpdGNoIChy b2xlKSB7Ci0gICAgICAgIGNhc2UgU2Nyb2xsaW5nOgorICAgICAgICBjYXNlIFNjcm9sbENvb3Jk aW5hdGlvblJvbGU6OlNjcm9sbGluZzoKICAgICAgICAgICAgIHJldHVybiBtX3Njcm9sbGluZ05v ZGVJRDsKLSAgICAgICAgY2FzZSBWaWV3cG9ydENvbnN0cmFpbmVkOgorICAgICAgICBjYXNlIFNj cm9sbENvb3JkaW5hdGlvblJvbGU6OlZpZXdwb3J0Q29uc3RyYWluZWQ6CiAgICAgICAgICAgICBy ZXR1cm4gbV92aWV3cG9ydENvbnN0cmFpbmVkTm9kZUlEOwogICAgICAgICB9CiAgICAgICAgIHJl dHVybiAwOwogICAgIH0KICAgICAKLSAgICB2b2lkIHNldFNjcm9sbGluZ05vZGVJREZvclJvbGUo U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgTGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlIHJvbGUp CisgICAgdm9pZCBzZXRTY3JvbGxpbmdOb2RlSURGb3JSb2xlKFNjcm9sbGluZ05vZGVJRCBub2Rl SUQsIFNjcm9sbENvb3JkaW5hdGlvblJvbGUgcm9sZSkKICAgICB7CiAgICAgICAgIHN3aXRjaCAo cm9sZSkgewotICAgICAgICBjYXNlIFNjcm9sbGluZzoKKyAgICAgICAgY2FzZSBTY3JvbGxDb29y ZGluYXRpb25Sb2xlOjpTY3JvbGxpbmc6CiAgICAgICAgICAgICBtX3Njcm9sbGluZ05vZGVJRCA9 IG5vZGVJRDsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFZpZXdwb3J0Q29uc3Ry YWluZWQ6CisgICAgICAgIGNhc2UgU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25z dHJhaW5lZDoKICAgICAgICAgICAgIG1fdmlld3BvcnRDb25zdHJhaW5lZE5vZGVJRCA9IG5vZGVJ RDsKICAgICAgICAgICAgIHNldElzU2Nyb2xsQ29vcmRpbmF0ZWRXaXRoVmlld3BvcnRDb25zdHJh aW5lZFJvbGUobm9kZUlEKTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCAzY2ViZDc0ZWRi NGU1MzkxM2E1NDEwNWE5NDE1NjRlZjVjOWM4NmUwLi5kMzRmNjU5Nzk0ZTEwZmY1YWZlYzU4YTdj OTViN2UxN2RlOGQwZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzY2MiwxNSArMzY2MiwxNSBAQCBzdGF0aWMgYm9v bCBjYW5Db29yZGluYXRlU2Nyb2xsaW5nRm9yTGF5ZXIoY29uc3QgUmVuZGVyTGF5ZXImIGxheWVy KQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRT dGF0dXMoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHRpb25TZXQ8U2Nyb2xsaW5nTm9kZUNoYW5nZUZs YWdzPiBjaGFuZ2VzKQogewotICAgIE9wdGlvblNldDxMYXllclNjcm9sbENvb3JkaW5hdGlvblJv bGU+IGNvb3JkaW5hdGlvblJvbGVzOworICAgIE9wdGlvblNldDxTY3JvbGxDb29yZGluYXRpb25S b2xlPiBjb29yZGluYXRpb25Sb2xlczsKICAgICBpZiAoaXNWaWV3cG9ydENvbnN0cmFpbmVkRml4 ZWRPclN0aWNreUxheWVyKGxheWVyKSkKLSAgICAgICAgY29vcmRpbmF0aW9uUm9sZXMuYWRkKFZp ZXdwb3J0Q29uc3RyYWluZWQpOworICAgICAgICBjb29yZGluYXRpb25Sb2xlcy5hZGQoU2Nyb2xs Q29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCk7CiAKICAgICBpZiAodXNlQ29v cmRpbmF0ZWRTY3JvbGxpbmdGb3JMYXllcihsYXllcikpCi0gICAgICAgIGNvb3JkaW5hdGlvblJv bGVzLmFkZChTY3JvbGxpbmcpOworICAgICAgICBjb29yZGluYXRpb25Sb2xlcy5hZGQoU2Nyb2xs Q29vcmRpbmF0aW9uUm9sZTo6U2Nyb2xsaW5nKTsKIAogICAgIGlmIChsYXllci5pc0NvbXBvc2l0 ZWQoKSkKLSAgICAgICAgbGF5ZXIuYmFja2luZygpLT5zZXRJc1Njcm9sbENvb3JkaW5hdGVkV2l0 aFZpZXdwb3J0Q29uc3RyYWluZWRSb2xlKGNvb3JkaW5hdGlvblJvbGVzLmNvbnRhaW5zKFZpZXdw b3J0Q29uc3RyYWluZWQpKTsKKyAgICAgICAgbGF5ZXIuYmFja2luZygpLT5zZXRJc1Njcm9sbENv b3JkaW5hdGVkV2l0aFZpZXdwb3J0Q29uc3RyYWluZWRSb2xlKGNvb3JkaW5hdGlvblJvbGVzLmNv bnRhaW5zKFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlZpZXdwb3J0Q29uc3RyYWluZWQpKTsKIAog ICAgIGlmIChjb29yZGluYXRpb25Sb2xlcyAmJiBjYW5Db29yZGluYXRlU2Nyb2xsaW5nRm9yTGF5 ZXIobGF5ZXIpKSB7CiAgICAgICAgIGlmIChtX3Njcm9sbENvb3JkaW5hdGVkTGF5ZXJzLmFkZCgm bGF5ZXIpLmlzTmV3RW50cnkpCkBAIC0zNjkxLDcgKzM2OTEsNyBAQCB2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6cmVtb3ZlRnJvbVNjcm9sbENvb3JkaW5hdGVkTGF5ZXJzKFJlbmRlckxheWVy JiBsYXllcgogICAgIG1fc2Nyb2xsQ29vcmRpbmF0ZWRMYXllcnMucmVtb3ZlKCZsYXllcik7CiAg ICAgbV9zY3JvbGxDb29yZGluYXRlZExheWVyc05lZWRpbmdVcGRhdGUucmVtb3ZlKCZsYXllcik7 CiAKLSAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVyLCB7IFNjcm9sbGluZywg Vmlld3BvcnRDb25zdHJhaW5lZCB9KTsKKyAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVy KGxheWVyLCB7IFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlNjcm9sbGluZywgU2Nyb2xsQ29vcmRp bmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCB9KTsKIH0KIAogRml4ZWRQb3NpdGlvblZp ZXdwb3J0Q29uc3RyYWludHMgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlRml4ZWRWaWV3 cG9ydENvbnN0cmFpbnRzKFJlbmRlckxheWVyJiBsYXllcikgY29uc3QKQEAgLTM4MTAsMTkgKzM4 MTAsMTkgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYXR0YWNoU3ViZnJhbWVTY3Jv bGxMYXllcnMoKQogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSBMYXllclNjcm9sbENvb3JkaW5h dGlvblJvbGUgc2Nyb2xsQ29vcmRpbmF0aW9uUm9sZUZvck5vZGVUeXBlKFNjcm9sbGluZ05vZGVU eXBlIG5vZGVUeXBlKQorc3RhdGljIGlubGluZSBTY3JvbGxDb29yZGluYXRpb25Sb2xlIHNjcm9s bENvb3JkaW5hdGlvblJvbGVGb3JOb2RlVHlwZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSkK IHsKICAgICBzd2l0Y2ggKG5vZGVUeXBlKSB7CiAgICAgY2FzZSBTY3JvbGxpbmdOb2RlVHlwZTo6 TWFpbkZyYW1lOgogICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6OlN1YmZyYW1lOgogICAgIGNh c2UgU2Nyb2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93OgotICAgICAgICByZXR1cm4gU2Nyb2xsaW5n OworICAgICAgICByZXR1cm4gU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6U2Nyb2xsaW5nOwogICAg IGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6OkZpeGVkOgogICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5 cGU6OlN0aWNreToKLSAgICAgICAgcmV0dXJuIFZpZXdwb3J0Q29uc3RyYWluZWQ7CisgICAgICAg IHJldHVybiBTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpWaWV3cG9ydENvbnN0cmFpbmVkOwogICAg IH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gU2Nyb2xsaW5nOworICAg IHJldHVybiBTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpTY3JvbGxpbmc7CiB9CiAKIFNjcm9sbGlu Z05vZGVJRCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVy TGF5ZXImIGxheWVyLCBTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlE IHBhcmVudE5vZGVJRCkKQEAgLTM4MzQsNyArMzgzNCw3IEBAIFNjcm9sbGluZ05vZGVJRCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVyTGF5ZXImIGxheWVy LCBTCiAgICAgaWYgKCFiYWNraW5nKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIExheWVyU2Ny b2xsQ29vcmRpbmF0aW9uUm9sZSByb2xlID0gc2Nyb2xsQ29vcmRpbmF0aW9uUm9sZUZvck5vZGVU eXBlKG5vZGVUeXBlKTsKKyAgICBTY3JvbGxDb29yZGluYXRpb25Sb2xlIHJvbGUgPSBzY3JvbGxD b29yZGluYXRpb25Sb2xlRm9yTm9kZVR5cGUobm9kZVR5cGUpOwogICAgIFNjcm9sbGluZ05vZGVJ RCBub2RlSUQgPSBiYWNraW5nLT5zY3JvbGxpbmdOb2RlSURGb3JSb2xlKHJvbGUpOwogICAgIGlm ICghbm9kZUlEKQogICAgICAgICBub2RlSUQgPSBzY3JvbGxpbmdDb29yZGluYXRvci0+dW5pcXVl U2Nyb2xsaW5nTm9kZUlEKCk7CkBAIC0zODQ5LDE5ICszODQ5LDE5IEBAIFNjcm9sbGluZ05vZGVJ RCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVyTGF5ZXIm IGxheWVyLCBTCiAgICAgcmV0dXJuIG5vZGVJRDsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBv c2l0b3I6OmRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBP cHRpb25TZXQ8TGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlPiByb2xlcykKK3ZvaWQgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVy JiBsYXllciwgT3B0aW9uU2V0PFNjcm9sbENvb3JkaW5hdGlvblJvbGU+IHJvbGVzKQogewogICAg IGF1dG8qIGJhY2tpbmcgPSBsYXllci5iYWNraW5nKCk7CiAgICAgaWYgKCFiYWNraW5nKQogICAg ICAgICByZXR1cm47CiAKLSAgICBpZiAocm9sZXMgJiBTY3JvbGxpbmcpIHsKLSAgICAgICAgaWYg KFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBiYWNraW5nLT5zY3JvbGxpbmdOb2RlSURGb3JSb2xl KFNjcm9sbGluZykpCisgICAgaWYgKHJvbGVzLmNvbnRhaW5zKFNjcm9sbENvb3JkaW5hdGlvblJv bGU6OlNjcm9sbGluZykpIHsKKyAgICAgICAgaWYgKFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBi YWNraW5nLT5zY3JvbGxpbmdOb2RlSURGb3JSb2xlKFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlNj cm9sbGluZykpCiAgICAgICAgICAgICBtX3Njcm9sbGluZ05vZGVUb0xheWVyTWFwLnJlbW92ZShu b2RlSUQpOwogICAgIH0KIAotICAgIGlmIChyb2xlcyAmIFZpZXdwb3J0Q29uc3RyYWluZWQpIHsK LSAgICAgICAgaWYgKFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBiYWNraW5nLT5zY3JvbGxpbmdO b2RlSURGb3JSb2xlKFZpZXdwb3J0Q29uc3RyYWluZWQpKQorICAgIGlmIChyb2xlcy5jb250YWlu cyhTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpWaWV3cG9ydENvbnN0cmFpbmVkKSkgeworICAgICAg ICBpZiAoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCA9IGJhY2tpbmctPnNjcm9sbGluZ05vZGVJREZv clJvbGUoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCkpCiAgICAg ICAgICAgICBtX3Njcm9sbGluZ05vZGVUb0xheWVyTWFwLnJlbW92ZShub2RlSUQpOwogICAgIH0K IApAQCAtMzg4OCw3ICszODg4LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQKICAgICBzY3Jv bGxpbmdDb29yZGluYXRvci0+dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKG5vZGVJRCwgbV9zY3Jv bGxMYXllci5nZXQoKSwgbV9yb290Q29udGVudExheWVyLmdldCgpLCBmaXhlZFJvb3RCYWNrZ3Jv dW5kTGF5ZXIoKSwgY2xpcExheWVyKCksIHNjcm9sbGluZ0dlb21ldHJ5KTsKIH0KIAotdm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVy TGF5ZXImIGxheWVyLCBPcHRpb25TZXQ8TGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlPiByZWFz b25zLCBPcHRpb25TZXQ8U2Nyb2xsaW5nTm9kZUNoYW5nZUZsYWdzPiBjaGFuZ2VzKQordm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVy TGF5ZXImIGxheWVyLCBPcHRpb25TZXQ8U2Nyb2xsQ29vcmRpbmF0aW9uUm9sZT4gcm9sZXMsIE9w dGlvblNldDxTY3JvbGxpbmdOb2RlQ2hhbmdlRmxhZ3M+IGNoYW5nZXMpCiB7CiAgICAgYm9vbCBp c1JlbmRlclZpZXdMYXllciA9IGxheWVyLmlzUmVuZGVyVmlld0xheWVyKCk7CiAKQEAgLTM5MDUs NyArMzkwNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29y ZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgT3B0CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKHBhcmVudERv Y3VtZW50SG9zdGluZ05vZGVJRCk7Ci0gICAgICAgIGlmICghKHJlYXNvbnMgJiBWaWV3cG9ydENv bnN0cmFpbmVkKSAmJiBpc1JlbmRlclZpZXdMYXllcikKKyAgICAgICAgaWYgKCEocm9sZXMuY29u dGFpbnMoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCkpICYmIGlz UmVuZGVyVmlld0xheWVyKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzkxNyw3 ICszOTE3LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3Jk aW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHQKIAogICAgIC8vIEFsd2F5cyBjYWxs IHRoaXMgZXZlbiBpZiB0aGUgYmFja2luZyBpcyBhbHJlYWR5IGF0dGFjaGVkIGJlY2F1c2UgdGhl IHBhcmVudCBtYXkgaGF2ZSBjaGFuZ2VkLgogICAgIC8vIElmIGEgbm9kZSBwbGF5cyBib3RoIHJv bGVzLCBmaXhlZC9zdGlja3kgaXMgYWx3YXlzIHRoZSBhbmNlc3RvciBub2RlIG9mIHNjcm9sbGlu Zy4KLSAgICBpZiAocmVhc29ucyAmIFZpZXdwb3J0Q29uc3RyYWluZWQpIHsKKyAgICBpZiAocm9s ZXMuY29udGFpbnMoU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCkp IHsKICAgICAgICAgU2Nyb2xsaW5nTm9kZVR5cGUgbm9kZVR5cGUgPSBTY3JvbGxpbmdOb2RlVHlw ZTo6TWFpbkZyYW1lOwogICAgICAgICBpZiAobGF5ZXIucmVuZGVyZXIoKS5pc0ZpeGVkUG9zaXRp b25lZCgpKQogICAgICAgICAgICAgbm9kZVR5cGUgPSBTY3JvbGxpbmdOb2RlVHlwZTo6Rml4ZWQ7 CkBAIC0zOTUyLDkgKzM5NTIsOSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRl U2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIE9wdAogICAgICAgICAK ICAgICAgICAgcGFyZW50Tm9kZUlEID0gbm9kZUlEOwogICAgIH0gZWxzZQotICAgICAgICBkZXRh Y2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVyLCBWaWV3cG9ydENvbnN0cmFpbmVkKTsKKyAg ICAgICAgZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllciwgU2Nyb2xsQ29vcmRpbmF0 aW9uUm9sZTo6Vmlld3BvcnRDb25zdHJhaW5lZCk7CiAgICAgICAgIAotICAgIGlmIChyZWFzb25z ICYgU2Nyb2xsaW5nKSB7CisgICAgaWYgKHJvbGVzLmNvbnRhaW5zKFNjcm9sbENvb3JkaW5hdGlv blJvbGU6OlNjcm9sbGluZykpIHsKICAgICAgICAgaWYgKGlzUmVuZGVyVmlld0xheWVyKQogICAg ICAgICAgICAgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKHBhcmVudE5vZGVJ RCk7CiAgICAgICAgIGVsc2UgewpAQCAtMzk4OCw3ICszOTg4LDcgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxh eWVyLCBPcHQKICAgICAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT51cGRhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGUobm9kZUlELCBiYWNraW5nLT5zY3JvbGxpbmdMYXllcigpLCBiYWNraW5n LT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCksIHNjcm9sbGluZ0dlb21ldHJ5KTsKICAgICAgICAg fQogICAgIH0gZWxzZQotICAgICAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVy LCBTY3JvbGxpbmcpOworICAgICAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVy LCBTY3JvbGxDb29yZGluYXRpb25Sb2xlOjpTY3JvbGxpbmcpOwogfQogCiBTY3JvbGxhYmxlQXJl YSogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzY3JvbGxhYmxlQXJlYUZvclNjcm9sbExheWVySUQo U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkgY29uc3QKQEAgLTQwNzAsNyArNDA3MCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1bnJlZ2lzdGVyQWxsU2Nyb2xsaW5nTGF5ZXJzKCkKIHZv aWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp3aWxsUmVtb3ZlU2Nyb2xsaW5nTGF5ZXJXaXRoQmFj a2luZyhSZW5kZXJMYXllciYgbGF5ZXIsIFJlbmRlckxheWVyQmFja2luZyYgYmFja2luZykKIHsK ICAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29y ZGluYXRvcigpKSB7Ci0gICAgICAgIGJhY2tpbmcuZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5h dG9yKFNjcm9sbGluZyk7CisgICAgICAgIGJhY2tpbmcuZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3Jk aW5hdG9yKFNjcm9sbENvb3JkaW5hdGlvblJvbGU6OlNjcm9sbGluZyk7CiAKICAgICAgICAgLy8g Rm9yIENvb3JkaW5hdGVkIEdyYXBoaWNzLgogICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+ c2Nyb2xsYWJsZUFyZWFTY3JvbGxMYXllckRpZENoYW5nZShsYXllcik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggNzBkZGU1MzJl OWVhNjNmNWY2YzMwMzViOWQ4Njc5MzhmZjU1Mzc3Yi4uMGUwZTZkNDA5YmQwMTNjMzRlOGE3N2Jj YWNkYTNlMmNmZWYyNDU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuaApAQCAtODMsNiArODMsMTEgQEAgZW51bSBjbGFzcyBDb21wb3Np dGluZ1JlYXNvbiB7CiAgICAgRW1iZWRkZWRWaWV3ICAgICAgICAgICAgICAgICAgICAgICAgICAg PSAxIDw8IDI2LAogfTsKIAorZW51bSBjbGFzcyBTY3JvbGxDb29yZGluYXRpb25Sb2xlIHsKKyAg ICBWaWV3cG9ydENvbnN0cmFpbmVkID0gMSA8PCAwLAorICAgIFNjcm9sbGluZyAgICAgICAgICAg PSAxIDw8IDEKK307CisKIC8vIFJlbmRlckxheWVyQ29tcG9zaXRvciBtYW5hZ2VzIHRoZSBoaWVy YXJjaHkgb2YKIC8vIGNvbXBvc2l0ZWQgUmVuZGVyTGF5ZXJzLiBJdCBkZXRlcm1pbmVzIHdoaWNo IFJlbmRlckxheWVycwogLy8gYmVjb21lIGNvbXBvc2l0aW5nLCBhbmQgY3JlYXRlcyBhbmQgbWFp bnRhaW5zIGEgaGllcmFyY2h5IG9mCkBAIC00NDYsOCArNDUxLDggQEAgcHJpdmF0ZToKIAogICAg IHZvaWQgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKFNjcm9sbGluZ05vZGVJ RCk7CiAgICAgU2Nyb2xsaW5nTm9kZUlEIGF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVyTGF5ZXIm LCBTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIHBhcmVudE5vZGVJRCk7Ci0gICAg dm9pZCB1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiwgT3B0aW9uU2V0 PExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZT4sIE9wdGlvblNldDxTY3JvbGxpbmdOb2RlQ2hh bmdlRmxhZ3M+KTsKLSAgICB2b2lkIGRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVy TGF5ZXImLCBPcHRpb25TZXQ8TGF5ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlPik7CisgICAgdm9p ZCB1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiwgT3B0aW9uU2V0PFNj cm9sbENvb3JkaW5hdGlvblJvbGU+LCBPcHRpb25TZXQ8U2Nyb2xsaW5nTm9kZUNoYW5nZUZsYWdz Pik7CisgICAgdm9pZCBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiwg T3B0aW9uU2V0PFNjcm9sbENvb3JkaW5hdGlvblJvbGU+KTsKICAgICB2b2lkIHJlYXR0YWNoU3Vi ZnJhbWVTY3JvbGxMYXllcnMoKTsKICAgICAKICAgICBGaXhlZFBvc2l0aW9uVmlld3BvcnRDb25z dHJhaW50cyBjb21wdXRlRml4ZWRWaWV3cG9ydENvbnN0cmFpbnRzKFJlbmRlckxheWVyJikgY29u c3Q7CkBAIC00NjYsNiArNDcxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIGhhc0Nvb3JkaW5hdGVk U2Nyb2xsaW5nKCkgY29uc3Q7CiAgICAgYm9vbCB1c2VDb29yZGluYXRlZFNjcm9sbGluZ0Zvckxh eWVyKGNvbnN0IFJlbmRlckxheWVyJikgY29uc3Q7CiAKKyAgICAvLyBGSVhNRTogbWFrZSB0aGUg Y29vcmRpbmF0ZWQvYXN5bmMgdGVybWlub2xvZ3kgY29uc2lzdGVudC4KICAgICBib29sIGlzQXN5 bmNTY3JvbGxhYmxlU3RpY2t5TGF5ZXIoY29uc3QgUmVuZGVyTGF5ZXImLCBjb25zdCBSZW5kZXJM YXllcioqIGVuY2xvc2luZ0FjY2VsZXJhdGVkT3ZlcmZsb3dMYXllciA9IG51bGxwdHIpIGNvbnN0 OwogICAgIGJvb2wgaXNWaWV3cG9ydENvbnN0cmFpbmVkRml4ZWRPclN0aWNreUxheWVyKGNvbnN0 IFJlbmRlckxheWVyJikgY29uc3Q7CiAgICAgCg==