126445 2014-01-03 11:32:39 -0800 Allow different types of ScrollingTrees to have different types of ScrollingTreeNode subclasses 2014-01-03 12:02:53 -0800 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 964196 0 simon.fraser 2014-01-03 11:32:39 -0800 Allow different types of ScrollingTrees to have different types of ScrollingTreeNode subclasses 964198 1 220325 simon.fraser 2014-01-03 11:37:36 -0800 Created attachment 220325 Patch 964209 2 simon.fraser 2014-01-03 12:02:53 -0800 http://trac.webkit.org/changeset/161276 220325 2014-01-03 11:37:36 -0800 2014-01-03 11:40:01 -0800 Patch bug-126445-20140103113735.patch text/plain 13557 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE4ZGVkMjIxYzRkM2Jk ODA1MmY1ZjZhY2YwMTIyNDAxMmUyYzg0ZC4uYWYyZDMxYzdiZDdlY2E3ZmFlNzk5ODQ5ODQ2MDZl MGM3OTQ3Nzc2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE0LTAxLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IGRpZmZl cmVudCB0eXBlcyBvZiBTY3JvbGxpbmdUcmVlcyB0byBoYXZlIGRpZmZlcmVudCB0eXBlcyBvZiBT Y3JvbGxpbmdUcmVlTm9kZSBzdWJjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY0NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gaGF2ZSBTY3Jv bGxpbmdUcmVlIHN1YmNsYXNzZXMgd2l0aCBkaWZmZXJlbnQgc3ViY2xhc3NlcyBvZiBTY3JvbGxp bmdUcmVlTm9kZXMsCisgICAgICAgIGJ5IGdpdmluZyBTY3JvbGxpbmdUcmVlIGEgcHVyZSB2aXJ0 dWFsIGNyZWF0ZU5vZGUoKSBmdW5jdGlvbi4gVGhyZWFkZWRTY3JvbGxpbmdUcmVlIGltcGxlbWVu dHMKKyAgICAgICAgdGhpcywgYW5kIHRoZW4gZGVsZWdhdGVzIG5vZGUgY3JlYXRpb24gdG8gaXRz IEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IgKHNpbmNlIHdlIGhhdmUKKyAgICAgICAgYSBTY3Jv bGxpbmdDb29yZGluYXRvck1hYyBidXQgbm8gcmVhbCBuZWVkIGZvciBhIFRocmVhZGVkU2Nyb2xs aW5nVHJlZU1hYykuCisgICAgICAgIAorICAgICAgICBBbHNvIG1hZGUgVGhyZWFkZWRTY3JvbGxp bmdUcmVlJ3MgbV9zY3JvbGxpbmdDb29yZGluYXRvciBhbiBBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yLAorICAgICAgICBzaW5jZSBieSBkZWZpbml0aW9uIGEgdGhyZWFkZWQgc2Nyb2xsaW5nIHRy ZWUgdXNlcyBhbiBhc3luYyBjb29yZGluYXRvci4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWU6OnVwZGF0 ZVRyZWVGcm9tU3RhdGVOb2RlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpjcmVhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpUaHJlYWRlZFNjcm9sbGluZ1Ry ZWUpOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpjcmVhdGVOb2Rl KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaDoKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMuaDoKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6Y3JlYXRlU2Nyb2xsaW5n VHJlZU5vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZU1hYy5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlTWFjOjpjcmVhdGUpOgorCiAyMDE0LTAxLTAzICBwZWF2b0BvdXRsb29rLmNv bSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBlcnJv ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCBlYjBkMDUyNzgzNWQzNDIwNmQwYzhmZTk4MTNhOGY2 YzAyYmFiYTk0Li4xMGMyOTgwNDMxZTcyYmM5NGExNjA1MWZkMDRmMzQwNTY3NjEzY2FmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5oCkBAIC01Miw2ICs1Miw4IEBAIHB1YmxpYzoKIAogICAgIFNjcm9sbGlu Z1RyZWUqIHNjcm9sbGluZ1RyZWUoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGluZ1RyZWUuZ2V0 KCk7IH0KIAorICAgIHZpcnR1YWwgUGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gY3JlYXRl U2Nyb2xsaW5nVHJlZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCkgPSAw OworCiBwcm90ZWN0ZWQ6CiAgICAgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcihQYWdlKik7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKaW5k ZXggODQwYzMzY2JhNDEwZWU0ZDliYzllYjZhYmRkYzQ0YTU5MzI2ZTM4OS4uOWYxOTdjNzBlYzBi NmFmMmZjZDZiMWQyMTRiNDk0ODNkM2UxMWNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTMwLDEwICszMCw4IEBACiAKICNpbmNs dWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxpbmdTdGF0ZVRyZWUu aCIKLSNpbmNsdWRlICJTY3JvbGxpbmdUcmVlRml4ZWROb2RlLmgiCiAjaW5jbHVkZSAiU2Nyb2xs aW5nVHJlZU5vZGUuaCIKICNpbmNsdWRlICJTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oIgot I2luY2x1ZGUgIlNjcm9sbGluZ1RyZWVTdGlja3lOb2RlLmgiCiAjaW5jbHVkZSA8d3RmL1RlbXBv cmFyeUNoYW5nZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xMzMsMjQgKzEzMSwxMiBA QCB2b2lkIFNjcm9sbGluZ1RyZWU6OnVwZGF0ZVRyZWVGcm9tU3RhdGVOb2RlKGNvbnN0IFNjcm9s bGluZ1N0YXRlTm9kZSogc3RhdGVOb2RlKQogICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgcm9v dCBub2RlLiBOdWtlIHRoZSBub2RlIG1hcC4KICAgICAgICAgICAgIG1fbm9kZU1hcC5jbGVhcigp OwogCi0gICAgICAgICAgICBtX3Jvb3ROb2RlID0gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6 OmNyZWF0ZSgqdGhpcywgbm9kZUlEKTsKKyAgICAgICAgICAgIG1fcm9vdE5vZGUgPSBzdGF0aWNf cG9pbnRlcl9jYXN0PFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPihjcmVhdGVOb2RlKFNjcm9s bGluZ05vZGUsIG5vZGVJRCkpOwogICAgICAgICAgICAgbV9ub2RlTWFwLnNldChub2RlSUQsIG1f cm9vdE5vZGUuZ2V0KCkpOwogICAgICAgICAgICAgbV9yb290Tm9kZS0+dXBkYXRlQmVmb3JlQ2hp bGRyZW4oKnN0YXRlTm9kZSk7CiAgICAgICAgICAgICBub2RlID0gbV9yb290Tm9kZS5nZXQoKTsK ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIE93blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4g bmV3Tm9kZTsKLSAgICAgICAgICAgIHN3aXRjaCAoc3RhdGVOb2RlLT5ub2RlVHlwZSgpKSB7Ci0g ICAgICAgICAgICBjYXNlIFNjcm9sbGluZ05vZGU6Ci0gICAgICAgICAgICAgICAgbmV3Tm9kZSA9 IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjcmVhdGUoKnRoaXMsIG5vZGVJRCk7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEZpeGVkTm9kZToKLSAgICAgICAg ICAgICAgICBuZXdOb2RlID0gU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZTo6Y3JlYXRlKCp0aGlzLCBu b2RlSUQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBTdGlja3lO b2RlOgotICAgICAgICAgICAgICAgIG5ld05vZGUgPSBTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZTo6 Y3JlYXRlKCp0aGlzLCBub2RlSUQpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgfQotCisgICAgICAgICAgICBPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IG5ld05vZGUgPSBj cmVhdGVOb2RlKHN0YXRlTm9kZS0+bm9kZVR5cGUoKSwgbm9kZUlEKTsKICAgICAgICAgICAgIG5v ZGUgPSBuZXdOb2RlLmdldCgpOwogICAgICAgICAgICAgbV9ub2RlTWFwLnNldChub2RlSUQsIG5v ZGUpOwogICAgICAgICAgICAgU2Nyb2xsaW5nVHJlZU5vZGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gbV9ub2RlTWFwLmZpbmQoc3RhdGVOb2RlLT5wYXJlbnQoKS0+c2Nyb2xsaW5nTm9kZUlEKCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4 IDBkZTM1NDhmMGJlYWMwMjM3ODA3Mjg2OGI2MTBkM2Q4MDVhZGRkYzguLmQzYmJkZjE0NzQ1MjUx NWJmMDVkYzllNjRmZDczMjUyNzVmYTNiZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTEwMyw2ICsxMDMsOCBAQCBwcml2YXRlOgogICAg IHZvaWQgcmVtb3ZlRGVzdHJveWVkTm9kZXMoY29uc3QgU2Nyb2xsaW5nU3RhdGVUcmVlJik7CiAg ICAgdm9pZCB1cGRhdGVUcmVlRnJvbVN0YXRlTm9kZShjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUq KTsKIAorICAgIHZpcnR1YWwgUGFzc093blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gY3JlYXRlTm9k ZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEKSA9IDA7CisKICAgICBPd25QdHI8 U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU+IG1fcm9vdE5vZGU7CiAKICAgICB0eXBlZGVmIEhh c2hNYXA8U2Nyb2xsaW5nTm9kZUlELCBTY3JvbGxpbmdUcmVlTm9kZSo+IFNjcm9sbGluZ1RyZWVO b2RlTWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nVHJlZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKaW5kZXggMTYyOTIzYjRmYWZhZmRhYWI3ZmU4MTc0 OGFlZWFiNGVlZDE4MjM1NS4uZGUwYzhhMDJkZDhmMWI0OGMzZDZhYWM4ZTkzODAyNGRkNGVmOTMy ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCkBAIC00Miw3ICs0Miw2IEBAIGNsYXNzIFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTsKIAogY2xhc3MgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUg OiBwdWJsaWMgU2Nyb2xsaW5nVHJlZU5vZGUgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3du UHRyPFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Nyb2xsaW5nVHJlZSYsIFNj cm9sbGluZ05vZGVJRCk7CiAgICAgdmlydHVhbCB+U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUo KTsKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxp bmdTdGF0ZU5vZGUmKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCmluZGV4IGQ4NTdkYWZmNDkyNDNi YjVhNDg3NTVkNGQxYTc1MzIwM2Q5MjVlMjQuLjVlMGViZWYwYzdkMmNmMTM0NmQ0YTE5OWY1ZmVm YzVlZGY1MTIxYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Ro cmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcApAQCAtMjgsOCArMjgsOCBAQAogCiAjaWYgRU5B QkxFKEFTWU5DX1NDUk9MTElORykKIAorI2luY2x1ZGUgIkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKLSNpbmNsdWRlICJTY3JvbGxp bmdDb29yZGluYXRvci5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1RocmVhZC5oIgogI2luY2x1ZGUg IlNjcm9sbGluZ1RyZWVGaXhlZE5vZGUuaCIKICNpbmNsdWRlICJTY3JvbGxpbmdUcmVlTm9kZS5o IgpAQCAtNDAsMTIgKzQwLDEyIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUmVmUHRyPFRo cmVhZGVkU2Nyb2xsaW5nVHJlZT4gVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpjcmVhdGUoU2Nyb2xs aW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yKQorUmVmUHRyPFRocmVhZGVkU2Ny b2xsaW5nVHJlZT4gVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpjcmVhdGUoQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBUaHJlYWRlZFNjcm9sbGluZ1RyZWUoc2Nyb2xsaW5nQ29vcmRpbmF0b3IpKTsKIH0KIAot VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWUoU2Nyb2xsaW5nQ29v cmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yKQorVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpU aHJlYWRlZFNjcm9sbGluZ1RyZWUoQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xsaW5n Q29vcmRpbmF0b3IpCiAgICAgOiBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yKHNjcm9sbGluZ0Nvb3Jk aW5hdG9yKQogewogfQpAQCAtMTIwLDYgKzEyMCwxMSBAQCB2b2lkIFRocmVhZGVkU2Nyb2xsaW5n VHJlZTo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlIHBoYXNl KQogfQogI2VuZGlmCiAKK1Bhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFRocmVhZGVkU2Ny b2xsaW5nVHJlZTo6Y3JlYXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xs aW5nTm9kZUlEIG5vZGVJRCkKK3sKKyAgICByZXR1cm4gbV9zY3JvbGxpbmdDb29yZGluYXRvci0+ Y3JlYXRlU2Nyb2xsaW5nVHJlZU5vZGUobm9kZVR5cGUsIG5vZGVJRCk7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1Ry ZWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJl ZS5oCmluZGV4IGE5MDNhODRmYWZlY2UyYWJlMThkMmFjYzg2NDE0YTA0N2RlY2EwYjMuLmY4ODEz YmUxODMxOGFkNDRiYjBhNGFmYzNlNjU5NzI3YmRjZTVmYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCkBAIC0zNSwx MyArMzUsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBBc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yOworCiAvLyBUaGUgVGhyZWFkZWRTY3JvbGxpbmdUcmVlIGNsYXNzIGxpdmVz IGFsbW9zdCBleGNsdXNpdmVseSBvbiB0aGUgc2Nyb2xsaW5nIHRocmVhZCBhbmQgbWFuYWdlcyB0 aGUKIC8vIGhpZXJhcmNoeSBvZiBzY3JvbGxhYmxlIHJlZ2lvbnMgb24gdGhlIHBhZ2UuIEl0J3Mg YWxzbyByZXNwb25zaWJsZSBmb3IgZGlzcGF0Y2hpbmcgZXZlbnRzCiAvLyB0byB0aGUgY29ycmVj dCBzY3JvbGxpbmcgdHJlZSBub2RlcyBvciBkaXNwYXRjaGluZyBldmVudHMgYmFjayB0byB0aGUg U2Nyb2xsaW5nQ29vcmRpbmF0b3IKIC8vIG9iamVjdCBvbiB0aGUgbWFpbiB0aHJlYWQgaWYgdGhl eSBjYW4ndCBiZSBoYW5kbGVkIG9uIHRoZSBzY3JvbGxpbmcgdGhyZWFkIGZvciB2YXJpb3VzIHJl YXNvbnMuCiBjbGFzcyBUaHJlYWRlZFNjcm9sbGluZ1RyZWUgOiBwdWJsaWMgU2Nyb2xsaW5nVHJl ZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZlB0cjxUaHJlYWRlZFNjcm9sbGluZ1RyZWU+IGNy ZWF0ZShTY3JvbGxpbmdDb29yZGluYXRvciopOworICAgIHN0YXRpYyBSZWZQdHI8VGhyZWFkZWRT Y3JvbGxpbmdUcmVlPiBjcmVhdGUoQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvciopOwogCiAgICAg dmlydHVhbCB+VGhyZWFkZWRTY3JvbGxpbmdUcmVlKCk7CiAKQEAgLTU5LDE0ICs2MSwxNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGUoKSBPVkVSUklERTsKIAogcHJpdmF0 ZToKLSAgICBleHBsaWNpdCBUaHJlYWRlZFNjcm9sbGluZ1RyZWUoU2Nyb2xsaW5nQ29vcmRpbmF0 b3IqKTsKKyAgICBleHBsaWNpdCBUaHJlYWRlZFNjcm9sbGluZ1RyZWUoQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvciopOworCisgICAgdmlydHVhbCBQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVOb2Rl PiBjcmVhdGVOb2RlKFNjcm9sbGluZ05vZGVUeXBlLCBTY3JvbGxpbmdOb2RlSUQpIE9WRVJSSURF OwogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9uKGNvbnN0 IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgU2V0T3JTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlv biA9IFN5bmNTY3JvbGxpbmdMYXllclBvc2l0aW9uKSBPVkVSUklERTsKICNpZiBQTEFURk9STShN QUMpCiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShQbGF0Zm9ybVdoZWVs RXZlbnRQaGFzZSkgT1ZFUlJJREU7CiAjZW5kaWYKIAotICAgIFJlZlB0cjxTY3JvbGxpbmdDb29y ZGluYXRvcj4gbV9zY3JvbGxpbmdDb29yZGluYXRvcjsKKyAgICBSZWZQdHI8QXN5bmNTY3JvbGxp bmdDb29yZGluYXRvcj4gbV9zY3JvbGxpbmdDb29yZGluYXRvcjsKIH07CiAKIFNDUk9MTElOR19U UkVFX1RZUEVfQ0FTVFMoVGhyZWFkZWRTY3JvbGxpbmdUcmVlLCBpc1RocmVhZGVkU2Nyb2xsaW5n VHJlZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdDb29yZGluYXRvck1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgKaW5kZXggMTU3ZWVkOWJhYjdlNjYyMmM4YTYx OWJiYTQ5NmUyNDg3MzYyOTk0MS4uZTQ4YThmZDMzMTFlNTg2MjJiMjkwNjI1ZDIyZmZhOWNhOTMx Mzc3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ0Nvb3JkaW5hdG9yTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgKQEAgLTUxLDYgKzUxLDcgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KEZyYW1lVmlldyosIGNvbnN0IFBsYXRm b3JtV2hlZWxFdmVudCYpIE9WRVJSSURFOwogCiBwcml2YXRlOgorICAgIHZpcnR1YWwgUGFzc093 blB0cjxTY3JvbGxpbmdUcmVlTm9kZT4gY3JlYXRlU2Nyb2xsaW5nVHJlZU5vZGUoU2Nyb2xsaW5n Tm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNj aGVkdWxlVHJlZVN0YXRlQ29tbWl0KCkgT1ZFUlJJREU7CiAKICAgICB2b2lkIHNjcm9sbGluZ1N0 YXRlVHJlZUNvbW1pdHRlclRpbWVyRmlyZWQoVGltZXI8U2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM+ Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nQ29vcmRpbmF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMv U2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0KaW5kZXggYjQzOTIxZWNjN2RlYWQyNGY2NzUzZTBk ZTcyNjY1NGE5ZGFlZjc1NC4uNzE3OWU1MTdhOWJjNmJhYTc0OTYzNWYyMmZmNTMzODUxNWE4NGRh OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21h Yy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQpAQCAtMzYsNiArMzYsOSBAQAogI2luY2x1ZGUg IlJlZ2lvbi5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1N0YXRlVHJlZS5oIgogI2luY2x1ZGUgIlNj cm9sbGluZ1RocmVhZC5oIgorI2luY2x1ZGUgIlNjcm9sbGluZ1RyZWVGaXhlZE5vZGUuaCIKKyNp bmNsdWRlICJTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oIgorI2luY2x1ZGUgIlNjcm9s bGluZ1RyZWVTdGlja3lOb2RlLmgiCiAjaW5jbHVkZSAiVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgi CiAjaW5jbHVkZSAiVGlsZWRCYWNraW5nLmgiCiAjaW5jbHVkZSA8d3RmL0Z1bmN0aW9uYWwuaD4K QEAgLTEzNSw2ICsxMzgsMjIgQEAgdm9pZCBTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6dXBkYXRl VGlsZWRTY3JvbGxpbmdJbmRpY2F0b3IoKQogICAgIHRpbGVkQmFja2luZy0+c2V0U2Nyb2xsaW5n TW9kZUluZGljYXRpb24oaW5kaWNhdG9yTW9kZSk7CiB9CiAKK1Bhc3NPd25QdHI8U2Nyb2xsaW5n VHJlZU5vZGU+IFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpjcmVhdGVTY3JvbGxpbmdUcmVlTm9k ZShTY3JvbGxpbmdOb2RlVHlwZSBub2RlVHlwZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKK3sK KyAgICBBU1NFUlQoc2Nyb2xsaW5nVHJlZSgpKTsKKworICAgIHN3aXRjaCAobm9kZVR5cGUpIHsK KyAgICBjYXNlIFNjcm9sbGluZ05vZGU6CisgICAgICAgIHJldHVybiBTY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZU1hYzo6Y3JlYXRlKCpzY3JvbGxpbmdUcmVlKCksIG5vZGVJRCk7CisgICAgY2Fz ZSBGaXhlZE5vZGU6CisgICAgICAgIHJldHVybiBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjpjcmVh dGUoKnNjcm9sbGluZ1RyZWUoKSwgbm9kZUlEKTsKKyAgICBjYXNlIFN0aWNreU5vZGU6CisgICAg ICAgIHJldHVybiBTY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZTo6Y3JlYXRlKCpzY3JvbGxpbmdUcmVl KCksIG5vZGVJRCk7CisgICAgfQorICAgIHJldHVybiBudWxscHRyOworfQorCisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNj cm9sbGluZ05vZGVNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3Jv bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oCmluZGV4IDAyNjkwM2NmYWFhODE5Yzc4MDUyMGI1 NTBmMjNhN2E3ZDFkNDdiZDAuLmJhYTllYTNjNzFkNDlkMDcyZWYwODVlNzVmNzA2NmNhOTk3OTll ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oCkBAIC0zOSwxMCArMzksMTIg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZU1hYyA6IHB1YmxpYyBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZSwgcHJpdmF0ZSBTY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlckNsaWVudCB7CiBwdWJsaWM6Ci0gICAgU2Nyb2xsaW5nVHJlZVNj cm9sbGluZ05vZGVNYWMoU2Nyb2xsaW5nVHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7CisgICAgc3Rh dGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU+IGNyZWF0ZShTY3JvbGxp bmdUcmVlJiwgU2Nyb2xsaW5nTm9kZUlEKTsKICAgICB2aXJ0dWFsIH5TY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZU1hYygpOwogCiBwcml2YXRlOgorICAgIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlTWFjKFNjcm9sbGluZ1RyZWUmLCBTY3JvbGxpbmdOb2RlSUQpOworCiAgICAgLy8gU2Nyb2xs aW5nVHJlZU5vZGUgbWVtYmVyIGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmVm b3JlQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikg T1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggNjk4M2Zm MjNlYzIwYjQ3Y2Q2YWQ3OWEzYzc1MDM5YjAwMzZlY2M2ZC4uM2IzNWUzNTZjOGFiMmNhMjQ2MmMz NWUxODRkYTExNGJkOTNjMDNiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5t bQpAQCAtNTAsNyArNTAsNyBAQCBzdGF0aWMgdm9pZCBsb2dUaHJlYWRlZFNjcm9sbGluZ01vZGUo dW5zaWduZWQgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKTsKIHN0YXRpYyB2b2lkIGxvZ1do ZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKHVuc2lnbmVkKTsKIAogCi1QYXNzT3duUHRyPFNj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPiBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6Y3Jl YXRlKFNjcm9sbGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQp CitQYXNzT3duUHRyPFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlPiBTY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZU1hYzo6Y3JlYXRlKFNjcm9sbGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9s bGluZ05vZGVJRCBub2RlSUQpCiB7CiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZU1hYyhzY3JvbGxpbmdUcmVlLCBub2RlSUQpKTsKIH0K