139636 2014-12-14 21:18:31 -0800 Change HysteresisActivity to use a lambda 2014-12-15 11:37:04 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1055557 0 barraclough 2014-12-14 21:18:31 -0800 The current implementation provides notifications via callbacks to a delegate. Using a delegate with callbacks is limiting a number of ways. The callback names are very ambiguous, the callbacks must either be on a separate object (more boilerplate), or the callback must be public for HysteresisActivity to call them, or friends get involved. Without the boilerplate of extra delegate objects it's hard to scale use of these objects – a single object can't serve as a delegate for multiple HysteresisActivity members. 1055561 1 243282 barraclough 2014-12-14 22:02:52 -0800 Created attachment 243282 Fix 1055681 2 barraclough 2014-12-15 11:37:04 -0800 Transmitting file data .......... Committed revision 177295. 243282 2014-12-14 22:02:52 -0800 2014-12-15 09:26:36 -0800 Fix 139636.1.patch text/plain 13547 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzI3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUxIEBACisyMDE0LTEyLTE0ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBDaGFuZ2UgSHlz dGVyZXNpc0FjdGl2aXR5IHRvIHVzZSBhIGxhbWJkYQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NjM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gcHJvdmlk ZXMgbm90aWZpY2F0aW9ucyB2aWEgY2FsbGJhY2tzIHRvIGEgZGVsZWdhdGUuIFVzaW5nIGEgZGVs ZWdhdGUKKyAgICAgICAgd2l0aCBjYWxsYmFja3MgaXMgbGltaXRpbmcgYSBudW1iZXIgb2Ygd2F5 cy4gVGhlIGNhbGxiYWNrIG5hbWVzIGFyZSB2ZXJ5IGFtYmlndW91cywgdGhlIGNhbGxiYWNrcwor ICAgICAgICBtdXN0IGVpdGhlciBiZSBvbiBhIHNlcGFyYXRlIG9iamVjdCAobW9yZSBib2lsZXJw bGF0ZSksIG9yIHRoZSBjYWxsYmFjayBtdXN0IGJlIHB1YmxpYyBmb3IKKyAgICAgICAgSHlzdGVy ZXNpc0FjdGl2aXR5IHRvIGNhbGwgdGhlbSwgb3IgZnJpZW5kcyBnZXQgaW52b2x2ZWQuIFdpdGhv dXQgdGhlIGJvaWxlcnBsYXRlIG9mIGV4dHJhCisgICAgICAgIGRlbGVnYXRlIG9iamVjdHMgaXQn cyBoYXJkIHRvIHNjYWxlIHVzZSBvZiB0aGVzZSBvYmplY3RzIOKAk8KgYSBzaW5nbGUgb2JqZWN0 IGNhbid0IHNlcnZlIGFzIGEKKyAgICAgICAgZGVsZWdhdGUgZm9yIG11bHRpcGxlIEh5c3RlcmVz aXNBY3Rpdml0eSBtZW1iZXJzLgorCisgICAgICAgIEluc3RlYWQsIG1ha2UgSHlzdGVyZXNpc0Fj dGl2aXR5IHRha2UgYSBsYW1iZGEgdG8gY2FsbGJhY2sgb24gc3RhdGUgY2hhbmdlLiBUbyBzaW1w bGlmeSwgY2hhbmdlZAorICAgICAgICBIeXN0ZXJlc2lzU3RhdGUgdG8gb25seSB0cmFjayBTdGFy dGVkL1N0b3BwZWQgc3RhdGVzIChyZW1vdmVkIFdpbGxTdG9wUGVuZGluZ1RpbWVvdXQpLgorCisg ICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICAgICAtIHJlbW92ZWQgZXhwb3J0cyBv ZiBkZWxldGVkIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBwYWdlL1BhZ2VUaHJvdHRsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6UGFnZVRocm90dGxlcik6CisgICAgICAg ICAgICAtIG1faHlzdGVyZXNpcyBsYW1iZGEgY2FsbHMgdXBkYXRlVXNlckFjdGl2aXR5LgorICAg ICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6cGFnZUFjdGl2aXR5Q291bnRlclZhbHVlRGlk Q2hhbmdlKToKKyAgICAgICAgICAgIC0gQVNTRVJUIHVwZGF0ZWQgZHVlIHRvIHJlbW92YWwgb2Yg V2lsbFN0b3BQZW5kaW5nVGltZW91dCBzdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJv dHRsZXI6OnN0YXJ0ZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxl cjo6c3RvcHBlZCk6IERlbGV0ZWQuCisgICAgICAgICAgICAtIGZ1bmN0aW9uYWxpdHkgcmVwbGFj ZWQgYnkgbGFtYmRhLgorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5oOgorICAgICAgICAg ICAgLSBIeXN0ZXJlc2lzQWN0aXZpdHkgaXMgbm8gbG9uZ2VyIHRlbXBsYXRlZCBvbiBkZWxlZ2F0 ZSB0eXBlLCByZW1vdmVkIGZ1bmN0aW9uIGRlY2xhcmF0aW9ucyAmIGZyaWVuZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9IeXN0ZXJlc2lzQWN0aXZpdHkuaDoKKyAgICAgICAgKFdlYkNvcmU6Okh5c3Rl cmVzaXNBY3Rpdml0eTo6SHlzdGVyZXNpc0FjdGl2aXR5KToKKyAgICAgICAgICAgIC0gSHlzdGVy ZXNpc0FjdGl2aXR5IHRha2VzIGEgbGFtYmRhLCBub3QgYSBkZWxlZ2F0ZS4KKyAgICAgICAgKFdl YkNvcmU6Okh5c3RlcmVzaXNBY3Rpdml0eTo6c3RhcnQpOgorICAgICAgICAgICAgLSBkZWxlZ2F0 ZSBjYWxsIC0+IGNhbGxiYWNrLgorICAgICAgICAoV2ViQ29yZTo6SHlzdGVyZXNpc0FjdGl2aXR5 OjpzdGF0ZSk6CisgICAgICAgICAgICAtIHNpbXBsaWZpZWQgdG8gcmVtb3ZlIFdpbGxTdG9wUGVu ZGluZ1RpbWVvdXQuCisgICAgICAgIChXZWJDb3JlOjpIeXN0ZXJlc2lzQWN0aXZpdHk6Omh5c3Rl cmVzaXNUaW1lckZpcmVkKToKKyAgICAgICAgICAgIC0gZGVsZWdhdGUgY2FsbCAtPiBjYWxsYmFj ay4KKyAgICAgICAgKiBwbGF0Zm9ybS9Vc2VyQWN0aXZpdHkuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VXNlckFjdGl2aXR5OjpVc2VyQWN0aXZpdHkpOgorICAgICAgICAgICAgLSBIeXN0ZXJlc2lz QWN0aXZpdHkgbGFtYmRhIGNhbGxzIGh5c3RlcmVzaXNVcGRhdGVkLgorICAgICAgICAoV2ViQ29y ZTo6VXNlckFjdGl2aXR5OjpoeXN0ZXJlc2lzVXBkYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpV c2VyQWN0aXZpdHk6OnN0YXJ0ZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VXNlckFj dGl2aXR5OjpzdG9wcGVkKTogRGVsZXRlZC4KKyAgICAgICAgICAgIC0gc3RhcnRlZC9zdG9wcGVk IC0+IGh5c3RlcmVzaXNVcGRhdGVkLgorICAgICAgICAqIHBsYXRmb3JtL1VzZXJBY3Rpdml0eS5o OgorICAgICAgICAgICAgLSBzdGFydGVkL3N0b3BwZWQgLT4gaHlzdGVyZXNpc1VwZGF0ZWQsIHJl bW92ZWQgZnJpZW5kLgorCiAyMDE0LTEyLTE0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTc3MjM4IGFu ZCByMTc3MjQ0LgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE3NzI1NSkKKysr IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0yNzAsNyAr MjcwLDYgQEAgX19aTjdXZWJDb3JlMTJUZXh0SXRlcmF0b3I4c3VicmFuZ2VFUE5TXwogX19aTjdX ZWJDb3JlMTJUZXh0SXRlcmF0b3JDMUVQS05TXzVSYW5nZUV0CiBfX1pON1dlYkNvcmUxMlRleHRJ dGVyYXRvckQxRXYKIF9fWk43V2ViQ29yZTEyVVRGOEVuY29kaW5nRXYKLV9fWk43V2ViQ29yZTEy VXNlckFjdGl2aXR5N3N0YXJ0ZWRFdgogX19aTjdXZWJDb3JlMTJVc2VyQWN0aXZpdHlDMUVQS2MK IF9fWk43V2ViQ29yZTEyV29ya2VyVGhyZWFkMTd3b3JrZXJUaHJlYWRDb3VudEV2CiBfX1pON1dl YkNvcmUxMmJsb2JSZWdpc3RyeUV2CkBAIC0zMjksNyArMzI4LDYgQEAgX19aTjdXZWJDb3JlMTNL ZXlib2FyZEV2ZW50QzFFdgogX19aTjdXZWJDb3JlMTNOb2RlVHJhdmVyc2FsMTNkZWVwTGFzdENo aWxkRVBOU180Tm9kZUUKIF9fWk43V2ViQ29yZTEzTm9kZVRyYXZlcnNhbDE5bmV4dEFuY2VzdG9y U2libGluZ0VQS05TXzROb2RlRQogX19aTjdXZWJDb3JlMTNOb2RlVHJhdmVyc2FsMTluZXh0QW5j ZXN0b3JTaWJsaW5nRVBLTlNfNE5vZGVFUzNfCi1fX1pON1dlYkNvcmUxM1BhZ2VUaHJvdHRsZXI3 c3RhcnRlZEV2CiBfX1pON1dlYkNvcmUxM1Jlc291cmNlRXJyb3JDMUVQN05TRXJyb3IKIF9fWk43 V2ViQ29yZTEzUmVzb3VyY2VFcnJvckMxRVA5X19DRkVycm9yCiBfX1pON1dlYkNvcmUxM1NRTFJl c3VsdERvbmVFCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHJldmlz aW9uIDE3NzI1NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBQYWdl VGhyb3R0bGVyOjpQYWdlVGhyb3R0bGVyKFZpZXdTdGF0ZTo6RmxhZ3Mgdmlld1N0YXRlKQogICAg IDogbV92aWV3U3RhdGUodmlld1N0YXRlKQotICAgICwgbV9oeXN0ZXJlc2lzKCp0aGlzKQorICAg ICwgbV9oeXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUpIHsgdXBkYXRlVXNlckFjdGl2 aXR5KCk7IH0pCiAgICAgLCBtX3BhZ2VBY3Rpdml0eUNvdW50ZXIoW3RoaXNdKCkgeyBwYWdlQWN0 aXZpdHlDb3VudGVyVmFsdWVEaWRDaGFuZ2UoKTsgfSkKIHsKICAgICB1cGRhdGVVc2VyQWN0aXZp dHkoKTsKQEAgLTYwLDggKzYwLDggQEAgdm9pZCBQYWdlVGhyb3R0bGVyOjpwYWdlQWN0aXZpdHlD b3VudGVyVgogICAgIGVsc2UKICAgICAgICAgbV9oeXN0ZXJlc2lzLnN0b3AoKTsKIAotICAgIC8v IElmIHRoZSBjb3VudGVyIGlzIG5vbnplcm8sIHN0YXRlIG11c3QgYmUgU3RhcnRlZDsgaWYgdGhl IGNvdW50ZXIgaXMgemVybywgc3RhdGUgbWF5IGJlIFdhaXRpbmcgb3IgU3RvcHBlZC4KLSAgICBB U1NFUlQoISFtX3BhZ2VBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSA9PSAobV9oeXN0ZXJlc2lzLnN0 YXRlKCkgPT0gSHlzdGVyZXNpc1N0YXRlOjpTdGFydGVkKSk7CisgICAgLy8gSWYgdGhlIGNvdW50 ZXIgaXMgbm9uemVybywgc3RhdGUgY2Fubm90IGJlIFN0b3BwZWQuCisgICAgQVNTRVJUKCEobV9w YWdlQWN0aXZpdHlDb3VudGVyLnZhbHVlKCkgJiYgbV9oeXN0ZXJlc2lzLnN0YXRlKCkgPT0gSHlz dGVyZXNpc1N0YXRlOjpTdG9wcGVkKSk7CiB9CiAKIHZvaWQgUGFnZVRocm90dGxlcjo6dXBkYXRl VXNlckFjdGl2aXR5KCkKQEAgLTg1LDE0ICs4NSw0IEBAIHZvaWQgUGFnZVRocm90dGxlcjo6c2V0 Vmlld1N0YXRlKFZpZXdTdGEKICAgICAgICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7CiB9CiAKLXZv aWQgUGFnZVRocm90dGxlcjo6c3RhcnRlZCgpCi17Ci0gICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7 Ci19Ci0KLXZvaWQgUGFnZVRocm90dGxlcjo6c3RvcHBlZCgpCi17Ci0gICAgdXBkYXRlVXNlckFj dGl2aXR5KCk7Ci19Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCShy ZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAko d29ya2luZyBjb3B5KQpAQCAtNTEsMTUgKzUxLDEwIEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAg ICB2b2lkIHBhZ2VBY3Rpdml0eUNvdW50ZXJWYWx1ZURpZENoYW5nZSgpOwotCiAgICAgdm9pZCB1 cGRhdGVVc2VyQWN0aXZpdHkoKTsKIAotICAgIGZyaWVuZCBjbGFzcyBIeXN0ZXJlc2lzQWN0aXZp dHk8UGFnZVRocm90dGxlcj47Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdGFydGVkKCk7Ci0g ICAgdm9pZCBzdG9wcGVkKCk7Ci0KICAgICBWaWV3U3RhdGU6OkZsYWdzIG1fdmlld1N0YXRlOwot ICAgIEh5c3RlcmVzaXNBY3Rpdml0eTxQYWdlVGhyb3R0bGVyPiBtX2h5c3RlcmVzaXM7CisgICAg SHlzdGVyZXNpc0FjdGl2aXR5IG1faHlzdGVyZXNpczsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VXNl ckFjdGl2aXR5OjpJbXBsPiBtX2FjdGl2aXR5OwogICAgIFJlZkNvdW50ZXIgbV9wYWdlQWN0aXZp dHlDb3VudGVyOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0h5c3RlcmVzaXNB Y3Rpdml0eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0h5c3RlcmVz aXNBY3Rpdml0eS5oCShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9IeXN0ZXJlc2lzQWN0aXZpdHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsMTggKzM0LDE2IEBA IHN0YXRpYyBjb25zdCBkb3VibGUgRGVmYXVsdEh5c3RlcmVzaXNTZWMKIAogZW51bSBjbGFzcyBI eXN0ZXJlc2lzU3RhdGUgewogICAgIFN0YXJ0ZWQsCi0gICAgV2lsbFN0b3BQZW5kaW5nVGltZW91 dCwKICAgICBTdG9wcGVkCiB9OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBEZWxlZ2F0ZT4KIGNsYXNz IEh5c3RlcmVzaXNBY3Rpdml0eSB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgSHlzdGVyZXNpc0Fj dGl2aXR5KERlbGVnYXRlJiBkZWxlZ2F0ZSwgZG91YmxlIGh5c3RlcmVzaXNTZWNvbmRzID0gRGVm YXVsdEh5c3RlcmVzaXNTZWNvbmRzKQotICAgICAgICA6IG1fZGVsZWdhdGUoZGVsZWdhdGUpCisg ICAgZXhwbGljaXQgSHlzdGVyZXNpc0FjdGl2aXR5KHN0ZDo6ZnVuY3Rpb248dm9pZChIeXN0ZXJl c2lzU3RhdGUpPiBjYWxsYmFjayA9IFtdKEh5c3RlcmVzaXNTdGF0ZSkgeyB9LCBkb3VibGUgaHlz dGVyZXNpc1NlY29uZHMgPSBEZWZhdWx0SHlzdGVyZXNpc1NlY29uZHMpCisgICAgICAgIDogbV9j YWxsYmFjayhjYWxsYmFjaykKICAgICAgICAgLCBtX2h5c3RlcmVzaXNTZWNvbmRzKGh5c3RlcmVz aXNTZWNvbmRzKQogICAgICAgICAsIG1fYWN0aXZlKGZhbHNlKQotICAgICAgICAsIG1fdGltZXIo KnRoaXMsICZIeXN0ZXJlc2lzQWN0aXZpdHk8RGVsZWdhdGU+OjpoeXN0ZXJlc2lzVGltZXJGaXJl ZCkKKyAgICAgICAgLCBtX3RpbWVyKCp0aGlzLCAmSHlzdGVyZXNpc0FjdGl2aXR5OjpoeXN0ZXJl c2lzVGltZXJGaXJlZCkKICAgICB7CiAgICAgfQogCkBAIC01OCw3ICs1Niw3IEBAIHB1YmxpYzoK ICAgICAgICAgaWYgKG1fdGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgICAgIG1fdGltZXIuc3Rv cCgpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2RlbGVnYXRlLnN0YXJ0ZWQoKTsKKyAg ICAgICAgICAgIG1fY2FsbGJhY2soSHlzdGVyZXNpc1N0YXRlOjpTdGFydGVkKTsKICAgICB9CiAK ICAgICB2b2lkIHN0b3AoKQpAQCAtODAsMjEgKzc4LDE3IEBAIHB1YmxpYzoKIAogICAgIEh5c3Rl cmVzaXNTdGF0ZSBzdGF0ZSgpIGNvbnN0CiAgICAgewotICAgICAgICBpZiAobV9hY3RpdmUpCi0g ICAgICAgICAgICByZXR1cm4gSHlzdGVyZXNpc1N0YXRlOjpTdGFydGVkOwotICAgICAgICBpZiAo bV90aW1lci5pc0FjdGl2ZSgpKQotICAgICAgICAgICAgcmV0dXJuIEh5c3RlcmVzaXNTdGF0ZTo6 V2lsbFN0b3BQZW5kaW5nVGltZW91dDsKLSAgICAgICAgcmV0dXJuIEh5c3RlcmVzaXNTdGF0ZTo6 U3RvcHBlZDsKKyAgICAgICAgcmV0dXJuIG1fYWN0aXZlIHx8IG1fdGltZXIuaXNBY3RpdmUoKSA/ IEh5c3RlcmVzaXNTdGF0ZTo6U3RhcnRlZCA6IEh5c3RlcmVzaXNTdGF0ZTo6U3RvcHBlZDsKICAg ICB9CiAgICAgCiBwcml2YXRlOgogICAgIHZvaWQgaHlzdGVyZXNpc1RpbWVyRmlyZWQoKQogICAg IHsKLSAgICAgICAgbV9kZWxlZ2F0ZS5zdG9wcGVkKCk7CiAgICAgICAgIG1fdGltZXIuc3RvcCgp OworICAgICAgICBtX2NhbGxiYWNrKEh5c3RlcmVzaXNTdGF0ZTo6U3RvcHBlZCk7CiAgICAgfQog Ci0gICAgRGVsZWdhdGUmIG1fZGVsZWdhdGU7CisgICAgc3RkOjpmdW5jdGlvbjx2b2lkKEh5c3Rl cmVzaXNTdGF0ZSk+IG1fY2FsbGJhY2s7CiAgICAgZG91YmxlIG1faHlzdGVyZXNpc1NlY29uZHM7 CiAgICAgYm9vbCBtX2FjdGl2ZTsKICAgICBUaW1lciBtX3RpbWVyOwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vVXNlckFjdGl2aXR5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Vc2VyQWN0aXZpdHkuY3BwCShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWN0aXZpdHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NSwxOSArNDUsMTcgQEAgdm9pZCBVc2VyQWN0aXZpdHk6OkltcGw6OmVuZEFjdGl2aXR5KCkKICNl bmRpZgogCiBVc2VyQWN0aXZpdHk6OlVzZXJBY3Rpdml0eShjb25zdCBjaGFyKiBkZXNjcmlwdGlv bikKLSAgICA6IEh5c3RlcmVzaXNBY3Rpdml0eTxVc2VyQWN0aXZpdHk+KCp0aGlzKQorICAgIDog SHlzdGVyZXNpc0FjdGl2aXR5KFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUgc3RhdGUpIHsgaHlzdGVy ZXNpc1VwZGF0ZWQoc3RhdGUpOyB9KQogICAgICwgbV9pbXBsKGRlc2NyaXB0aW9uKQogewogfQog Ci12b2lkIFVzZXJBY3Rpdml0eTo6c3RhcnRlZCgpCit2b2lkIFVzZXJBY3Rpdml0eTo6aHlzdGVy ZXNpc1VwZGF0ZWQoSHlzdGVyZXNpc1N0YXRlIHN0YXRlKQogewotICAgIG1faW1wbC5iZWdpbkFj dGl2aXR5KCk7Ci19Ci0KLXZvaWQgVXNlckFjdGl2aXR5OjpzdG9wcGVkKCkKLXsKLSAgICBtX2lt cGwuZW5kQWN0aXZpdHkoKTsKKyAgICBpZiAoc3RhdGUgPT0gSHlzdGVyZXNpc1N0YXRlOjpTdGFy dGVkKQorICAgICAgICBtX2ltcGwuYmVnaW5BY3Rpdml0eSgpOworICAgIGVsc2UKKyAgICAgICAg bV9pbXBsLmVuZEFjdGl2aXR5KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBY3Rpdml0eS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBY3Rpdml0eS5oCShyZXZpc2lvbiAxNzcyNTUpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWN0aXZpdHkuaAkod29ya2luZyBjb3B5KQpA QCAtMzksNyArMzksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGUgVXNlckFjdGl2aXR5 IHR5cGUgaXMgdXNlZCB0byBpbmRpY2F0ZSB0byB0aGUgb3BlcmF0aW5nIHN5c3RlbSB0aGF0CiAv LyBhIHVzZXIgaW5pdGlhdGVkIG9yIHZpc2libGUgYWN0aW9uIGlzIHRha2luZyBwbGFjZSwgYW5k IGFzIHN1Y2ggdGhhdAogLy8gcmVzb3VyY2VzIHNob3VsZCBiZSBhbGxvY2F0ZWQgdG8gdGhlIHBy b2Nlc3MgYWNjb3JkaW5nbHkuCi1jbGFzcyBVc2VyQWN0aXZpdHkgOiBwdWJsaWMgSHlzdGVyZXNp c0FjdGl2aXR5PFVzZXJBY3Rpdml0eT4geworY2xhc3MgVXNlckFjdGl2aXR5IDogcHVibGljIEh5 c3RlcmVzaXNBY3Rpdml0eSB7CiBwdWJsaWM6CiAgICAgY2xhc3MgSW1wbCB7CiAgICAgcHVibGlj OgpAQCAtNTgsMTAgKzU4LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGV4cGxpY2l0 IFVzZXJBY3Rpdml0eShjb25zdCBjaGFyKiBkZXNjcmlwdGlvbik7CiAKIHByaXZhdGU6Ci0gICAg ZnJpZW5kIGNsYXNzIEh5c3RlcmVzaXNBY3Rpdml0eTxVc2VyQWN0aXZpdHk+OwotCi0gICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzdGFydGVkKCk7Ci0gICAgdm9pZCBzdG9wcGVkKCk7CisgICAgdm9p ZCBoeXN0ZXJlc2lzVXBkYXRlZChIeXN0ZXJlc2lzU3RhdGUpOwogCiAgICAgSW1wbCBtX2ltcGw7 CiB9OwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTc3MjcwKQorKysgU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTQtMTItMTQgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5n ZSBIeXN0ZXJlc2lzQWN0aXZpdHkgdG8gdXNlIGEgbGFtYmRhCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk2MzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBw cm92aWRlcyBub3RpZmljYXRpb25zIHZpYSBjYWxsYmFja3MgdG8gYSBkZWxlZ2F0ZS4gVXNpbmcg YSBkZWxlZ2F0ZQorICAgICAgICB3aXRoIGNhbGxiYWNrcyBpcyBsaW1pdGluZyBhIG51bWJlciBv ZiB3YXlzLiBUaGUgY2FsbGJhY2sgbmFtZXMgYXJlIHZlcnkgYW1iaWd1b3VzLCB0aGUgY2FsbGJh Y2tzCisgICAgICAgIG11c3QgZWl0aGVyIGJlIG9uIGEgc2VwYXJhdGUgb2JqZWN0IChtb3JlIGJv aWxlcnBsYXRlKSwgb3IgdGhlIGNhbGxiYWNrIG11c3QgYmUgcHVibGljIGZvcgorICAgICAgICBI eXN0ZXJlc2lzQWN0aXZpdHkgdG8gY2FsbCB0aGVtLCBvciBmcmllbmRzIGdldCBpbnZvbHZlZC4g V2l0aG91dCB0aGUgYm9pbGVycGxhdGUgb2YgZXh0cmEKKyAgICAgICAgZGVsZWdhdGUgb2JqZWN0 cyBpdCdzIGhhcmQgdG8gc2NhbGUgdXNlIG9mIHRoZXNlIG9iamVjdHMg4oCTwqBhIHNpbmdsZSBv YmplY3QgY2FuJ3Qgc2VydmUgYXMgYQorICAgICAgICBkZWxlZ2F0ZSBmb3IgbXVsdGlwbGUgSHlz dGVyZXNpc0FjdGl2aXR5IG1lbWJlcnMuCisKKyAgICAgICAgSW5zdGVhZCwgbWFrZSBIeXN0ZXJl c2lzQWN0aXZpdHkgdGFrZSBhIGxhbWJkYSB0byBjYWxsYmFjayBvbiBzdGF0ZSBjaGFuZ2UuIFRv IHNpbXBsaWZ5LCBjaGFuZ2VkCisgICAgICAgIEh5c3RlcmVzaXNTdGF0ZSB0byBvbmx5IHRyYWNr IFN0YXJ0ZWQvU3RvcHBlZCBzdGF0ZXMgKHJlbW92ZWQgV2lsbFN0b3BQZW5kaW5nVGltZW91dCku CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNRTGl0ZURhdGFiYXNl VHJhY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcjo6 V2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyKToKKyAgICAgICAgICAgIC0gSHlzdGVyZXNpc0FjdGl2 aXR5IG5vdyB0YWtlcyBhIGxhbWJkYSwgbm90IGEgZGVsZWdhdGUuCisgICAgICAgIChXZWJLaXQ6 OldlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcjo6aHlzdGVyZXNpc1VwZGF0ZWQpOgorICAgICAgICAo V2ViS2l0OjpXZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXI6OnN0YXJ0ZWQpOiBEZWxldGVkLgorICAg ICAgICAoV2ViS2l0OjpXZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXI6OnN0b3BwZWQpOiBEZWxldGVk LgorICAgICAgICAgICAgLSBzdGFydGVkL3N0b3BwZWQgbWVyZ2VkIGludG8gaHlzdGVyZXNpc1Vw ZGF0ZWQKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNRTGl0ZURhdGFi YXNlVHJhY2tlci5oOgorICAgICAgICAgICAgLSBIeXN0ZXJlc2lzQWN0aXZpdHkgaXMgbm8gbG9u Z2VyIHRlbXBsYXRlZCBvbiBkZWxlZ2F0ZSB0eXBlLCBjaGFuZ2VkIGZ1bmN0aW9uIGRlY2xhcmF0 aW9ucy4KKwogMjAxNC0xMi0xNCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmVwbGFjZSBQYXNzUmVmIHdpdGggUmVmL1JlZiYmIGFjcm9zcyB0aGUgYm9hcmQu CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNRTGl0 ZURhdGFiYXNlVHJhY2tlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXIuY3BwCShyZXZpc2lv biAxNzcyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YlNRTGl0ZURhdGFiYXNlVHJhY2tlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcg QEAgY29uc3QgY2hhciogV2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpzdQogCiBXZWJTUUxpdGVE YXRhYmFzZVRyYWNrZXI6OldlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcihXZWJQcm9jZXNzKiBwcm9j ZXNzKQogICAgIDogbV9wcm9jZXNzKHByb2Nlc3MpCi0gICAgLCBtX2h5c3RlcmVzaXMoKnRoaXMp CisgICAgLCBtX2h5c3RlcmVzaXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSBzdGF0ZSkgeyBoeXN0 ZXJlc2lzVXBkYXRlZChzdGF0ZSk7IH0pCiB7CiB9CiAKQEAgLTY3LDE0ICs2Nyw5IEBAIHZvaWQg V2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpkaWRGaW5pc2gKICAgICB9KTsKIH0KIAotdm9pZCBX ZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXI6OnN0YXJ0ZWQoKQordm9pZCBXZWJTUUxpdGVEYXRhYmFz ZVRyYWNrZXI6Omh5c3RlcmVzaXNVcGRhdGVkKEh5c3RlcmVzaXNTdGF0ZSBzdGF0ZSkKIHsKLSAg ICBtX3Byb2Nlc3MtPnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Oldl YlByb2Nlc3NQcm94eTo6U2V0SXNIb2xkaW5nTG9ja2VkRmlsZXModHJ1ZSksIDApOwotfQotCi12 b2lkIFdlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcjo6c3RvcHBlZCgpCi17Ci0gICAgbV9wcm9jZXNz LT5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJv eHk6OlNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGZhbHNlKSwgMCk7CisgICAgbV9wcm9jZXNzLT5w YXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6 OlNldElzSG9sZGluZ0xvY2tlZEZpbGVzKHN0YXRlID09IEh5c3RlcmVzaXNTdGF0ZTo6U3RhcnRl ZCksIDApOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJT UUxpdGVEYXRhYmFzZVRyYWNrZXIuaAkocmV2aXNpb24gMTc3MjU1KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXIuaAko d29ya2luZyBjb3B5KQpAQCAtNTIsMTMgKzUyLDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgZGlkRmluaXNoTGFzdFRyYW5zYWN0aW9uKCkgb3ZlcnJpZGU7CiAKIHByaXZhdGU6Ci0gICAg Ly8gV2ViQ29yZTo6SHlzdGVyZXNpc0FjdGl2aXR5Ci0gICAgZnJpZW5kIGNsYXNzIFdlYkNvcmU6 Okh5c3RlcmVzaXNBY3Rpdml0eTxXZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXI+OwotICAgIHZvaWQg c3RhcnRlZCgpOwotICAgIHZvaWQgc3RvcHBlZCgpOworICAgIHZvaWQgaHlzdGVyZXNpc1VwZGF0 ZWQoV2ViQ29yZTo6SHlzdGVyZXNpc1N0YXRlKTsKIAogICAgIFdlYlByb2Nlc3MqIG1fcHJvY2Vz czsKLSAgICBXZWJDb3JlOjpIeXN0ZXJlc2lzQWN0aXZpdHk8V2ViU1FMaXRlRGF0YWJhc2VUcmFj a2VyPiBtX2h5c3RlcmVzaXM7CisgICAgV2ViQ29yZTo6SHlzdGVyZXNpc0FjdGl2aXR5IG1faHlz dGVyZXNpczsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=