134075 2014-06-19 14:20:01 -0700 Make ScrollingTreeNodes refounted, for easier tree reconfiguration 2014-06-20 12:21:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin cmarcelo commit-queue jamesr luiz sam simon.fraser thorton tonikitoo oldest_to_newest 1016765 0 simon.fraser 2014-06-19 14:20:01 -0700 Make ScrollingTreeNodes refounted, for easier tree reconfiguration 1016767 1 233382 simon.fraser 2014-06-19 14:21:54 -0700 Created attachment 233382 Patch 1016990 2 simon.fraser 2014-06-20 12:21:42 -0700 https://trac.webkit.org/r170196 233382 2014-06-19 14:21:54 -0700 2014-06-19 14:31:16 -0700 Patch bug-134075-20140619142133.patch text/plain 29198 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdhNWUyNTI1ZGFlNDE3 Y2YwM2FhNzc4ZDc2ZTc3YTcwMjM4YTRjZi4uOGFiMWM1MTc3NGE0YjUzMDc3NzRjYjMxY2U2ZGY4 OTM4ZTExZTExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTA2LTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgU2Nyb2xs aW5nVHJlZU5vZGVzIHJlZm91bnRlZCwgZm9yIGVhc2llciB0cmVlIHJlY29uZmlndXJhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0MDc1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBTY3Jv bGxpbmdUcmVlTm9kZSBiZSByZWYtY291bnRlZC4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OmhhbmRs ZVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6dXBkYXRlVHJl ZUZyb21TdGF0ZU5vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OnJvb3ROb2RlKToKKyAgICAgICAg KiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxpbmdUcmVlTm9kZTo6YXBwZW5kQ2hpbGQpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWVOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFk ZWRTY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGVkU2Nyb2xsaW5n VHJlZTo6Y3JlYXRlTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3Jv bGxpbmdUcmVlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3Jk aW5hdG9ySU9TLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3Jk aW5hdG9ySU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3JJT1M6 OmNyZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9pb3Mv U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5oOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLm1tOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6Y3JlYXRlKToK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUlPUy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlSU9TOjpjcmVhdGVOb2RlKToKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUlPUy5oOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5oOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpjcmVhdGVTY3JvbGxpbmdUcmVlTm9kZSk6CisgICAg ICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUuaDoKKyAgICAg ICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6OmNyZWF0ZSk6CisgICAgICAgICog cGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMuaDoK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGVNYWM6OmNyZWF0ZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z1RyZWVTdGlja3lOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z1RyZWVTdGlja3lOb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVN0aWNr eU5vZGU6OmNyZWF0ZSk6CisKIDIwMTQtMDYtMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSB0aGUgcmVtb3ZlTm9kZSgpIHRyZWUgd2Fsa2lu ZyBmcm9tIFNjcm9sbGluZ1N0YXRlTm90ZSBpbnRvIFNjcm9sbGluZ1N0YXRlVHJlZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CmluZGV4IGVlYWYzNWRiMTY3M2Q4NDAwZmI5OWFlNzY4NzRmZTNlZjI5ZmQzMWQuLjdiZDVkZjM0 YjYyYWQyZTE1NjIyNzJiNzdlOWEwMGRiYmZiMDNiYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MiBAQAorMjAxNC0wNi0xOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KworICAgICAgICBNYWtlIFNjcm9sbGluZ1RyZWVOb2RlcyByZWZvdW50ZWQsIGZvciBlYXNpZXIg dHJlZSByZWNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNDA3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1ha2UgU2Nyb2xsaW5nVHJlZU5vZGUgYmUgcmVmLWNvdW50ZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdUcmVlOjpjcmVhdGVOb2RlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2Rl SU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92 ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6U2Nyb2xsaW5nVHJl ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUzo6Y3JlYXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yLm1tOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvcjo6Y3JlYXRlU2Nyb2xsaW5nVHJlZU5v ZGUpOgorCiAyMDE0LTA2LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIGJhY2sgV0tQYWdlUnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lX2IgZm9y IG5vdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3Jv bGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IGY1NDdmYjFmZGJmNDU2YWIyOTAwMTNmMTNkZmYy MTNiODE5MWFkYzcuLjVhMWRkMDJkYTFhZGQxYTczMzM0NWFiZGI4YjIzYzMyODc0Y2ZkYTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogCiAgICAgU2Nyb2xs aW5nVHJlZSogc2Nyb2xsaW5nVHJlZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsaW5nVHJlZS5n ZXQoKTsgfQogCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiBjcmVh dGVTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKSA9 IDA7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiBjcmVhdGVTY3Jv bGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKSA9IDA7CiAK ICAgICB2b2lkIHNjcm9sbGluZ1N0YXRlVHJlZVByb3BlcnRpZXNDaGFuZ2VkKCk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggYzcy ODYxYzY5YTg4NjI0OGFhZTNmNjNlOTU0NGE0ZTFhOWFhYWRmZC4uYzZkNWJmMzliNTIyNTk2YTkw OTgxMmIwYzI3ODZiNDEwY2UxMjJmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgdm9pZCBTY3JvbGxpbmdU cmVlOjpzZXRPckNsZWFyTGF0Y2hlZE5vZGUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVl bEV2ZW50LAogdm9pZCBTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRm b3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKICAgICBpZiAobV9yb290Tm9kZSkKLSAgICAg ICAgbV9yb290Tm9kZS0+aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKKyAgICAgICAgdG9T Y3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZShtX3Jvb3ROb2RlLmdldCgpKS0+aGFuZGxlV2hlZWxF dmVudCh3aGVlbEV2ZW50KTsKIH0KIAogdm9pZCBTY3JvbGxpbmdUcmVlOjp2aWV3cG9ydENoYW5n ZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0JiBmaXhlZFBvc2l0aW9uUmVjdCwgZG91YmxlIHNjYWxlKQpAQCAtMTc3 LDEyICsxNzcsMTIgQEAgdm9pZCBTY3JvbGxpbmdUcmVlOjp1cGRhdGVUcmVlRnJvbVN0YXRlTm9k ZShjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUqIHN0YXRlTm9kZSkKICAgICAgICAgICAgIC8vIFRo aXMgaXMgdGhlIHJvb3Qgbm9kZS4gTnVrZSB0aGUgbm9kZSBtYXAuCiAgICAgICAgICAgICBtX25v ZGVNYXAuY2xlYXIoKTsKIAotICAgICAgICAgICAgbV9yb290Tm9kZSA9IHN0YXRpY19wb2ludGVy X2Nhc3Q8U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU+KGNyZWF0ZU5vZGUoRnJhbWVTY3JvbGxp bmdOb2RlLCBub2RlSUQpKTsKKyAgICAgICAgICAgIG1fcm9vdE5vZGUgPSBjcmVhdGVOb2RlKEZy YW1lU2Nyb2xsaW5nTm9kZSwgbm9kZUlEKTsKICAgICAgICAgICAgIG1fbm9kZU1hcC5zZXQobm9k ZUlELCBtX3Jvb3ROb2RlLmdldCgpKTsKICAgICAgICAgICAgIG1fcm9vdE5vZGUtPnVwZGF0ZUJl Zm9yZUNoaWxkcmVuKCpzdGF0ZU5vZGUpOwogICAgICAgICAgICAgbm9kZSA9IG1fcm9vdE5vZGUu Z2V0KCk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBPd25QdHI8U2Nyb2xsaW5nVHJl ZU5vZGU+IG5ld05vZGUgPSBjcmVhdGVOb2RlKHN0YXRlTm9kZS0+bm9kZVR5cGUoKSwgbm9kZUlE KTsKKyAgICAgICAgICAgIFJlZlB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gbmV3Tm9kZSA9IGNyZWF0 ZU5vZGUoc3RhdGVOb2RlLT5ub2RlVHlwZSgpLCBub2RlSUQpOwogICAgICAgICAgICAgbm9kZSA9 IG5ld05vZGUuZ2V0KCk7CiAgICAgICAgICAgICBtX25vZGVNYXAuc2V0KG5vZGVJRCwgbm9kZSk7 CiAgICAgICAgICAgICBTY3JvbGxpbmdUcmVlTm9kZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBt X25vZGVNYXAuZmluZChzdGF0ZU5vZGUtPnBhcmVudCgpLT5zY3JvbGxpbmdOb2RlSUQoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKaW5kZXggYzFk ZjllOTc3YTYyNTQ3OTg5ODYyMDcwNGVmMjA5ZTYxNTQwZjY3Yy4uOGYxNDU4MGFiOGIzZWI5M2Uw NzY1ZThiYjBjMjU2Y2IwOGJiYWQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtMTE2LDcgKzExNiw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9vbCBmbGFnKTsKICAgICBi b29sIHNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoKTsKIAotICAgIFNjcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2RlKiByb290Tm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdE5vZGUu Z2V0KCk7IH0KKyAgICBTY3JvbGxpbmdUcmVlTm9kZSogcm9vdE5vZGUoKSBjb25zdCB7IHJldHVy biBtX3Jvb3ROb2RlLmdldCgpOyB9CiAKICAgICBTY3JvbGxpbmdOb2RlSUQgbGF0Y2hlZE5vZGUo KTsKICAgICB2b2lkIHNldExhdGNoZWROb2RlKFNjcm9sbGluZ05vZGVJRCk7CkBAIC0xMzMsMTEg KzEzMywxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlRGVzdHJveWVkTm9kZXMoY29uc3Qg U2Nyb2xsaW5nU3RhdGVUcmVlJik7CiAgICAgdm9pZCB1cGRhdGVUcmVlRnJvbVN0YXRlTm9kZShj b25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUqKTsKIAotICAgIHZpcnR1YWwgUGFzc093blB0cjxTY3Jv bGxpbmdUcmVlTm9kZT4gY3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9k ZUlEKSA9IDA7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiBjcmVh dGVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQpID0gMDsKIAogICAgIFNj cm9sbGluZ1RyZWVOb2RlKiBub2RlRm9ySUQoU2Nyb2xsaW5nTm9kZUlEKSBjb25zdDsKIAotICAg IE93blB0cjxTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZT4gbV9yb290Tm9kZTsKKyAgICBSZWZQ dHI8U2Nyb2xsaW5nVHJlZU5vZGU+IG1fcm9vdE5vZGU7CiAKICAgICB0eXBlZGVmIEhhc2hNYXA8 U2Nyb2xsaW5nTm9kZUlELCBTY3JvbGxpbmdUcmVlTm9kZSo+IFNjcm9sbGluZ1RyZWVOb2RlTWFw OwogICAgIFNjcm9sbGluZ1RyZWVOb2RlTWFwIG1fbm9kZU1hcDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVOb2RlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVOb2RlLmNwcAppbmRleCBhOTUzNzE0 NzIxNGIzOGEwNTBmODBlYWZhZDAyOGU2MTg3MDE0NjRlLi45ODE2NjQ2ZjhlNzczMTg1OWVmYTM0 ZmYyNTJjZjEyYWE5YzE4Y2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuY3BwCkBAIC00NCwxMiArNDQsMTIgQEAgU2Nyb2xsaW5n VHJlZU5vZGU6On5TY3JvbGxpbmdUcmVlTm9kZSgpCiB7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nVHJl ZU5vZGU6OmFwcGVuZENoaWxkKFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IGNoaWxkTm9k ZSkKK3ZvaWQgU2Nyb2xsaW5nVHJlZU5vZGU6OmFwcGVuZENoaWxkKFBhc3NSZWZQdHI8U2Nyb2xs aW5nVHJlZU5vZGU+IGNoaWxkTm9kZSkKIHsKICAgICBjaGlsZE5vZGUtPnNldFBhcmVudCh0aGlz KTsKIAogICAgIGlmICghbV9jaGlsZHJlbikKLSAgICAgICAgbV9jaGlsZHJlbiA9IGFkb3B0UHRy KG5ldyBWZWN0b3I8T3duUHRyPFNjcm9sbGluZ1RyZWVOb2RlPj4pOworICAgICAgICBtX2NoaWxk cmVuID0gYWRvcHRQdHIobmV3IFNjcm9sbGluZ1RyZWVDaGlsZHJlblZlY3Rvcik7CiAKICAgICBt X2NoaWxkcmVuLT5hcHBlbmQoY2hpbGROb2RlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5oCmluZGV4IGYwZjFhNTQyMzYzODhiNmY5 OTA4MWNmYzgzNWUzZDkzODgyZDc3ZjMuLmY1M2I1MzE5ZTNmMjkxMjJkZTU1NDMzNzhiN2FmOTc0 N2YwNGQ3ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nVHJlZU5vZGUuaApAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgIkludFJlY3QuaCIKICNp bmNsdWRlICJTY3JvbGxUeXBlcy5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ0Nvb3JkaW5hdG9yLmgi Ci0jaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTM5LDcgKzM5LDcgQEAgY2xhc3MgU2Nyb2xs aW5nU3RhdGVGaXhlZE5vZGU7CiBjbGFzcyBTY3JvbGxpbmdTdGF0ZU5vZGU7CiBjbGFzcyBTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU7CiAKLWNsYXNzIFNjcm9sbGluZ1RyZWVOb2RlIHsKK2Ns YXNzIFNjcm9sbGluZ1RyZWVOb2RlIDogcHVibGljIFJlZkNvdW50ZWQ8U2Nyb2xsaW5nVHJlZU5v ZGU+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5TY3JvbGxpbmdUcmVlTm9kZSgpOwogCkBAIC02 MCwxNCArNjAsMTQgQEAgcHVibGljOgogICAgIFNjcm9sbGluZ1RyZWVOb2RlKiBwYXJlbnQoKSBj b25zdCB7IHJldHVybiBtX3BhcmVudDsgfQogICAgIHZvaWQgc2V0UGFyZW50KFNjcm9sbGluZ1Ry ZWVOb2RlKiBwYXJlbnQpIHsgbV9wYXJlbnQgPSBwYXJlbnQ7IH0KIAotICAgIHZvaWQgYXBwZW5k Q2hpbGQoUGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4pOworICAgIHZvaWQgYXBwZW5kQ2hp bGQoUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlTm9kZT4pOwogICAgIHZvaWQgcmVtb3ZlQ2hpbGQo U2Nyb2xsaW5nVHJlZU5vZGUqKTsKIAogcHJvdGVjdGVkOgogICAgIFNjcm9sbGluZ1RyZWVOb2Rl KFNjcm9sbGluZ1RyZWUmLCBTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKTsKICAg ICBTY3JvbGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxp bmdUcmVlOyB9CiAKLSAgICB0eXBlZGVmIFZlY3RvcjxPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+ PiBTY3JvbGxpbmdUcmVlQ2hpbGRyZW5WZWN0b3I7CisgICAgdHlwZWRlZiBWZWN0b3I8UmVmUHRy PFNjcm9sbGluZ1RyZWVOb2RlPj4gU2Nyb2xsaW5nVHJlZUNoaWxkcmVuVmVjdG9yOwogICAgIE93 blB0cjxTY3JvbGxpbmdUcmVlQ2hpbGRyZW5WZWN0b3I+IG1fY2hpbGRyZW47CiAKIHByaXZhdGU6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9s bGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3Jv bGxpbmdUcmVlLmNwcAppbmRleCA1NzkwMTc3ZTg1ZTBhNWIyZjYzZTRlZmJhNzYyZDUyYjNiZTY0 YWRmLi5lMjMzNDdkOTc2YTU3N2Q0MWM5ZWI1N2NlYjZiZTI5OTE3MTViNWNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJl ZS5jcHAKQEAgLTExNiw3ICsxMTYsNyBAQCB2b2lkIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6aGFu ZGxlV2hlZWxFdmVudFBoYXNlKFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlIHBoYXNlKQogfQogI2Vu ZGlmCiAKLVBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFRocmVhZGVkU2Nyb2xsaW5nVHJl ZTo6Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlE IG5vZGVJRCkKK1Bhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFRocmVhZGVkU2Nyb2xsaW5n VHJlZTo6Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5nTm9k ZUlEIG5vZGVJRCkKIHsKICAgICByZXR1cm4gbV9zY3JvbGxpbmdDb29yZGluYXRvci0+Y3JlYXRl U2Nyb2xsaW5nVHJlZU5vZGUobm9kZVR5cGUsIG5vZGVJRCk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCmluZGV4IGI4 YzVjYmI0N2U4NmZkMWY4YjljMjZjMDkxZGFlNmYwOWQxZjcyNWMuLjRlNzc1MTE5MDQxNDg5M2Yw ODA1MTBiMjczN2VjNzk0NjA2NGE4NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCkBAIC01OSw3ICs1OSw3IEBAIHB1 YmxpYzoKIHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBUaHJlYWRlZFNjcm9sbGluZ1RyZWUoQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvciopOwogCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPFNjcm9s bGluZ1RyZWVOb2RlPiBjcmVhdGVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2Rl SUQpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlTm9kZT4g Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKSBvdmVycmlkZTsK IAogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxpbmdUcmVlTm9kZURpZFNjcm9sbChTY3JvbGxpbmdO b2RlSUQsIGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBTZXRPclN5bmNTY3JvbGxp bmdMYXllclBvc2l0aW9uID0gU3luY1Njcm9sbGluZ0xheWVyUG9zaXRpb24pIG92ZXJyaWRlOwog I2lmIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL2lvcy9TY3JvbGxpbmdDb29yZGluYXRvcklPUy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3JkaW5hdG9ySU9TLmgKaW5kZXggYzk1OThlNzhiMmE4 OGUyZjI0NzhhMTY0ODc2MDBiZWU4YzNjOWQzMC4uNTRlMDYwOWMxMzcyODdjOWFjM2E2Y2EyZmZj OTAxN2U0MmUxN2E5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv aW9zL1Njcm9sbGluZ0Nvb3JkaW5hdG9ySU9TLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3JkaW5hdG9ySU9TLmgKQEAgLTUxLDcgKzUxLDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KEZyYW1lVmlldyosIGNv bnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpIG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAKIHBy aXZhdGU6Ci0gICAgdmlydHVhbCBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVOb2RlPiBjcmVhdGVT Y3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKSBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IGNyZWF0ZVNj cm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQpIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZVRyZWVTdGF0ZUNvbW1pdCgpIG92ZXJyaWRl OwogCiAgICAgdm9pZCBzY3JvbGxpbmdTdGF0ZVRyZWVDb21taXR0ZXJUaW1lckZpcmVkKFRpbWVy PFNjcm9sbGluZ0Nvb3JkaW5hdG9ySU9TPiopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3JkaW5hdG9ySU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ0Nvb3JkaW5hdG9ySU9TLm1tCmluZGV4 IDVmYzI5Nzc5NDMwZDZhZjBkYTNiN2I5ZDU3NTkwNzRjNzYyOTk3MTEuLjI3M2RkZmY3MzI3ZmJm ODZhNDcxNWQ2NDllMWU4YmNmODg3ZjhkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdDb29yZGluYXRvcklPUy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nQ29vcmRpbmF0b3JJT1MubW0KQEAg LTEwNCw3ICsxMDQsNyBAQCB2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9ySU9TOjpjb21taXRUcmVl U3RhdGUoKQogICAgIC8vIEZJWE1FOiBmaWd1cmUgb3V0IGhvdyB0byBjb21taXQuCiB9CiAKLVBh c3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFNjcm9sbGluZ0Nvb3JkaW5hdG9ySU9TOjpjcmVh dGVTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5n Tm9kZUlEIG5vZGVJRCkKK1Bhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFNjcm9sbGluZ0Nv b3JkaW5hdG9ySU9TOjpjcmVhdGVTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBu b2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKIHsKICAgICBBU1NFUlQoc2Nyb2xsaW5n VHJlZSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9z L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLmgKaW5k ZXggZWI5YTcwODRkMDEzN2YwZWRhYjhhNWM5OGExZDI5MmFmOTkwMWYxNy4uZDRkM2Y0NzMxZjFm ZGY0MzQxMTg3M2I0NzIzNDk4ZTgyMjIwODhjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZUlPUy5oCkBAIC0zNyw3ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUyA6IHB1YmxpYyBTY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093 blB0cjxTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TPiBjcmVhdGUoU2Nyb2xsaW5n VHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8U2Nyb2xsaW5n VHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUz4gY3JlYXRlKFNjcm9sbGluZ1RyZWUmLCBTY3JvbGxp bmdOb2RlSUQpOwogICAgIHZpcnR1YWwgflNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJ T1MoKTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9k ZUlPUy5tbQppbmRleCBiYWU4MzQ2NWRjZDMyYTE1OWVjY2JiMzkzNGM4MWU0MTQ3M2JlMTMwLi45 ZGY3ZThhOWExNGEzMWVkMzFmMTYzZGNlNDYwYWNiYWNlNTg5OWRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5tbQpAQCAtNDAsOSArNDAsOSBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZUlPUz4gU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6Y3JlYXRlKFNjcm9s bGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCitQYXNzUmVm UHRyPFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1M+IFNjcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGVJT1M6OmNyZWF0ZShTY3JvbGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlLCBT Y3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUyhzY3JvbGxpbmdUcmVlLCBub2RlSUQpKTsKKyAg ICByZXR1cm4gYWRvcHRSZWYobmV3IFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1Mo c2Nyb2xsaW5nVHJlZSwgbm9kZUlEKSk7CiB9CiAKIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGVJT1M6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MoU2Nyb2xsaW5nVHJl ZSYgc2Nyb2xsaW5nVHJlZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlSU9TLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlSU9TLmNwcAppbmRl eCA5YWQzZTI1NTIyNzk0ZTE3NjkxYjk3NWM1ZmUxYTgwMWQ3YTA4ZDQyLi4xMTVjMDE2YWY1ZThi MzE4YmZmODMxNzdmMDBhZTViMGI5MjJjYWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUlPUy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVJT1MuY3BwCkBAIC05Miw3ICs5Miw3 IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZUlPUzo6c2Nyb2xsaW5nVHJlZU5vZGVEaWRTY3JvbGwoU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCwgY29uc3QKICAgICBjYWxsT25NYWluVGhyZWFkKGJpbmQoJkFz eW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjaGVkdWxlVXBkYXRlU2Nyb2xsUG9zaXRpb25BZnRl ckFzeW5jU2Nyb2xsLCBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yLmdldCgpLCBub2RlSUQsIHNjcm9s bFBvc2l0aW9uLCBpc0hhbmRsaW5nUHJvZ3JhbW1hdGljU2Nyb2xsKCksIHNjcm9sbGluZ0xheWVy UG9zaXRpb25BY3Rpb24pKTsKIH0KIAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gU2Ny b2xsaW5nVHJlZUlPUzo6Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCkKK1Bhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFNjcm9s bGluZ1RyZWVJT1M6OmNyZWF0ZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9s bGluZ05vZGVJRCBub2RlSUQpCiB7CiAgICAgcmV0dXJuIG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3It PmNyZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKG5vZGVUeXBlLCBub2RlSUQpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVJT1MuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlSU9TLmgKaW5k ZXggYzc2MTZhNWFiMWE3MGUzMjY3NTM5MTFkMDMwZDdmMmZjNDVjYzFiNS4uYzZhOTQ3ZTNjYWIw YmM5ZDVjYzI4ZTg1OGEyZGNjNTgyNTBmNWRlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVJT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUlPUy5oCkBAIC01NCw3ICs1NCw3IEBA IHByaXZhdGU6CiAgICAgZXhwbGljaXQgU2Nyb2xsaW5nVHJlZUlPUyhBc3luY1Njcm9sbGluZ0Nv b3JkaW5hdG9yKik7CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsaW5nVHJlZUlPUygpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHZpcnR1YWwgUGFzc093blB0cjxTY3Jv bGxpbmdUcmVlTm9kZT4gY3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9k ZUlEKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+ IGNyZWF0ZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCkgb3ZlcnJpZGU7 CiAKICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsaW5nVHJlZU5vZGVEaWRTY3JvbGwoU2Nyb2xsaW5n Tm9kZUlELCBjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgU2V0T3JTeW5jU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbiA9IFN5bmNTY3JvbGxpbmdMYXllclBvc2l0aW9uKSBvdmVycmlkZTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nQ29vcmRpbmF0b3JNYWMuaAppbmRleCAxZjMwMjBlYzAxMTYwZDQwNjQxYzE1ZWFiN2M1 OWU4YjBhNGFiYmIwLi44ZWEyMjUyZjY5MmJmYjEyMGVmZWQ1MThmMDBiMGUwOWI0YmQ0ODdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29v cmRpbmF0b3JNYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nQ29vcmRpbmF0b3JNYWMuaApAQCAtNTEsNyArNTEsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBib29sIGhhbmRsZVdoZWVsRXZlbnQoRnJhbWVWaWV3KiwgY29uc3QgUGxhdGZvcm1XaGVl bEV2ZW50Jikgb3ZlcnJpZGU7CiAKIHByaXZhdGU6Ci0gICAgdmlydHVhbCBQYXNzT3duUHRyPFNj cm9sbGluZ1RyZWVOb2RlPiBjcmVhdGVTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlw ZSwgU2Nyb2xsaW5nTm9kZUlEKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U2Ny b2xsaW5nVHJlZU5vZGU+IGNyZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ05vZGVUeXBl LCBTY3JvbGxpbmdOb2RlSUQpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZVRy ZWVTdGF0ZUNvbW1pdCgpIG92ZXJyaWRlOwogCiAgICAgdm9pZCBzY3JvbGxpbmdTdGF0ZVRyZWVD b21taXR0ZXJUaW1lckZpcmVkKFRpbWVyPFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjPiopOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3Jk aW5hdG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yTWFjLm1tCmluZGV4IGM2YmUwYmU2OGIzOWQwMDAzNzVjNmI5YzFlNzBlZDE0 OWI5MzcwZjkuLjM2Mzc0NTc0NWFmNTMwZWVlNTQ0NWEzZTJkODdlOTJlODEzNmZlNTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGlu YXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nQ29vcmRpbmF0b3JNYWMubW0KQEAgLTE0Miw3ICsxNDIsNyBAQCB2b2lkIFNjcm9sbGluZ0Nv b3JkaW5hdG9yTWFjOjp1cGRhdGVUaWxlZFNjcm9sbGluZ0luZGljYXRvcigpCiAgICAgdGlsZWRC YWNraW5nLT5zZXRTY3JvbGxpbmdNb2RlSW5kaWNhdGlvbihpbmRpY2F0b3JNb2RlKTsKIH0KIAot UGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OmNy ZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ05vZGVUeXBlIG5vZGVUeXBlLCBTY3JvbGxp bmdOb2RlSUQgbm9kZUlEKQorUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gU2Nyb2xsaW5n Q29vcmRpbmF0b3JNYWM6OmNyZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ05vZGVUeXBl IG5vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogewogICAgIEFTU0VSVChzY3JvbGxp bmdUcmVlKCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUuaAppbmRleCAwMTI4YWM1ODJiZDRjY2VkNGEy MjE2MWE1ZjE4ZTVhNzA0Njc1NjBhLi4zMTQzYTA3M2EyZWExN2E2MTk3MTA2MmYzYjViOTc2ZTM1 NGY5OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nVHJlZUZpeGVkTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLmgKQEAgLTQwLDcgKzQwLDcgQEAgY2xhc3MgRml4 ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHM7CiAKIGNsYXNzIFNjcm9sbGluZ1RyZWVGaXhl ZE5vZGUgOiBwdWJsaWMgU2Nyb2xsaW5nVHJlZU5vZGUgewogcHVibGljOgotICAgIHN0YXRpYyBQ YXNzT3duUHRyPFNjcm9sbGluZ1RyZWVGaXhlZE5vZGU+IGNyZWF0ZShTY3JvbGxpbmdUcmVlJiwg U2Nyb2xsaW5nTm9kZUlEKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlRml4 ZWROb2RlPiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7CiAKICAgICB2 aXJ0dWFsIH5TY3JvbGxpbmdUcmVlRml4ZWROb2RlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLm1tIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0K aW5kZXggMGQzYWM0MmQ0YjA2NTNjYmY4NmJkMmJkY2VlYTc2ZTM3YjYxZDgxMy4uZTI0ZDFhNTIy MDc0YWU0ODU2NTIwZGNkMDMxMWZlODVkNjNhZTZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0K QEAgLTM0LDkgKzM0LDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzT3duUHRyPFNj cm9sbGluZ1RyZWVGaXhlZE5vZGU+IFNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6OmNyZWF0ZShTY3Jv bGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQorUGFzc1Jl ZlB0cjxTY3JvbGxpbmdUcmVlRml4ZWROb2RlPiBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjpjcmVh dGUoU2Nyb2xsaW5nVHJlZSYgc2Nyb2xsaW5nVHJlZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkK IHsKLSAgICByZXR1cm4gYWRvcHRQdHIobmV3IFNjcm9sbGluZ1RyZWVGaXhlZE5vZGUoc2Nyb2xs aW5nVHJlZSwgbm9kZUlEKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTY3JvbGxpbmdUcmVl Rml4ZWROb2RlKHNjcm9sbGluZ1RyZWUsIG5vZGVJRCkpOwogfQogCiBTY3JvbGxpbmdUcmVlRml4 ZWROb2RlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlKFNjcm9sbGluZ1RyZWUmIHNjcm9sbGluZ1Ry ZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVNYWMuaAppbmRleCBhZGVjNzQ5OTJiMTk3ZTRjZmJlNDQ1YjUxNWVlNjVjZWE2MmVh OTQ0Li41YzFlZDlkNWU1YWFmMmEyM2M0Mzg1OTg3YjQ4YjYzY2I5NGRlMzkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLmgKQEAgLTM5LDcgKzM5LDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl TWFjIDogcHVibGljIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUsIHByaXZhdGUgU2Ny b2xsRWxhc3RpY2l0eUNvbnRyb2xsZXJDbGllbnQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNz T3duUHRyPFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU+IGNyZWF0ZShTY3JvbGxpbmdU cmVlJiwgU2Nyb2xsaW5nTm9kZUlEKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSYsIFNjcm9sbGluZ05v ZGVJRCk7CiAgICAgdmlydHVhbCB+U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYygp OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5t bQppbmRleCA3M2ExYmFiNDRlN2QyMTA0YmI2NjEwNjg2ZWMwZWJjOTc3MDQ2N2JjLi5lN2FhMDRm MGViYzdhODM5OTIzOTYwMDgxZTlmMzM3MGNlNWI1ODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJl ZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5tbQpAQCAtNTAsOSArNTAsOSBAQCBzdGF0aWMgdm9pZCBs b2dUaHJlYWRlZFNjcm9sbGluZ01vZGUodW5zaWduZWQgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zKTsKIHN0YXRpYyB2b2lkIGxvZ1doZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKHVuc2ln bmVkKTsKIAogCi1QYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU+IFNj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OmNyZWF0ZShTY3JvbGxpbmdUcmVlJiBz Y3JvbGxpbmdUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQorUGFzc1JlZlB0cjxTY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlPiBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl TWFjOjpjcmVhdGUoU2Nyb2xsaW5nVHJlZSYgc2Nyb2xsaW5nVHJlZSwgU2Nyb2xsaW5nTm9kZUlE IG5vZGVJRCkKIHsKLSAgICByZXR1cm4gYWRvcHRQdHIobmV3IFNjcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGVNYWMoc2Nyb2xsaW5nVHJlZSwgbm9kZUlEKSk7CisgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjKHNjcm9sbGluZ1RyZWUs IG5vZGVJRCkpOwogfQogCiBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjpTY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjKFNjcm9sbGluZ1RyZWUmIHNjcm9sbGluZ1Ry ZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUuaCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCmluZGV4IGJl YzI5NDEzOGIyMWNhZDdmMjlmMTJhMjU2ZDM1YTcwMmIwODU5NmMuLjExYTM2MTRlNTEzNDliMTAx OTg5NjdiZmZiN2E2Y2JjMDcwNzc5MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCkBAIC00MCw3 ICs0MCw3IEBAIGNsYXNzIFN0aWNreVBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50czsKIAogY2xh c3MgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUgOiBwdWJsaWMgU2Nyb2xsaW5nVHJlZU5vZGUgewog cHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVTdGlja3lOb2RlPiBj cmVhdGUoU2Nyb2xsaW5nVHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7CisgICAgc3RhdGljIFBhc3NS ZWZQdHI8U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU+IGNyZWF0ZShTY3JvbGxpbmdUcmVlJiwgU2Ny b2xsaW5nTm9kZUlEKTsKIAogICAgIHZpcnR1YWwgflNjcm9sbGluZ1RyZWVTdGlja3lOb2RlKCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlU3RpY2t5Tm9kZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCAxZDlhY2RjNzg0YzJhNDI0Yzc1OTA4ZWVm NTBlNjRkMjQ0MWZjMjYyLi5hMzhhNTMyMmI1MzZlMDNjYjc5ZTcxMmVhZGZiMjM1ZTVhYjY1YmMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZVN0aWNreU5vZGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVTdGlja3lOb2RlLm1tCkBAIC0zNSw5ICszNSw5IEBACiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZT4gU2Nyb2xs aW5nVHJlZVN0aWNreU5vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlLCBT Y3JvbGxpbmdOb2RlSUQgbm9kZUlEKQorUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlU3RpY2t5Tm9k ZT4gU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OmNyZWF0ZShTY3JvbGxpbmdUcmVlJiBzY3JvbGxp bmdUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogewotICAgIHJldHVybiBhZG9wdFB0cihu ZXcgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUoc2Nyb2xsaW5nVHJlZSwgbm9kZUlEKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZShzY3JvbGxpbmdUcmVl LCBub2RlSUQpKTsKIH0KIAogU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OlNjcm9sbGluZ1RyZWVT dGlja3lOb2RlKFNjcm9sbGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBu b2RlSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1Jl bW90ZVNjcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGlu Zy9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcAppbmRleCA1ZjU0MGU2YTNiYTYwMDYyODk0NmEwZmIy NzFhOTk5YzdjMDEwZTUwLi5mNjhmZjUwYTNlZThmYWFhYWZlMGM5OWE0ZTJjYTFjN2M5ZmY4Mjc2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNj cm9sbGluZ1RyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcv UmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTk5LDcgKzk5LDcgQEAgdm9pZCBSZW1vdGVTY3Jv bGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsKFNjcm9sbGluZ05vZGVJ RCBub2RlSUQKICAgICBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuc2Nyb2xsaW5nVHJlZU5v ZGVSZXF1ZXN0c1Njcm9sbChub2RlSUQsIHNjcm9sbFBvc2l0aW9uLCByZXByZXNlbnRzUHJvZ3Jh bW1hdGljU2Nyb2xsKTsKIH0KIAotUGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gUmVtb3Rl U2Nyb2xsaW5nVHJlZTo6Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCkKK1Bhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFJlbW90 ZVNjcm9sbGluZ1RyZWU6OmNyZWF0ZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNj cm9sbGluZ05vZGVJRCBub2RlSUQpCiB7CiAgICAgc3dpdGNoIChub2RlVHlwZSkgewogICAgIGNh c2UgRnJhbWVTY3JvbGxpbmdOb2RlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAppbmRleCBiNjI0OWE0ODU2MmM1 NjQ5NjIwZGE2NjAwNjQyNWIwOWJjZDVmMGY4Li5kNmVmN2NiMmQ2MGNhZWE3ZmFhZjIwNzcyOGQ1 NGJlNDJkMGU1NGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xs aW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv U2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaApAQCAtNjEsNyArNjEsNyBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxpbmdUcmVlTm9kZVdpbGxTdGFydFBhbkdlc3R1cmUo KSBvdmVycmlkZTsKICNlbmRpZgogCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPFdlYkNvcmU6OlNj cm9sbGluZ1RyZWVOb2RlPiBjcmVhdGVOb2RlKFdlYkNvcmU6OlNjcm9sbGluZ05vZGVUeXBlLCBX ZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQpOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb3Jl OjpTY3JvbGxpbmdUcmVlTm9kZT4gY3JlYXRlTm9kZShXZWJDb3JlOjpTY3JvbGxpbmdOb2RlVHlw ZSwgV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKTsKICAgICAKICAgICBSZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5JiBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk7CiB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJl ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Nj cm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5oCmluZGV4 IDExMjYxMTEwZjkzODA1NzEyMmVlZDliNzI5Y2RkYjNiNDkxZmRkM2QuLjNjNmI0ZTA4YzExOWE5 YmE2ZGE0YWU4ZGNlYWM2YmEyMzA0ODBjN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJ T1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxp bmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLmgKQEAgLTM3LDcgKzM3LDcgQEAgbmFtZXNw YWNlIFdlYktpdCB7CiAKIGNsYXNzIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJ T1MgOiBwdWJsaWMgV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZSB7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Ny b2xsaW5nTm9kZUlPUz4gY3JlYXRlKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWUmLCBXZWJDb3JlOjpT Y3JvbGxpbmdOb2RlSUQpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNjcm9sbGluZ1RyZWVPdmVy Zmxvd1Njcm9sbGluZ05vZGVJT1M+IGNyZWF0ZShXZWJDb3JlOjpTY3JvbGxpbmdUcmVlJiwgV2Vi Q29yZTo6U2Nyb2xsaW5nTm9kZUlEKTsKICAgICB2aXJ0dWFsIH5TY3JvbGxpbmdUcmVlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlSU9TKCk7CiAKICAgICB2b2lkIHNjcm9sbFZpZXdXaWxsU3RhcnRQYW5H ZXN0dXJlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5n L2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xs aW5nTm9kZUlPUy5tbQppbmRleCA2YTI4NjIyNGViZTBiMWVkYWE5MGRmN2IwNzAxNDkwYzA1NGNj YmE1Li5mZGEyMWZmZmJiYzIwMDdjYTQzNzFkOTEyZjNmOWFjMDZkNDQxYmE1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlT3Zl cmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T Y3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MubW0KQEAg LTkxLDkgKzkxLDkgQEAgQGVuZAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUGFzc093blB0cjxT Y3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TPiBTY3JvbGxpbmdUcmVlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlSU9TOjpjcmVhdGUoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZSYgc2Nyb2xs aW5nVHJlZSwgV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKK1Bhc3NSZWZQdHI8U2Ny b2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUz4gU2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUzo6Y3JlYXRlKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWUmIHNjcm9sbGlu Z1RyZWUsIFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiB7Ci0gICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TKHNjcm9sbGlu Z1RyZWUsIG5vZGVJRCkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2Nyb2xsaW5nVHJlZU92 ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUyhzY3JvbGxpbmdUcmVlLCBub2RlSUQpKTsKIH0KIAogU2Ny b2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUzo6U2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUyhXZWJDb3JlOjpTY3JvbGxpbmdUcmVlJiBzY3JvbGxpbmdUcmVlLCBX ZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5h dG9yLmgKaW5kZXggMDVkYTFkODRlMGFiYWYzZDk4NGNlYWUxMGU5MDk5ODlhYWM1YjY5Yi4uZjJl NDI0NGFlMWU1MjA3Yzk2NDcxODZiMWVkMzRjMjZlNjRkYzRlNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvci5oCkBAIC02NCw3ICs2NCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBi b29sIGNvb3JkaW5hdGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KFdlYkNvcmU6OkZyYW1lVmlldyop IGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZVRyZWVTdGF0ZUNvbW1p dCgpIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPFdlYkNvcmU6OlNjcm9sbGlu Z1RyZWVOb2RlPiBjcmVhdGVTY3JvbGxpbmdUcmVlTm9kZShXZWJDb3JlOjpTY3JvbGxpbmdOb2Rl VHlwZSwgV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8V2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU5vZGU+IGNyZWF0ZVNjcm9sbGluZ1RyZWVO b2RlKFdlYkNvcmU6OlNjcm9sbGluZ05vZGVUeXBlLCBXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQp IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBpc1J1YmJlckJhbmRJblByb2dyZXNzKCkgY29u c3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBpbm5pbmdCZWhhdmlvcihX ZWJDb3JlOjpTY3JvbGxQaW5uaW5nQmVoYXZpb3IpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvci5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yLm1tCmluZGV4IDFmZTY5NmUyZTM5YTBmYWRlNzBiZTNiYjljZjhhNjg3 ZjQyNzAwMTMuLmZiMmE0MDZjMGYyZjYzYWQ4MTkzNmUwNzFkY2Y1ZjM1ZDcwNTU1NTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGlu Z0Nvb3JkaW5hdG9yLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU2Nyb2xsaW5n L1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yLm1tCkBAIC02Nyw3ICs2Nyw3IEBAIHZvaWQgUmVt b3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjaGVkdWxlVHJlZVN0YXRlQ29tbWl0KCkKICAgICBt X3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZsdXNoKCk7 CiB9CiAKLVBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFJlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yOjpjcmVhdGVTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xs aW5nTm9kZUlEKQorUGFzc1JlZlB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OmNyZWF0ZVNjcm9sbGluZ1RyZWVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBT Y3JvbGxpbmdOb2RlSUQpCiB7CiAgICAgLy8gV2UgbmV2ZXIgY3JlYXRlZCBzY3JvbGxpbmcgbm9k ZXMgaW4gdGhlIFdlYlByb2Nlc3Mgd2l0aCByZW1vdGUgc2Nyb2xsaW5nLgogICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwo=