218621 2020-11-05 09:52:49 -0800 Clean up ScrollingStateTree setPropertyChangesAfterReattach() code 2020-11-05 11:53:19 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr koivisto luiz simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1704909 0 simon.fraser 2020-11-05 09:52:49 -0800 Clean up ScrollingStateTree setPropertyChangesAfterReattach() code 1704910 1 413315 simon.fraser 2020-11-05 09:54:08 -0800 Created attachment 413315 Patch 1704961 2 ews-feeder 2020-11-05 11:53:00 -0800 Committed r269458: <https://trac.webkit.org/changeset/269458> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413315. 1704962 3 webkit-bug-importer 2020-11-05 11:53:19 -0800 <rdar://problem/71087488> 413315 2020-11-05 09:54:08 -0800 2020-11-05 11:53:00 -0800 Patch bug-218621-20201105095407.patch text/plain 22782 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZmYTQ1ZjFmZTJkYjMz ZDBlZTEwZjRhN2YxOWUwNmNjMDFhZjUwMy4uN2YyZGQyNGUwMTM0ZjgxZWY5MDMwZjY0MGFmZjU2 YmJhOGEyYWI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIwLTExLTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFNj cm9sbGluZ1N0YXRlVHJlZSBzZXRQcm9wZXJ0eUNoYW5nZXNBZnRlclJlYXR0YWNoKCkgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4NjIxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBs b3RzIG9mIGluZGl2aWR1YWwgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoKSBjYWxscyB3aXRo IGEgc2luZ2xlIGNhbGwKKyAgICAgICAgd2l0aCBhbiBPcHRpb25TZXQ8PiBhcmd1bWVudC4KKwor ICAgICAgICBUaGUgdmlydHVhbCBhcHBsaWNhYmxlUHJvcGVydGllcygpIGNhbGxzIGJhc2UgY2xh c3NlcyB0byBnZW5lcmF0ZSBhbiBPcHRpb25TZXQ8PgorICAgICAgICBvZiBhbGwgdGhlIHByb3Bl cnRpZXMgZm9yIGEgbm9kZSB0eXBlLgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nU3RhdGVGaXhlZE5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVG aXhlZE5vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ1N0YXRlRml4ZWROb2RlOjpzZXRQcm9wZXJ0eUNoYW5nZXNBZnRlclJlYXR0YWNo KTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZpeGVk Tm9kZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjphcHBsaWNhYmxlUHJvcGVydGllcyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0UHJvcGVydHlDaGFuZ2VzQWZ0 ZXJSZWF0dGFjaCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdTdGF0ZU5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2Rl OjphcHBsaWNhYmxlUHJvcGVydGllcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2gpOgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nU3RhdGVOb2RlOjpzZXRQcm9wZXJ0aWVzQ2hhbmdlZEludGVybmFsKToKKyAgICAg ICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsUHJveHlOb2Rl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94 eU5vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0Fm dGVyUmVhdHRhY2gpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGU6OnNldFByb3Bl cnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2gpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjphcHBsaWNhYmxlUHJvcGVydGllcyBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFByb3Bl cnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2gpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxpbmdTdGF0ZVN0aWNreU5vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZTo6c2V0UHJvcGVydHlDaGFuZ2Vz QWZ0ZXJSZWF0dGFjaCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nU3RhdGVTdGlja3lOb2RlLmg6CisKIDIwMjAtMTEtMDQgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQSBwcm9ncmFtbWF0aWMgc2Nyb2xsIHNob3Vs ZCBzdG9wIGFueSBydWJiZXJiYW5kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZS5jcHAKaW5kZXggZjhiYmIzZmE1 ZDQ5NTJiMmRjMWI5Y2YwZmY4N2QxM2JmNmFiOTE1ZC4uZDZiZDU3MjNjYjZjMjI3ZTI5MjIwYmNl MjI4MjNkMmZhZWFiOWE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRml4ZWROb2RlLmNwcApAQCAtNTgsMTAgKzU4LDEzIEBA IFJlZjxTY3JvbGxpbmdTdGF0ZU5vZGU+IFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlOjpjbG9uZShT Y3JvbGxpbmdTdGF0ZVRyZWUmIGFkb3B0CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU2Nyb2xs aW5nU3RhdGVGaXhlZE5vZGUoKnRoaXMsIGFkb3B0aXZlVHJlZSkpOwogfQogCi12b2lkIFNjcm9s bGluZ1N0YXRlRml4ZWROb2RlOjpzZXRQcm9wZXJ0eUNoYW5nZXNBZnRlclJlYXR0YWNoKCkKK09w dGlvblNldDxTY3JvbGxpbmdTdGF0ZU5vZGU6OlByb3BlcnR5PiBTY3JvbGxpbmdTdGF0ZUZpeGVk Tm9kZTo6YXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25zdAogewotICAgIHNldFByb3BlcnR5Q2hh bmdlZEludGVybmFsKFByb3BlcnR5OjpWaWV3cG9ydENvbnN0cmFpbnRzKTsKLSAgICBTY3JvbGxp bmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2goKTsKKyAgICBjb25z dGV4cHIgT3B0aW9uU2V0PFByb3BlcnR5PiBub2RlUHJvcGVydGllcyA9IHsgUHJvcGVydHk6OlJl bGF0ZWRPdmVyZmxvd1Njcm9sbGluZ05vZGVzLCBQcm9wZXJ0eTo6TGF5b3V0Q29uc3RyYWludERh dGEgfTsKKworICAgIGF1dG8gcHJvcGVydGllcyA9IFNjcm9sbGluZ1N0YXRlTm9kZTo6YXBwbGlj YWJsZVByb3BlcnRpZXMoKTsKKyAgICBwcm9wZXJ0aWVzLmFkZChub2RlUHJvcGVydGllcyk7Cisg ICAgcmV0dXJuIHByb3BlcnRpZXM7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGU6 OnVwZGF0ZUNvbnN0cmFpbnRzKGNvbnN0IEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRz JiBjb25zdHJhaW50cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlRml4ZWROb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZS5oCmluZGV4IDM5MWQyOTI5YzBjOGEwMzM5MGFlZjhi YTFmMjk2OGY2OGExNjdjOGQuLmMzZDljYzY1OWY0ODA3YjQ4M2Y3ZjY4ZGVjNzBlZmIyOGE5ZGIz ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlRml4ZWROb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nU3RhdGVGaXhlZE5vZGUuaApAQCAtNDAsNyArNDAsNyBAQCBjbGFzcyBTY3JvbGxpbmdTdGF0 ZUZpeGVkTm9kZSBmaW5hbCA6IHB1YmxpYyBTY3JvbGxpbmdTdGF0ZU5vZGUgewogcHVibGljOgog ICAgIHN0YXRpYyBSZWY8U2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGU+IGNyZWF0ZShTY3JvbGxpbmdT dGF0ZVRyZWUmLCBTY3JvbGxpbmdOb2RlSUQpOwogCi0gICAgUmVmPFNjcm9sbGluZ1N0YXRlTm9k ZT4gY2xvbmUoU2Nyb2xsaW5nU3RhdGVUcmVlJikgb3ZlcnJpZGU7CisgICAgUmVmPFNjcm9sbGlu Z1N0YXRlTm9kZT4gY2xvbmUoU2Nyb2xsaW5nU3RhdGVUcmVlJikgZmluYWw7CiAKICAgICB2aXJ0 dWFsIH5TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZSgpOwogCkBAIC01MSwxMSArNTEsMTAgQEAgcHJp dmF0ZToKICAgICBTY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUmLCBT Y3JvbGxpbmdOb2RlSUQpOwogICAgIFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlKGNvbnN0IFNjcm9s bGluZ1N0YXRlRml4ZWROb2RlJiwgU2Nyb2xsaW5nU3RhdGVUcmVlJik7CiAKLSAgICB2b2lkIHNl dFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2goKSBvdmVycmlkZTsKKyAgICB2b2lkIHJlY29u Y2lsZUxheWVyUG9zaXRpb25Gb3JWaWV3cG9ydFJlY3QoY29uc3QgTGF5b3V0UmVjdCYgdmlld3Bv cnRSZWN0LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKSBmaW5hbDsKIAotICAgIHZvaWQg cmVjb25jaWxlTGF5ZXJQb3NpdGlvbkZvclZpZXdwb3J0UmVjdChjb25zdCBMYXlvdXRSZWN0JiB2 aWV3cG9ydFJlY3QsIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pIG92ZXJyaWRlOwotCi0g ICAgdm9pZCBkdW1wUHJvcGVydGllcyhXVEY6OlRleHRTdHJlYW0mLCBTY3JvbGxpbmdTdGF0ZVRy ZWVBc1RleHRCZWhhdmlvcikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdm9pZCBkdW1wUHJvcGVydGll cyhXVEY6OlRleHRTdHJlYW0mLCBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvcikgY29u c3QgZmluYWw7CisgICAgT3B0aW9uU2V0PFNjcm9sbGluZ1N0YXRlTm9kZTo6UHJvcGVydHk+IGFw cGxpY2FibGVQcm9wZXJ0aWVzKCkgY29uc3QgZmluYWw7CiAKICAgICBGaXhlZFBvc2l0aW9uVmll d3BvcnRDb25zdHJhaW50cyBtX2NvbnN0cmFpbnRzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlLmNwcAppbmRleCBiMmYzNGFjN2ZkMzNjNjZhZWM1ZmE2OTZlZjYyZDBiYzY0Y2U1 NWVhLi5mZTZmMjgxOTg1NTMyNWMxMzBhYjk2MzA2ZWQwZWQ1YTZlNWE4ODU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCkBAIC04NiwzMCArODYsMzMgQEAgUmVmPFNjcm9s bGluZ1N0YXRlTm9kZT4gU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OmNsb25lKFNj cm9sbGluZ1N0YXRlVHIKICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTY3JvbGxpbmdTdGF0ZUZy YW1lU2Nyb2xsaW5nTm9kZSgqdGhpcywgYWRvcHRpdmVUcmVlKSk7CiB9CiAKLXZvaWQgU2Nyb2xs aW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVhdHRh Y2goKQorT3B0aW9uU2V0PFNjcm9sbGluZ1N0YXRlTm9kZTo6UHJvcGVydHk+IFNjcm9sbGluZ1N0 YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjphcHBsaWNhYmxlUHJvcGVydGllcygpIGNvbnN0CiB7Ci0g ICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkZyYW1lU2NhbGVGYWN0b3Ip OwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpFdmVudFRyYWNraW5n UmVnaW9uKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6Um9vdENv bnRlbnRzTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpT Y3JvbGxlZENvbnRlbnRzTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFBy b3BlcnR5OjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZElu dGVybmFsKFByb3BlcnR5OjpJbnNldENsaXBMYXllcik7Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2Vk SW50ZXJuYWwoUHJvcGVydHk6OkNvbnRlbnRTaGFkb3dMYXllcik7Ci0gICAgc2V0UHJvcGVydHlD aGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkhlYWRlckhlaWdodCk7Ci0gICAgc2V0UHJvcGVydHlD aGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkZvb3RlckhlaWdodCk7Ci0gICAgc2V0UHJvcGVydHlD aGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkhlYWRlckxheWVyKTsKLSAgICBzZXRQcm9wZXJ0eUNo YW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6Rm9vdGVyTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hh bmdlZEludGVybmFsKFByb3BlcnR5OjpCZWhhdmlvckZvckZpeGVkRWxlbWVudHMpOwotICAgIHNl dFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpUb3BDb250ZW50SW5zZXQpOwotICAg IHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpGaXhlZEVsZW1lbnRzTGF5b3V0 UmVsYXRpdmVUb0ZyYW1lKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0 eTo6VmlzdWFsVmlld3BvcnRJc1NtYWxsZXJUaGFuTGF5b3V0Vmlld3BvcnQpOwotICAgIHNldFBy b3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpBc3luY0ZyYW1lT3JPdmVyZmxvd1Njcm9s bGluZ0VuYWJsZWQpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpM YXlvdXRWaWV3cG9ydCk7Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6 Ok1pbkxheW91dFZpZXdwb3J0T3JpZ2luKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5h bChQcm9wZXJ0eTo6TWF4TGF5b3V0Vmlld3BvcnRPcmlnaW4pOwotICAgIHNldFByb3BlcnR5Q2hh bmdlZEludGVybmFsKFByb3BlcnR5OjpPdmVycmlkZVZpc3VhbFZpZXdwb3J0U2l6ZSk7Ci0KLSAg ICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVh dHRhY2goKTsKKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0PFByb3BlcnR5PiBub2RlUHJvcGVydGll cyA9IHsKKyAgICAgICAgUHJvcGVydHk6OkZyYW1lU2NhbGVGYWN0b3IsCisgICAgICAgIFByb3Bl cnR5OjpFdmVudFRyYWNraW5nUmVnaW9uLAorICAgICAgICBQcm9wZXJ0eTo6Um9vdENvbnRlbnRz TGF5ZXIsCisgICAgICAgIFByb3BlcnR5OjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIsCisgICAgICAg IFByb3BlcnR5OjpJbnNldENsaXBMYXllciwKKyAgICAgICAgUHJvcGVydHk6OkNvbnRlbnRTaGFk b3dMYXllciwKKyAgICAgICAgUHJvcGVydHk6OkhlYWRlckhlaWdodCwKKyAgICAgICAgUHJvcGVy dHk6OkZvb3RlckhlaWdodCwKKyAgICAgICAgUHJvcGVydHk6OkhlYWRlckxheWVyLAorICAgICAg ICBQcm9wZXJ0eTo6Rm9vdGVyTGF5ZXIsCisgICAgICAgIFByb3BlcnR5OjpCZWhhdmlvckZvckZp eGVkRWxlbWVudHMsCisgICAgICAgIFByb3BlcnR5OjpUb3BDb250ZW50SW5zZXQsCisgICAgICAg IFByb3BlcnR5OjpGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lLAorICAgICAgICBQ cm9wZXJ0eTo6VmlzdWFsVmlld3BvcnRJc1NtYWxsZXJUaGFuTGF5b3V0Vmlld3BvcnQsCisgICAg ICAgIFByb3BlcnR5OjpBc3luY0ZyYW1lT3JPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQsCisgICAg ICAgIFByb3BlcnR5OjpMYXlvdXRWaWV3cG9ydCwKKyAgICAgICAgUHJvcGVydHk6Ok1pbkxheW91 dFZpZXdwb3J0T3JpZ2luLAorICAgICAgICBQcm9wZXJ0eTo6TWF4TGF5b3V0Vmlld3BvcnRPcmln aW4sCisgICAgICAgIFByb3BlcnR5OjpPdmVycmlkZVZpc3VhbFZpZXdwb3J0U2l6ZSwKKyAgICB9 OworCisgICAgYXV0byBwcm9wZXJ0aWVzID0gU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjph cHBsaWNhYmxlUHJvcGVydGllcygpOworICAgIHByb3BlcnRpZXMuYWRkKG5vZGVQcm9wZXJ0aWVz KTsKKyAgICByZXR1cm4gcHJvcGVydGllczsKIH0KIAogdm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1l U2Nyb2xsaW5nTm9kZTo6c2V0RnJhbWVTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZhY3RvcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCmluZGV4IDlmZGY4OGRmMzc0Njc2NzIwYWY2YWY5 ZWI1NGQ2ZmM0YmZjYmMyNDcuLjEzMTcwYzYxYzE2MWYwMzY2ZTYzMTM3ODJmNWYzMzNhMThhZDk3 NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaApAQCAtMTE3LDcgKzExNyw3IEBA IHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5n U3RhdGVUcmVlJiwgU2Nyb2xsaW5nTm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCk7CiAgICAgU2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUoY29uc3QgU2Nyb2xsaW5nU3RhdGVGcmFtZVNj cm9sbGluZ05vZGUmLCBTY3JvbGxpbmdTdGF0ZVRyZWUmKTsKIAotICAgIHZvaWQgc2V0UHJvcGVy dHlDaGFuZ2VzQWZ0ZXJSZWF0dGFjaCgpIG92ZXJyaWRlOworICAgIE9wdGlvblNldDxTY3JvbGxp bmdTdGF0ZU5vZGU6OlByb3BlcnR5PiBhcHBsaWNhYmxlUHJvcGVydGllcygpIGNvbnN0IGZpbmFs OwogCiAgICAgTGF5ZXJSZXByZXNlbnRhdGlvbiBtX3Jvb3RDb250ZW50c0xheWVyOwogICAgIExh eWVyUmVwcmVzZW50YXRpb24gbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXI7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmNwcAppbmRleCAx M2EyYmY0NTI3OTg2MGM2NDM2OTk1YzkwNDVjOGUyZDk0NjNkNmJiLi43MTk1ZGIzMjYzZjI4ODI0 ODkzOTkxZDg2Yjc1MWUxMDQ4NGE0M2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAKQEAgLTY4LDEwICs2OCwxNSBAQCB2 b2lkIFNjcm9sbGluZ1N0YXRlTm9kZTo6c2V0UHJvcGVydHlDaGFuZ2VkKFByb3BlcnR5IHByb3Bl cnR5KQogICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKCk7 CiB9CiAKK09wdGlvblNldDxTY3JvbGxpbmdTdGF0ZU5vZGU6OlByb3BlcnR5PiBTY3JvbGxpbmdT dGF0ZU5vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzKCkgY29uc3QKK3sKKyAgICByZXR1cm4geyBQ cm9wZXJ0eTo6TGF5ZXIsIFByb3BlcnR5OjpDaGlsZE5vZGVzIH07Cit9CisKIHZvaWQgU2Nyb2xs aW5nU3RhdGVOb2RlOjpzZXRQcm9wZXJ0eUNoYW5nZXNBZnRlclJlYXR0YWNoKCkKIHsKLSAgICBz ZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6TGF5ZXIpOwotICAgIHNldFByb3Bl cnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpDaGlsZE5vZGVzKTsKKyAgICBhdXRvIGFsbFBy b3BlcnRpZXNGb3JOb2RlVHlwZSA9IGFwcGxpY2FibGVQcm9wZXJ0aWVzKCk7CisgICAgc2V0UHJv cGVydGllc0NoYW5nZWRJbnRlcm5hbChhbGxQcm9wZXJ0aWVzRm9yTm9kZVR5cGUpOwogICAgIG1f c2Nyb2xsaW5nU3RhdGVUcmVlLnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKaW5k ZXggMGE5NzQzMTRiZWQ5NzNiZDZkMWZjNGNlMjMzMjdjYTNiODIzOGU0NS4uMTU0NmZhZmU3N2Ez OTgyOGZkZDk0NjE4MzI3NGIwNmEzNGM5MjhhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKQEAgLTMxNCw4ICszMTQsMTAgQEAg cHJvdGVjdGVkOgogICAgIFNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxpbmdOb2RlVHlwZSwgU2Ny b2xsaW5nU3RhdGVUcmVlJiwgU2Nyb2xsaW5nTm9kZUlEKTsKIAogICAgIHZvaWQgc2V0UHJvcGVy dHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHkgcHJvcGVydHkpIHsgbV9jaGFuZ2VkUHJvcGVydGll cy5hZGQocHJvcGVydHkpOyB9CisgICAgdm9pZCBzZXRQcm9wZXJ0aWVzQ2hhbmdlZEludGVybmFs KE9wdGlvblNldDxQcm9wZXJ0eT4gcHJvcGVydGllcykgeyBtX2NoYW5nZWRQcm9wZXJ0aWVzLmFk ZChwcm9wZXJ0aWVzKTsgfQogCiAgICAgdmlydHVhbCB2b2lkIGR1bXBQcm9wZXJ0aWVzKFdURjo6 VGV4dFN0cmVhbSYsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdDsKKyAg ICB2aXJ0dWFsIE9wdGlvblNldDxQcm9wZXJ0eT4gYXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25z dDsKIAogcHJpdmF0ZToKICAgICB2b2lkIGR1bXAoV1RGOjpUZXh0U3RyZWFtJiwgU2Nyb2xsaW5n U3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU92ZXJmbG93 U2Nyb2xsUHJveHlOb2RlLmNwcAppbmRleCAxOTI5YTJkNzYwOGI4ODNiODA1OTliY2NmOTc3MzY4 NzllYjhmZGVmLi4wMTVhOWI2NGFiYjBiZTMyMzcyNDdkYzY0OGJkYzliM2NmN2I1N2YxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU92ZXJm bG93U2Nyb2xsUHJveHlOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlLmNwcApAQCAtNTcsMTMgKzU3 LDE2IEBAIFJlZjxTY3JvbGxpbmdTdGF0ZU5vZGU+IFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3Jv bGxQcm94eU5vZGU6OmNsb25lKFNjcm9sbGluZ1N0CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg U2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZSgqdGhpcywgYWRvcHRpdmVUcmVl KSk7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6c2V0 UHJvcGVydHlDaGFuZ2VzQWZ0ZXJSZWF0dGFjaCgpCitPcHRpb25TZXQ8U2Nyb2xsaW5nU3RhdGVO b2RlOjpQcm9wZXJ0eT4gU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6YXBw bGljYWJsZVByb3BlcnRpZXMoKSBjb25zdAogewotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVy bmFsKFByb3BlcnR5OjpPdmVyZmxvd1Njcm9sbGluZ05vZGUpOworICAgIGNvbnN0ZXhwciBPcHRp b25TZXQ8UHJvcGVydHk+IG5vZGVQcm9wZXJ0aWVzID0geyBQcm9wZXJ0eTo6T3ZlcmZsb3dTY3Jv bGxpbmdOb2RlIH07CiAKLSAgICBTY3JvbGxpbmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hhbmdl c0FmdGVyUmVhdHRhY2goKTsKKyAgICBhdXRvIHByb3BlcnRpZXMgPSBTY3JvbGxpbmdTdGF0ZU5v ZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzKCk7CisgICAgcHJvcGVydGllcy5hZGQobm9kZVByb3Bl cnRpZXMpOworICAgIHJldHVybiBwcm9wZXJ0aWVzOwogfQogCisKIHZvaWQgU2Nyb2xsaW5nU3Rh dGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6c2V0T3ZlcmZsb3dTY3JvbGxpbmdOb2RlKFNjcm9s bGluZ05vZGVJRCBub2RlSUQpCiB7CiAgICAgaWYgKG5vZGVJRCA9PSBtX292ZXJmbG93U2Nyb2xs aW5nTm9kZUlEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5oCmluZGV4 IDc3ZmNlM2M3ODc5YjUxZDJjY2FmMTAzYjM1ZWM3ZDk0MjY2OTBhNzQuLmJhZjdkODIxMzE0OWMy ZDlkMGE1YjRmODM3MmVmYzY2MjllYjZjMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Ny b2xsUHJveHlOb2RlLmgKQEAgLTQzLDE0ICs0MywxMyBAQCBwdWJsaWM6CiAgICAgU2Nyb2xsaW5n Tm9kZUlEIG92ZXJmbG93U2Nyb2xsaW5nTm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fb3ZlcmZsb3dT Y3JvbGxpbmdOb2RlSUQ7IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldE92ZXJmbG93U2Ny b2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQpOwogCi0gICAgdm9pZCBkdW1wUHJvcGVydGllcyhX VEY6OlRleHRTdHJlYW0mLCBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvcikgY29uc3Qg b3ZlcnJpZGU7Ci0KIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFBy b3h5Tm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUmLCBTY3JvbGxpbmdOb2RlSUQpOwogICAgIFNjcm9s bGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUoY29uc3QgU2Nyb2xsaW5nU3RhdGVPdmVy Zmxvd1Njcm9sbFByb3h5Tm9kZSYsIFNjcm9sbGluZ1N0YXRlVHJlZSYpOwogCi0gICAgdm9pZCBz ZXRQcm9wZXJ0eUNoYW5nZXNBZnRlclJlYXR0YWNoKCkgb3ZlcnJpZGU7Ci0gICAgCisgICAgdm9p ZCBkdW1wUHJvcGVydGllcyhXVEY6OlRleHRTdHJlYW0mLCBTY3JvbGxpbmdTdGF0ZVRyZWVBc1Rl eHRCZWhhdmlvcikgY29uc3QgZmluYWw7CisgICAgT3B0aW9uU2V0PFNjcm9sbGluZ1N0YXRlTm9k ZTo6UHJvcGVydHk+IGFwcGxpY2FibGVQcm9wZXJ0aWVzKCkgY29uc3QgZmluYWw7CisKICAgICBT Y3JvbGxpbmdOb2RlSUQgbV9vdmVyZmxvd1Njcm9sbGluZ05vZGVJRCB7IDAgfTsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlUG9z aXRpb25lZE5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVQb3NpdGlvbmVkTm9kZS5jcHAKaW5kZXggZGNkNThhOTk4NzA4NDEyODc3YWMxNzVjNGNl YmVmZGQwNjFlYzgzZS4uMWQwYTEzMDMxYWIyMjk1Y2JhZTU1ZmQxMzUyYTNlYjBlZmU5MDM5NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVQ b3NpdGlvbmVkTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVQb3NpdGlvbmVkTm9kZS5jcHAKQEAgLTU5LDExICs1OSwxMyBAQCBSZWY8U2Ny b2xsaW5nU3RhdGVOb2RlPiBTY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2RlOjpjbG9uZShTY3Jv bGxpbmdTdGF0ZVRyZWUmCiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU2Nyb2xsaW5nU3RhdGVQ b3NpdGlvbmVkTm9kZSgqdGhpcywgYWRvcHRpdmVUcmVlKSk7CiB9CiAKLXZvaWQgU2Nyb2xsaW5n U3RhdGVQb3NpdGlvbmVkTm9kZTo6c2V0UHJvcGVydHlDaGFuZ2VzQWZ0ZXJSZWF0dGFjaCgpCitP cHRpb25TZXQ8U2Nyb2xsaW5nU3RhdGVOb2RlOjpQcm9wZXJ0eT4gU2Nyb2xsaW5nU3RhdGVQb3Np dGlvbmVkTm9kZTo6YXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25zdAogewotICAgIHNldFByb3Bl cnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpSZWxhdGVkT3ZlcmZsb3dTY3JvbGxpbmdOb2Rl cyk7Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkxheW91dENvbnN0 cmFpbnREYXRhKTsKLSAgICBTY3JvbGxpbmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0Fm dGVyUmVhdHRhY2goKTsKKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0PFByb3BlcnR5PiBub2RlUHJv cGVydGllcyA9IHsgUHJvcGVydHk6OlJlbGF0ZWRPdmVyZmxvd1Njcm9sbGluZ05vZGVzLCBQcm9w ZXJ0eTo6TGF5b3V0Q29uc3RyYWludERhdGEgfTsKKworICAgIGF1dG8gcHJvcGVydGllcyA9IFNj cm9sbGluZ1N0YXRlTm9kZTo6YXBwbGljYWJsZVByb3BlcnRpZXMoKTsKKyAgICBwcm9wZXJ0aWVz LmFkZChub2RlUHJvcGVydGllcyk7CisgICAgcmV0dXJuIHByb3BlcnRpZXM7CiB9CiAKIHZvaWQg U2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVkTm9kZTo6c2V0UmVsYXRlZE92ZXJmbG93U2Nyb2xsaW5n Tm9kZXMoVmVjdG9yPFNjcm9sbGluZ05vZGVJRD4mJiBub2RlcykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5v ZGUuaAppbmRleCAzOGU0YjM4ZWEzODdlODQ1MTdhZmQ3ZWRmOGI1ZWRiZjA2ZThjMTc0Li5iM2Nk NzdkYTljNGVkNTk0NzczZjQ5OTFkYzI3ODkyOTYyYzA4YTE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2RlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVk Tm9kZS5oCkBAIC01Niw5ICs1Niw4IEBAIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nU3RhdGVQb3Np dGlvbmVkTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUmLCBTY3JvbGxpbmdOb2RlSUQpOwogICAgIFNj cm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUoY29uc3QgU2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVk Tm9kZSYsIFNjcm9sbGluZ1N0YXRlVHJlZSYpOwogCi0gICAgdm9pZCBzZXRQcm9wZXJ0eUNoYW5n ZXNBZnRlclJlYXR0YWNoKCkgb3ZlcnJpZGU7Ci0KLSAgICB2b2lkIGR1bXBQcm9wZXJ0aWVzKFdU Rjo6VGV4dFN0cmVhbSYsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdCBv dmVycmlkZTsKKyAgICB2b2lkIGR1bXBQcm9wZXJ0aWVzKFdURjo6VGV4dFN0cmVhbSYsIFNjcm9s bGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdCBmaW5hbDsKKyAgICBPcHRpb25TZXQ8 U2Nyb2xsaW5nU3RhdGVOb2RlOjpQcm9wZXJ0eT4gYXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25z dCBmaW5hbDsKIAogICAgIFZlY3RvcjxTY3JvbGxpbmdOb2RlSUQ+IG1fcmVsYXRlZE92ZXJmbG93 U2Nyb2xsaW5nTm9kZXM7CiAgICAgQWJzb2x1dGVQb3NpdGlvbkNvbnN0cmFpbnRzIG1fY29uc3Ry YWludHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCA5NGYwNjdkNjFiZGQyZmY3MGYx YTkwM2RkNzk3MWNkMGViZTQ2NTVlLi4yZDY4NmRlZTYzNjA5NGZiMjg5Zjc3NmQzMTAwZmI4N2I3 NWRiMTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTgwLDMzICs4MCwzOCBAQCBT Y3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6On5TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUo KQogICAgIHNjcm9sbGluZ1N0YXRlVHJlZSgpLnNjcm9sbGluZ05vZGVSZW1vdmVkKCk7CiB9CiAK LXZvaWQgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpzZXRQcm9wZXJ0eUNoYW5nZXNBZnRl clJlYXR0YWNoKCkKK09wdGlvblNldDxTY3JvbGxpbmdTdGF0ZU5vZGU6OlByb3BlcnR5PiBTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OmFwcGxpY2FibGVQcm9wZXJ0aWVzKCkgY29uc3QKIHsK LSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6U2Nyb2xsYWJsZUFyZWFT aXplKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6VG90YWxDb250 ZW50c1NpemUpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpSZWFj aGFibGVDb250ZW50c1NpemUpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3Bl cnR5OjpTY3JvbGxQb3NpdGlvbik7Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJv cGVydHk6OlNjcm9sbE9yaWdpbik7Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJv cGVydHk6OlNjcm9sbGFibGVBcmVhUGFyYW1zKTsKKyAgICAvLyBOb3RlIHRoYXQgdGhpcyBsaXN0 IGRvZXMgbm90IGluY2x1ZGUgUHJvcGVydHk6OlJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uLCB3aGlj aCBpcyBpbXBlcmF0aXZlLCBub3Qgc3RhdGVmdWwuCisgICAgY29uc3RleHByIE9wdGlvblNldDxQ cm9wZXJ0eT4gbm9kZVByb3BlcnRpZXMgPSB7CisgICAgICAgIFByb3BlcnR5OjpTY3JvbGxhYmxl QXJlYVNpemUsCisgICAgICAgIFByb3BlcnR5OjpUb3RhbENvbnRlbnRzU2l6ZSwKKyAgICAgICAg UHJvcGVydHk6OlJlYWNoYWJsZUNvbnRlbnRzU2l6ZSwKKyAgICAgICAgUHJvcGVydHk6OlNjcm9s bFBvc2l0aW9uLAorICAgICAgICBQcm9wZXJ0eTo6U2Nyb2xsT3JpZ2luLAorICAgICAgICBQcm9w ZXJ0eTo6U2Nyb2xsYWJsZUFyZWFQYXJhbXMsCiAjaWYgRU5BQkxFKFNDUk9MTElOR19USFJFQUQp Ci0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OlJlYXNvbnNGb3JTeW5j aHJvbm91c1Njcm9sbGluZyk7CisgICAgICAgIFByb3BlcnR5OjpSZWFzb25zRm9yU3luY2hyb25v dXNTY3JvbGxpbmcsCiAjZW5kaWYKICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQotICAgIHNl dFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpIb3Jpem9udGFsU25hcE9mZnNldHMp OwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpWZXJ0aWNhbFNuYXBP ZmZzZXRzKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6SG9yaXpv bnRhbFNuYXBPZmZzZXRSYW5nZXMpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFBy b3BlcnR5OjpWZXJ0aWNhbFNuYXBPZmZzZXRSYW5nZXMpOwotICAgIHNldFByb3BlcnR5Q2hhbmdl ZEludGVybmFsKFByb3BlcnR5OjpDdXJyZW50SG9yaXpvbnRhbFNuYXBPZmZzZXRJbmRleCk7Ci0g ICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OkN1cnJlbnRWZXJ0aWNhbFNu YXBPZmZzZXRJbmRleCk7CisgICAgICAgIFByb3BlcnR5OjpIb3Jpem9udGFsU25hcE9mZnNldHMs CisgICAgICAgIFByb3BlcnR5OjpWZXJ0aWNhbFNuYXBPZmZzZXRzLAorICAgICAgICBQcm9wZXJ0 eTo6SG9yaXpvbnRhbFNuYXBPZmZzZXRSYW5nZXMsCisgICAgICAgIFByb3BlcnR5OjpWZXJ0aWNh bFNuYXBPZmZzZXRSYW5nZXMsCisgICAgICAgIFByb3BlcnR5OjpDdXJyZW50SG9yaXpvbnRhbFNu YXBPZmZzZXRJbmRleCwKKyAgICAgICAgUHJvcGVydHk6OkN1cnJlbnRWZXJ0aWNhbFNuYXBPZmZz ZXRJbmRleCwKKyAgICAgICAgUHJvcGVydHk6OklzTW9uaXRvcmluZ1doZWVsRXZlbnRzLAogI2Vu ZGlmCi0gICAgc2V0UHJvcGVydHlDaGFuZ2VkSW50ZXJuYWwoUHJvcGVydHk6OklzTW9uaXRvcmlu Z1doZWVsRXZlbnRzKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6 U2Nyb2xsQ29udGFpbmVyTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFBy b3BlcnR5OjpTY3JvbGxlZENvbnRlbnRzTGF5ZXIpOwotICAgIHNldFByb3BlcnR5Q2hhbmdlZElu dGVybmFsKFByb3BlcnR5OjpIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIpOwotICAgIHNldFByb3Bl cnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpWZXJ0aWNhbFNjcm9sbGJhckxheWVyKTsKLSAg ICBzZXRQcm9wZXJ0eUNoYW5nZWRJbnRlcm5hbChQcm9wZXJ0eTo6UGFpbnRlckZvclNjcm9sbGJh cik7Ci0KLSAgICBTY3JvbGxpbmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVh dHRhY2goKTsKKyAgICAgICAgUHJvcGVydHk6OlNjcm9sbENvbnRhaW5lckxheWVyLAorICAgICAg ICBQcm9wZXJ0eTo6U2Nyb2xsZWRDb250ZW50c0xheWVyLAorICAgICAgICBQcm9wZXJ0eTo6SG9y aXpvbnRhbFNjcm9sbGJhckxheWVyLAorICAgICAgICBQcm9wZXJ0eTo6VmVydGljYWxTY3JvbGxi YXJMYXllciwKKyAgICAgICAgUHJvcGVydHk6OlBhaW50ZXJGb3JTY3JvbGxiYXIKKyAgICB9Owor CisgICAgYXV0byBwcm9wZXJ0aWVzID0gU2Nyb2xsaW5nU3RhdGVOb2RlOjphcHBsaWNhYmxlUHJv cGVydGllcygpOworICAgIHByb3BlcnRpZXMuYWRkKG5vZGVQcm9wZXJ0aWVzKTsKKyAgICByZXR1 cm4gcHJvcGVydGllczsKIH0KIAogdm9pZCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNl dFNjcm9sbGFibGVBcmVhU2l6ZShjb25zdCBGbG9hdFNpemUmIHNpemUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5n Tm9kZS5oCmluZGV4IDU1OWI2OWI0NGI5NjVlN2JjNzBhMjRlMjczMTUzNjhhNTExNGZjMzguLjQw OWFlOWQ5YWU2NzkwM2VmNmJhYTI5ZjViZDI3NGU0YzNkYjE0NWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5n Tm9kZS5oCkBAIC0xMjgsOCArMTI4LDcgQEAgcHJvdGVjdGVkOgogICAgIFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUmLCBTY3JvbGxpbmdOb2RlVHlwZSwgU2Ny b2xsaW5nTm9kZUlEKTsKICAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoY29uc3QgU2Ny b2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlJiwgU2Nyb2xsaW5nU3RhdGVUcmVlJik7CiAKLSAgICB2 b2lkIHNldFByb3BlcnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2goKSBvdmVycmlkZTsKLQorICAgIE9w dGlvblNldDxQcm9wZXJ0eT4gYXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25zdCBvdmVycmlkZTsK ICAgICB2b2lkIGR1bXBQcm9wZXJ0aWVzKFdURjo6VGV4dFN0cmVhbSYsIFNjcm9sbGluZ1N0YXRl VHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdCBvdmVycmlkZTsKIAogcHJpdmF0ZToKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9k ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNr eU5vZGUuY3BwCmluZGV4IDA2ODA5YmFhNWFjNzdjYTQ1MGRkYjdlMTA2NmM1YTg2MjFkN2RlMzUu Ljg0M2U2YTQyMGUwNGNlNmE4Y2JlMzJjMjQwNDk5ZWNhNjI1MjA1NzAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTdGlja3lO b2RlLmNwcApAQCAtNjMsMTAgKzYzLDEzIEBAIFJlZjxTY3JvbGxpbmdTdGF0ZU5vZGU+IFNjcm9s bGluZ1N0YXRlU3RpY2t5Tm9kZTo6Y2xvbmUoU2Nyb2xsaW5nU3RhdGVUcmVlJiBhZG9wCiAgICAg cmV0dXJuIGFkb3B0UmVmKCpuZXcgU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlKCp0aGlzLCBhZG9w dGl2ZVRyZWUpKTsKIH0KIAotdm9pZCBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OnNldFByb3Bl cnR5Q2hhbmdlc0FmdGVyUmVhdHRhY2goKQorT3B0aW9uU2V0PFNjcm9sbGluZ1N0YXRlTm9kZTo6 UHJvcGVydHk+IFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZTo6YXBwbGljYWJsZVByb3BlcnRpZXMo KSBjb25zdAogewotICAgIHNldFByb3BlcnR5Q2hhbmdlZEludGVybmFsKFByb3BlcnR5OjpWaWV3 cG9ydENvbnN0cmFpbnRzKTsKLSAgICBTY3JvbGxpbmdTdGF0ZU5vZGU6OnNldFByb3BlcnR5Q2hh bmdlc0FmdGVyUmVhdHRhY2goKTsKKyAgICBjb25zdGV4cHIgT3B0aW9uU2V0PFByb3BlcnR5PiBu b2RlUHJvcGVydGllcyA9IHsgUHJvcGVydHk6OlZpZXdwb3J0Q29uc3RyYWludHMgfTsKKworICAg IGF1dG8gcHJvcGVydGllcyA9IFNjcm9sbGluZ1N0YXRlTm9kZTo6YXBwbGljYWJsZVByb3BlcnRp ZXMoKTsKKyAgICBwcm9wZXJ0aWVzLmFkZChub2RlUHJvcGVydGllcyk7CisgICAgcmV0dXJuIHBy b3BlcnRpZXM7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlOjp1cGRhdGVDb25z dHJhaW50cyhjb25zdCBTdGlja3lQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMmIGNvbnN0cmFp bnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVTdGlja3lOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZVN0aWNreU5vZGUuaAppbmRleCA1MzRlY2FhNGY5OWUxNDU3ZWJkOGY2ZjZkZTVlMTll MWQzNjg4ZTQzLi44NzJjMDhiNmJmYzVlZGQyZmFhMWEzYzQ2YmUwNmE5OTU0MWY4MDMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNr eU5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0 ZVN0aWNreU5vZGUuaApAQCAtNTEsMTIgKzUxLDExIEBAIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5n U3RhdGVTdGlja3lOb2RlKFNjcm9sbGluZ1N0YXRlVHJlZSYsIFNjcm9sbGluZ05vZGVJRCk7CiAg ICAgU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlKGNvbnN0IFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9k ZSYsIFNjcm9sbGluZ1N0YXRlVHJlZSYpOwogCi0gICAgdm9pZCBzZXRQcm9wZXJ0eUNoYW5nZXNB ZnRlclJlYXR0YWNoKCkgb3ZlcnJpZGU7Ci0KICAgICBGbG9hdFBvaW50IGNvbXB1dGVMYXllclBv c2l0aW9uKGNvbnN0IExheW91dFJlY3QmIHZpZXdwb3J0UmVjdCkgY29uc3Q7Ci0gICAgdm9pZCBy ZWNvbmNpbGVMYXllclBvc2l0aW9uRm9yVmlld3BvcnRSZWN0KGNvbnN0IExheW91dFJlY3QmIHZp ZXdwb3J0UmVjdCwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgb3ZlcnJpZGU7CisgICAg dm9pZCByZWNvbmNpbGVMYXllclBvc2l0aW9uRm9yVmlld3BvcnRSZWN0KGNvbnN0IExheW91dFJl Y3QmIHZpZXdwb3J0UmVjdCwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgZmluYWw7CiAK LSAgICB2b2lkIGR1bXBQcm9wZXJ0aWVzKFdURjo6VGV4dFN0cmVhbSYsIFNjcm9sbGluZ1N0YXRl VHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdCBvdmVycmlkZTsKKyAgICB2b2lkIGR1bXBQcm9wZXJ0 aWVzKFdURjo6VGV4dFN0cmVhbSYsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBj b25zdCBmaW5hbDsKKyAgICBPcHRpb25TZXQ8U2Nyb2xsaW5nU3RhdGVOb2RlOjpQcm9wZXJ0eT4g YXBwbGljYWJsZVByb3BlcnRpZXMoKSBjb25zdCBmaW5hbDsKIAogICAgIFN0aWNreVBvc2l0aW9u Vmlld3BvcnRDb25zdHJhaW50cyBtX2NvbnN0cmFpbnRzOwogfTsK