133333 2014-05-27 19:32:59 -0700 Do some renaming in the scrolling tree 2014-05-27 21:45:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca cmarcelo commit-queue jamesr luiz sam simon.fraser thorton tonikitoo oldest_to_newest 1012114 0 simon.fraser 2014-05-27 19:32:59 -0700 Do some renaming in the scrolling tree 1012115 1 232164 simon.fraser 2014-05-27 19:35:20 -0700 Created attachment 232164 Patch 1012128 2 simon.fraser 2014-05-27 21:45:59 -0700 https://trac.webkit.org/r169410 232164 2014-05-27 19:35:20 -0700 2014-05-27 20:01:54 -0700 Patch bug-133333-20140527193457.patch text/plain 23228 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5Mzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M2NDIyYmRhYWZlMzUw MjhlMWNhMjU0MzhmMjA1ODQ1MjYzM2M2OS4uOThjYWRlYzIwOGM0M2EyZGY0NDliODNkOGZkYjk3 NDI0N2YxNzE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE0LTA1LTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIERvIHNvbWUgcmVu YW1pbmcgaW4gdGhlIHNjcm9sbGluZyB0cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMzMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgU2Nyb2xsaW5nVHJlZU5vZGU6OnBhcmVudFNjcm9s bFBvc2l0aW9uRGlkQ2hhbmdlKCkgdG8gdXBkYXRlTGF5ZXJzQWZ0ZXJBbmNlc3RvckNoYW5nZSgp CisgICAgICAgIHNpbmNlIHRoaXMgZ29lcyBkZWVwIGFuZCB0byBpbmRpY2F0ZSB0aGF0IGl0J3Mg YWJvdXQgbGF5ZXIgdXBkYXRpbmcuCisgICAgICAgIAorICAgICAgICBBbHNvIHJlbmFtZSB0aGUg InZpZXdwb3J0UmVjdCIgcGFyYW1ldGVyIHRvICJmaXhlZFBvc2l0aW9uUmVjdCIsIHNpbmNlIG9u IGlPUworICAgICAgICB0aGlzIGlzIHRoZSBjdXN0b20gZml4ZWQtcG9zaXRpb24gcmVjdCB0aGF0 IGNoYW5nZXMgb24gem9vbWluZy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6dmlld3BvcnRDaGFu Z2VkVmlhRGVsZWdhdGVkU2Nyb2xsaW5nKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVO b2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZUlPUy5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5n VHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5n ZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9T Ojp1cGRhdGVDaGlsZE5vZGVzQWZ0ZXJTY3JvbGwpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdUcmVlRml4ZWROb2RlOjp1cGRhdGVMYXllcnNBZnRlckFuY2VzdG9yQ2hhbmdlKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6OnBhcmVudFNjcm9sbFBvc2l0aW9u RGlkQ2hhbmdlKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c2V0U2Nyb2xsTGF5ZXJQ b3NpdGlvbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTdGlj a3lOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTdGlj a3lOb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OnVw ZGF0ZUxheWVyc0FmdGVyQW5jZXN0b3JDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nVHJlZVN0aWNreU5vZGU6OnBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKTogRGVsZXRl ZC4KKworMjAxNC0wNS0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KwogICAgICAgICBJbnN0YW50aWF0ZSBhIFNjcm9sbGluZ1RyZWVNYWMgb24gTWFjCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMzMzIKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CmluZGV4IGQ0N2MwODI1MzQ4YWUyNzU1MDE5NGVmNTEyNWQxMmFiNmU1YjBhZDYuLjhkMGNlNjVm Y2YzOTdlMTkwZTc3MWY1N2Y3MTdhOWM3ZGYwYjI4NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MiBAQAorMjAxNC0wNS0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KworICAgICAgICBEbyBzb21lIHJlbmFtaW5nIGluIHRoZSBzY3JvbGxpbmcgdHJlZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzMzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW5hbWUg U2Nyb2xsaW5nVHJlZU5vZGU6OnBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKCkgdG8gdXBk YXRlTGF5ZXJzQWZ0ZXJBbmNlc3RvckNoYW5nZSgpCisgICAgICAgIHNpbmNlIHRoaXMgZ29lcyBk ZWVwIGFuZCB0byBpbmRpY2F0ZSB0aGF0IGl0J3MgYWJvdXQgbGF5ZXIgdXBkYXRpbmcuCisgICAg ICAgIAorICAgICAgICBBbHNvIHJlbmFtZSB0aGUgInZpZXdwb3J0UmVjdCIgcGFyYW1ldGVyIHRv ICJmaXhlZFBvc2l0aW9uUmVjdCIsIHNpbmNlIG9uIGlPUworICAgICAgICB0aGlzIGlzIHRoZSBj dXN0b20gZml4ZWQtcG9zaXRpb24gcmVjdCB0aGF0IGNoYW5nZXMgb24gem9vbWluZy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6 OnZpZXdwb3J0Q2hhbmdlZFZpYURlbGVnYXRlZFNjcm9sbGluZyk6CisgICAgICAgICogVUlQcm9j ZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5n Tm9kZUlPUy5oOgorICAgICAgICAoV2ViS2l0OjpTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxp bmdOb2RlSU9TOjp1cGRhdGVMYXllcnNBZnRlclZpZXdwb3J0Q2hhbmdlKToKKwogMjAxNC0wNS0y NyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWJLaXQyXSBNb3Zl IFdlYlByZWZlcmVuY2VzIG1hY3JvIGRlZmluaXRpb25zIGFuZCBrZXkgbmFtZXMgaW50byB0aGVp ciBvd24gZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZS5jcHAKaW5kZXggZDgyMWNmNzRjYzJiODZiYzY5NjA1MTc4YTMyZGY5YmMzYzI5M2YxMS4u Njg5ZjM2NDQ3NjE5ZGEyODM0MWVjODM0NTc0ZmYzOWFjN2MxMzU3ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTk4LDcgKzk4LDcg QEAgdm9pZCBTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYgd2hlZWxFdmVudCkKICAgICAgICAgbV9yb290Tm9kZS0+aGFuZGxlV2hlZWxFdmVu dCh3aGVlbEV2ZW50KTsKIH0KIAotdm9pZCBTY3JvbGxpbmdUcmVlOjp2aWV3cG9ydENoYW5nZWRW aWFEZWxlZ2F0ZWRTY3JvbGxpbmcoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiB2aWV3cG9ydFJlY3QsIGRvdWJsZSBzY2FsZSkKK3ZvaWQgU2Nyb2xsaW5n VHJlZTo6dmlld3BvcnRDaGFuZ2VkVmlhRGVsZWdhdGVkU2Nyb2xsaW5nKFNjcm9sbGluZ05vZGVJ RCBub2RlSUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZml4ZWRQb3NpdGlvblJlY3QsIGRv dWJsZSBzY2FsZSkKIHsKICAgICBTY3JvbGxpbmdUcmVlTm9kZSogbm9kZSA9IG5vZGVGb3JJRChu b2RlSUQpOwogICAgIGlmICghbm9kZSkKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIFNjcm9sbGlu Z1RyZWU6OnZpZXdwb3J0Q2hhbmdlZFZpYURlbGVnYXRlZFNjcm9sbGluZyhTY3JvbGxpbmdOb2Rl SUQgbm9kZUlELAogICAgIGlmICghbm9kZS0+aXNTY3JvbGxpbmdOb2RlKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHRvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUobm9kZSktPnVwZGF0ZUxh eWVyc0FmdGVyVmlld3BvcnRDaGFuZ2Uodmlld3BvcnRSZWN0LCBzY2FsZSk7CisgICAgdG9TY3Jv bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZShub2RlKS0+dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENo YW5nZShmaXhlZFBvc2l0aW9uUmVjdCwgc2NhbGUpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWU6 OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZFZpYURlbGVnYXRlZFNjcm9sbGluZyhTY3JvbGxpbmdOb2Rl SUQgbm9kZUlELCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9v bCBpblVzZXJJbnRlcmF0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZS5oCmluZGV4IGNjNzQ4YWU2NjE5OWIyNDZhNjViYWFhODEzMGUwMGQ1YThjZDUz ZTEuLjNlZjI0NjJmNjMzNGFkYzMyMTlhZWM0YWM2M2E3ZWI3NzdmYzliNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTgwLDcgKzgwLDcg QEAgcHVibGljOgogCiAgICAgLy8gRGVsZWdhdGVkIHNjcm9sbGluZy96b29taW5nIGhhcyBjYXVz ZWQgdGhlIHZpZXdwb3J0IHRvIGNoYW5nZSwgc28gdXBkYXRlIHZpZXdwb3J0LWNvbnN0cmFpbmVk IGxheWVycwogICAgIC8vIChidXQgZG9uJ3QgY2F1c2Ugc2Nyb2xsIGV2ZW50cyB0byBiZSBmaXJl ZCkuCi0gICAgdmlydHVhbCB2b2lkIHZpZXdwb3J0Q2hhbmdlZFZpYURlbGVnYXRlZFNjcm9sbGlu ZyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmlld3BvcnRSZWN0 LCBkb3VibGUgc2NhbGUpOworICAgIHZpcnR1YWwgdm9pZCB2aWV3cG9ydENoYW5nZWRWaWFEZWxl Z2F0ZWRTY3JvbGxpbmcoU2Nyb2xsaW5nTm9kZUlELCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm IGZpeGVkUG9zaXRpb25SZWN0LCBkb3VibGUgc2NhbGUpOwogCiAgICAgLy8gRGVsZWdhdGVkIHNj cm9sbGluZyBoYXMgc2Nyb2xsZWQgYSBub2RlLiBVcGRhdGUgbGF5ZXIgcG9zaXRpb25zIG9uIGRl c2NlbmRhbnQgdHJlZSBub2RlcywKICAgICAvLyBhbmQgY2FsbCBzY3JvbGxpbmdUcmVlTm9kZURp ZFNjcm9sbCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCmluZGV4IGQ0ZTY1YTYwOTUx YTVlZGEzZTQyY2UxOTllMTgwNzcxNDA3MWQzYjQuLjUyYjc5MTc2OWNmYmI1YTkwN2Q4YTAwNjZm YTk3YzVlOTIyZTk0NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmgKQEAgLTQzLDEz ICs0MywxMyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUJlZm9yZUNoaWxkcmVu KGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYpIG92ZXJyaWRlOwogICAgIAogICAgIC8vIEZJWE1F OiBXZSBzaG91bGQgaW1wbGVtZW50IHRoaXMgd2hlbiB3ZSBzdXBwb3J0IFNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlcyBhcyBjaGlsZHJlbi4KLSAgICB2aXJ0dWFsIHZvaWQgcGFyZW50U2Nyb2xs UG9zaXRpb25EaWRDaGFuZ2UoY29uc3QgRmxvYXRSZWN0JiAvKnZpZXdwb3J0UmVjdCovLCBjb25z dCBGbG9hdFNpemUmIC8qY3VtdWxhdGl2ZURlbHRhKi8pIG92ZXJyaWRlIHsgfQorICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVMYXllcnNBZnRlckFuY2VzdG9yQ2hhbmdlKGNvbnN0IFNjcm9sbGluZ1Ry ZWVOb2RlJiAvKmNoYW5nZWROb2RlKi8sIGNvbnN0IEZsb2F0UmVjdCYgLypmaXhlZFBvc2l0aW9u UmVjdCovLCBjb25zdCBGbG9hdFNpemUmIC8qY3VtdWxhdGl2ZURlbHRhKi8pIG92ZXJyaWRlIHsg fQogCiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVl bEV2ZW50JikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBG bG9hdFBvaW50Jik7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBvc2l0aW9uV2l0aG91dENv bnRlbnRFZGdlQ29uc3RyYWludHMoY29uc3QgRmxvYXRQb2ludCYpID0gMDsKIAotICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVMYXllcnNBZnRlclZpZXdwb3J0Q2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYg dmlld3BvcnRSZWN0LCBkb3VibGUgc2NhbGUpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl TGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3QmIGZpeGVkUG9zaXRpb25S ZWN0LCBkb3VibGUgc2NhbGUpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0 ZXJEZWxlZ2F0ZWRTY3JvbGwoY29uc3QgRmxvYXRQb2ludCYpIHsgfQogCiAgICAgU3luY2hyb25v dXNTY3JvbGxpbmdSZWFzb25zIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucygpIGNvbnN0IHsg cmV0dXJuIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zOyB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9kZS5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuaAppbmRleCA2YWQ0N2FlMTBj Njg5Yzk4N2M1OWFkYTVlMjZlYTUyYWU3Zjk2N2Y2Li5mMGYxYTU0MjM2Mzg4YjZmOTkwODFjZmM4 MzVlM2Q5Mzg4MmQ3N2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1RyZWVOb2RlLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5n U3RhdGVOb2RlJikgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgcGFyZW50U2Nyb2xsUG9zaXRpb25E aWRDaGFuZ2UoY29uc3QgRmxvYXRSZWN0JiB2aWV3cG9ydFJlY3QsIGNvbnN0IEZsb2F0U2l6ZSYg Y3VtdWxhdGl2ZURlbHRhKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVyc0FmdGVy QW5jZXN0b3JDaGFuZ2UoY29uc3QgU2Nyb2xsaW5nVHJlZU5vZGUmIGNoYW5nZWROb2RlLCBjb25z dCBGbG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBjb25zdCBGbG9hdFNpemUmIGN1bXVsYXRp dmVEZWx0YSkgPSAwOwogCiAgICAgU2Nyb2xsaW5nVHJlZU5vZGUqIHBhcmVudCgpIGNvbnN0IHsg cmV0dXJuIG1fcGFyZW50OyB9CiAgICAgdm9pZCBzZXRQYXJlbnQoU2Nyb2xsaW5nVHJlZU5vZGUq IHBhcmVudCkgeyBtX3BhcmVudCA9IHBhcmVudDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKaW5kZXgg NGQ1NjcyYmU1ZjU2OWMwODNiMjRlOTA4OWUzNTNjMzI1MTE2NjZiZC4uNmQyNzY5M2ExNmQ2MjQ3 ZmI3YWY1ODUzZTMzNmQ5OTAxNTE0ZmI2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCkBAIC00Nywx MyArNDcsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVBZnRlckNoaWxkcmVu KGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYpIG92ZXJyaWRlOwogCiAgICAgLy8gRklYTUU6IFdl IHNob3VsZCBpbXBsZW1lbnQgdGhpcyB3aGVuIHdlIHN1cHBvcnQgU2Nyb2xsaW5nVHJlZVNjcm9s bGluZ05vZGVzIGFzIGNoaWxkcmVuLgotICAgIHZpcnR1YWwgdm9pZCBwYXJlbnRTY3JvbGxQb3Np dGlvbkRpZENoYW5nZShjb25zdCBGbG9hdFJlY3QmIC8qdmlld3BvcnRSZWN0Ki8sIGNvbnN0IEZs b2F0U2l6ZSYgLypjdW11bGF0aXZlRGVsdGEqLykgb3ZlcnJpZGUgeyB9CisgICAgdmlydHVhbCB2 b2lkIHVwZGF0ZUxheWVyc0FmdGVyQW5jZXN0b3JDaGFuZ2UoY29uc3QgU2Nyb2xsaW5nVHJlZU5v ZGUmIC8qY2hhbmdlZE5vZGUqLywgY29uc3QgRmxvYXRSZWN0JiAvKmZpeGVkUG9zaXRpb25SZWN0 Ki8sIGNvbnN0IEZsb2F0U2l6ZSYgLypjdW11bGF0aXZlRGVsdGEqLykgb3ZlcnJpZGUgeyB9CiAK ICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZl bnQmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0 UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb25XaXRob3V0Q29udGVu dEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFBvaW50Jik7CiAKLSAgICB2aXJ0dWFsIHZvaWQg dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3QmIHZpZXdwb3J0 UmVjdCwgZG91YmxlIHNjYWxlKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVyc0Fm dGVyVmlld3BvcnRDaGFuZ2UoY29uc3QgRmxvYXRSZWN0JiBmaXhlZFBvc2l0aW9uUmVjdCwgZG91 YmxlIHNjYWxlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVyc0FmdGVyRGVsZWdh dGVkU2Nyb2xsKGNvbnN0IEZsb2F0UG9pbnQmKSB7IH0KIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGVJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLmgKaW5kZXggYTgzMzhlYWFjMWFiYTY1YmQw YmUzN2ZkNjA0ZTk5Njg2M2ZiMThhZS4uZWI5YTcwODRkMDEzN2YwZWRhYjhhNWM5OGExZDI5MmFm OTkwMWYxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Nj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5oCkBA IC01MSw3ICs1MSw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIEZsb2F0UG9pbnQgc2Nyb2xs UG9zaXRpb24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9z aXRpb25XaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFBvaW50Jikgb3Zl cnJpZGU7CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5n ZShjb25zdCBGbG9hdFJlY3QmIHZpZXdwb3J0UmVjdCwgZG91YmxlIHNjYWxlKTsKKyAgICB2aXJ0 dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3Qm IGZpeGVkUG9zaXRpb25SZWN0LCBkb3VibGUgc2NhbGUpOwogICAgIHZpcnR1YWwgdm9pZCB1cGRh dGVMYXllcnNBZnRlckRlbGVnYXRlZFNjcm9sbChjb25zdCBGbG9hdFBvaW50Jikgb3ZlcnJpZGU7 CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsTGF5ZXJQb3NpdGlvbihjb25zdCBGbG9hdFBv aW50Jikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9T Lm1tCmluZGV4IDhhOTY5N2RlZDQzMTM5YmExNTZlNWE1ZDkxNzczMzg4YTgwNDQyYWMuLjExMGYy M2U4NzU3OTJlM2JmNTUxMjlkNDc1YmNkMTMwZTU5ZmMxMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLm1tCkBAIC0xMjYsMTYgKzEyNiwxNyBAQCB2b2lkIFNj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1M6OnNldFNjcm9sbExheWVyUG9zaXRpb24o Y29uc3QgRmxvYXRQb2ludAogICAgIHVwZGF0ZUNoaWxkTm9kZXNBZnRlclNjcm9sbChzY3JvbGxQ b3NpdGlvbik7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6 dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3QmIHZpZXdwb3J0 UmVjdCwgZG91YmxlIC8qc2NhbGUqLykKK3ZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZUlPUzo6dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3Qm IGZpeGVkUG9zaXRpb25SZWN0LCBkb3VibGUgLypzY2FsZSovKQogewotICAgIFttX2NvdW50ZXJT Y3JvbGxpbmdMYXllciBzZXRQb3NpdGlvbjp2aWV3cG9ydFJlY3QubG9jYXRpb24oKV07CisgICAg Ly8gTm90ZTogd2UgbmV2ZXIgY3VycmVudGx5IGhhdmUgYSBtX2NvdW50ZXJTY3JvbGxpbmdMYXll ciAod2hpY2ggaXMgdXNlZCBmb3IgYmFja2dyb3VuZC1hdHRhY2htZW50OmZpeGVkKSBvbiBpT1Mu CisgICAgW21fY291bnRlclNjcm9sbGluZ0xheWVyIHNldFBvc2l0aW9uOmZpeGVkUG9zaXRpb25S ZWN0LmxvY2F0aW9uKCldOwogCiAgICAgaWYgKCFtX2NoaWxkcmVuKQogICAgICAgICByZXR1cm47 CiAKICAgICBzaXplX3Qgc2l6ZSA9IG1fY2hpbGRyZW4tPnNpemUoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IHNpemU7ICsraSkKLSAgICAgICAgbV9jaGlsZHJlbi0+YXQoaSktPnBhcmVu dFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKHZpZXdwb3J0UmVjdCwgRmxvYXRTaXplKCkpOworICAg ICAgICBtX2NoaWxkcmVuLT5hdChpKS0+dXBkYXRlTGF5ZXJzQWZ0ZXJBbmNlc3RvckNoYW5nZSgq dGhpcywgZml4ZWRQb3NpdGlvblJlY3QsIEZsb2F0U2l6ZSgpKTsKIH0KIAogdm9pZCBTY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TOjp1cGRhdGVMYXllcnNBZnRlckRlbGVnYXRlZFNj cm9sbChjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbikKQEAgLTE2OSwxNCArMTcwLDE0 IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZUlPUzo6dXBkYXRlQ2hpbGRO b2Rlc0FmdGVyU2Nyb2xsKGNvbnN0IEZsb2F0CiAgICAgCiAgICAgaWYgKCFtX2NoaWxkcmVuKQog ICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICB2aWV3cG9ydFJlY3Quc2V0TG9jYXRpb24oc2Ny b2xsT2Zmc2V0KTsKLSAgICAKKwogICAgIEZsb2F0UmVjdCB2aWV3cG9ydENvbnN0cmFpbmVkT2Jq ZWN0c1JlY3QgPSBGcmFtZVZpZXc6OnJlY3RGb3JWaWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0cyhl bmNsb3NpbmdMYXlvdXRSZWN0KHZpZXdwb3J0UmVjdCksIHJvdW5kZWRMYXlvdXRTaXplKHRvdGFs Q29udGVudHNTaXplKCkpLCBmcmFtZVNjYWxlRmFjdG9yKCksIGZhbHNlLCBiZWhhdmlvckZvckZp eGVkKTsKLSAgICAKKwogICAgIHNpemVfdCBzaXplID0gbV9jaGlsZHJlbi0+c2l6ZSgpOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKQotICAgICAgICBtX2NoaWxkcmVuLT5h dChpKS0+cGFyZW50U2Nyb2xsUG9zaXRpb25EaWRDaGFuZ2Uodmlld3BvcnRDb25zdHJhaW5lZE9i amVjdHNSZWN0LCBGbG9hdFNpemUoKSk7CisgICAgICAgIG1fY2hpbGRyZW4tPmF0KGkpLT51cGRh dGVMYXllcnNBZnRlckFuY2VzdG9yQ2hhbmdlKCp0aGlzLCBmaXhlZFBvc2l0aW9uUmVjdCwgRmxv YXRTaXplKCkpOwogfQogCiBGbG9hdFBvaW50IFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVJT1M6Om1pbmltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUuaApp bmRleCBlYWRlNGRhM2NlODM3MGRhMzY2MzlkNWIxZjk2NDI0ZGQ3YzZmYWZmLi4wMTI4YWM1ODJi ZDRjY2VkNGEyMjE2MWE1ZjE4ZTVhNzA0Njc1NjBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLmgKQEAg LTQ4LDcgKzQ4LDcgQEAgcHJpdmF0ZToKICAgICBTY3JvbGxpbmdUcmVlRml4ZWROb2RlKFNjcm9s bGluZ1RyZWUmLCBTY3JvbGxpbmdOb2RlSUQpOwogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUJl Zm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYpIG92ZXJyaWRlOwotICAgIHZp cnR1YWwgdm9pZCBwYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5nZShjb25zdCBGbG9hdFJlY3Qm IHZpZXdwb3J0UmVjdCwgY29uc3QgRmxvYXRTaXplJiBjdW11bGF0aXZlRGVsdGEpIG92ZXJyaWRl OworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMYXllcnNBZnRlckFuY2VzdG9yQ2hhbmdlKGNvbnN0 IFNjcm9sbGluZ1RyZWVOb2RlJiBjaGFuZ2VkTm9kZSwgY29uc3QgRmxvYXRSZWN0JiBmaXhlZFBv c2l0aW9uUmVjdCwgY29uc3QgRmxvYXRTaXplJiBjdW11bGF0aXZlRGVsdGEpIG92ZXJyaWRlOwog CiAgICAgRml4ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMgbV9jb25zdHJhaW50czsKICAg ICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9sYXllcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLm1tIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KaW5kZXgg ZTI1YWYwODUwZGMwNDU2NjVjNjQ4MDZhMTUzODUwZjVhMTY5MjAxZC4uZWRhMDcxZTBhNjcxZmFi M2VkYzIzMDdkNmRhZDQwNTBmMjkxZWZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KQEAgLTY0 LDkgKzY0LDkgQEAgc3RhdGljIGlubGluZSBDR1BvaW50IG9wZXJhdG9yKihDR1BvaW50JiBhLCBj b25zdCBDR1NpemUmIGIpCiAgICAgcmV0dXJuIENHUG9pbnRNYWtlKGEueCAqIGIud2lkdGgsIGEu eSAqIGIuaGVpZ2h0KTsKIH0KIAotdm9pZCBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjpwYXJlbnRT Y3JvbGxQb3NpdGlvbkRpZENoYW5nZShjb25zdCBGbG9hdFJlY3QmIHZpZXdwb3J0UmVjdCwgY29u c3QgRmxvYXRTaXplJiBjdW11bGF0aXZlRGVsdGEpCit2b2lkIFNjcm9sbGluZ1RyZWVGaXhlZE5v ZGU6OnVwZGF0ZUxheWVyc0FmdGVyQW5jZXN0b3JDaGFuZ2UoY29uc3QgU2Nyb2xsaW5nVHJlZU5v ZGUmIGNoYW5nZWROb2RlLCBjb25zdCBGbG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBjb25z dCBGbG9hdFNpemUmIGN1bXVsYXRpdmVEZWx0YSkKIHsKLSAgICBGbG9hdFBvaW50IGxheWVyUG9z aXRpb24gPSBtX2NvbnN0cmFpbnRzLmxheWVyUG9zaXRpb25Gb3JWaWV3cG9ydFJlY3Qodmlld3Bv cnRSZWN0KTsKKyAgICBGbG9hdFBvaW50IGxheWVyUG9zaXRpb24gPSBtX2NvbnN0cmFpbnRzLmxh eWVyUG9zaXRpb25Gb3JWaWV3cG9ydFJlY3QoZml4ZWRQb3NpdGlvblJlY3QpOwogICAgIGxheWVy UG9zaXRpb24gLT0gY3VtdWxhdGl2ZURlbHRhOwogCiAgICAgQ0dSZWN0IGxheWVyQm91bmRzID0g W21fbGF5ZXIuZ2V0KCkgYm91bmRzXTsKQEAgLTgxLDcgKzgxLDcgQEAgdm9pZCBTY3JvbGxpbmdU cmVlRml4ZWROb2RlOjpwYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5nZShjb25zdCBGbG9hdFJl Y3QmIHZpZXcKIAogICAgIHNpemVfdCBzaXplID0gbV9jaGlsZHJlbi0+c2l6ZSgpOwogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKQotICAgICAgICBtX2NoaWxkcmVuLT5hdChp KS0+cGFyZW50U2Nyb2xsUG9zaXRpb25EaWRDaGFuZ2Uodmlld3BvcnRSZWN0LCBuZXdEZWx0YSk7 CisgICAgICAgIG1fY2hpbGRyZW4tPmF0KGkpLT51cGRhdGVMYXllcnNBZnRlckFuY2VzdG9yQ2hh bmdlKGNoYW5nZWROb2RlLCBmaXhlZFBvc2l0aW9uUmVjdCwgbmV3RGVsdGEpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVN YWMuaAppbmRleCBlZDY5MWU5N2NkM2NiOTNiYTA0NGY5NjkyZjU0YTQ3YjdhMTZlNTBiLi5hZGVj NzQ5OTJiMTk3ZTRjZmJlNDQ1YjUxNWVlNjVjZWE2MmVhOTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9k ZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLmgKQEAgLTY5LDcgKzY5LDcgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYpIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbldpdGhvdXRDb250ZW50RWRn ZUNvbnN0cmFpbnRzKGNvbnN0IEZsb2F0UG9pbnQmKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVMYXllcnNBZnRlclZpZXdwb3J0Q2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYgdmll d3BvcnRSZWN0LCBkb3VibGUgc2NhbGUpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCB1cGRh dGVMYXllcnNBZnRlclZpZXdwb3J0Q2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYgZml4ZWRQb3NpdGlv blJlY3QsIGRvdWJsZSBzY2FsZSkgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Ny b2xsTGF5ZXJQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50Jikgb3ZlcnJpZGU7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVT Y3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Nj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggMjdlMDA5ZDZhZTc4ZmQw OGYxM2U4N2M4YjgwNmNhNjI4ZjA5ZjhkNi4uNmYxOGMyMGI4Y2FkOGVjMWVkMTVmZDk1MzJmYjRj ODhmMDI4MTYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMu bW0KQEAgLTM0OSw3ICszNDksNiBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWM6OnNldFNjcm9sbExheWVyUG9zaXRpb24oY29uc3QgRmxvYXRQb2ludAogICAgIEZsb2F0 UG9pbnQgc2Nyb2xsT2Zmc2V0ID0gcG9zaXRpb24gLSB0b0Zsb2F0U2l6ZShzY3JvbGxPcmlnaW4o KSk7CiAgICAgRmxvYXRSZWN0IHZpZXdwb3J0UmVjdChGbG9hdFBvaW50KCksIHNjcm9sbGFibGVB cmVhU2l6ZSgpKTsKICAgICAKLSAgICAvLyBGSVhNRTogc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3Np dGlvbigpIG5lZWRzIHRvIGRvIGZsb2F0IG1hdGguCiAgICAgRmxvYXRTaXplIHNjcm9sbE9mZnNl dEZvckZpeGVkQ2hpbGRyZW4gPSBGcmFtZVZpZXc6OnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRp b24oZW5jbG9zaW5nTGF5b3V0UmVjdCh2aWV3cG9ydFJlY3QpLAogICAgICAgICByb3VuZGVkTGF5 b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgcm91bmRlZExheW91dFBvaW50KHNjcm9sbE9m ZnNldCksIHNjcm9sbE9yaWdpbigpLCBmcmFtZVNjYWxlRmFjdG9yKCksIGZhbHNlLCBiZWhhdmlv ckZvckZpeGVkLCBoZWFkZXJIZWlnaHQoKSwgZm9vdGVySGVpZ2h0KCkpOwogICAgIApAQCAtNDEw LDcgKzQwOSw3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6c2V0 U2Nyb2xsTGF5ZXJQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50CiAKICAgICBzaXplX3Qgc2l6ZSA9 IG1fY2hpbGRyZW4tPnNpemUoKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsr aSkKLSAgICAgICAgbV9jaGlsZHJlbi0+YXQoaSktPnBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hh bmdlKHZpZXdwb3J0UmVjdCwgRmxvYXRTaXplKCkpOworICAgICAgICBtX2NoaWxkcmVuLT5hdChp KS0+dXBkYXRlTGF5ZXJzQWZ0ZXJBbmNlc3RvckNoYW5nZSgqdGhpcywgdmlld3BvcnRSZWN0LCBG bG9hdFNpemUoKSk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1h Yzo6dXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBGbG9hdFJlY3QmLCBkb3Vi bGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xs aW5nVHJlZVN0aWNreU5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCmluZGV4IGU5ZWI1N2Q0Zjk0NjkxNGQ2MWI1MzRkZDU5 ODRmYjUwYWQxYTRkMTMuLmJlYzI5NDEzOGIyMWNhZDdmMjlmMTJhMjU2ZDM1YTcwMmIwODU5NmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdU cmVlU3RpY2t5Tm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5oCkBAIC00OCw3ICs0OCw3IEBAIHByaXZhdGU6CiAgICAg U2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUoU2Nyb2xsaW5nVHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7 CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5n U3RhdGVOb2RlJikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIHBhcmVudFNjcm9sbFBvc2l0 aW9uRGlkQ2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYgdmlld3BvcnRSZWN0LCBjb25zdCBGbG9hdFNp emUmIGN1bXVsYXRpdmVEZWx0YSkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxh eWVyc0FmdGVyQW5jZXN0b3JDaGFuZ2UoY29uc3QgU2Nyb2xsaW5nVHJlZU5vZGUmIGNoYW5nZWRO b2RlLCBjb25zdCBGbG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBjb25zdCBGbG9hdFNpemUm IGN1bXVsYXRpdmVEZWx0YSkgb3ZlcnJpZGU7CiAKICAgICBTdGlja3lQb3NpdGlvblZpZXdwb3J0 Q29uc3RyYWludHMgbV9jb25zdHJhaW50czsKICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9sYXll cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlU3RpY2t5Tm9kZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCA3ODMwNTFmYzQ3OTliNzJkYTBiNDM4M2Fm NGQ2NDJhY2FlNWM0NTNmLi5kNjVmYTZkYjZlOGVkNTYyZTBlMGY4ZDEyYWQyM2IwOGE5N2E2Yjlj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZVN0aWNreU5vZGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVTdGlja3lOb2RlLm1tCkBAIC02NCw5ICs2NCw5IEBAIHN0YXRpYyBpbmxp bmUgQ0dQb2ludCBvcGVyYXRvciooQ0dQb2ludCYgYSwgY29uc3QgQ0dTaXplJiBiKQogICAgIHJl dHVybiBDR1BvaW50TWFrZShhLnggKiBiLndpZHRoLCBhLnkgKiBiLmhlaWdodCk7CiB9CiAKLXZv aWQgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OnBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdl KGNvbnN0IEZsb2F0UmVjdCYgdmlld3BvcnRSZWN0LCBjb25zdCBGbG9hdFNpemUmIGN1bXVsYXRp dmVEZWx0YSkKK3ZvaWQgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OnVwZGF0ZUxheWVyc0FmdGVy QW5jZXN0b3JDaGFuZ2UoY29uc3QgU2Nyb2xsaW5nVHJlZU5vZGUmIGNoYW5nZWROb2RlLCBjb25z dCBGbG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBjb25zdCBGbG9hdFNpemUmIGN1bXVsYXRp dmVEZWx0YSkKIHsKLSAgICBGbG9hdFBvaW50IGxheWVyUG9zaXRpb24gPSBtX2NvbnN0cmFpbnRz LmxheWVyUG9zaXRpb25Gb3JDb25zdHJhaW5pbmdSZWN0KHZpZXdwb3J0UmVjdCk7CisgICAgRmxv YXRQb2ludCBsYXllclBvc2l0aW9uID0gbV9jb25zdHJhaW50cy5sYXllclBvc2l0aW9uRm9yQ29u c3RyYWluaW5nUmVjdChmaXhlZFBvc2l0aW9uUmVjdCk7CiAKICAgICAvLyBGSVhNRTogU3VidHJh Y3RpbmcgdGhlIGN1bXVsYXRpdmVEZWx0YSBpcyBub3QgdG90YWxseSBzdWZmaWNpZW50IHRvIGdl dCB0aGUgbmV3IHBvc2l0aW9uIHJpZ2h0IGZvciBuZXN0ZWQKICAgICAvLyBzdGlja3kgb2JqZWN0 cy4gV2UgcHJvYmFibHkgbmVlZCBhIHdheSB0byBtb2RpZnkgdGhlIGNvbnRhaW5pbmdCbG9ja1Jl Y3QgaW4gdGhlIFZpZXdwb3J0Q29udHJhaW50cwpAQCAtODUsNyArODUsNyBAQCB2b2lkIFNjcm9s bGluZ1RyZWVTdGlja3lOb2RlOjpwYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5nZShjb25zdCBG bG9hdFJlY3QmIHZpZQogCiAgICAgc2l6ZV90IHNpemUgPSBtX2NoaWxkcmVuLT5zaXplKCk7CiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCi0gICAgICAgIG1fY2hpbGRyZW4t PmF0KGkpLT5wYXJlbnRTY3JvbGxQb3NpdGlvbkRpZENoYW5nZSh2aWV3cG9ydFJlY3QsIG5ld0Rl bHRhKTsKKyAgICAgICAgbV9jaGlsZHJlbi0+YXQoaSktPnVwZGF0ZUxheWVyc0FmdGVyQW5jZXN0 b3JDaGFuZ2UoY2hhbmdlZE5vZGUsIGZpeGVkUG9zaXRpb25SZWN0LCBuZXdEZWx0YSk7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHkuY3BwCmluZGV4IDE0ZTYwYjg3ZTk0ZmQ0ODk5NTk0Y2FlOTc5YzQ0OWIwMTlhOGVjZjQu LjE1Y2M4ZTEwYmIwMDZlYzA3YTRkNmMwNTAxMWQzZDMzNzdlOGY1ZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1v dGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcApAQCAtMTU0LDkgKzE1NCw5IEBAIGJvb2wg UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eTo6aXNQb2ludEluTm9uRmFzdFNjcm9sbGFi bGVSZWdpb24oY29uc3QgSW50CiAgICAgcmV0dXJuIG1fc2Nyb2xsaW5nVHJlZS0+aXNQb2ludElu Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24ocCk7CiB9CiAKLXZvaWQgUmVtb3RlU2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eTo6dmlld3BvcnRDaGFuZ2VkVmlhRGVsZWdhdGVkU2Nyb2xsaW5nKFNjcm9s bGluZ05vZGVJRCBub2RlSUQsIGNvbnN0IEZsb2F0UmVjdCYgdmlld3BvcnRSZWN0LCBkb3VibGUg c2NhbGUpCit2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnZpZXdwb3J0Q2hh bmdlZFZpYURlbGVnYXRlZFNjcm9sbGluZyhTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBG bG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBkb3VibGUgc2NhbGUpCiB7Ci0gICAgbV9zY3Jv bGxpbmdUcmVlLT52aWV3cG9ydENoYW5nZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcobm9kZUlELCB2 aWV3cG9ydFJlY3QsIHNjYWxlKTsKKyAgICBtX3Njcm9sbGluZ1RyZWUtPnZpZXdwb3J0Q2hhbmdl ZFZpYURlbGVnYXRlZFNjcm9sbGluZyhub2RlSUQsIGZpeGVkUG9zaXRpb25SZWN0LCBzY2FsZSk7 CiB9CiAKIC8vIFRoaXMgY29tZXMgZnJvbSB0aGUgc2Nyb2xsaW5nIHRyZWUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3Rl U2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCmluZGV4IGM5YmFhODVlNGM5NDIxNTg0MDA3M2Ez MzgxZjdkNWQ2YzJmNDQzMTIuLjM4NTBjOGYwNmZkNzQ0MjI3Nzk3ZmJkNDA2ZGMzYjZmMTQyZWI3 ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3Rl U2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCkBAIC01OCw3ICs1 OCw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzUG9pbnRJbk5vbkZhc3RTY3JvbGxhYmxlUmVnaW9u KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgY29uc3Q7CiAKICAgICAvLyBDYWxsZWQgZXh0ZXJu YWxseSB3aGVuIG5hdGl2ZSB2aWV3cyBtb3ZlIGFyb3VuZC4KLSAgICB2b2lkIHZpZXdwb3J0Q2hh bmdlZFZpYURlbGVnYXRlZFNjcm9sbGluZyhXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQsIGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmlld3BvcnRSZWN0LCBkb3VibGUgc2NhbGUpOworICAgIHZv aWQgdmlld3BvcnRDaGFuZ2VkVmlhRGVsZWdhdGVkU2Nyb2xsaW5nKFdlYkNvcmU6OlNjcm9sbGlu Z05vZGVJRCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBmaXhlZFBvc2l0aW9uUmVjdCwgZG91 YmxlIHNjYWxlKTsKIAogICAgIC8vIEZJWE1FOiBleHBvc2UgdGhlIHRyZWUgYW5kIHBhc3MgdGhp cyB0byB0aGF0PwogICAgIGJvb2wgaGFuZGxlV2hlZWxFdmVudChjb25zdCBXZWJDb3JlOjpQbGF0 Zm9ybVdoZWVsRXZlbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T Y3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxv d1Njcm9sbGluZ05vZGVJT1MuaAppbmRleCAxZWJlZDU5MzNiN2ZiYTM5ZTdjNTg5M2YwMGI1YmY3 Yzg1MzhmMGM5Li5lYTZlMTU3MTZjMWVhODdjYmIyOTNmMjI1MmE0OGEyNDc1ZTYwOTQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdU cmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5o CkBAIC01NCw3ICs1NCw3IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xs TGF5ZXJQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jikgb3ZlcnJpZGU7CiAKLSAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmIHZpZXdwb3J0UmVjdCwgZG91YmxlIHNjYWxlKSB7IH0KKyAgICB2aXJ0 dWFsIHZvaWQgdXBkYXRlTGF5ZXJzQWZ0ZXJWaWV3cG9ydENoYW5nZShjb25zdCBXZWJDb3JlOjpG bG9hdFJlY3QmIGZpeGVkUG9zaXRpb25SZWN0LCBkb3VibGUgc2NhbGUpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVu dCYpIG92ZXJyaWRlIHsgfQogCiAgICAgdm9pZCB1cGRhdGVDaGlsZE5vZGVzQWZ0ZXJTY3JvbGwo Y29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwo=