114388 2013-04-10 15:34:41 -0700 Flesh out the Animations logging 2013-04-10 15:46:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino dstockwell simon.fraser oldest_to_newest 873271 0 simon.fraser 2013-04-10 15:34:41 -0700 Flesh out the Animations logging 873273 1 197411 simon.fraser 2013-04-10 15:35:15 -0700 Created attachment 197411 Patch 873279 2 simon.fraser 2013-04-10 15:46:13 -0700 https://trac.webkit.org/r148145 873281 3 simon.fraser 2013-04-10 15:46:32 -0700 Sample output: Creating KeyframeAnimation 0x1184322e0 with keyframes spin duration 2.00 delay 0.00, iterations 2.00 property -webkit-transform 0x1184322e0 AnimationState New -> StartWaitTimer 0x1184322e0 AnimationState StartWaitTimer -> StartWaitStyleAvailable 0x1184322e0 AnimationState StartWaitStyleAvailable -> StartWaitResponse 0x1184322e0 AnimationState StartWaitResponse -> Looping 0x1184322e0 AnimationState Looping -> Ending 0x1184322e0 AnimationState Ending -> Ending 0x1184322e0 AnimationState Ending -> Done Removing KeyframeAnimation 0x1184322e0 197411 2013-04-10 15:35:15 -0700 2013-04-10 15:36:30 -0700 Patch bug-114388-20130410153459.patch text/plain 19856 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVmMjZiNDQwYWZkZGMy N2MyZGFlZTExNWVlNDUwZGFhYjUzZWQ5My4uZmJiYzc1M2I3ZjFhZTgxYmYxOWE5ZjA2NTI0ZDI1 ODVhZGFkMjM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEzLTA0LTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZsZXNoIG91dCB0 aGUgQW5pbWF0aW9ucyBsb2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTQzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBMb2cgc3RhdGUgY2hhbmdlcyBhbmQgdHJhbnNpdGlvbi9hbmltYXRpb24g Y3JlYXRpb24gYW5kIGRlc3RydWN0aW9uCisgICAgICAgIHRvIHRoZSBBbmltYXRpb25zIGxvZyBj aGFubmVsLgorCisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpuYW1lRm9yU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0 aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlv bkJhc2U6OmZpcmVBbmltYXRpb25FdmVudHNJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpB bmltYXRpb25CYXNlOjpnb0ludG9FbmRpbmdPckxvb3BpbmdTdGF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpBbmltYXRpb25CYXNlOjpmcmVlemVBdFRpbWUpOgorICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVB bmltYXRpb246OnVwZGF0ZVRyYW5zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKToKKyAgICAgICAgKiBwYWdlL2Fu aW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVB bmltYXRpb246OmtleWZyYW1lcyk6CisgICAgICAgIChLZXlmcmFtZUFuaW1hdGlvbik6CisKKzIw MTMtMDQtMTAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAg ICAgTWlub3IgY29kZSBjbGVhbnVwIGluIEFuaW1hdGlvbkJhc2U6OnByb2dyZXNzCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQzNzEKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAppbmRleCBjODVj YzUzYTIyMzc1NjY2MTQ2NGU4OGVlY2M0NzgxN2QyYWRiYjg3Li43OTZlN2M3NWIxYjFmODQ2ODlk ZDk3MTAzOTI3NzNjNzQ4ZjRiZWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Fu aW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1h dGlvbi9BbmltYXRpb25CYXNlLmNwcApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkRvY3Vt ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkZsb2F0Q29udmVyc2lv bi5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJSZW5kZXJCb3guaCIKICNpbmNs dWRlICJSZW5kZXJTdHlsZS5oIgogI2luY2x1ZGUgIlVuaXRCZXppZXIuaCIKQEAgLTExMSw2ICsx MTIsMjcgQEAgYm9vbCBBbmltYXRpb25CYXNlOjphbmltYXRpb25zTWF0Y2goY29uc3QgQW5pbWF0 aW9uKiBhbmltKSBjb25zdAogICAgIHJldHVybiBtX2FuaW1hdGlvbi0+YW5pbWF0aW9uc01hdGNo KGFuaW0pOwogfQogCisjaWYgIUxPR19ESVNBQkxFRAorc3RhdGljIGNvbnN0IGNoYXIqIG5hbWVG b3JTdGF0ZShBbmltYXRpb25CYXNlOjpBbmltU3RhdGUgc3RhdGUpCit7CisgICAgc3dpdGNoIChz dGF0ZSkgeworICAgIGNhc2UgQW5pbWF0aW9uQmFzZTo6QW5pbWF0aW9uU3RhdGVOZXc6IHJldHVy biAiTmV3IjsKKyAgICBjYXNlIEFuaW1hdGlvbkJhc2U6OkFuaW1hdGlvblN0YXRlU3RhcnRXYWl0 VGltZXI6IHJldHVybiAiU3RhcnRXYWl0VGltZXIiOworICAgIGNhc2UgQW5pbWF0aW9uQmFzZTo6 QW5pbWF0aW9uU3RhdGVTdGFydFdhaXRTdHlsZUF2YWlsYWJsZTogcmV0dXJuICJTdGFydFdhaXRT dHlsZUF2YWlsYWJsZSI7CisgICAgY2FzZSBBbmltYXRpb25CYXNlOjpBbmltYXRpb25TdGF0ZVN0 YXJ0V2FpdFJlc3BvbnNlOiByZXR1cm4gIlN0YXJ0V2FpdFJlc3BvbnNlIjsKKyAgICBjYXNlIEFu aW1hdGlvbkJhc2U6OkFuaW1hdGlvblN0YXRlTG9vcGluZzogcmV0dXJuICJMb29waW5nIjsKKyAg ICBjYXNlIEFuaW1hdGlvbkJhc2U6OkFuaW1hdGlvblN0YXRlRW5kaW5nOiByZXR1cm4gIkVuZGlu ZyI7CisgICAgY2FzZSBBbmltYXRpb25CYXNlOjpBbmltYXRpb25TdGF0ZVBhdXNlZFdhaXRUaW1l cjogcmV0dXJuICJQYXVzZWRXYWl0VGltZXIiOworICAgIGNhc2UgQW5pbWF0aW9uQmFzZTo6QW5p bWF0aW9uU3RhdGVQYXVzZWRXYWl0U3R5bGVBdmFpbGFibGU6IHJldHVybiAiUGF1c2VkV2FpdFN0 eWxlQXZhaWxhYmxlIjsKKyAgICBjYXNlIEFuaW1hdGlvbkJhc2U6OkFuaW1hdGlvblN0YXRlUGF1 c2VkV2FpdFJlc3BvbnNlOiByZXR1cm4gIlBhdXNlZFdhaXRSZXNwb25zZSI7CisgICAgY2FzZSBB bmltYXRpb25CYXNlOjpBbmltYXRpb25TdGF0ZVBhdXNlZFJ1bjogcmV0dXJuICJQYXVzZWRSdW4i OworICAgIGNhc2UgQW5pbWF0aW9uQmFzZTo6QW5pbWF0aW9uU3RhdGVEb25lOiByZXR1cm4gIkRv bmUiOworICAgIGNhc2UgQW5pbWF0aW9uQmFzZTo6QW5pbWF0aW9uU3RhdGVGaWxsaW5nRm9yd2Fy ZHM6IHJldHVybiAiRmlsbGluZ0ZvcndhcmRzIjsKKyAgICB9CisgICAgcmV0dXJuICIiOworfQor I2VuZGlmCisKIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1TdGF0 ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiB7CiAgICAgaWYgKCFtX2NvbXBBbmltKQpAQCAt MTIwLDYgKzE0Miw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFu aW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAgICAgaWYgKGlucHV0ID09IEFuaW1h dGlvblN0YXRlSW5wdXRNYWtlTmV3KSB7CiAgICAgICAgIGlmIChtX2FuaW1TdGF0ZSA9PSBBbmlt YXRpb25TdGF0ZVN0YXJ0V2FpdFN0eWxlQXZhaWxhYmxlKQogICAgICAgICAgICAgbV9jb21wQW5p bS0+YW5pbWF0aW9uQ29udHJvbGxlcigpLT5yZW1vdmVGcm9tQW5pbWF0aW9uc1dhaXRpbmdGb3JT dHlsZSh0aGlzKTsKKyAgICAgICAgTE9HKEFuaW1hdGlvbnMsICIlcCBBbmltYXRpb25TdGF0ZSAl cyAtPiBOZXciLCB0aGlzLCBuYW1lRm9yU3RhdGUobV9hbmltU3RhdGUpKTsKICAgICAgICAgbV9h bmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZU5ldzsKICAgICAgICAgbV9zdGFydFRpbWUgPSAwOwog ICAgICAgICBtX3BhdXNlVGltZSA9IC0xOwpAQCAtMTMyLDYgKzE1NSw3IEBAIHZvaWQgQW5pbWF0 aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUg cGFyYW0pCiAgICAgaWYgKGlucHV0ID09IEFuaW1hdGlvblN0YXRlSW5wdXRSZXN0YXJ0QW5pbWF0 aW9uKSB7CiAgICAgICAgIGlmIChtX2FuaW1TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZVN0YXJ0V2Fp dFN0eWxlQXZhaWxhYmxlKQogICAgICAgICAgICAgbV9jb21wQW5pbS0+YW5pbWF0aW9uQ29udHJv bGxlcigpLT5yZW1vdmVGcm9tQW5pbWF0aW9uc1dhaXRpbmdGb3JTdHlsZSh0aGlzKTsKKyAgICAg ICAgTE9HKEFuaW1hdGlvbnMsICIlcCBBbmltYXRpb25TdGF0ZSAlcyAtPiBOZXciLCB0aGlzLCBu YW1lRm9yU3RhdGUobV9hbmltU3RhdGUpKTsKICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRp b25TdGF0ZU5ldzsKICAgICAgICAgbV9zdGFydFRpbWUgPSAwOwogICAgICAgICBtX3BhdXNlVGlt ZSA9IC0xOwpAQCAtMTQ3LDYgKzE3MSw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3Rh dGVNYWNoaW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAgICAgaWYgKGlu cHV0ID09IEFuaW1hdGlvblN0YXRlSW5wdXRFbmRBbmltYXRpb24pIHsKICAgICAgICAgaWYgKG1f YW5pbVN0YXRlID09IEFuaW1hdGlvblN0YXRlU3RhcnRXYWl0U3R5bGVBdmFpbGFibGUpCiAgICAg ICAgICAgICBtX2NvbXBBbmltLT5hbmltYXRpb25Db250cm9sbGVyKCktPnJlbW92ZUZyb21Bbmlt YXRpb25zV2FpdGluZ0ZvclN0eWxlKHRoaXMpOworICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVw IEFuaW1hdGlvblN0YXRlICVzIC0+IERvbmUiLCB0aGlzLCBuYW1lRm9yU3RhdGUobV9hbmltU3Rh dGUpKTsKICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZURvbmU7CiAgICAgICAg IGVuZEFuaW1hdGlvbigpOwogICAgICAgICByZXR1cm47CkBAIC0xNzYsNiArMjAxLDcgQEAgdm9p ZCBBbmltYXRpb25CYXNlOjp1cGRhdGVTdGF0ZU1hY2hpbmUoQW5pbVN0YXRlSW5wdXQgaW5wdXQs IGRvdWJsZSBwYXJhbSkKICAgICAgICAgICAgIEFTU0VSVChpbnB1dCA9PSBBbmltYXRpb25TdGF0 ZUlucHV0U3RhcnRBbmltYXRpb24gfHwgaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1dFBsYXlT dGF0ZVJ1bm5pbmcgfHwgaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1dFBsYXlTdGF0ZVBhdXNl ZCk7CiAgICAgICAgICAgICBpZiAoaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1dFN0YXJ0QW5p bWF0aW9uIHx8IGlucHV0ID09IEFuaW1hdGlvblN0YXRlSW5wdXRQbGF5U3RhdGVSdW5uaW5nKSB7 CiAgICAgICAgICAgICAgICAgbV9yZXF1ZXN0ZWRTdGFydFRpbWUgPSBiZWdpbkFuaW1hdGlvblVw ZGF0ZVRpbWUoKTsKKyAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlv blN0YXRlICVzIC0+IFN0YXJ0V2FpdFRpbWVyIiwgdGhpcywgbmFtZUZvclN0YXRlKG1fYW5pbVN0 YXRlKSk7CiAgICAgICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0YXJ0 V2FpdFRpbWVyOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xODUsNiAr MjExLDcgQEAgdm9pZCBBbmltYXRpb25CYXNlOjp1cGRhdGVTdGF0ZU1hY2hpbmUoQW5pbVN0YXRl SW5wdXQgaW5wdXQsIGRvdWJsZSBwYXJhbSkKICAgICAgICAgICAgIGlmIChpbnB1dCA9PSBBbmlt YXRpb25TdGF0ZUlucHV0U3RhcnRUaW1lckZpcmVkKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJU KHBhcmFtID49IDApOwogICAgICAgICAgICAgICAgIC8vIFN0YXJ0IHRpbWVyIGhhcyBmaXJlZCwg dGVsbCB0aGUgYW5pbWF0aW9uIHRvIHN0YXJ0IGFuZCB3YWl0IGZvciBpdCB0byByZXNwb25kIHdp dGggc3RhcnQgdGltZQorICAgICAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAiJXAgQW5pbWF0 aW9uU3RhdGUgJXMgLT4gU3RhcnRXYWl0U3R5bGVBdmFpbGFibGUiLCB0aGlzLCBuYW1lRm9yU3Rh dGUobV9hbmltU3RhdGUpKTsKICAgICAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlv blN0YXRlU3RhcnRXYWl0U3R5bGVBdmFpbGFibGU7CiAgICAgICAgICAgICAgICAgbV9jb21wQW5p bS0+YW5pbWF0aW9uQ29udHJvbGxlcigpLT5hZGRUb0FuaW1hdGlvbnNXYWl0aW5nRm9yU3R5bGUo dGhpcyk7CiAKQEAgLTE5NSw2ICsyMjIsNyBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0 YXRlTWFjaGluZShBbmltU3RhdGVJbnB1dCBpbnB1dCwgZG91YmxlIHBhcmFtKQogICAgICAgICAg ICAgICAgIEFTU0VSVCghcGF1c2VkKCkpOwogICAgICAgICAgICAgICAgIC8vIFdlJ3JlIHdhaXRp bmcgZm9yIHRoZSBzdGFydCB0aW1lciB0byBmaXJlIGFuZCB3ZSBnb3QgYSBwYXVzZS4gQ2FuY2Vs IHRoZSB0aW1lciwgcGF1c2UgYW5kIHdhaXQKICAgICAgICAgICAgICAgICBtX3BhdXNlVGltZSA9 IGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpOworICAgICAgICAgICAgICAgIExPRyhBbmltYXRp b25zLCAiJXAgQW5pbWF0aW9uU3RhdGUgJXMgLT4gUGF1c2VkV2FpdFRpbWVyIiwgdGhpcywgbmFt ZUZvclN0YXRlKG1fYW5pbVN0YXRlKSk7CiAgICAgICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBB bmltYXRpb25TdGF0ZVBhdXNlZFdhaXRUaW1lcjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGJyZWFrOwpAQCAtMjAzLDYgKzIzMSw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3Rh dGVNYWNoaW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAKICAgICAgICAg ICAgIGlmIChpbnB1dCA9PSBBbmltYXRpb25TdGF0ZUlucHV0U3R5bGVBdmFpbGFibGUpIHsKICAg ICAgICAgICAgICAgICAvLyBTdGFydCB0aW1lciBoYXMgZmlyZWQsIHRlbGwgdGhlIGFuaW1hdGlv biB0byBzdGFydCBhbmQgd2FpdCBmb3IgaXQgdG8gcmVzcG9uZCB3aXRoIHN0YXJ0IHRpbWUKKyAg ICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlvblN0YXRlICVzIC0+IFN0 YXJ0V2FpdFJlc3BvbnNlIiwgdGhpcywgbmFtZUZvclN0YXRlKG1fYW5pbVN0YXRlKSk7CiAgICAg ICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFJlc3BvbnNl OwogCiAgICAgICAgICAgICAgICAgb3ZlcnJpZGVBbmltYXRpb25zKCk7CkBAIC0yMTEsNiArMjQw LDcgQEAgdm9pZCBBbmltYXRpb25CYXNlOjp1cGRhdGVTdGF0ZU1hY2hpbmUoQW5pbVN0YXRlSW5w dXQgaW5wdXQsIGRvdWJsZSBwYXJhbSkKICAgICAgICAgICAgICAgICBpZiAob3ZlcnJpZGRlbigp KSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFdlIHdvbid0IHRyeSB0byBzdGFydCBhY2NlbGVy YXRlZCBhbmltYXRpb25zIGlmIHdlIGFyZSBvdmVycmlkZGVuIGFuZAogICAgICAgICAgICAgICAg ICAgICAvLyBqdXN0IG1vdmUgb24gdG8gdGhlIG5leHQgc3RhdGUuCisgICAgICAgICAgICAgICAg ICAgIExPRyhBbmltYXRpb25zLCAiJXAgQW5pbWF0aW9uU3RhdGUgJXMgLT4gU3RhcnRXYWl0UmVz cG9uc2UiLCB0aGlzLCBuYW1lRm9yU3RhdGUobV9hbmltU3RhdGUpKTsKICAgICAgICAgICAgICAg ICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFJlc3BvbnNlOwogICAg ICAgICAgICAgICAgICAgICBtX2lzQWNjZWxlcmF0ZWQgPSBmYWxzZTsKICAgICAgICAgICAgICAg ICAgICAgdXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1hdGlvblN0YXRlSW5wdXRTdGFydFRpbWVTZXQs IGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpKTsKQEAgLTIyNyw2ICsyNTcsNyBAQCB2b2lkIEFu aW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZShBbmltU3RhdGVJbnB1dCBpbnB1dCwgZG91 YmxlIHBhcmFtKQogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBXZSdy ZSB3YWl0aW5nIGZvciB0aGUgc3R5bGUgdG8gYmUgYXZhaWxhYmxlIGFuZCB3ZSBnb3QgYSBwYXVz ZS4gUGF1c2UgYW5kIHdhaXQKICAgICAgICAgICAgICAgICBtX3BhdXNlVGltZSA9IGJlZ2luQW5p bWF0aW9uVXBkYXRlVGltZSgpOworICAgICAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAiJXAg QW5pbWF0aW9uU3RhdGUgJXMgLT4gUGF1c2VkV2FpdFN0eWxlQXZhaWxhYmxlIiwgdGhpcywgbmFt ZUZvclN0YXRlKG1fYW5pbVN0YXRlKSk7CiAgICAgICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBB bmltYXRpb25TdGF0ZVBhdXNlZFdhaXRTdHlsZUF2YWlsYWJsZTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIGJyZWFrOwpAQCAtMjU3LDYgKzI4OCw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6 dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAg ICAgICAgICAgICAgICAgLy8gd2UgdW5wYXVzZSwgd2Ugd2lsbCBhY3QgYXMgdGhvdWdoIHRoZSBz dGFydCB0aW1lciBqdXN0IGZpcmVkCiAgICAgICAgICAgICAgICAgbV9wYXVzZVRpbWUgPSBiZWdp bkFuaW1hdGlvblVwZGF0ZVRpbWUoKTsKICAgICAgICAgICAgICAgICBwYXVzZUFuaW1hdGlvbihi ZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSAtIG1fc3RhcnRUaW1lKTsKKyAgICAgICAgICAgICAg ICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlvblN0YXRlICVzIC0+IFBhdXNlZFdhaXRSZXNw b25zZSIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0ZSkpOwogICAgICAgICAgICAgICAg IG1fYW5pbVN0YXRlID0gQW5pbWF0aW9uU3RhdGVQYXVzZWRXYWl0UmVzcG9uc2U7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBicmVhazsKQEAgLTI3NCw2ICszMDYsNyBAQCB2b2lkIEFuaW1h dGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZShBbmltU3RhdGVJbnB1dCBpbnB1dCwgZG91Ymxl IHBhcmFtKQogICAgICAgICAgICAgICAgIC8vIFdlIGFyZSBwYXVzaW5nIHdoaWxlIHJ1bm5pbmcu IENhbmNlbCB0aGUgYW5pbWF0aW9uIGFuZCB3YWl0CiAgICAgICAgICAgICAgICAgbV9wYXVzZVRp bWUgPSBiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKTsKICAgICAgICAgICAgICAgICBwYXVzZUFu aW1hdGlvbihiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSAtIG1fc3RhcnRUaW1lKTsKKyAgICAg ICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlvblN0YXRlICVzIC0+IFBhdXNl ZFJ1biIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0ZSkpOwogICAgICAgICAgICAgICAg IG1fYW5pbVN0YXRlID0gQW5pbWF0aW9uU3RhdGVQYXVzZWRSdW47CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBicmVhazsKQEAgLTI4OCwxMiArMzIxLDE0IEBAIHZvaWQgQW5pbWF0aW9uQmFz ZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0p CiAgICAgICAgICAgICAgICAgLy8gRW5kIHRpbWVyIGZpcmVkLCBmaW5pc2ggdXAKICAgICAgICAg ICAgICAgICBvbkFuaW1hdGlvbkVuZChwYXJhbSk7CiAKKyAgICAgICAgICAgICAgICBMT0coQW5p bWF0aW9ucywgIiVwIEFuaW1hdGlvblN0YXRlICVzIC0+IERvbmUiLCB0aGlzLCBuYW1lRm9yU3Rh dGUobV9hbmltU3RhdGUpKTsKICAgICAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlv blN0YXRlRG9uZTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBpZiAobV9vYmpl Y3QpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKG1fYW5pbWF0aW9uLT5maWxsc0ZvcndhcmRz KCkpCisgICAgICAgICAgICAgICAgICAgIGlmIChtX2FuaW1hdGlvbi0+ZmlsbHNGb3J3YXJkcygp KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlv blN0YXRlICVzIC0+IEZpbGxpbmdGb3J3YXJkcyIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1T dGF0ZSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25T dGF0ZUZpbGxpbmdGb3J3YXJkczsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VtZU92ZXJyaWRk ZW5BbmltYXRpb25zKCk7CiAKICAgICAgICAgICAgICAgICAgICAgLy8gRmlyZSBvZmYgYW5vdGhl ciBzdHlsZSBjaGFuZ2Ugc28gd2UgY2FuIHNldCB0aGUgZmluYWwgdmFsdWUKQEAgLTMwMyw2ICsz MzgsNyBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZShBbmltU3RhdGVJ bnB1dCBpbnB1dCwgZG91YmxlIHBhcmFtKQogICAgICAgICAgICAgICAgIC8vIFdlIGFyZSBwYXVz aW5nIHdoaWxlIHJ1bm5pbmcuIENhbmNlbCB0aGUgYW5pbWF0aW9uIGFuZCB3YWl0CiAgICAgICAg ICAgICAgICAgbV9wYXVzZVRpbWUgPSBiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKTsKICAgICAg ICAgICAgICAgICBwYXVzZUFuaW1hdGlvbihiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSAtIG1f c3RhcnRUaW1lKTsKKyAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlv blN0YXRlICVzIC0+IFBhdXNlZFJ1biIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0ZSkp OwogICAgICAgICAgICAgICAgIG1fYW5pbVN0YXRlID0gQW5pbWF0aW9uU3RhdGVQYXVzZWRSdW47 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyB8dGhpc3wgbWF5IGJlIGRlbGV0ZWQgaGVy ZQpAQCAtMzE1LDYgKzM1MSw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNo aW5lKEFuaW1TdGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAgICAgICAgICAgICBtX3Bh dXNlVGltZSA9IC0xOwogCiAgICAgICAgICAgICAvLyB3ZSB3ZXJlIHdhaXRpbmcgZm9yIHRoZSBz dGFydCB0aW1lciB0byBmaXJlLCBnbyBiYWNrIGFuZCB3YWl0IGFnYWluCisgICAgICAgICAgICBM T0coQW5pbWF0aW9ucywgIiVwIEFuaW1hdGlvblN0YXRlICVzIC0+IE5ldyIsIHRoaXMsIG5hbWVG b3JTdGF0ZShtX2FuaW1TdGF0ZSkpOwogICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRp b25TdGF0ZU5ldzsKICAgICAgICAgICAgIHVwZGF0ZVN0YXRlTWFjaGluZShBbmltYXRpb25TdGF0 ZUlucHV0U3RhcnRBbmltYXRpb24sIDApOwogICAgICAgICAgICAgYnJlYWs7CkBAIC0zMzYsMTIg KzM3MywxNCBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZShBbmltU3Rh dGVJbnB1dCBpbnB1dCwgZG91YmxlIHBhcmFtKQogICAgICAgICAgICAgICAgICAgICBtX3N0YXJ0 VGltZSA9IDA7CiAgICAgICAgICAgICAgICAgbV9wYXVzZVRpbWUgPSAtMTsKIAotICAgICAgICAg ICAgICAgIGlmIChtX2FuaW1TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZVBhdXNlZFdhaXRTdHlsZUF2 YWlsYWJsZSkKKyAgICAgICAgICAgICAgICBpZiAobV9hbmltU3RhdGUgPT0gQW5pbWF0aW9uU3Rh dGVQYXVzZWRXYWl0U3R5bGVBdmFpbGFibGUpIHsKKyAgICAgICAgICAgICAgICAgICAgTE9HKEFu aW1hdGlvbnMsICIlcCBBbmltYXRpb25TdGF0ZSAlcyAtPiBTdGFydFdhaXRTdHlsZUF2YWlsYWJs ZSIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0ZSkpOwogICAgICAgICAgICAgICAgICAg ICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlvblN0YXRlU3RhcnRXYWl0U3R5bGVBdmFpbGFibGU7Ci0g ICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgICAgICAgICAgLy8gV2Ugd2VyZSBlaXRoZXIgcnVubmluZyBvciB3YWl0aW5nIGZvciBhIGJl Z2luIHRpbWUgcmVzcG9uc2UgZnJvbSB0aGUgYW5pbWF0aW9uLgogICAgICAgICAgICAgICAgICAg ICAvLyBFaXRoZXIgd2F5IHdlIG5lZWQgdG8gcmVzdGFydCB0aGUgYW5pbWF0aW9uIChwb3NzaWJs eSB3aXRoIGFuIG9mZnNldCBpZiB3ZQogICAgICAgICAgICAgICAgICAgICAvLyBoYWQgYWxyZWFk eSBiZWVuIHJ1bm5pbmcpIGFuZCB3YWl0IGZvciBpdCB0byBzdGFydC4KKyAgICAgICAgICAgICAg ICAgICAgTE9HKEFuaW1hdGlvbnMsICIlcCBBbmltYXRpb25TdGF0ZSAlcyAtPiBTdGFydFdhaXRS ZXNwb25zZSIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0ZSkpOwogICAgICAgICAgICAg ICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlvblN0YXRlU3RhcnRXYWl0UmVzcG9uc2U7CiAK ICAgICAgICAgICAgICAgICAgICAgLy8gU3RhcnQgdGhlIGFuaW1hdGlvbgpAQCAtMzY0LDYgKzQw Myw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1TdGF0ZUlu cHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg ICAgLy8gV2UgYXJlIHBhdXNlZCBidXQgd2UgZ290IHRoZSBjYWxsYmFjayB0aGF0IG5vdGlmaWVz IHVzIHRoYXQgYW4gYWNjZWxlcmF0ZWQgYW5pbWF0aW9uIHN0YXJ0ZWQuCiAgICAgICAgICAgICAg ICAgLy8gV2UgaWdub3JlIHRoZSBzdGFydCB0aW1lIGFuZCBqdXN0IG1vdmUgaW50byB0aGUgcGF1 c2VkLXJ1biBzdGF0ZS4KKyAgICAgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIiVwIEFuaW1h dGlvblN0YXRlICVzIC0+IFBhdXNlZFJ1biIsIHRoaXMsIG5hbWVGb3JTdGF0ZShtX2FuaW1TdGF0 ZSkpOwogICAgICAgICAgICAgICAgIG1fYW5pbVN0YXRlID0gQW5pbWF0aW9uU3RhdGVQYXVzZWRS dW47CiAgICAgICAgICAgICAgICAgQVNTRVJUKG1fc3RhcnRUaW1lID09IDApOwogICAgICAgICAg ICAgICAgIG1fc3RhcnRUaW1lID0gcGFyYW07CkBAIC0zNzQsNiArNDE0LDcgQEAgdm9pZCBBbmlt YXRpb25CYXNlOjp1cGRhdGVTdGF0ZU1hY2hpbmUoQW5pbVN0YXRlSW5wdXQgaW5wdXQsIGRvdWJs ZSBwYXJhbSkKICAgICAgICAgICAgIEFTU0VSVChtX2FuaW1TdGF0ZSA9PSBBbmltYXRpb25TdGF0 ZVBhdXNlZFdhaXRTdHlsZUF2YWlsYWJsZSk7CiAgICAgICAgICAgICAvLyBXZSBhcmUgcGF1c2Vk IGJ1dCB3ZSBnb3QgdGhlIGNhbGxiYWNrIHRoYXQgbm90aWZpZXMgdXMgdGhhdCBzdHlsZSBoYXMg YmVlbiB1cGRhdGVkLgogICAgICAgICAgICAgLy8gV2UgbW92ZSB0byB0aGUgQW5pbWF0aW9uU3Rh dGVQYXVzZWRXYWl0UmVzcG9uc2Ugc3RhdGUKKyAgICAgICAgICAgIExPRyhBbmltYXRpb25zLCAi JXAgQW5pbWF0aW9uU3RhdGUgJXMgLT4gUGF1c2VkV2FpdFJlc3BvbnNlIiwgdGhpcywgbmFtZUZv clN0YXRlKG1fYW5pbVN0YXRlKSk7CiAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlv blN0YXRlUGF1c2VkV2FpdFJlc3BvbnNlOwogICAgICAgICAgICAgb3ZlcnJpZGVBbmltYXRpb25z KCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTQxNyw2ICs0NTgsNyBAQCB2b2lkIEFuaW1hdGlv bkJhc2U6OmZpcmVBbmltYXRpb25FdmVudHNJZk5lZWRlZCgpCiAgICAgaWYgKG1fdG90YWxEdXJh dGlvbiA+PSAwICYmIGVsYXBzZWREdXJhdGlvbiA+PSBtX3RvdGFsRHVyYXRpb24pIHsKICAgICAg ICAgLy8gV2UgbWF5IHN0aWxsIGJlIGluIEFuaW1hdGlvblN0YXRlTG9vcGluZyBpZiB3ZSd2ZSBt YW5hZ2VkIHRvIHNraXAgYQogICAgICAgICAvLyB3aG9sZSBpdGVyYXRpb24sIGluIHdoaWNoIGNh c2Ugd2Ugc2hvdWxkIGp1bXAgdG8gdGhlIGVuZCBzdGF0ZS4KKyAgICAgICAgTE9HKEFuaW1hdGlv bnMsICIlcCBBbmltYXRpb25TdGF0ZSAlcyAtPiBFbmRpbmciLCB0aGlzLCBuYW1lRm9yU3RhdGUo bV9hbmltU3RhdGUpKTsKICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZUVuZGlu ZzsKIAogICAgICAgICAvLyBGaXJlIGFuIGVuZCBldmVudApAQCAtNTgwLDYgKzYyMiw3IEBAIHZv aWQgQW5pbWF0aW9uQmFzZTo6Z29JbnRvRW5kaW5nT3JMb29waW5nU3RhdGUoKQogICAgIGRvdWJs ZSB0OwogICAgIGJvb2wgaXNMb29waW5nOwogICAgIGdldFRpbWVUb05leHRFdmVudCh0LCBpc0xv b3BpbmcpOworICAgIExPRyhBbmltYXRpb25zLCAiJXAgQW5pbWF0aW9uU3RhdGUgJXMgLT4gJXMi LCB0aGlzLCBuYW1lRm9yU3RhdGUobV9hbmltU3RhdGUpLCBpc0xvb3BpbmcgPyAiTG9vcGluZyIg OiAiRW5kaW5nIik7CiAgICAgbV9hbmltU3RhdGUgPSBpc0xvb3BpbmcgPyBBbmltYXRpb25TdGF0 ZUxvb3BpbmcgOiBBbmltYXRpb25TdGF0ZUVuZGluZzsKIH0KICAgCkBAIC01OTAsNiArNjMzLDcg QEAgdm9pZCBBbmltYXRpb25CYXNlOjpmcmVlemVBdFRpbWUoZG91YmxlIHQpCiAKICAgICBpZiAo IW1fc3RhcnRUaW1lKSB7CiAgICAgICAgIC8vIElmIHdlIGhhdmVuJ3Qgc3RhcnRlZCB5ZXQsIG1h a2UgaXQgYXMgaWYgd2Ugc3RhcnRlZC4KKyAgICAgICAgTE9HKEFuaW1hdGlvbnMsICIlcCBBbmlt YXRpb25TdGF0ZSAlcyAtPiBTdGFydFdhaXRSZXNwb25zZSIsIHRoaXMsIG5hbWVGb3JTdGF0ZSht X2FuaW1TdGF0ZSkpOwogICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlvblN0YXRlU3RhcnRX YWl0UmVzcG9uc2U7CiAgICAgICAgIG9uQW5pbWF0aW9uU3RhcnRSZXNwb25zZShjdXJyZW50VGlt ZSgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9D b21wb3NpdGVBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29t cG9zaXRlQW5pbWF0aW9uLmNwcAppbmRleCBhYzNmZmY3ZGQ4Njc0YThlOWQ2MmNhZDc5MjU2MzM3 YjZiZjMwYTgwLi44YjRkNWYxNjQyNjBlZDgwZTZhNmMxMjBhYmIwZjMwNWQ5MjgxMTgxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlv bi5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAj aW5jbHVkZSAiSW1wbGljaXRBbmltYXRpb24uaCIKICNpbmNsdWRlICJLZXlmcmFtZUFuaW1hdGlv bi5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNp bmNsdWRlICJSZW5kZXJTdHlsZS5oIgogCkBAIC0xNDAsNyArMTQxLDcgQEAgdm9pZCBDb21wb3Np dGVBbmltYXRpb246OnVwZGF0ZVRyYW5zaXRpb25zKFJlbmRlck9iamVjdCogcmVuZGVyZXIsIFJl bmRlclN0eWxlKgogICAgICAgICAgICAgICAgICAgICAvLyBsaXN0LiBJbiB0aGlzIGNhc2UsIHRo ZSBsYXR0ZXIgb25lIG92ZXJyaWRlcyB0aGUgZWFybGllciBvbmUsIHNvIHdlCiAgICAgICAgICAg ICAgICAgICAgIC8vIGJlaGF2ZSBhcyB0aG91Z2ggdGhpcyBpcyBhIHJ1bm5pbmcgYW5pbWF0aW9u IGJlaW5nIHJlcGxhY2VkLgogICAgICAgICAgICAgICAgICAgICBpZiAoIWltcGxBbmltLT5pc1Rh cmdldFByb3BlcnR5RXF1YWwocHJvcCwgdGFyZ2V0U3R5bGUpKSB7Ci0gICAgI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBGb3IgYWNjZWxlcmF0ZWQgYW5pbWF0aW9ucyB3ZSBu ZWVkIHRvIHJldHVybiBhIG5ldyBSZW5kZXJTdHlsZSB3aXRoIHRoZSBfY3VycmVudF8gdmFsdWUK ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIG9mIHRoZSBwcm9wZXJ0eSwgc28gdGhhdCByZXN0 YXJ0ZWQgdHJhbnNpdGlvbnMgdXNlIHRoZSBjb3JyZWN0IHN0YXJ0aW5nIHBvaW50LgogICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKENTU1Byb3BlcnR5QW5pbWF0aW9uOjphbmltYXRpb25PZlBy b3BlcnR5SXNBY2NlbGVyYXRlZChwcm9wKSAmJiBpbXBsQW5pbS0+aXNBY2NlbGVyYXRlZCgpKSB7 CkBAIC0xNDksNyArMTUwLDggQEAgdm9pZCBDb21wb3NpdGVBbmltYXRpb246OnVwZGF0ZVRyYW5z aXRpb25zKFJlbmRlck9iamVjdCogcmVuZGVyZXIsIFJlbmRlclN0eWxlKgogCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW1wbEFuaW0tPmJsZW5kUHJvcGVydHlWYWx1ZUluU3R5bGUocHJv cCwgbW9kaWZpZWRDdXJyZW50U3R5bGUuZ2V0KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAg fQotICAgICNlbmRpZgorI2VuZGlmCisgICAgICAgICAgICAgICAgICAgICAgICBMT0coQW5pbWF0 aW9ucywgIlJlbW92aW5nIGV4aXN0aW5nIEltcGxpY2l0QW5pbWF0aW9uICVwIGZvciBwcm9wZXJ0 eSAlcyIsIGltcGxBbmltLCBnZXRQcm9wZXJ0eU5hbWUocHJvcCkpOwogICAgICAgICAgICAgICAg ICAgICAgICAgYW5pbWF0aW9uQ29udHJvbGxlcigpLT5hbmltYXRpb25XaWxsQmVSZW1vdmVkKGlt cGxBbmltKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1fdHJhbnNpdGlvbnMucmVtb3ZlKHBy b3ApOwogICAgICAgICAgICAgICAgICAgICAgICAgZXF1YWwgPSBmYWxzZTsKQEAgLTE2NSw3ICsx NjcsOSBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6dXBkYXRlVHJhbnNpdGlvbnMoUmVuZGVy T2JqZWN0KiByZW5kZXJlciwgUmVuZGVyU3R5bGUqCiAgICAgICAgICAgICAgICAgLy8gPGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDc4Nz4KICAgICAgICAgICAgICAg ICBpZiAoIWVxdWFsICYmIGlzQWN0aXZlVHJhbnNpdGlvbikgewogICAgICAgICAgICAgICAgICAg ICAvLyBBZGQgdGhlIG5ldyB0cmFuc2l0aW9uCi0gICAgICAgICAgICAgICAgICAgIG1fdHJhbnNp dGlvbnMuc2V0KHByb3AsIEltcGxpY2l0QW5pbWF0aW9uOjpjcmVhdGUoY29uc3RfY2FzdDxBbmlt YXRpb24qPihhbmltKSwgcHJvcCwgcmVuZGVyZXIsIHRoaXMsIG1vZGlmaWVkQ3VycmVudFN0eWxl ID8gbW9kaWZpZWRDdXJyZW50U3R5bGUuZ2V0KCkgOiBmcm9tU3R5bGUpKTsKKyAgICAgICAgICAg ICAgICAgICAgUmVmUHRyPEltcGxpY2l0QW5pbWF0aW9uPiBhbmltYXRpb24gPSBJbXBsaWNpdEFu aW1hdGlvbjo6Y3JlYXRlKGNvbnN0X2Nhc3Q8QW5pbWF0aW9uKj4oYW5pbSksIHByb3AsIHJlbmRl cmVyLCB0aGlzLCBtb2RpZmllZEN1cnJlbnRTdHlsZSA/IG1vZGlmaWVkQ3VycmVudFN0eWxlLmdl dCgpIDogZnJvbVN0eWxlKTsKKyAgICAgICAgICAgICAgICAgICAgTE9HKEFuaW1hdGlvbnMsICJD cmVhdGVkIEltcGxpY2l0QW5pbWF0aW9uICVwIGZvciBwcm9wZXJ0eSAlcyBkdXJhdGlvbiAlLjJm IGRlbGF5ICUuMmYiLCBhbmltYXRpb24uZ2V0KCksIGdldFByb3BlcnR5TmFtZShwcm9wKSwgYW5p bS0+ZHVyYXRpb24oKSwgYW5pbS0+ZGVsYXkoKSk7CisgICAgICAgICAgICAgICAgICAgIG1fdHJh bnNpdGlvbnMuc2V0KHByb3AsIGFuaW1hdGlvbi5yZWxlYXNlKCkpOwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAvLyBXZSBvbmx5IG5lZWQgb25l IHBhc3MgZm9yIHRoZSBzaW5nbGUgcHJvcCBjYXNlCkBAIC0xODMsNiArMTg3LDcgQEAgdm9pZCBD b21wb3NpdGVBbmltYXRpb246OnVwZGF0ZVRyYW5zaXRpb25zKFJlbmRlck9iamVjdCogcmVuZGVy ZXIsIFJlbmRlclN0eWxlKgogICAgICAgICBpZiAoIWFuaW0tPmFjdGl2ZSgpKSB7CiAgICAgICAg ICAgICBhbmltYXRpb25Db250cm9sbGVyKCktPmFuaW1hdGlvbldpbGxCZVJlbW92ZWQoYW5pbSk7 CiAgICAgICAgICAgICB0b0JlUmVtb3ZlZC5hcHBlbmQoYW5pbS0+YW5pbWF0aW5nUHJvcGVydHko KSk7CisgICAgICAgICAgICBMT0coQW5pbWF0aW9ucywgIlJlbW92aW5nIEltcGxpY2l0QW5pbWF0 aW9uICVwIGZvciBwcm9wZXJ0eSAlcyIsIGFuaW0sIGdldFByb3BlcnR5TmFtZShhbmltLT5hbmlt YXRpbmdQcm9wZXJ0eSgpKSk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTI0Niw2ICsyNTEsMTIg QEAgdm9pZCBDb21wb3NpdGVBbmltYXRpb246OnVwZGF0ZUtleWZyYW1lQW5pbWF0aW9ucyhSZW5k ZXJPYmplY3QqIHJlbmRlcmVyLCBSZW5kZXIKICAgICAgICAgICAgICAgICAgICAga2V5ZnJhbWVB bmltLT5zZXRJbmRleChpKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKChhbmltLT5kdXJh dGlvbigpIHx8IGFuaW0tPmRlbGF5KCkpICYmIGFuaW0tPml0ZXJhdGlvbkNvdW50KCkgJiYgYW5p bWF0aW9uTmFtZSAhPSBub25lKSB7CiAgICAgICAgICAgICAgICAgICAgIGtleWZyYW1lQW5pbSA9 IEtleWZyYW1lQW5pbWF0aW9uOjpjcmVhdGUoY29uc3RfY2FzdDxBbmltYXRpb24qPihhbmltKSwg cmVuZGVyZXIsIGksIHRoaXMsIHRhcmdldFN0eWxlKTsKKyAgICAgICAgICAgICAgICAgICAgTE9H KEFuaW1hdGlvbnMsICJDcmVhdGluZyBLZXlmcmFtZUFuaW1hdGlvbiAlcCB3aXRoIGtleWZyYW1l cyAlcyBkdXJhdGlvbiAlLjJmIGRlbGF5ICUuMmYsIGl0ZXJhdGlvbnMgJS4yZiIsIGtleWZyYW1l QW5pbS5nZXQoKSwgYW5pbS0+bmFtZSgpLnV0ZjgoKS5kYXRhKCksIGFuaW0tPmR1cmF0aW9uKCks IGFuaW0tPmRlbGF5KCksIGFuaW0tPml0ZXJhdGlvbkNvdW50KCkpOworI2lmICFMT0dfRElTQUJM RUQKKyAgICAgICAgICAgICAgICAgICAgSGFzaFNldDxDU1NQcm9wZXJ0eUlEPjo6Y29uc3RfaXRl cmF0b3IgZW5kUHJvcGVydGllcyA9IGtleWZyYW1lQW5pbS0+a2V5ZnJhbWVzKCkuZW5kUHJvcGVy dGllcygpOworICAgICAgICAgICAgICAgICAgICBmb3IgKEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD46 OmNvbnN0X2l0ZXJhdG9yIGl0ID0ga2V5ZnJhbWVBbmltLT5rZXlmcmFtZXMoKS5iZWdpblByb3Bl cnRpZXMoKTsgaXQgIT0gZW5kUHJvcGVydGllczsgKytpdCkKKyAgICAgICAgICAgICAgICAgICAg ICAgIExPRyhBbmltYXRpb25zLCAiICBwcm9wZXJ0eSAlcyIsIGdldFByb3BlcnR5TmFtZSgqaXQp KTsKKyNlbmRpZgogICAgICAgICAgICAgICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9ucy5zZXQo a2V5ZnJhbWVBbmltLT5uYW1lKCkuaW1wbCgpLCBrZXlmcmFtZUFuaW0pOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICAKQEAgLTI2NSw2ICsyNzYsNyBAQCB2b2lkIENvbXBvc2l0 ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKFJlbmRlck9iamVjdCogcmVuZGVy ZXIsIFJlbmRlcgogICAgICAgICAgICAgYW5pbXNUb0JlUmVtb3ZlZC5hcHBlbmQoa2V5ZnJhbWVB bmltLT5uYW1lKCkuaW1wbCgpKTsKICAgICAgICAgICAgIGFuaW1hdGlvbkNvbnRyb2xsZXIoKS0+ YW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChrZXlmcmFtZUFuaW0pOwogICAgICAgICAgICAga2V5ZnJh bWVBbmltLT5jbGVhcigpOworICAgICAgICAgICAgTE9HKEFuaW1hdGlvbnMsICJSZW1vdmluZyBL ZXlmcmFtZUFuaW1hdGlvbiAlcCIsIGtleWZyYW1lQW5pbSk7CiAgICAgICAgIH0KICAgICB9CiAg ICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFu aW1hdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRp b24uaAppbmRleCA4YjcxMDIxOWZkYjhmYmRiYTE1NDlhOTE4NDlmOTNjNjcyYWYwNTA0Li43MmJm ZDIwM2JhYmY4ODE1YWFiYTZhNGE4MjBmMTA4MGExOWJiOGQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmgKQEAgLTQ5LDYgKzQ5LDgg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlKENvbXBvc2l0ZUFuaW1hdGlvbios IFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlclN0eWxlKiBjdXJyZW50U3R5bGUsIFJlbmRlclN0 eWxlKiB0YXJnZXRTdHlsZSwgUmVmUHRyPFJlbmRlclN0eWxlPiYgYW5pbWF0ZWRTdHlsZSk7CiAg ICAgdmlydHVhbCB2b2lkIGdldEFuaW1hdGVkU3R5bGUoUmVmUHRyPFJlbmRlclN0eWxlPiYgYW5p bWF0ZWRTdHlsZSk7CiAKKyAgICBjb25zdCBLZXlmcmFtZUxpc3QmIGtleWZyYW1lcygpIGNvbnN0 IHsgcmV0dXJuIG1fa2V5ZnJhbWVzOyB9CisKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUo KSBjb25zdCB7IHJldHVybiBtX2tleWZyYW1lcy5hbmltYXRpb25OYW1lKCk7IH0KICAgICBpbnQg aW5kZXgoKSBjb25zdCB7IHJldHVybiBtX2luZGV4OyB9CiAgICAgdm9pZCBzZXRJbmRleChpbnQg aSkgeyBtX2luZGV4ID0gaTsgfQo=