143725 2015-04-14 13:59:52 -0700 [iOS] Clean up registration of layers with the ScrollingCoordinator 2015-04-14 14:15:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1085250 0 simon.fraser 2015-04-14 13:59:52 -0700 [iOS] Clean up registeration of layers with the ScrollingCoordinator 1085252 1 250737 simon.fraser 2015-04-14 14:03:05 -0700 Created attachment 250737 Patch 1085258 2 simon.fraser 2015-04-14 14:15:40 -0700 https://trac.webkit.org/r182809 250737 2015-04-14 14:03:05 -0700 2015-04-14 14:06:28 -0700 Patch bug-143725-20150414140209.patch text/plain 16525 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY5NTFiMTRkZWZjOTUw YzkxZGYxNjcyYWUwMGQ5ZGEyOWMyNjE4Yy4uZmU1OTFkYTUzNWE5ZGY3ZmQyN2M2NmI5NDEyMDUx ODNjZWE4YzQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTA0LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIENsZWFu IHVwIHJlZ2lzdGVyYXRpb24gb2YgbGF5ZXJzIHdpdGggdGhlIFNjcm9sbGluZ0Nvb3JkaW5hdG9y CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM3MjUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlm eSBhIGNvdXBsZSBvZiBiaXRzIG9mIGNvZGUgcmVsYXRlZCB0byB0aGUgcmVnaXN0cmF0aW9uIG9m IGxheWVycyB3aXRoCisgICAgICAgIHRoZSBTY3JvbGxpbmdDb29yZGluYXRvciBpbiBSZW5kZXJM YXllckNvbXBvc2l0b3IuCisgICAgICAgIAorICAgICAgICBGaXJzdCwgUmVuZGVyTGF5ZXJCYWNr aW5nIHdhcyB1c2luZyBTY3JvbGxpbmdOb2RlVHlwZXMgdG8gY2hvb3NlIHdoaWNoIHNjcm9sbGlu ZworICAgICAgICByb2xlcyBhIGxheWVyIGhhcywgd2hpY2ggbGV0IHRvIGFtYmlndW91cyBjb2Rl IHdoZXJlIHdlIGhhcmRjb2RlZCBhIFNjcm9sbGluZ05vZGVUeXBlCisgICAgICAgIHdpdGgga25v d2xlZGdlIG9mIHdoYXQgUmVuZGVyTGF5ZXJCYWNraW5nIGRpZCB3aXRoIGl0LiBDbGVhbiB1cCBi eSB1c2luZyBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGUsCisgICAgICAgIHdoaWNoIGlzIG1v dmVkIHRvIFJlbmRlckxheWVyLmggc28gdGhhdCBSZW5kZXJMYXllckNvbXBvc2l0b3IuaCBhbmQg UmVuZGVyTGF5ZXJCYWNraW5nLmgKKyAgICAgICAgYm90aCBzZWUgaXQuCisgICAgICAgIAorICAg ICAgICBTZWNvbmRseSwgYXZvaWQgaGF2aW5nIGJvdGggZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3Jk aW5hdG9yKCkgYW5kIGRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvckZvclJvbGUoKQorICAg ICAgICBieSBwYXNzaW5nIGluIHRoZSBiaXRtYXNrIG9mIHJvbGVzLgorCisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxMYXll cklEKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQmFja2luZzo6flJlbmRlckxheWVyQmFja2luZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckJhY2tpbmc6OmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvcik6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGlu YXRvckZvclJvbGUpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29v cmRpbmF0ZWRTdGF0dXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9y OjpyZW1vdmVGcm9tU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6 c2Nyb2xsQ29vcmRpbmF0aW9uUm9sZUZvck5vZGVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQ29tcG9zaXRvcjo6YXR0YWNoU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxD b29yZGluYXRlZExheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv cjo6d2lsbFJlbW92ZVNjcm9sbGluZ0xheWVyV2l0aEJhY2tpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyRm9y Um9sZSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5oOgorCiAyMDE1LTA0LTEzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1MgV0syXSBJbnRlcmFjdGl2ZSBlbGVtZW50cyBvZiBkZXZlbG9wZXIu YXBwbGUuY29tIGFyZSBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA5YmYx MDQ2YjljOWZjOTEyNTg4ZTA2OTk0OTUyMWM3Njc2ZWUxMmY5Li40MjM4NjkxZjQwOTk2NDI1MzQz OGUyZTZmYjdhOGE1NzY2OTU1Zjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC04 MzUsNyArODM1LDcgQEAgdWludDY0X3QgRnJhbWVWaWV3OjpzY3JvbGxMYXllcklEKCkgY29uc3QK ICAgICBpZiAoIWJhY2tpbmcpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgcmV0dXJuIGJhY2tp bmctPnNjcm9sbGluZ05vZGVJREZvclJvbGUoRnJhbWVTY3JvbGxpbmdOb2RlKTsKKyAgICByZXR1 cm4gYmFja2luZy0+c2Nyb2xsaW5nTm9kZUlERm9yUm9sZShTY3JvbGxpbmcpOwogfQogCiBTY3Jv bGxhYmxlQXJlYSogRnJhbWVWaWV3OjpzY3JvbGxhYmxlQXJlYUZvclNjcm9sbExheWVySUQodWlu dDY0X3Qgbm9kZUlEKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApp bmRleCA2YzM5OGNkMmZmNzdmMzY0M2M3M2Y1OTVjZTU5NjA3OGVhNjQ5MDU4Li5jNDdkZTE0ZTE0 MWIwNTg3ZWY4YTFjNWMwNjVjMTI2OWQ5NmZmZDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaApAQCAtMTA0LDYgKzEwNCwxMiBAQCBlbnVtIFNob3VsZEFwcGx5Um9vdE9m ZnNldFRvRnJhZ21lbnRzIHsKICAgICBJZ25vcmVSb290T2Zmc2V0Rm9yRnJhZ21lbnRzCiB9Owog CitlbnVtIExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZSB7CisgICAgVmlld3BvcnRDb25zdHJh aW5lZCA9IDEgPDwgMCwKKyAgICBTY3JvbGxpbmcgICAgICAgICAgID0gMSA8PCAxCit9OwordHlw ZWRlZiB1bnNpZ25lZCBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGVzOworCiBjbGFzcyBSZW5k ZXJMYXllciBmaW5hbCA6IHB1YmxpYyBTY3JvbGxhYmxlQXJlYSB7CiAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CiBwdWJsaWM6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDA1NTQ0MmFiMzE1YmU4NmU3MzE2ZGFlZDBkZDE2YTZl M2IxMjk0MmYuLmZkNDIzZDY2NDg0OTQ4ZmFjZDYyNTUyM2IzYTg4NWQyMGE1Y2M0NzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0x NTEsNyArMTUxLDcgQEAgUmVuZGVyTGF5ZXJCYWNraW5nOjp+UmVuZGVyTGF5ZXJCYWNraW5nKCkK ICAgICB1cGRhdGVCYWNrZ3JvdW5kTGF5ZXIoZmFsc2UpOwogICAgIHVwZGF0ZU1hc2tpbmdMYXll cihmYWxzZSwgZmFsc2UpOwogICAgIHVwZGF0ZVNjcm9sbGluZ0xheWVycyhmYWxzZSk7Ci0gICAg ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKCk7CisgICAgZGV0YWNoRnJvbVNjcm9sbGlu Z0Nvb3JkaW5hdG9yKFNjcm9sbGluZyB8IFZpZXdwb3J0Q29uc3RyYWluZWQpOwogICAgIGRlc3Ry b3lHcmFwaGljc0xheWVycygpOwogfQogCkBAIC0xNTUxLDcgKzE1NTEsNyBAQCBib29sIFJlbmRl ckxheWVyQmFja2luZzo6dXBkYXRlU2Nyb2xsaW5nTGF5ZXJzKGJvb2wgbmVlZHNTY3JvbGxpbmdM YXllcnMpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpk ZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoKQordm9pZCBSZW5kZXJMYXllckJhY2tpbmc6 OmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvcihMYXllclNjcm9sbENvb3JkaW5hdGlvblJv bGVzIHJvbGVzKQogewogICAgIGlmICghbV9zY3JvbGxpbmdOb2RlSUQgJiYgIW1fdmlld3BvcnRD b25zdHJhaW5lZE5vZGVJRCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTU2MCwyOCArMTU2MCwxNSBA QCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9y KCkKICAgICBpZiAoIXNjcm9sbGluZ0Nvb3JkaW5hdG9yKQogICAgICAgICByZXR1cm47CiAKLSAg ICBpZiAobV9zY3JvbGxpbmdOb2RlSUQpCisgICAgaWYgKChyb2xlcyAmIFNjcm9sbGluZykgJiYg bV9zY3JvbGxpbmdOb2RlSUQpIHsKICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmRldGFj aEZyb21TdGF0ZVRyZWUobV9zY3JvbGxpbmdOb2RlSUQpOwotCi0gICAgaWYgKG1fdmlld3BvcnRD b25zdHJhaW5lZE5vZGVJRCkKKyAgICAgICAgbV9zY3JvbGxpbmdOb2RlSUQgPSAwOworICAgIH0K KyAgICAKKyAgICBpZiAoKHJvbGVzICYgVmlld3BvcnRDb25zdHJhaW5lZCkgJiYgbV92aWV3cG9y dENvbnN0cmFpbmVkTm9kZUlEKSB7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5kZXRh Y2hGcm9tU3RhdGVUcmVlKG1fdmlld3BvcnRDb25zdHJhaW5lZE5vZGVJRCk7Ci0KLSAgICBtX3Nj cm9sbGluZ05vZGVJRCA9IDA7Ci0gICAgbV92aWV3cG9ydENvbnN0cmFpbmVkTm9kZUlEID0gMDsK LX0KLQotdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGlu YXRvckZvclJvbGUoU2Nyb2xsaW5nTm9kZVR5cGUgcm9sZSkKLXsKLSAgICBTY3JvbGxpbmdOb2Rl SUQgbm9kZUlEID0gc2Nyb2xsaW5nTm9kZUlERm9yUm9sZShyb2xlKTsKLSAgICBpZiAoIW5vZGVJ RCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yID0gc2Nyb2xsaW5nQ29vcmRpbmF0b3JGcm9tTGF5ZXIobV9vd25pbmdMYXll cik7Ci0gICAgaWYgKCFzY3JvbGxpbmdDb29yZGluYXRvcikKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmRldGFjaEZyb21TdGF0ZVRyZWUobm9kZUlEKTsKLSAg ICBzZXRTY3JvbGxpbmdOb2RlSURGb3JSb2xlKDAsIHJvbGUpOworICAgICAgICBtX3ZpZXdwb3J0 Q29uc3RyYWluZWROb2RlSUQgPSAwOworICAgIH0KIH0KIAogR3JhcGhpY3NMYXllclBhaW50aW5n UGhhc2UgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludGluZ1BoYXNlRm9yUHJpbWFyeUxheWVyKCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaApp bmRleCBlNzRmZGRkNmFmOGIxMWYxMmY0Mjc3ZDhhNjNmYTEzNmRhZGQ3YzA2Li5iOWQ1M2M0M2Vm M2VlYjQwMzVjYzk1Mzg3MThmMDY0OWU1ODBhZDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBAIC0xMDcsMzEgKzEwNywyNiBAQCBwdWJsaWM6 CiAgICAgR3JhcGhpY3NMYXllciogc2Nyb2xsaW5nTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Nj cm9sbGluZ0xheWVyLmdldCgpOyB9CiAgICAgR3JhcGhpY3NMYXllciogc2Nyb2xsaW5nQ29udGVu dHNMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci5nZXQoKTsg fQogCi0gICAgdm9pZCBkZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoKTsKLSAgICB2b2lk IGRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvckZvclJvbGUoU2Nyb2xsaW5nTm9kZVR5cGUp OworICAgIHZvaWQgZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKExheWVyU2Nyb2xsQ29v cmRpbmF0aW9uUm9sZXMpOwogICAgIAotICAgIFNjcm9sbGluZ05vZGVJRCBzY3JvbGxpbmdOb2Rl SURGb3JSb2xlKFNjcm9sbGluZ05vZGVUeXBlIG5vZGVUeXBlKSBjb25zdAorICAgIFNjcm9sbGlu Z05vZGVJRCBzY3JvbGxpbmdOb2RlSURGb3JSb2xlKExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9s ZSByb2xlKSBjb25zdAogICAgIHsKLSAgICAgICAgc3dpdGNoIChub2RlVHlwZSkgewotICAgICAg ICBjYXNlIEZyYW1lU2Nyb2xsaW5nTm9kZToKLSAgICAgICAgY2FzZSBPdmVyZmxvd1Njcm9sbGlu Z05vZGU6CisgICAgICAgIHN3aXRjaCAocm9sZSkgeworICAgICAgICBjYXNlIFNjcm9sbGluZzoK ICAgICAgICAgICAgIHJldHVybiBtX3Njcm9sbGluZ05vZGVJRDsKLSAgICAgICAgY2FzZSBGaXhl ZE5vZGU6Ci0gICAgICAgIGNhc2UgU3RpY2t5Tm9kZToKKyAgICAgICAgY2FzZSBWaWV3cG9ydENv bnN0cmFpbmVkOgogICAgICAgICAgICAgcmV0dXJuIG1fdmlld3BvcnRDb25zdHJhaW5lZE5vZGVJ RDsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgCi0gICAgdm9pZCBz ZXRTY3JvbGxpbmdOb2RlSURGb3JSb2xlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIFNjcm9sbGlu Z05vZGVUeXBlIG5vZGVUeXBlKQorICAgIHZvaWQgc2V0U2Nyb2xsaW5nTm9kZUlERm9yUm9sZShT Y3JvbGxpbmdOb2RlSUQgbm9kZUlELCBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGUgcm9sZSkK ICAgICB7Ci0gICAgICAgIHN3aXRjaCAobm9kZVR5cGUpIHsKLSAgICAgICAgY2FzZSBGcmFtZVNj cm9sbGluZ05vZGU6Ci0gICAgICAgIGNhc2UgT3ZlcmZsb3dTY3JvbGxpbmdOb2RlOgorICAgICAg ICBzd2l0Y2ggKHJvbGUpIHsKKyAgICAgICAgY2FzZSBTY3JvbGxpbmc6CiAgICAgICAgICAgICBt X3Njcm9sbGluZ05vZGVJRCA9IG5vZGVJRDsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBj YXNlIEZpeGVkTm9kZToKLSAgICAgICAgY2FzZSBTdGlja3lOb2RlOgorICAgICAgICBjYXNlIFZp ZXdwb3J0Q29uc3RyYWluZWQ6CiAgICAgICAgICAgICBtX3ZpZXdwb3J0Q29uc3RyYWluZWROb2Rl SUQgPSBub2RlSUQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA3NjQy MjQzYzliZjI2MWY0ZmQ4YzM1NmZiMzFjYjBkY2VmYWY3MDdmLi4zYzJjNzlkZjcxZDVlYmE0NGVk OTE2ODdhNTFjMzkwOWIwODI1MTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzY0MywxOCArMzY0MywxOCBAQCB2b2lk IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGV2aWNlT3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCkK IAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkU3Rh dHVzKFJlbmRlckxheWVyJiBsYXllcikKIHsKLSAgICBTY3JvbGxDb29yZGluYXRpb25SZWFzb25z IGNvb3JkaW5hdGlvblJlYXNvbnMgPSAwOworICAgIExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9s ZXMgY29vcmRpbmF0aW9uUm9sZXMgPSAwOwogICAgIGlmIChpc1ZpZXdwb3J0Q29uc3RyYWluZWRG aXhlZE9yU3RpY2t5TGF5ZXIobGF5ZXIpKQotICAgICAgICBjb29yZGluYXRpb25SZWFzb25zIHw9 IEZpeGVkT3JTdGlja3k7CisgICAgICAgIGNvb3JkaW5hdGlvblJvbGVzIHw9IFZpZXdwb3J0Q29u c3RyYWluZWQ7CiAKICAgICBpZiAodXNlQ29vcmRpbmF0ZWRTY3JvbGxpbmdGb3JMYXllcihtX3Jl bmRlclZpZXcsIGxheWVyKSkKLSAgICAgICAgY29vcmRpbmF0aW9uUmVhc29ucyB8PSBTY3JvbGxp bmc7CisgICAgICAgIGNvb3JkaW5hdGlvblJvbGVzIHw9IFNjcm9sbGluZzsKIAotICAgIGlmIChj b29yZGluYXRpb25SZWFzb25zKSB7CisgICAgaWYgKGNvb3JkaW5hdGlvblJvbGVzKSB7CiAgICAg ICAgIGlmIChtX3Njcm9sbENvb3JkaW5hdGVkTGF5ZXJzLmFkZCgmbGF5ZXIpLmlzTmV3RW50cnkp CiAgICAgICAgICAgICBtX3N1YmZyYW1lU2Nyb2xsTGF5ZXJzTmVlZFJlYXR0YWNoID0gdHJ1ZTsK IAotICAgICAgICB1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVyLCBjb29yZGluYXRp b25SZWFzb25zKTsKKyAgICAgICAgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllciwg Y29vcmRpbmF0aW9uUm9sZXMpOwogICAgIH0gZWxzZQogICAgICAgICByZW1vdmVGcm9tU2Nyb2xs Q29vcmRpbmF0ZWRMYXllcnMobGF5ZXIpOwogfQpAQCAtMzY2OSw3ICszNjY5LDcgQEAgdm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlbW92ZUZyb21TY3JvbGxDb29yZGluYXRlZExheWVycyhS ZW5kZXJMYXllciYgbGF5ZXIKICAgICBtX3Njcm9sbENvb3JkaW5hdGVkTGF5ZXJzLnJlbW92ZSgm bGF5ZXIpOwogICAgIG1fc2Nyb2xsQ29vcmRpbmF0ZWRMYXllcnNOZWVkaW5nVXBkYXRlLnJlbW92 ZSgmbGF5ZXIpOwogCi0gICAgZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllcik7Cisg ICAgZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllciwgU2Nyb2xsaW5nIHwgVmlld3Bv cnRDb25zdHJhaW5lZCk7CiB9CiAKIEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUZpeGVkVmlld3BvcnRDb25zdHJhaW50cyhSZW5k ZXJMYXllciYgbGF5ZXIpIGNvbnN0CkBAIC0zNzkwLDYgKzM3OTAsMjAgQEAgdm9pZCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OnJlYXR0YWNoU3ViZnJhbWVTY3JvbGxMYXllcnMoKQogICAgIH0KIH0K IAorc3RhdGljIGlubGluZSBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGUgc2Nyb2xsQ29vcmRp bmF0aW9uUm9sZUZvck5vZGVUeXBlKFNjcm9sbGluZ05vZGVUeXBlIG5vZGVUeXBlKQoreworICAg IHN3aXRjaCAobm9kZVR5cGUpIHsKKyAgICBjYXNlIEZyYW1lU2Nyb2xsaW5nTm9kZToKKyAgICBj YXNlIE92ZXJmbG93U2Nyb2xsaW5nTm9kZToKKyAgICAgICAgcmV0dXJuIFNjcm9sbGluZzsKKyAg ICBjYXNlIEZpeGVkTm9kZToKKyAgICBjYXNlIFN0aWNreU5vZGU6CisgICAgICAgIHJldHVybiBW aWV3cG9ydENvbnN0cmFpbmVkOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICByZXR1cm4gU2Nyb2xsaW5nOworfQorCiBTY3JvbGxpbmdOb2RlSUQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjphdHRhY2hTY3JvbGxpbmdOb2RlKFJlbmRlckxheWVyJiBsYXllciwgU2Nyb2xsaW5n Tm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCBwYXJlbnROb2RlSUQpCiB7CiAgICAg U2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xs aW5nQ29vcmRpbmF0b3IoKTsKQEAgLTM3OTksNyArMzgxMyw4IEBAIFNjcm9sbGluZ05vZGVJRCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OmF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVyTGF5ZXImIGxh eWVyLCBTCiAgICAgaWYgKCFiYWNraW5nKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIFNjcm9s bGluZ05vZGVJRCBub2RlSUQgPSBiYWNraW5nLT5zY3JvbGxpbmdOb2RlSURGb3JSb2xlKG5vZGVU eXBlKTsKKyAgICBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGUgcm9sZSA9IHNjcm9sbENvb3Jk aW5hdGlvblJvbGVGb3JOb2RlVHlwZShub2RlVHlwZSk7CisgICAgU2Nyb2xsaW5nTm9kZUlEIG5v ZGVJRCA9IGJhY2tpbmctPnNjcm9sbGluZ05vZGVJREZvclJvbGUocm9sZSk7CiAgICAgaWYgKCFu b2RlSUQpCiAgICAgICAgIG5vZGVJRCA9IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT51bmlxdWVTY3Jv bGxMYXllcklEKCk7CiAKQEAgLTM4MDcsMzcgKzM4MjIsMjkgQEAgU2Nyb2xsaW5nTm9kZUlEIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6YXR0YWNoU2Nyb2xsaW5nTm9kZShSZW5kZXJMYXllciYgbGF5 ZXIsIFMKICAgICBpZiAoIW5vZGVJRCkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBiYWNraW5n LT5zZXRTY3JvbGxpbmdOb2RlSURGb3JSb2xlKG5vZGVJRCwgbm9kZVR5cGUpOworICAgIGJhY2tp bmctPnNldFNjcm9sbGluZ05vZGVJREZvclJvbGUobm9kZUlELCByb2xlKTsKICAgICBtX3Njcm9s bGluZ05vZGVUb0xheWVyTWFwLmFkZChub2RlSUQsICZsYXllcik7CiAgICAgCiAgICAgcmV0dXJu IG5vZGVJRDsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFNjcm9sbENv b3JkaW5hdGVkTGF5ZXJGb3JSb2xlKFJlbmRlckxheWVyJiBsYXllciwgU2Nyb2xsaW5nTm9kZVR5 cGUgcm9sZSkKLXsKLSAgICBSZW5kZXJMYXllckJhY2tpbmcqIGJhY2tpbmcgPSBsYXllci5iYWNr aW5nKCk7Ci0gICAgaWYgKCFiYWNraW5nKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCA9IGJhY2tpbmctPnNjcm9sbGluZ05vZGVJREZvclJvbGUocm9s ZSkpCi0gICAgICAgIG1fc2Nyb2xsaW5nTm9kZVRvTGF5ZXJNYXAucmVtb3ZlKG5vZGVJRCk7Ci0K LSAgICBiYWNraW5nLT5kZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3JGb3JSb2xlKHJvbGUp OwotfQotCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGV0YWNoU2Nyb2xsQ29vcmRpbmF0 ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIpCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 ZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIExheWVyU2Ny b2xsQ29vcmRpbmF0aW9uUm9sZXMgcm9sZXMpCiB7CiAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBi YWNraW5nID0gbGF5ZXIuYmFja2luZygpOwogICAgIGlmICghYmFja2luZykKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaWYgKFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBiYWNraW5nLT5zY3JvbGxp bmdOb2RlSURGb3JSb2xlKEZyYW1lU2Nyb2xsaW5nTm9kZSkpCi0gICAgICAgIG1fc2Nyb2xsaW5n Tm9kZVRvTGF5ZXJNYXAucmVtb3ZlKG5vZGVJRCk7CisgICAgaWYgKHJvbGVzICYgU2Nyb2xsaW5n KSB7CisgICAgICAgIGlmIChTY3JvbGxpbmdOb2RlSUQgbm9kZUlEID0gYmFja2luZy0+c2Nyb2xs aW5nTm9kZUlERm9yUm9sZShTY3JvbGxpbmcpKQorICAgICAgICAgICAgbV9zY3JvbGxpbmdOb2Rl VG9MYXllck1hcC5yZW1vdmUobm9kZUlEKTsKKyAgICB9CiAKLSAgICBpZiAoU2Nyb2xsaW5nTm9k ZUlEIG5vZGVJRCA9IGJhY2tpbmctPnNjcm9sbGluZ05vZGVJREZvclJvbGUoRml4ZWROb2RlKSkK LSAgICAgICAgbV9zY3JvbGxpbmdOb2RlVG9MYXllck1hcC5yZW1vdmUobm9kZUlEKTsKKyAgICBp ZiAocm9sZXMgJiBWaWV3cG9ydENvbnN0cmFpbmVkKSB7CisgICAgICAgIGlmIChTY3JvbGxpbmdO b2RlSUQgbm9kZUlEID0gYmFja2luZy0+c2Nyb2xsaW5nTm9kZUlERm9yUm9sZShWaWV3cG9ydENv bnN0cmFpbmVkKSkKKyAgICAgICAgICAgIG1fc2Nyb2xsaW5nTm9kZVRvTGF5ZXJNYXAucmVtb3Zl KG5vZGVJRCk7CisgICAgfQogCi0gICAgYmFja2luZy0+ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3Jk aW5hdG9yKCk7CisgICAgYmFja2luZy0+ZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKHJv bGVzKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3Jk aW5hdGlvbkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQgcGFyZW50Tm9kZUlEKQpAQCAtMzg0 OSw3ICszODU2LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENv b3JkaW5hdGlvbkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQKICAgICBzY3JvbGxpbmdDb29y ZGluYXRvci0+dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKG5vZGVJRCwgbV9zY3JvbGxMYXllci5n ZXQoKSwgbV9yb290Q29udGVudExheWVyLmdldCgpLCBmaXhlZFJvb3RCYWNrZ3JvdW5kTGF5ZXIo KSwgY2xpcExheWVyKCkpOwogfQogCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRl U2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIFNjcm9sbENvb3JkaW5h dGlvblJlYXNvbnMgcmVhc29ucykKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVT Y3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgTGF5ZXJTY3JvbGxDb29y ZGluYXRpb25Sb2xlcyByZWFzb25zKQogewogICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3Jv bGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCk7CiAgICAgaWYg KCFzY3JvbGxpbmdDb29yZGluYXRvciB8fCAhc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmNvb3JkaW5h dGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKSkpCkBAIC0z ODc0LDcgKzM4ODEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xs Q29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIFNjcgogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIHVwZGF0ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShwYXJl bnREb2N1bWVudEhvc3RpbmdOb2RlSUQpOwotICAgICAgICBpZiAoIShyZWFzb25zICYgRml4ZWRP clN0aWNreSkgJiYgaXNSb290TGF5ZXIpCisgICAgICAgIGlmICghKHJlYXNvbnMgJiBWaWV3cG9y dENvbnN0cmFpbmVkKSAmJiBpc1Jvb3RMYXllcikKICAgICAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTM4ODQsNyArMzg5MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRh dGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgU2NyCiAgICAgCiAg ICAgLy8gQWx3YXlzIGNhbGwgdGhpcyBldmVuIGlmIHRoZSBiYWNraW5nIGlzIGFscmVhZHkgYXR0 YWNoZWQgYmVjYXVzZSB0aGUgcGFyZW50IG1heSBoYXZlIGNoYW5nZWQuCiAgICAgLy8gSWYgYSBu b2RlIHBsYXlzIGJvdGggcm9sZXMsIGZpeGVkL3N0aWNreSBpcyBhbHdheXMgdGhlIGFuY2VzdG9y IG5vZGUgb2Ygc2Nyb2xsaW5nLgotICAgIGlmIChyZWFzb25zICYgRml4ZWRPclN0aWNreSkgewor ICAgIGlmIChyZWFzb25zICYgVmlld3BvcnRDb25zdHJhaW5lZCkgewogICAgICAgICBTY3JvbGxp bmdOb2RlVHlwZSBub2RlVHlwZSA9IEZyYW1lU2Nyb2xsaW5nTm9kZTsKICAgICAgICAgaWYgKGxh eWVyLnJlbmRlcmVyKCkuc3R5bGUoKS5wb3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24pCiAgICAg ICAgICAgICBub2RlVHlwZSA9IEZpeGVkTm9kZTsKQEAgLTM5MTEsNyArMzkxOCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRl ckxheWVyJiBsYXllciwgU2NyCiAgICAgICAgIAogICAgICAgICBwYXJlbnROb2RlSUQgPSBub2Rl SUQ7CiAgICAgfSBlbHNlCi0gICAgICAgIGRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXJGb3JS b2xlKGxheWVyLCBGaXhlZE5vZGUpOworICAgICAgICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExh eWVyKGxheWVyLCBWaWV3cG9ydENvbnN0cmFpbmVkKTsKIAogICAgIGlmIChyZWFzb25zICYgU2Ny b2xsaW5nKSB7CiAgICAgICAgIGlmIChpc1Jvb3RMYXllcikKQEAgLTM5MzcsNyArMzk0NCw3IEBA IHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVy KFJlbmRlckxheWVyJiBsYXllciwgU2NyCiAgICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRv ci0+dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKG5vZGVJRCwgYmFja2luZy0+c2Nyb2xsaW5n TGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xsaW5nQ29udGVudHNMYXllcigpLCAmc2Nyb2xsaW5nR2Vv bWV0cnkpOwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIGRldGFjaFNjcm9sbENvb3Jk aW5hdGVkTGF5ZXJGb3JSb2xlKGxheWVyLCBPdmVyZmxvd1Njcm9sbGluZ05vZGUpOworICAgICAg ICBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKGxheWVyLCBTY3JvbGxpbmcpOwogfQogCiBT Y3JvbGxhYmxlQXJlYSogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzY3JvbGxhYmxlQXJlYUZvclNj cm9sbExheWVySUQoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkgY29uc3QKQEAgLTQwMzAsNyArNDAz Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1bnJlZ2lzdGVyQWxsU2Nyb2xsaW5n TGF5ZXJzKCkKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp3aWxsUmVtb3ZlU2Nyb2xsaW5n TGF5ZXJXaXRoQmFja2luZyhSZW5kZXJMYXllciYgbGF5ZXIsIFJlbmRlckxheWVyQmFja2luZyYg YmFja2luZykKIHsKICAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3Jk aW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgewotICAgICAgICBiYWNraW5n LmRldGFjaEZyb21TY3JvbGxpbmdDb29yZGluYXRvcigpOworICAgICAgICBiYWNraW5nLmRldGFj aEZyb21TY3JvbGxpbmdDb29yZGluYXRvcihTY3JvbGxpbmcpOwogCiAgICAgICAgIC8vIEZvciBD b29yZGluYXRlZCBHcmFwaGljcy4KICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNjcm9s bGFibGVBcmVhU2Nyb2xsTGF5ZXJEaWRDaGFuZ2UobGF5ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IGJhYTY2NWZmYzkxNzQ3 YWEyYjUyYTM3N2Q4MTgxMmE4YTE4Mjc4ZWUuLjZiNjMwZjYyMGIxMDhlYTNlM2Y3Y2FjMDQ0OTI4 NGU1YmIxMmE0ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKQEAgLTQyNCwxNyArNDI0LDEwIEBAIHByaXZhdGU6CiAKICNlbmRpZgog Ci0gICAgZW51bSBTY3JvbGxDb29yZGluYXRpb25SZWFzb24gewotICAgICAgICBGaXhlZE9yU3Rp Y2t5ID0gMSA8PCAwLAotICAgICAgICBTY3JvbGxpbmcgPSAxIDw8IDEKLSAgICB9OwotICAgIHR5 cGVkZWYgdW5zaWduZWQgU2Nyb2xsQ29vcmRpbmF0aW9uUmVhc29uczsKLQogICAgIHZvaWQgdXBk YXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKFNjcm9sbGluZ05vZGVJRCk7CiAgICAg U2Nyb2xsaW5nTm9kZUlEIGF0dGFjaFNjcm9sbGluZ05vZGUoUmVuZGVyTGF5ZXImLCBTY3JvbGxp bmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIHBhcmVudE5vZGVJRCk7Ci0gICAgdm9pZCB1cGRh dGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiwgU2Nyb2xsQ29vcmRpbmF0aW9u UmVhc29ucyk7Ci0gICAgdm9pZCBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxh eWVyJik7Ci0gICAgdm9pZCBkZXRhY2hTY3JvbGxDb29yZGluYXRlZExheWVyRm9yUm9sZShSZW5k ZXJMYXllciYsIFNjcm9sbGluZ05vZGVUeXBlKTsKKyAgICB2b2lkIHVwZGF0ZVNjcm9sbENvb3Jk aW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImLCBMYXllclNjcm9sbENvb3JkaW5hdGlvblJvbGVzKTsK KyAgICB2b2lkIGRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImLCBMYXll clNjcm9sbENvb3JkaW5hdGlvblJvbGVzKTsKICAgICB2b2lkIHJlYXR0YWNoU3ViZnJhbWVTY3Jv bGxMYXllcnMoKTsKICAgICAKICAgICBGaXhlZFBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50cyBj b21wdXRlRml4ZWRWaWV3cG9ydENvbnN0cmFpbnRzKFJlbmRlckxheWVyJikgY29uc3Q7Cg==