147394 2015-07-28 18:36:25 -0700 Animations sometimes fail to start 2015-07-28 19:00:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 1112992 0 simon.fraser 2015-07-28 18:36:25 -0700 Animations sometimes fail to start 1112993 1 257718 simon.fraser 2015-07-28 18:43:48 -0700 Created attachment 257718 Patch 1112995 2 257719 simon.fraser 2015-07-28 18:46:45 -0700 Created attachment 257719 Patch 1112998 3 simon.fraser 2015-07-28 19:00:00 -0700 https://trac.webkit.org/r187535 257718 2015-07-28 18:43:48 -0700 2015-07-28 18:46:57 -0700 Patch bug-147394-20150728184226.patch text/plain 14213 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3NDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjhkYTllMGI4YTVlN2Zk M2Q0MzE4NjM0ZjU3ODJlYTA1Y2QxNTE0MS4uOTI1MDRhOTE0ZTEyMWEwYWY4YzIxZDJjYzE4NWY5 OGRmN2VmY2RiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACisyMDE1LTA3LTI4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFuaW1hdGlvbnMg c29tZXRpbWVzIGZhaWwgdG8gc3RhcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzM5NAorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMTg1MjYwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gYW4g YWNjZWxlcmF0ZWQgYW5pbWF0aW9uIG9yIHRyYW5zaXRpb24gd2FzIHN0YXJ0ZWQgYXQgdGhlIHNh bWUgdGltZSBhcworICAgICAgICBhIG5vbi1hY2NlbGVyYXRlZCBvbmUsIGFuZCB0aGVuIHRoZSBu b2RlIGZvciB0aGUgZm9ybWVyIHdhcyByZW1vdmVkLCB3ZSBjb3VsZAorICAgICAgICBuZXZlciBr aWNrIG9mZiB0aGUgbm9uLWFjY2VsZXJhdGVkIGFuaW1hdGlvbi4KKyAgICAgICAgCisgICAgICAg IEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlIGhhcyBsb2dpYyB0byBzeW5jaHJvbml6ZSB0aGUg dHdvIHR5cGVzIG9mIGFuaW1hdGlvbgorICAgICAgICB3aGVuIHRoZXkgc3RhcnQgaW4gdGhlIHNh bWUgYW5pbWF0aW9uIHVwZGF0ZSwgd2hpY2ggaW52b2x2ZXMgc2V0dGluZyB0aGUKKyAgICAgICAg bV93YWl0aW5nRm9yQXN5bmNTdGFydE5vdGlmaWNhdGlvbiBmbGFnLCBhbmQgd2FpdGluZyBmb3Ig YSBub3RpZnlBbmltYXRpb25TdGFydGVkKCkKKyAgICAgICAgdG8gY29tZSBpbiBmcm9tIHRoZSBn cmFwaGljcyBzeXN0ZW0uCisgICAgICAgIAorICAgICAgICBIb3dldmVyLCBpdCBmYWlsZWQgdG8g aGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSBhY2NlbGVyYXRlZCBhbmltYXRpb24gd2FzIHJlbW92 ZWQKKyAgICAgICAgYmVmb3JlIHRoZSBjYWxsYmFjayB3YXMgcmVjZWl2ZWQsIHdoaWNoIGxlZnQg dGhlIG1fd2FpdGluZ0ZvckFzeW5jU3RhcnROb3RpZmljYXRpb24gZmxhZworICAgICAgICBzZXQg dG8gdHJ1ZSwgcHJldmVudGluZyB0aGUgbm9uLWFjY2VsZXJhdGVkIGFuaW1hdGlvbiBmcm9tIHJ1 bm5pbmcuCisgICAgICAgIAorICAgICAgICBUZXN0OiBhbmltYXRpb25zL3JlbW92ZS1zeW5jaW5n LWFuaW1hdGlvbi5odG1sCisKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNl Lmg6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25CYXNlOjppc0FjY2VsZXJhdGVkKTogTWFr ZSB0aGlzIHB1YmxpYy4KKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpj bGVhcik6IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxl clByaXZhdGU6OnJlY2VpdmVkU3RhcnRUaW1lUmVzcG9uc2UpOiBBZGQgbG9nZ2luZy4KKyAgICAg ICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjphbmltYXRpb25XaWxsQmVS ZW1vdmVkKTogQWRkIGxvZ2dpbmcuCisgICAgICAgIEFmdGVyIHJlbW92aW5nIGFuaW1hdGlvbnMg ZnJvbSB0aGUgbWFwcywgY2hlY2sgdG8gc2VlIGlmIHdlIGV4cGVjdCBhbnkgb2YgdGhlCisgICAg ICAgIHJlbWFpbmluZyBhbmltYXRpb25zIGFyZSB3YWl0aW5nIGZvciBhIG5vdGlmeUFuaW1hdGlv blN0YXJ0ZWQoKS4gSWYgbm90LCBjbGVhcgorICAgICAgICB0aGUgbV93YWl0aW5nRm9yQXN5bmNT dGFydE5vdGlmaWNhdGlvbiBmbGFnLgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJv bGxlcjo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCk6IExvZyB0aGUgcmVuZGVyZXIuCisgICAgICAg IChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6QW5pbWF0aW9uQ29udHJvbGxl clByaXZhdGUpOiBSZW1vdmUgdW5uZWVkZWQKKyAgICAgICAgaW5pdGlhbGl6YXRpb25zIG9mIEhh c2hNYXBzLgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVBbmltYXRpb246OnVwZGF0ZVRyYW5zaXRpb25z KTogTG9nIHJlbmRlcmVycy4KKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUFuaW1hdGlvbjo6 dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKTogRGl0dG8uCisKIDIwMTUtMDctMjggIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJ1aWxkcyB1c2lu ZyBQYXRoQ2Fpcm8uCiAKICAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QYXRoQ2Fp cm8uY3BwOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5o CmluZGV4IGE1NDE0NWJlNmRhZGZkM2QzYTI1MmIxM2FjNzc0NjhiYWY0NjU2ODkuLjBmMDczMzJj OGEzZmQ5MGVjMmU0ODVkNjczZWQxOTI1MjdiODFiM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKQEAgLTEzMSw2ICsxMzEsOCBAQCBwdWJsaWM6 CiAgICAgYm9vbCB3YWl0aW5nRm9yU3RhcnRUaW1lKCkgY29uc3QgeyByZXR1cm4gbV9hbmltYXRp b25TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZTo6U3RhcnRXYWl0UmVzcG9uc2U7IH0KICAgICBib29s IHdhaXRpbmdGb3JTdHlsZUF2YWlsYWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fYW5pbWF0aW9uU3Rh dGUgPT0gQW5pbWF0aW9uU3RhdGU6OlN0YXJ0V2FpdFN0eWxlQXZhaWxhYmxlOyB9CiAKKyAgICBi b29sIGlzQWNjZWxlcmF0ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQWNjZWxlcmF0ZWQ7IH0KKwog ICAgIHZpcnR1YWwgZG91YmxlIHRpbWVUb05leHRTZXJ2aWNlKCk7CiAKICAgICBkb3VibGUgcHJv Z3Jlc3MoZG91YmxlIHNjYWxlID0gMSwgZG91YmxlIG9mZnNldCA9IDAsIGNvbnN0IFRpbWluZ0Z1 bmN0aW9uKiA9IG51bGxwdHIpIGNvbnN0OwpAQCAtMjMwLDcgKzIzMiw2IEBAIHByb3RlY3RlZDoK IAogICAgIHZvaWQgZ29JbnRvRW5kaW5nT3JMb29waW5nU3RhdGUoKTsKIAotICAgIGJvb2wgaXNB Y2NlbGVyYXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNBY2NlbGVyYXRlZDsgfQogICAgIEFuaW1h dGlvblN0YXRlIHN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9hbmltYXRpb25TdGF0ZTsgfQogCiAg ICAgc3RhdGljIHZvaWQgc2V0TmVlZHNTdHlsZVJlY2FsYyhFbGVtZW50Kik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCmlu ZGV4IDNmNzNkMzZmYzFlYTdhMWM5ZDkxMGYwY2E3Mjg5ZmRkZjUyNzhlOTQuLjM4ZTE4Y2MyNWMy NTg0NWNjMzkyOWRjOWMxYWQ3ZjBiZjc0MWVlYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC03Miw4ICs3Miw2 IEBAIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0 ZShGcmFtZSYgZnJhbWUpCiAgICAgLCBtX3VwZGF0ZVN0eWxlSWZOZWVkZWREaXNwYXRjaGVyKCp0 aGlzLCAmQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnVwZGF0ZVN0eWxlSWZOZWVkZWREaXNw YXRjaGVyRmlyZWQpCiAgICAgLCBtX2ZyYW1lKGZyYW1lKQogICAgICwgbV9iZWdpbkFuaW1hdGlv blVwZGF0ZVRpbWUoY0JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZU5vdFNldCkKLSAgICAsIG1fYW5p bWF0aW9uc1dhaXRpbmdGb3JTdHlsZSgpCi0gICAgLCBtX2FuaW1hdGlvbnNXYWl0aW5nRm9yU3Rh cnRUaW1lUmVzcG9uc2UoKQogICAgICwgbV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50KDApCiAg ICAgLCBtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0aW9uKGZhbHNlKQogICAgICwgbV9p c1N1c3BlbmRlZChmYWxzZSkKQEAgLTk4LDYgKzk2LDggQEAgQ29tcG9zaXRlQW5pbWF0aW9uJiBB bmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6ZW5zdXJlQ29tcG9zaXRlQW5pbWF0aW9uKFJlbmRl ckUKIAogYm9vbCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6Y2xlYXIoUmVuZGVyRWxlbWVu dCYgcmVuZGVyZXIpCiB7CisgICAgTE9HKEFuaW1hdGlvbnMsICJBbmltYXRpb25Db250cm9sbGVy UHJpdmF0ZSAlcCBjbGVhcjogJXAiLCB0aGlzLCAmcmVuZGVyZXIpOworCiAgICAgQVNTRVJUKHJl bmRlcmVyLmlzQ1NTQW5pbWF0aW5nKCkpOwogICAgIEFTU0VSVChtX2NvbXBvc2l0ZUFuaW1hdGlv bnMuY29udGFpbnMoJnJlbmRlcmVyKSk7CiAKQEAgLTQxMCw2ICs0MTAsOCBAQCB2b2lkIEFuaW1h dGlvbkNvbnRyb2xsZXJQcml2YXRlOjplbmRBbmltYXRpb25VcGRhdGUoKQogCiB2b2lkIEFuaW1h dGlvbkNvbnRyb2xsZXJQcml2YXRlOjpyZWNlaXZlZFN0YXJ0VGltZVJlc3BvbnNlKGRvdWJsZSB0 aW1lKQogeworICAgIExPRyhBbmltYXRpb25zLCAiQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUg JXAgcmVjZWl2ZWRTdGFydFRpbWVSZXNwb25zZSAlZiIsIHRoaXMsIHRpbWUpOworCiAgICAgbV93 YWl0aW5nRm9yQXN5bmNTdGFydE5vdGlmaWNhdGlvbiA9IGZhbHNlOwogICAgIHN0YXJ0VGltZVJl c3BvbnNlKHRpbWUpOwogfQpAQCAtNTIxLDExICs1MjMsMjQgQEAgdm9pZCBBbmltYXRpb25Db250 cm9sbGVyUHJpdmF0ZTo6c3RhcnRUaW1lUmVzcG9uc2UoZG91YmxlIHRpbWUpCiAKIHZvaWQgQW5p bWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmFuaW1hdGlvbldpbGxCZVJlbW92ZWQoQW5pbWF0aW9u QmFzZSogYW5pbWF0aW9uKQogeworICAgIExPRyhBbmltYXRpb25zLCAiQW5pbWF0aW9uQ29udHJv bGxlclByaXZhdGUgJXAgYW5pbWF0aW9uV2lsbEJlUmVtb3ZlZDogJXAiLCB0aGlzLCBhbmltYXRp b24pOworCiAgICAgcmVtb3ZlRnJvbUFuaW1hdGlvbnNXYWl0aW5nRm9yU3R5bGUoYW5pbWF0aW9u KTsKICAgICByZW1vdmVGcm9tQW5pbWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVSZXNwb25zZShh bmltYXRpb24pOwogI2lmIEVOQUJMRShDU1NfQU5JTUFUSU9OU19MRVZFTF8yKQogICAgIHJlbW92 ZUZyb21BbmltYXRpb25zRGVwZW5kZW50T25TY3JvbGwoYW5pbWF0aW9uKTsKICNlbmRpZgorCisg ICAgYm9vbCBhbnlBbmltYXRpb25zV2FpdGluZ0ZvckFzeW5jU3RhcnQgPSBmYWxzZTsKKyAgICBm b3IgKGF1dG8mIGFuaW1hdGlvbiA6IG1fYW5pbWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVSZXNw b25zZSkgeworICAgICAgICBpZiAoYW5pbWF0aW9uLT53YWl0aW5nRm9yU3RhcnRUaW1lKCkgJiYg YW5pbWF0aW9uLT5pc0FjY2VsZXJhdGVkKCkpIHsKKyAgICAgICAgICAgIGFueUFuaW1hdGlvbnNX YWl0aW5nRm9yQXN5bmNTdGFydCA9IHRydWU7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg fQorICAgIH0KKworICAgIGlmICghYW55QW5pbWF0aW9uc1dhaXRpbmdGb3JBc3luY1N0YXJ0KQor ICAgICAgICBtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0aW9uID0gZmFsc2U7CiB9CiAK ICNpZiBFTkFCTEUoQ1NTX0FOSU1BVElPTlNfTEVWRUxfMikKQEAgLTYzMyw4ICs2NDgsMTEgQEAg Ym9vbCBBbmltYXRpb25Db250cm9sbGVyOjpjb21wdXRlRXh0ZW50T2ZBbmltYXRpb24oUmVuZGVy RWxlbWVudCYgcmVuZGVyZXIsIExheW8KICAgICByZXR1cm4gbV9kYXRhLT5jb21wdXRlRXh0ZW50 T2ZBbmltYXRpb24ocmVuZGVyZXIsIGJvdW5kcyk7CiB9CiAKLXZvaWQgQW5pbWF0aW9uQ29udHJv bGxlcjo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZChSZW5kZXJFbGVtZW50JiwgZG91YmxlIHN0YXJ0 VGltZSkKK3ZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZChS ZW5kZXJFbGVtZW50JiByZW5kZXJlciwgZG91YmxlIHN0YXJ0VGltZSkKIHsKKyAgICBMT0coQW5p bWF0aW9ucywgIkFuaW1hdGlvbkNvbnRyb2xsZXIgJXAgbm90aWZ5QW5pbWF0aW9uU3RhcnRlZCBv biByZW5kZXJlciAlcCwgdGltZT0lZiIsIHRoaXMsICZyZW5kZXJlciwgc3RhcnRUaW1lKTsKKyAg ICBVTlVTRURfUEFSQU0ocmVuZGVyZXIpOworCiAgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5p bWF0aW9uVXBkYXRlQmxvY2sodGhpcyk7CiAgICAgbV9kYXRhLT5yZWNlaXZlZFN0YXJ0VGltZVJl c3BvbnNlKHN0YXJ0VGltZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Fu aW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmlt YXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcAppbmRleCAwN2Q4NGUwZGNjOGVlMTljZmJjMzQw ZDVkZjc2ZDQyYjMxZmIwMWFkLi4wZmI0Y2Y5ZjYxNjc2M2UyMzExMTI5NDU4Nzc1ZTZmNTlhYjEy YTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVB bmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0 ZUFuaW1hdGlvbi5jcHAKQEAgLTE2OCw3ICsxNjgsNyBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlv bjo6dXBkYXRlVHJhbnNpdGlvbnMoUmVuZGVyRWxlbWVudCogcmVuZGVyZXIsIFJlbmRlclN0eWxl KgogICAgICAgICAgICAgICAgIGlmICghZXF1YWwgJiYgaXNBY3RpdmVUcmFuc2l0aW9uKSB7CiAg ICAgICAgICAgICAgICAgICAgIC8vIEFkZCB0aGUgbmV3IHRyYW5zaXRpb24KICAgICAgICAgICAg ICAgICAgICAgUmVmUHRyPEltcGxpY2l0QW5pbWF0aW9uPiBpbXBsaWNpdEFuaW1hdGlvbiA9IElt cGxpY2l0QW5pbWF0aW9uOjpjcmVhdGUoYW5pbWF0aW9uLCBwcm9wLCByZW5kZXJlciwgdGhpcywg bW9kaWZpZWRDdXJyZW50U3R5bGUgPyBtb2RpZmllZEN1cnJlbnRTdHlsZS5nZXQoKSA6IGZyb21T dHlsZSk7Ci0gICAgICAgICAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAiQ3JlYXRlZCBJbXBs aWNpdEFuaW1hdGlvbiAlcCBmb3IgcHJvcGVydHkgJXMgZHVyYXRpb24gJS4yZiBkZWxheSAlLjJm IiwgaW1wbGljaXRBbmltYXRpb24uZ2V0KCksIGdldFByb3BlcnR5TmFtZShwcm9wKSwgYW5pbWF0 aW9uLmR1cmF0aW9uKCksIGFuaW1hdGlvbi5kZWxheSgpKTsKKyAgICAgICAgICAgICAgICAgICAg TE9HKEFuaW1hdGlvbnMsICJDcmVhdGVkIEltcGxpY2l0QW5pbWF0aW9uICVwIG9uIHJlbmRlcmVy ICVwIGZvciBwcm9wZXJ0eSAlcyBkdXJhdGlvbiAlLjJmIGRlbGF5ICUuMmYiLCBpbXBsaWNpdEFu aW1hdGlvbi5nZXQoKSwgcmVuZGVyZXIsIGdldFByb3BlcnR5TmFtZShwcm9wKSwgYW5pbWF0aW9u LmR1cmF0aW9uKCksIGFuaW1hdGlvbi5kZWxheSgpKTsKICAgICAgICAgICAgICAgICAgICAgbV90 cmFuc2l0aW9ucy5zZXQocHJvcCwgaW1wbGljaXRBbmltYXRpb24ucmVsZWFzZSgpKTsKICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgCkBAIC0xODUsNyArMTg1LDcgQEAgdm9pZCBD b21wb3NpdGVBbmltYXRpb246OnVwZGF0ZVRyYW5zaXRpb25zKFJlbmRlckVsZW1lbnQqIHJlbmRl cmVyLCBSZW5kZXJTdHlsZSoKICAgICAgICAgaWYgKCF0cmFuc2l0aW9uLT5hY3RpdmUoKSkgewog ICAgICAgICAgICAgYW5pbWF0aW9uQ29udHJvbGxlcigpLmFuaW1hdGlvbldpbGxCZVJlbW92ZWQo dHJhbnNpdGlvbi5nZXQoKSk7CiAgICAgICAgICAgICB0b0JlUmVtb3ZlZC5hcHBlbmQodHJhbnNp dGlvbi0+YW5pbWF0aW5nUHJvcGVydHkoKSk7Ci0gICAgICAgICAgICBMT0coQW5pbWF0aW9ucywg IlJlbW92aW5nIEltcGxpY2l0QW5pbWF0aW9uICVwIGZvciBwcm9wZXJ0eSAlcyIsIHRyYW5zaXRp b24uZ2V0KCksIGdldFByb3BlcnR5TmFtZSh0cmFuc2l0aW9uLT5hbmltYXRpbmdQcm9wZXJ0eSgp KSk7CisgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIlJlbW92aW5nIEltcGxpY2l0QW5pbWF0 aW9uICVwIGZyb20gcmVuZGVyZXIgJXAgZm9yIHByb3BlcnR5ICVzIiwgdHJhbnNpdGlvbi5nZXQo KSwgcmVuZGVyZXIsIGdldFByb3BlcnR5TmFtZSh0cmFuc2l0aW9uLT5hbmltYXRpbmdQcm9wZXJ0 eSgpKSk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTI1Niw3ICsyNTYsNyBAQCB2b2lkIENvbXBv c2l0ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKFJlbmRlckVsZW1lbnQqIHJl bmRlcmVyLCBSZW5kZQogICAgICAgICAgICAgICAgICAgICBrZXlmcmFtZUFuaW0tPnNldEluZGV4 KGkpOwogICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoKGFuaW1hdGlvbi5kdXJhdGlvbigpIHx8 IGFuaW1hdGlvbi5kZWxheSgpKSAmJiBhbmltYXRpb24uaXRlcmF0aW9uQ291bnQoKSAmJiBhbmlt YXRpb25OYW1lICE9IG5vbmUpIHsKICAgICAgICAgICAgICAgICAgICAga2V5ZnJhbWVBbmltID0g S2V5ZnJhbWVBbmltYXRpb246OmNyZWF0ZShhbmltYXRpb24sIHJlbmRlcmVyLCBpLCB0aGlzLCB0 YXJnZXRTdHlsZSk7Ci0gICAgICAgICAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAiQ3JlYXRp bmcgS2V5ZnJhbWVBbmltYXRpb24gJXAgd2l0aCBrZXlmcmFtZXMgJXMsIGR1cmF0aW9uICUuMmYs IGRlbGF5ICUuMmYsIGl0ZXJhdGlvbnMgJS4yZiIsIGtleWZyYW1lQW5pbS5nZXQoKSwgYW5pbWF0 aW9uLm5hbWUoKS51dGY4KCkuZGF0YSgpLCBhbmltYXRpb24uZHVyYXRpb24oKSwgYW5pbWF0aW9u LmRlbGF5KCksIGFuaW1hdGlvbi5pdGVyYXRpb25Db3VudCgpKTsKKyAgICAgICAgICAgICAgICAg ICAgTE9HKEFuaW1hdGlvbnMsICJDcmVhdGluZyBLZXlmcmFtZUFuaW1hdGlvbiAlcCBvbiByZW5k ZXJlciAlcCB3aXRoIGtleWZyYW1lcyAlcywgZHVyYXRpb24gJS4yZiwgZGVsYXkgJS4yZiwgaXRl cmF0aW9ucyAlLjJmIiwga2V5ZnJhbWVBbmltLmdldCgpLCByZW5kZXJlciwgYW5pbWF0aW9uLm5h bWUoKS51dGY4KCkuZGF0YSgpLCBhbmltYXRpb24uZHVyYXRpb24oKSwgYW5pbWF0aW9uLmRlbGF5 KCksIGFuaW1hdGlvbi5pdGVyYXRpb25Db3VudCgpKTsKICAgICAgICAgICAgICAgICAgICAgaWYg KG1fc3VzcGVuZGVkKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBrZXlmcmFtZUFuaW0tPnVw ZGF0ZVBsYXlTdGF0ZShBbmltUGxheVN0YXRlUGF1c2VkKTsKICAgICAgICAgICAgICAgICAgICAg ICAgIExPRyhBbmltYXRpb25zLCAiICAoY3JlYXRlZCBpbiBzdXNwZW5kZWQvcGF1c2VkIHN0YXRl KSIpOwpAQCAtMjg4LDcgKzI4OCw3IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjp1cGRhdGVL ZXlmcmFtZUFuaW1hdGlvbnMoUmVuZGVyRWxlbWVudCogcmVuZGVyZXIsIFJlbmRlCiAgICAgICAg ICAgICBhbmltc1RvQmVSZW1vdmVkLmFwcGVuZChhbmltYXRpb24tPm5hbWUoKS5pbXBsKCkpOwog ICAgICAgICAgICAgYW5pbWF0aW9uQ29udHJvbGxlcigpLmFuaW1hdGlvbldpbGxCZVJlbW92ZWQo YW5pbWF0aW9uLmdldCgpKTsKICAgICAgICAgICAgIGFuaW1hdGlvbi0+Y2xlYXIoKTsKLSAgICAg ICAgICAgIExPRyhBbmltYXRpb25zLCAiUmVtb3ZpbmcgS2V5ZnJhbWVBbmltYXRpb24gJXAiLCBh bmltYXRpb24uZ2V0KCkpOworICAgICAgICAgICAgTE9HKEFuaW1hdGlvbnMsICJSZW1vdmluZyBL ZXlmcmFtZUFuaW1hdGlvbiAlcCBmcm9tIHJlbmRlcmVyICVwIiwgYW5pbWF0aW9uLmdldCgpLCBy ZW5kZXJlcik7CiAgICAgICAgIH0KICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjE2NWI2YmY2NGQ3OGQx MTAwMWYzNjE3MDIyM2RhMmNjY2JkYzdiMy4uOTBlZmY5MTE3ZmYzODdhNzg0MWRhZTU2NmNjNTBk YWUzNDFkZjIxZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA3LTI4ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFuaW1hdGlvbnMgc29tZXRp bWVzIGZhaWwgdG8gc3RhcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzM5NAorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMTg1MjYwMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGVzdCB0 aGF0IHN0YXJ0cyBhbiBhY2NlbGVyYXRlZCBhbmQgbm9uLWFjY2VsZXJhdGVkIGFuaW1hdGlvbiwg dGhlbiByZW1vdmVzCisgICAgICAgIHRoZSBub2RlIGZvciB0aGUgYWNjZWxlcmF0ZWQgb25lLgor CisgICAgICAgICogYW5pbWF0aW9ucy9yZW1vdmUtc3luY2luZy1hbmltYXRpb24tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBhbmltYXRpb25zL3JlbW92ZS1zeW5jaW5nLWFuaW1hdGlv bi5odG1sOiBBZGRlZC4KKwogMjAxNS0wNy0yOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNob3cgUHNldWRvIEVsZW1lbnRz IGluIERPTSBUcmVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL3JlbW92ZS1z eW5jaW5nLWFuaW1hdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL3Jl bW92ZS1zeW5jaW5nLWFuaW1hdGlvbi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDRmZDhkOGRm M2ZjOTM5MzRiNGQ4ZjE5NGMwYzI3MTEyMzNjNWRjMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2FuaW1hdGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDUgQEAKK1RoZSByZW1haW5pbmcgc3F1YXJlIHNob3VsZCBzaG93IGEgY29sb3Ig YW5pbWF0aW9uIGZyb20gb3JhbmdlIHRvIGdyZWVuLgorCitDb2xvciBrZXlmcmFtZXMuCitQQVNT IC0gY29sb3JzIGFuaW1hdGlvbiByYW4uCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FuaW1h dGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9hbmltYXRp b25zL3JlbW92ZS1zeW5jaW5nLWFuaW1hdGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjllYjZiZTI3MzEx NDkwZTUxOTU2OTQ5NWI0MWI5YTllYjM3ZjJmMGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9hbmltYXRpb25zL3JlbW92ZS1zeW5jaW5nLWFuaW1hdGlvbi5odG1sCkBAIC0wLDAgKzEs OTMgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAg ICAgICAgI2NvbnRhaW5lciB7CisgICAgICAgICAgICAKKyAgICAgICAgfQorICAgICAgICAKKyAg ICAgICAgLmJveCB7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgd2lk dGg6IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luOiAxMHB4OworICAgICAgICAgICAgYmFja2dy b3VuZC1jb2xvcjogYmx1ZTsKKyAgICAgICAgfQorCisgICAgICAgICNjb250YWluZXIuY2hhbmdl ZCAjZmlyc3QgeworICAgICAgICAgICAgLXdlYmtpdC1hbmltYXRpb246IGZhZGUgMC4xcyBsaW5l YXI7CisgICAgICAgIH0KKworICAgICAgICAjY29udGFpbmVyLmNoYW5nZWQgI3NlY29uZCB7Cisg ICAgICAgICAgICAtd2Via2l0LWFuaW1hdGlvbjogY29sb3JzIDAuMXMgbGluZWFyOworICAgICAg ICB9CisgICAgICAgIAorICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgZmFkZSB7CisgICAgICAg ICAgICBmcm9tIHsgb3BhY2l0eTogMDsgfQorICAgICAgICAgICAgdG8geyBvcGFjaXR5OiAxOyB9 CisgICAgICAgIH0KKworICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgY29sb3JzIHsKKyAgICAg ICAgICAgIGZyb20geyBiYWNrZ3JvdW5kLWNvbG9yOiBvcmFuZ2U7IH0KKyAgICAgICAgICAgIHRv IHsgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47IH0KKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cisg ICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAg ICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVt cEFzVGV4dCgpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHZhciByZXN1bHRzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInJlc3VsdHMiKTsKKyAgICAgICAgICAgIHJlc3VsdHMuaW5uZXJIVE1MID0gcmVzdWx0cy5p bm5lckhUTUwgKyBtZXNzYWdlICsgIjxicj4iOworICAgICAgICB9CisKKyAgICAgICAgdmFyIHdh dGNoZG9nVGltZW91dElEOworCisgICAgICAgIGZ1bmN0aW9uIHRlc3RDb21wbGV0ZSgpCisgICAg ICAgIHsKKyAgICAgICAgICAgIHdpbmRvdy5jbGVhclRpbWVvdXQod2F0Y2hkb2dUaW1lb3V0SUQp OworICAgICAgICAgICAgd2F0Y2hkb2dUaW1lb3V0SUQgPSAwOworICAgICAgICAgICAgbG9nKCdQ QVNTIC0gY29sb3JzIGFuaW1hdGlvbiByYW4uJyk7CisgICAgICAgICAgICBpZiAod2luZG93LnRl c3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAg ICAgIH0KKyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIGRvVGVzdCgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdzZWNvbmQnKS5hZGRFdmVudExpc3RlbmVyKCdhbmlt YXRpb25lbmQnLCB0ZXN0Q29tcGxldGUpOworICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdjb250YWluZXInKS5jbGFzc0xpc3QuYWRkKCdjaGFuZ2VkJyk7CisgICAgICAg ICAgICAgICAgCisgICAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24oKSB7 CisgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmaXJzdCcpLnJl bW92ZSgpOworICAgICAgICAgICAgICAgIH0sIDApOworICAgICAgICAgICAgfSwgMCk7CisKKyAg ICAgICAgICAgIHdhdGNoZG9nVGltZW91dElEID0gd2luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24o KSB7CisgICAgICAgICAgICAgICAgbG9nKCdGQUlMIC0gY29sb3JzIGFuaW1hdGlvbiBkaWQgbm90 IHJ1bi4nKTsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAg ICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfSwgNTAw KTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIo J2xvYWQnLCBkb1Rlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5Pgor Cis8cD5UaGUgcmVtYWluaW5nIHNxdWFyZSBzaG91bGQgc2hvdyBhIGNvbG9yIGFuaW1hdGlvbiBm cm9tIG9yYW5nZSB0byBncmVlbi48L3A+Cis8ZGl2IGlkPSJjb250YWluZXIiPgorICAgIDxkaXYg aWQ9ImZpcnN0IiBjbGFzcz0iYm94Ij4KKyAgICAgICAgT3BhY2l0eSBrZXlmcmFtZXMuCisgICAg PC9kaXY+CisgICAgPGRpdiBpZD0ic2Vjb25kIiBjbGFzcz0iYm94Ij4KKyAgICAgICAgQ29sb3Ig a2V5ZnJhbWVzLgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgaWQ9InJlc3VsdHMiPjwvZGl2 PgorPC9ib2R5PgorPC9odG1sPgo= 257719 2015-07-28 18:46:45 -0700 2015-07-28 18:49:36 -0700 Patch diff.txt text/plain 14184 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyOGRhOWUwYjhhNWU3ZmQzZDQzMTg2MzRmNTc4MmVhMDVjZDE1MTQxLi45 MjUwNGE5MTRlMTIxYTBhZjhjMjFkMmNjMTg1Zjk4ZGY3ZWZjZGJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsNDQgQEAKKzIwMTUtMDctMjggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgQW5pbWF0aW9ucyBzb21ldGltZXMgZmFpbCB0byBzdGFydAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Mzk0CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzIxODUyNjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhbiBhY2NlbGVyYXRlZCBhbmltYXRpb24gb3IgdHJh bnNpdGlvbiB3YXMgc3RhcnRlZCBhdCB0aGUgc2FtZSB0aW1lIGFzCisgICAgICAgIGEgbm9uLWFj Y2VsZXJhdGVkIG9uZSwgYW5kIHRoZW4gdGhlIG5vZGUgZm9yIHRoZSBmb3JtZXIgd2FzIHJlbW92 ZWQsIHdlIGNvdWxkCisgICAgICAgIG5ldmVyIGtpY2sgb2ZmIHRoZSBub24tYWNjZWxlcmF0ZWQg YW5pbWF0aW9uLgorICAgICAgICAKKyAgICAgICAgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUg aGFzIGxvZ2ljIHRvIHN5bmNocm9uaXplIHRoZSB0d28gdHlwZXMgb2YgYW5pbWF0aW9uCisgICAg ICAgIHdoZW4gdGhleSBzdGFydCBpbiB0aGUgc2FtZSBhbmltYXRpb24gdXBkYXRlLCB3aGljaCBp bnZvbHZlcyBzZXR0aW5nIHRoZQorICAgICAgICBtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZp Y2F0aW9uIGZsYWcsIGFuZCB3YWl0aW5nIGZvciBhIG5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoKQor ICAgICAgICB0byBjb21lIGluIGZyb20gdGhlIGdyYXBoaWNzIHN5c3RlbS4KKyAgICAgICAgCisg ICAgICAgIEhvd2V2ZXIsIGl0IGZhaWxlZCB0byBoYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhlIGFj Y2VsZXJhdGVkIGFuaW1hdGlvbiB3YXMgcmVtb3ZlZAorICAgICAgICBiZWZvcmUgdGhlIGNhbGxi YWNrIHdhcyByZWNlaXZlZCwgd2hpY2ggbGVmdCB0aGUgbV93YWl0aW5nRm9yQXN5bmNTdGFydE5v dGlmaWNhdGlvbiBmbGFnCisgICAgICAgIHNldCB0byB0cnVlLCBwcmV2ZW50aW5nIHRoZSBub24t YWNjZWxlcmF0ZWQgYW5pbWF0aW9uIGZyb20gcnVubmluZy4KKyAgICAgICAgCisgICAgICAgIFRl c3Q6IGFuaW1hdGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLmh0bWwKKworICAgICAgICAq IHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1h dGlvbkJhc2U6OmlzQWNjZWxlcmF0ZWQpOiBNYWtlIHRoaXMgcHVibGljLgorICAgICAgICAqIHBh Z2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmNsZWFyKTogQWRkIGxvZ2dpbmcuCisgICAgICAg IChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6cmVjZWl2ZWRTdGFydFRpbWVS ZXNwb25zZSk6IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJv bGxlclByaXZhdGU6OmFuaW1hdGlvbldpbGxCZVJlbW92ZWQpOiBBZGQgbG9nZ2luZy4KKyAgICAg ICAgQWZ0ZXIgcmVtb3ZpbmcgYW5pbWF0aW9ucyBmcm9tIHRoZSBtYXBzLCBjaGVjayB0byBzZWUg aWYgd2UgZXhwZWN0IGFueSBvZiB0aGUKKyAgICAgICAgcmVtYWluaW5nIGFuaW1hdGlvbnMgYXJl IHdhaXRpbmcgZm9yIGEgbm90aWZ5QW5pbWF0aW9uU3RhcnRlZCgpLiBJZiBub3QsIGNsZWFyCisg ICAgICAgIHRoZSBtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0aW9uIGZsYWcuCisgICAg ICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyOjpub3RpZnlBbmltYXRpb25TdGFydGVk KTogTG9nIHRoZSByZW5kZXJlci4KKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xs ZXJQcml2YXRlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZSk6IFJlbW92ZSB1bm5lZWRlZAor ICAgICAgICBpbml0aWFsaXphdGlvbnMgb2YgSGFzaE1hcHMuCisgICAgICAgICogcGFnZS9hbmlt YXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 ZUFuaW1hdGlvbjo6dXBkYXRlVHJhbnNpdGlvbnMpOiBMb2cgcmVuZGVyZXJzLgorICAgICAgICAo V2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0aW9uOjp1cGRhdGVLZXlmcmFtZUFuaW1hdGlvbnMpOiBE aXR0by4KKwogMjAxNS0wNy0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYnVpbGRzIHVzaW5nIFBhdGhDYWlyby4KIAogICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHA6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKaW5kZXggYTU0MTQ1YmU2ZGFkZmQzZDNhMjUy YjEzYWM3NzQ2OGJhZjQ2NTY4OS4uMGYwNzMzMmM4YTNmZDkwZWMyZTQ4NWQ2NzNlZDE5MjUyN2I4 MWIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9u QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2Uu aApAQCAtMTMxLDYgKzEzMSw4IEBAIHB1YmxpYzoKICAgICBib29sIHdhaXRpbmdGb3JTdGFydFRp bWUoKSBjb25zdCB7IHJldHVybiBtX2FuaW1hdGlvblN0YXRlID09IEFuaW1hdGlvblN0YXRlOjpT dGFydFdhaXRSZXNwb25zZTsgfQogICAgIGJvb2wgd2FpdGluZ0ZvclN0eWxlQXZhaWxhYmxlKCkg Y29uc3QgeyByZXR1cm4gbV9hbmltYXRpb25TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZTo6U3RhcnRX YWl0U3R5bGVBdmFpbGFibGU7IH0KIAorICAgIGJvb2wgaXNBY2NlbGVyYXRlZCgpIGNvbnN0IHsg cmV0dXJuIG1faXNBY2NlbGVyYXRlZDsgfQorCiAgICAgdmlydHVhbCBkb3VibGUgdGltZVRvTmV4 dFNlcnZpY2UoKTsKIAogICAgIGRvdWJsZSBwcm9ncmVzcyhkb3VibGUgc2NhbGUgPSAxLCBkb3Vi bGUgb2Zmc2V0ID0gMCwgY29uc3QgVGltaW5nRnVuY3Rpb24qID0gbnVsbHB0cikgY29uc3Q7CkBA IC0yMzAsNyArMjMyLDYgQEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBnb0ludG9FbmRpbmdPckxv b3BpbmdTdGF0ZSgpOwogCi0gICAgYm9vbCBpc0FjY2VsZXJhdGVkKCkgY29uc3QgeyByZXR1cm4g bV9pc0FjY2VsZXJhdGVkOyB9CiAgICAgQW5pbWF0aW9uU3RhdGUgc3RhdGUoKSBjb25zdCB7IHJl dHVybiBtX2FuaW1hdGlvblN0YXRlOyB9CiAKICAgICBzdGF0aWMgdm9pZCBzZXROZWVkc1N0eWxl UmVjYWxjKEVsZW1lbnQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0 aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggM2Y3M2QzNmZjMWVhN2ExYzlkOTEwZjBj YTcyODlmZGRmNTI3OGU5NC4uMzhlMThjYzI1YzI1ODQ1Y2MzOTI5ZGM5YzFhZDdmMGJmNzQxZWVh NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9u Q29udHJvbGxlci5jcHAKQEAgLTcyLDggKzcyLDYgQEAgQW5pbWF0aW9uQ29udHJvbGxlclByaXZh dGU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlKEZyYW1lJiBmcmFtZSkKICAgICAsIG1fdXBk YXRlU3R5bGVJZk5lZWRlZERpc3BhdGNoZXIoKnRoaXMsICZBbmltYXRpb25Db250cm9sbGVyUHJp dmF0ZTo6dXBkYXRlU3R5bGVJZk5lZWRlZERpc3BhdGNoZXJGaXJlZCkKICAgICAsIG1fZnJhbWUo ZnJhbWUpCiAgICAgLCBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25V cGRhdGVUaW1lTm90U2V0KQotICAgICwgbV9hbmltYXRpb25zV2FpdGluZ0ZvclN0eWxlKCkKLSAg ICAsIG1fYW5pbWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVSZXNwb25zZSgpCiAgICAgLCBtX2Jl Z2luQW5pbWF0aW9uVXBkYXRlQ291bnQoMCkKICAgICAsIG1fd2FpdGluZ0ZvckFzeW5jU3RhcnRO b3RpZmljYXRpb24oZmFsc2UpCiAgICAgLCBtX2lzU3VzcGVuZGVkKGZhbHNlKQpAQCAtOTgsNiAr OTYsOCBAQCBDb21wb3NpdGVBbmltYXRpb24mIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpl bnN1cmVDb21wb3NpdGVBbmltYXRpb24oUmVuZGVyRQogCiBib29sIEFuaW1hdGlvbkNvbnRyb2xs ZXJQcml2YXRlOjpjbGVhcihSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKIHsKKyAgICBMT0coQW5p bWF0aW9ucywgIkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlICVwIGNsZWFyOiAlcCIsIHRoaXMs ICZyZW5kZXJlcik7CisKICAgICBBU1NFUlQocmVuZGVyZXIuaXNDU1NBbmltYXRpbmcoKSk7CiAg ICAgQVNTRVJUKG1fY29tcG9zaXRlQW5pbWF0aW9ucy5jb250YWlucygmcmVuZGVyZXIpKTsKIApA QCAtNDEwLDYgKzQxMCw4IEBAIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmVuZEFu aW1hdGlvblVwZGF0ZSgpCiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnJlY2Vp dmVkU3RhcnRUaW1lUmVzcG9uc2UoZG91YmxlIHRpbWUpCiB7CisgICAgTE9HKEFuaW1hdGlvbnMs ICJBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZSAlcCByZWNlaXZlZFN0YXJ0VGltZVJlc3BvbnNl ICVmIiwgdGhpcywgdGltZSk7CisKICAgICBtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0 aW9uID0gZmFsc2U7CiAgICAgc3RhcnRUaW1lUmVzcG9uc2UodGltZSk7CiB9CkBAIC01MjEsMTEg KzUyMywyNCBAQCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpzdGFydFRpbWVSZXNw b25zZShkb3VibGUgdGltZSkKIAogdm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6YW5p bWF0aW9uV2lsbEJlUmVtb3ZlZChBbmltYXRpb25CYXNlKiBhbmltYXRpb24pCiB7CisgICAgTE9H KEFuaW1hdGlvbnMsICJBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZSAlcCBhbmltYXRpb25XaWxs QmVSZW1vdmVkOiAlcCIsIHRoaXMsIGFuaW1hdGlvbik7CisKICAgICByZW1vdmVGcm9tQW5pbWF0 aW9uc1dhaXRpbmdGb3JTdHlsZShhbmltYXRpb24pOwogICAgIHJlbW92ZUZyb21BbmltYXRpb25z V2FpdGluZ0ZvclN0YXJ0VGltZVJlc3BvbnNlKGFuaW1hdGlvbik7CiAjaWYgRU5BQkxFKENTU19B TklNQVRJT05TX0xFVkVMXzIpCiAgICAgcmVtb3ZlRnJvbUFuaW1hdGlvbnNEZXBlbmRlbnRPblNj cm9sbChhbmltYXRpb24pOwogI2VuZGlmCisKKyAgICBib29sIGFueUFuaW1hdGlvbnNXYWl0aW5n Rm9yQXN5bmNTdGFydCA9IGZhbHNlOworICAgIGZvciAoYXV0byYgYW5pbWF0aW9uIDogbV9hbmlt YXRpb25zV2FpdGluZ0ZvclN0YXJ0VGltZVJlc3BvbnNlKSB7CisgICAgICAgIGlmIChhbmltYXRp b24tPndhaXRpbmdGb3JTdGFydFRpbWUoKSAmJiBhbmltYXRpb24tPmlzQWNjZWxlcmF0ZWQoKSkg eworICAgICAgICAgICAgYW55QW5pbWF0aW9uc1dhaXRpbmdGb3JBc3luY1N0YXJ0ID0gdHJ1ZTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgaWYgKCFhbnlBbmlt YXRpb25zV2FpdGluZ0ZvckFzeW5jU3RhcnQpCisgICAgICAgIG1fd2FpdGluZ0ZvckFzeW5jU3Rh cnROb3RpZmljYXRpb24gPSBmYWxzZTsKIH0KIAogI2lmIEVOQUJMRShDU1NfQU5JTUFUSU9OU19M RVZFTF8yKQpAQCAtNjMzLDggKzY0OCwxMSBAQCBib29sIEFuaW1hdGlvbkNvbnRyb2xsZXI6OmNv bXB1dGVFeHRlbnRPZkFuaW1hdGlvbihSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgTGF5bwogICAg IHJldHVybiBtX2RhdGEtPmNvbXB1dGVFeHRlbnRPZkFuaW1hdGlvbihyZW5kZXJlciwgYm91bmRz KTsKIH0KIAotdm9pZCBBbmltYXRpb25Db250cm9sbGVyOjpub3RpZnlBbmltYXRpb25TdGFydGVk KFJlbmRlckVsZW1lbnQmLCBkb3VibGUgc3RhcnRUaW1lKQordm9pZCBBbmltYXRpb25Db250cm9s bGVyOjpub3RpZnlBbmltYXRpb25TdGFydGVkKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBkb3Vi bGUgc3RhcnRUaW1lKQogeworICAgIExPRyhBbmltYXRpb25zLCAiQW5pbWF0aW9uQ29udHJvbGxl ciAlcCBub3RpZnlBbmltYXRpb25TdGFydGVkIG9uIHJlbmRlcmVyICVwLCB0aW1lPSVmIiwgdGhp cywgJnJlbmRlcmVyLCBzdGFydFRpbWUpOworICAgIFVOVVNFRF9QQVJBTShyZW5kZXJlcik7CisK ICAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9jayh0aGlzKTsKICAg ICBtX2RhdGEtPnJlY2VpdmVkU3RhcnRUaW1lUmVzcG9uc2Uoc3RhcnRUaW1lKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3Bw CmluZGV4IDA3ZDg0ZTBkY2M4ZWUxOWNmYmMzNDBkNWRmNzZkNDJiMzFmYjAxYWQuLjBmYjRjZjlm NjE2NzYzZTIzMTExMjk0NTg3NzVlNmY1OWFiMTJhOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcApAQCAtMTY4LDcgKzE2 OCw3IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjp1cGRhdGVUcmFuc2l0aW9ucyhSZW5kZXJF bGVtZW50KiByZW5kZXJlciwgUmVuZGVyU3R5bGUqCiAgICAgICAgICAgICAgICAgaWYgKCFlcXVh bCAmJiBpc0FjdGl2ZVRyYW5zaXRpb24pIHsKICAgICAgICAgICAgICAgICAgICAgLy8gQWRkIHRo ZSBuZXcgdHJhbnNpdGlvbgogICAgICAgICAgICAgICAgICAgICBSZWZQdHI8SW1wbGljaXRBbmlt YXRpb24+IGltcGxpY2l0QW5pbWF0aW9uID0gSW1wbGljaXRBbmltYXRpb246OmNyZWF0ZShhbmlt YXRpb24sIHByb3AsIHJlbmRlcmVyLCB0aGlzLCBtb2RpZmllZEN1cnJlbnRTdHlsZSA/IG1vZGlm aWVkQ3VycmVudFN0eWxlLmdldCgpIDogZnJvbVN0eWxlKTsKLSAgICAgICAgICAgICAgICAgICAg TE9HKEFuaW1hdGlvbnMsICJDcmVhdGVkIEltcGxpY2l0QW5pbWF0aW9uICVwIGZvciBwcm9wZXJ0 eSAlcyBkdXJhdGlvbiAlLjJmIGRlbGF5ICUuMmYiLCBpbXBsaWNpdEFuaW1hdGlvbi5nZXQoKSwg Z2V0UHJvcGVydHlOYW1lKHByb3ApLCBhbmltYXRpb24uZHVyYXRpb24oKSwgYW5pbWF0aW9uLmRl bGF5KCkpOworICAgICAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIkNyZWF0ZWQgSW1w bGljaXRBbmltYXRpb24gJXAgb24gcmVuZGVyZXIgJXAgZm9yIHByb3BlcnR5ICVzIGR1cmF0aW9u ICUuMmYgZGVsYXkgJS4yZiIsIGltcGxpY2l0QW5pbWF0aW9uLmdldCgpLCByZW5kZXJlciwgZ2V0 UHJvcGVydHlOYW1lKHByb3ApLCBhbmltYXRpb24uZHVyYXRpb24oKSwgYW5pbWF0aW9uLmRlbGF5 KCkpOwogICAgICAgICAgICAgICAgICAgICBtX3RyYW5zaXRpb25zLnNldChwcm9wLCBpbXBsaWNp dEFuaW1hdGlvbi5yZWxlYXNlKCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICAKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6dXBkYXRlVHJh bnNpdGlvbnMoUmVuZGVyRWxlbWVudCogcmVuZGVyZXIsIFJlbmRlclN0eWxlKgogICAgICAgICBp ZiAoIXRyYW5zaXRpb24tPmFjdGl2ZSgpKSB7CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9s bGVyKCkuYW5pbWF0aW9uV2lsbEJlUmVtb3ZlZCh0cmFuc2l0aW9uLmdldCgpKTsKICAgICAgICAg ICAgIHRvQmVSZW1vdmVkLmFwcGVuZCh0cmFuc2l0aW9uLT5hbmltYXRpbmdQcm9wZXJ0eSgpKTsK LSAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAiUmVtb3ZpbmcgSW1wbGljaXRBbmltYXRpb24g JXAgZm9yIHByb3BlcnR5ICVzIiwgdHJhbnNpdGlvbi5nZXQoKSwgZ2V0UHJvcGVydHlOYW1lKHRy YW5zaXRpb24tPmFuaW1hdGluZ1Byb3BlcnR5KCkpKTsKKyAgICAgICAgICAgIExPRyhBbmltYXRp b25zLCAiUmVtb3ZpbmcgSW1wbGljaXRBbmltYXRpb24gJXAgZnJvbSByZW5kZXJlciAlcCBmb3Ig cHJvcGVydHkgJXMiLCB0cmFuc2l0aW9uLmdldCgpLCByZW5kZXJlciwgZ2V0UHJvcGVydHlOYW1l KHRyYW5zaXRpb24tPmFuaW1hdGluZ1Byb3BlcnR5KCkpKTsKICAgICAgICAgfQogICAgIH0KIApA QCAtMjU2LDcgKzI1Niw3IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjp1cGRhdGVLZXlmcmFt ZUFuaW1hdGlvbnMoUmVuZGVyRWxlbWVudCogcmVuZGVyZXIsIFJlbmRlCiAgICAgICAgICAgICAg ICAgICAgIGtleWZyYW1lQW5pbS0+c2V0SW5kZXgoaSk7CiAgICAgICAgICAgICAgICAgfSBlbHNl IGlmICgoYW5pbWF0aW9uLmR1cmF0aW9uKCkgfHwgYW5pbWF0aW9uLmRlbGF5KCkpICYmIGFuaW1h dGlvbi5pdGVyYXRpb25Db3VudCgpICYmIGFuaW1hdGlvbk5hbWUgIT0gbm9uZSkgewogICAgICAg ICAgICAgICAgICAgICBrZXlmcmFtZUFuaW0gPSBLZXlmcmFtZUFuaW1hdGlvbjo6Y3JlYXRlKGFu aW1hdGlvbiwgcmVuZGVyZXIsIGksIHRoaXMsIHRhcmdldFN0eWxlKTsKLSAgICAgICAgICAgICAg ICAgICAgTE9HKEFuaW1hdGlvbnMsICJDcmVhdGluZyBLZXlmcmFtZUFuaW1hdGlvbiAlcCB3aXRo IGtleWZyYW1lcyAlcywgZHVyYXRpb24gJS4yZiwgZGVsYXkgJS4yZiwgaXRlcmF0aW9ucyAlLjJm Iiwga2V5ZnJhbWVBbmltLmdldCgpLCBhbmltYXRpb24ubmFtZSgpLnV0ZjgoKS5kYXRhKCksIGFu aW1hdGlvbi5kdXJhdGlvbigpLCBhbmltYXRpb24uZGVsYXkoKSwgYW5pbWF0aW9uLml0ZXJhdGlv bkNvdW50KCkpOworICAgICAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIkNyZWF0aW5n IEtleWZyYW1lQW5pbWF0aW9uICVwIG9uIHJlbmRlcmVyICVwIHdpdGgga2V5ZnJhbWVzICVzLCBk dXJhdGlvbiAlLjJmLCBkZWxheSAlLjJmLCBpdGVyYXRpb25zICUuMmYiLCBrZXlmcmFtZUFuaW0u Z2V0KCksIHJlbmRlcmVyLCBhbmltYXRpb24ubmFtZSgpLnV0ZjgoKS5kYXRhKCksIGFuaW1hdGlv bi5kdXJhdGlvbigpLCBhbmltYXRpb24uZGVsYXkoKSwgYW5pbWF0aW9uLml0ZXJhdGlvbkNvdW50 KCkpOwogICAgICAgICAgICAgICAgICAgICBpZiAobV9zdXNwZW5kZWQpIHsKICAgICAgICAgICAg ICAgICAgICAgICAgIGtleWZyYW1lQW5pbS0+dXBkYXRlUGxheVN0YXRlKEFuaW1QbGF5U3RhdGVQ YXVzZWQpOwogICAgICAgICAgICAgICAgICAgICAgICAgTE9HKEFuaW1hdGlvbnMsICIgIChjcmVh dGVkIGluIHN1c3BlbmRlZC9wYXVzZWQgc3RhdGUpIik7CkBAIC0yODgsNyArMjg4LDcgQEAgdm9p ZCBDb21wb3NpdGVBbmltYXRpb246OnVwZGF0ZUtleWZyYW1lQW5pbWF0aW9ucyhSZW5kZXJFbGVt ZW50KiByZW5kZXJlciwgUmVuZGUKICAgICAgICAgICAgIGFuaW1zVG9CZVJlbW92ZWQuYXBwZW5k KGFuaW1hdGlvbi0+bmFtZSgpLmltcGwoKSk7CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9s bGVyKCkuYW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChhbmltYXRpb24uZ2V0KCkpOwogICAgICAgICAg ICAgYW5pbWF0aW9uLT5jbGVhcigpOwotICAgICAgICAgICAgTE9HKEFuaW1hdGlvbnMsICJSZW1v dmluZyBLZXlmcmFtZUFuaW1hdGlvbiAlcCIsIGFuaW1hdGlvbi5nZXQoKSk7CisgICAgICAgICAg ICBMT0coQW5pbWF0aW9ucywgIlJlbW92aW5nIEtleWZyYW1lQW5pbWF0aW9uICVwIGZyb20gcmVu ZGVyZXIgJXAiLCBhbmltYXRpb24uZ2V0KCksIHJlbmRlcmVyKTsKICAgICAgICAgfQogICAgIH0K ICAgICAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA2MTY1YjZiZjY0ZDc4ZDExMDAxZjM2MTcwMjIzZGEyY2NjYmRjN2IzLi45 MGVmZjkxMTdmZjM4N2E3ODQxZGFlNTY2Y2M1MGRhZTM0MWRmMjFmIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTUtMDctMjggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+ CisKKyAgICAgICAgQW5pbWF0aW9ucyBzb21ldGltZXMgZmFpbCB0byBzdGFydAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Mzk0CisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIxODUyNjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICBUZXN0IHRoYXQgc3RhcnRzIGFuIGFjY2VsZXJhdGVkIGFu ZCBub24tYWNjZWxlcmF0ZWQgYW5pbWF0aW9uLCB0aGVuIHJlbW92ZXMKKyAgICAgICAgdGhlIG5v ZGUgZm9yIHRoZSBhY2NlbGVyYXRlZCBvbmUuCisKKyAgICAgICAgKiBhbmltYXRpb25zL3JlbW92 ZS1zeW5jaW5nLWFuaW1hdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFuaW1h dGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDE1LTA3LTI4 ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogU2hvdyBQc2V1ZG8gRWxlbWVudHMgaW4gRE9NIFRyZWUKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2FuaW1hdGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9uLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4wNGZkOGQ4ZGYzZmM5MzkzNGI0ZDhmMTk0YzBjMjcxMTIzM2M1 ZGMwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9yZW1vdmUtc3lu Y2luZy1hbmltYXRpb24tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorVGhlIHJlbWFpbmlu ZyBzcXVhcmUgc2hvdWxkIHNob3cgYSBjb2xvciBhbmltYXRpb24gZnJvbSBvcmFuZ2UgdG8gZ3Jl ZW4uCisKK0NvbG9yIGtleWZyYW1lcy4KK1BBU1MgLSBjb2xvcnMgYW5pbWF0aW9uIHJhbi4KKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9yZW1vdmUtc3luY2luZy1hbmltYXRp b24uaHRtbCBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVtb3ZlLXN5bmNpbmctYW5pbWF0aW9u Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uOWViNmJlMjczMTE0OTBlNTE5NTY5NDk1YjQxYjlhOWViMzdmMmYw YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVtb3ZlLXN5bmNp bmctYW5pbWF0aW9uLmh0bWwKQEAgLTAsMCArMSw5MyBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxo dG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICAjY29udGFpbmVyIHsKKyAgICAgICAg ICAgIAorICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuYm94IHsKKyAgICAgICAgICAgIGhl aWdodDogMTAwcHg7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBtYXJn aW46IDEwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICAgICAgICB9 CisKKyAgICAgICAgI2NvbnRhaW5lci5jaGFuZ2VkICNmaXJzdCB7CisgICAgICAgICAgICAtd2Vi a2l0LWFuaW1hdGlvbjogZmFkZSAwLjFzIGxpbmVhcjsKKyAgICAgICAgfQorCisgICAgICAgICNj b250YWluZXIuY2hhbmdlZCAjc2Vjb25kIHsKKyAgICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9u OiBjb2xvcnMgMC4xcyBsaW5lYXI7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIEAtd2Vi a2l0LWtleWZyYW1lcyBmYWRlIHsKKyAgICAgICAgICAgIGZyb20geyBvcGFjaXR5OiAwOyB9Cisg ICAgICAgICAgICB0byB7IG9wYWNpdHk6IDE7IH0KKyAgICAgICAgfQorCisgICAgICAgIEAtd2Vi a2l0LWtleWZyYW1lcyBjb2xvcnMgeworICAgICAgICAgICAgZnJvbSB7IGJhY2tncm91bmQtY29s b3I6IG9yYW5nZTsgfQorICAgICAgICAgICAgdG8geyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsg fQorICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgp OworICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgIH0KKworICAg ICAgICBmdW5jdGlvbiBsb2cobWVzc2FnZSkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHJl c3VsdHMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0cyIpOworICAgICAgICAgICAg cmVzdWx0cy5pbm5lckhUTUwgPSByZXN1bHRzLmlubmVySFRNTCArIG1lc3NhZ2UgKyAiPGJyPiI7 CisgICAgICAgIH0KKworICAgICAgICB2YXIgd2F0Y2hkb2dUaW1lb3V0SUQ7CisKKyAgICAgICAg ZnVuY3Rpb24gdGVzdENvbXBsZXRlKCkKKyAgICAgICAgeworICAgICAgICAgICAgd2luZG93LmNs ZWFyVGltZW91dCh3YXRjaGRvZ1RpbWVvdXRJRCk7CisgICAgICAgICAgICB3YXRjaGRvZ1RpbWVv dXRJRCA9IDA7CisgICAgICAgICAgICBsb2coJ1BBU1MgLSBjb2xvcnMgYW5pbWF0aW9uIHJhbi4n KTsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICB0 ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgZnVu Y3Rpb24gZG9UZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQo ZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Nl Y29uZCcpLmFkZEV2ZW50TGlzdGVuZXIoJ2FuaW1hdGlvbmVuZCcsIHRlc3RDb21wbGV0ZSk7Cisg ICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpLmNsYXNz TGlzdC5hZGQoJ2NoYW5nZWQnKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB3 aW5kb3cuc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2ZpcnN0JykucmVtb3ZlKCk7CisgICAgICAgICAgICAgICAgfSwg MCk7CisgICAgICAgICAgICB9LCAwKTsKKworICAgICAgICAgICAgd2F0Y2hkb2dUaW1lb3V0SUQg PSB3aW5kb3cuc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBsb2coJ0ZB SUwgLSBjb2xvcnMgYW5pbWF0aW9uIGRpZCBub3QgcnVuLicpOworICAgICAgICAgICAgICAgIGlm ICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3Rp ZnlEb25lKCk7CisgICAgICAgICAgICB9LCA1MDApOworICAgICAgICB9CisgICAgICAgIAorICAg ICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGRvVGVzdCwgZmFsc2UpOworICAg IDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisKKzxwPlRoZSByZW1haW5pbmcgc3F1YXJlIHNo b3VsZCBzaG93IGEgY29sb3IgYW5pbWF0aW9uIGZyb20gb3JhbmdlIHRvIGdyZWVuLjwvcD4KKzxk aXYgaWQ9ImNvbnRhaW5lciI+CisgICAgPGRpdiBpZD0iZmlyc3QiIGNsYXNzPSJib3giPgorICAg ICAgICBPcGFjaXR5IGtleWZyYW1lcy4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGlkPSJzZWNvbmQi IGNsYXNzPSJib3giPgorICAgICAgICBDb2xvciBrZXlmcmFtZXMuCisgICAgPC9kaXY+Cis8L2Rp dj4KKworPGRpdiBpZD0icmVzdWx0cyI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+