219028 2020-11-17 05:25:20 -0800 [Web Animations] Move all effect-specific parts of WebAnimation::timeToNextTick() to effect classes 2020-11-17 11:05:21 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino koivisto webkit-bug-importer oldest_to_newest 1708196 0 graouts 2020-11-17 05:25:20 -0800 [Web Animations] Move all effect-specific parts of WebAnimation::timeToNextTick() to effect classes 1708197 1 414332 graouts 2020-11-17 05:29:47 -0800 Created attachment 414332 Patch 1708298 2 ews-feeder 2020-11-17 11:04:33 -0800 Committed r269914: <https://trac.webkit.org/changeset/269914> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414332. 1708299 3 webkit-bug-importer 2020-11-17 11:05:21 -0800 <rdar://problem/71494324> 414332 2020-11-17 05:29:47 -0800 2020-11-17 11:04:33 -0800 Patch bug-219028-20201117142945.patch text/plain 10434 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ4ZTBjNDllZWMzYzFh Y2E2N2JmMjBlNWEyYWJkOTYyMWMzOTQxMy4uMzgxOTMwYmZkNzYwOGNjYTA0YTBiNDBjZWMyMzRj YTMxNzcyZTYwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTExLTE3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtXZWIgQW5pbWF0aW9u c10gTW92ZSBhbGwgZWZmZWN0LXNwZWNpZmljIHBhcnRzIG9mIFdlYkFuaW1hdGlvbjo6dGltZVRv TmV4dFRpY2soKSB0byBlZmZlY3QgY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTW9zdCBvZiBXZWJBbmltYXRpb246OnRpbWVUb05leHRUaWNr KCkgaXMgY29kZSB0aGF0IGlzIHNwZWNpZmljIHRvIGVmZmVjdHMuIFdlIG1vdmUgdGhpcyBjb2Rl IG91dCB0bworICAgICAgICBLZXlmcmFtZUVmZmVjdCBhbmQgYSB2aXJ0dWFsIG1ldGhvZCB3aXRo IGEgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBvbiBBbmltYXRpb25FZmZlY3QuIFRoaXMgaXMgdGhl IGZpcnN0CisgICAgICAgIHN0ZXAgdG93YXJkcyBhZGRpbmcgbW9yZSBzbWFydHMgdG8gdGhpcyBt ZXRob2Qgc3VjaCBhcyBhdm9pZGluZyBzdHlsZSByZWNhbGNzIGlmIHRoZXJlIGFyZSBubyBrZXlm cmFtZXMKKyAgICAgICAgc2V0IHVwIG9uIGEgS2V5ZnJhbWVFZmZlY3Qgb3IgcnVubmluZyBmZXdl ciBzdHlsZSByZWNhbGNzIHdoZW4gYW5pbWF0aW5nIGEgZGlzY3JldGUgcHJvcGVydHkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgd2UgYXJlIGp1c3QgbW92aW5nIGNvZGUgYXJv dW5kLgorCisgICAgICAgICogYW5pbWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5oOgorICAgICAgICAo V2ViQ29yZTo6QW5pbWF0aW9uRWZmZWN0Ojp0aW1lVG9OZXh0VGljayBjb25zdCk6CisgICAgICAg ICogYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZy YW1lRWZmZWN0Ojp0aW1lVG9OZXh0VGljayBjb25zdCk6CisgICAgICAgICogYW5pbWF0aW9uL0tl eWZyYW1lRWZmZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6aXNDb21w bGV0ZWx5QWNjZWxlcmF0ZWQgY29uc3QpOiBNYWtlIHRoaXMgbWV0aG9kIHByaXZhdGUgc2luY2Ug aXQgaXMgbm93IG9ubHkKKyAgICAgICAgY2FsbGVkIGJ5IEtleWZyYW1lRWZmZWN0LgorICAgICAg ICAqIGFuaW1hdGlvbi9XZWJBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViQW5p bWF0aW9uOjp0aW1lVG9OZXh0VGljayBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJBbmlt YXRpb246OmlzQ29tcGxldGVseUFjY2VsZXJhdGVkIGNvbnN0KTogRGVsZXRlZC4gVGhpcyBtZXRo b2Qgbm8gbG9uZ2VyIGhhcyBhbnkgY2FsbCBzaXRlcy4KKyAgICAgICAgKiBhbmltYXRpb24vV2Vi QW5pbWF0aW9uLmg6CisKIDIwMjAtMTEtMTYgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBUZXh0dXJlcyBGYWlsIHRvIFJlbmRlciBpbiBXZWJHTCBmcm9t IEhMUyBTdHJlYW0gb24gaVBob25lIDEyIFtpT1MgMTQuMl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1h dGlvbi9BbmltYXRpb25FZmZlY3QuaAppbmRleCBmNzAyMGZmZGNhN2M5MjI0ZTAxYzgwZTk0MjQ3 ODM5OGJhMTcwN2ZlLi5kNWI1MGU2YWMyODM2ZGJkMmQ3NGRlYzlhZTI1ZTJhNzFkYzA2YTRhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5oCkBAIC0xMDIsMTEg KzEwMiwxMyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHVwZGF0ZVN0YXRpY1RpbWluZ1Byb3BlcnRp ZXMoKTsKIAotICAgIHZpcnR1YWwgT3B0aW9uYWw8ZG91YmxlPiBwcm9ncmVzc1VudGlsTmV4dFN0 ZXAoZG91YmxlKSBjb25zdDsKKyAgICB2aXJ0dWFsIFNlY29uZHMgdGltZVRvTmV4dFRpY2soKSBj b25zdCB7IHJldHVybiBTZWNvbmRzOjppbmZpbml0eSgpOyB9CiAKIHByb3RlY3RlZDoKICAgICBl eHBsaWNpdCBBbmltYXRpb25FZmZlY3QoKTsKIAorICAgIHZpcnR1YWwgT3B0aW9uYWw8ZG91Ymxl PiBwcm9ncmVzc1VudGlsTmV4dFN0ZXAoZG91YmxlKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBl bnVtIGNsYXNzIENvbXB1dGVkRGlyZWN0aW9uIDogdWludDhfdCB7IEZvcndhcmRzLCBSZXZlcnNl IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmluZGV4 IGMyZjU5YjYxZjVkNThmMTY0NDg4YzczMzMwYzFiOThjOWFlYjlhMTguLjY2NjU3YmI4NjIzMGIy NjRhMDk1NDg3MzM3MWVkMjNjNjczZTY0ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9u L0tleWZyYW1lRWZmZWN0LmNwcApAQCAtMTk3Miw0ICsxOTcyLDQwIEBAIE9wdGlvbmFsPGRvdWJs ZT4gS2V5ZnJhbWVFZmZlY3Q6OnByb2dyZXNzVW50aWxOZXh0U3RlcChkb3VibGUgaXRlcmF0aW9u UHJvZ3Jlc3MpCiAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIAorU2Vjb25kcyBLZXlmcmFt ZUVmZmVjdDo6dGltZVRvTmV4dFRpY2soKSBjb25zdAoreworICAgIGF1dG8gdGltaW5nID0gZ2V0 QmFzaWNUaW1pbmcoKTsKKyAgICBzd2l0Y2ggKHRpbWluZy5waGFzZSkgeworICAgIGNhc2UgQW5p bWF0aW9uRWZmZWN0UGhhc2U6OkJlZm9yZToKKyAgICAgICAgLy8gVGhlIGVmZmVjdCBpcyBpbiBp dHMgImJlZm9yZSIgcGhhc2UsIGluIHRoaXMgY2FzZSB3ZSBjYW4gd2FpdCB1bnRpbCBpdCBlbnRl cnMgaXRzICJhY3RpdmUiIHBoYXNlLgorICAgICAgICByZXR1cm4gZGVsYXkoKSAtICp0aW1pbmcu bG9jYWxUaW1lOworICAgIGNhc2UgQW5pbWF0aW9uRWZmZWN0UGhhc2U6OkFjdGl2ZToKKyAgICAg ICAgaWYgKGlzQ29tcGxldGVseUFjY2VsZXJhdGVkKCkgJiYgaXNSdW5uaW5nQWNjZWxlcmF0ZWQo KSkgeworICAgICAgICAgICAgLy8gRnVsbHktYWNjZWxlcmF0ZWQgcnVubmluZyBDU1MgQW5pbWF0 aW9ucyBuZWVkIHRvIHRyaWdnZXIgImFuaW1hdGlvbml0ZXJhdGlvbiIgZXZlbnRzLCBpbiB0aGlz IGNhc2Ugd2UgbXVzdCB3YWl0IHVudGlsIHRoZSBuZXh0IGl0ZXJhdGlvbi4KKyAgICAgICAgICAg IGlmIChpczxDU1NBbmltYXRpb24+KGFuaW1hdGlvbigpKSkgeworICAgICAgICAgICAgICAgIGlm IChhdXRvIGl0ZXJhdGlvblByb2dyZXNzID0gZ2V0Q29tcHV0ZWRUaW1pbmcoKS5zaW1wbGVJdGVy YXRpb25Qcm9ncmVzcykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGl0ZXJhdGlvbkR1cmF0 aW9uKCkgKiAoMSAtICppdGVyYXRpb25Qcm9ncmVzcyk7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICAvLyBGdWxseS1hY2NlbGVyYXRlZCBydW5uaW5nIGVmZmVjdHMgaW4gdGhlICJhY3RpdmUi IHBoYXNlIGNhbiB3YWl0IHVudGlsIHRoZXkgZW5kZWQuCisgICAgICAgICAgICByZXR1cm4gZW5k VGltZSgpIC0gKnRpbWluZy5sb2NhbFRpbWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGF1dG8g aXRlcmF0aW9uUHJvZ3Jlc3MgPSBnZXRDb21wdXRlZFRpbWluZygpLnNpbXBsZUl0ZXJhdGlvblBy b2dyZXNzKSB7CisgICAgICAgICAgICAvLyBJbiBjYXNlIHdlJ3JlIGluIGEgcmFuZ2UgdGhhdCB1 c2VzIGEgc3RlcHMoKSB0aW1pbmcgZnVuY3Rpb24sIHdlIGNhbiBjb21wdXRlIHRoZSB0aW1lIHVu dGlsIHRoZSBuZXh0IHN0ZXAgc3RhcnRzLgorICAgICAgICAgICAgaWYgKGF1dG8gcHJvZ3Jlc3NV bnRpbE5leHRTdGVwID0gdGhpcy0+cHJvZ3Jlc3NVbnRpbE5leHRTdGVwKCppdGVyYXRpb25Qcm9n cmVzcykpCisgICAgICAgICAgICAgICAgcmV0dXJuIGl0ZXJhdGlvbkR1cmF0aW9uKCkgKiAqcHJv Z3Jlc3NVbnRpbE5leHRTdGVwOworICAgICAgICB9CisgICAgICAgIC8vIE90aGVyIGVmZmVjdHMg aW4gdGhlICJhY3RpdmUiIHBoYXNlIHdpbGwgbmVlZCB0byB1cGRhdGUgdGhlaXIgYW5pbWF0ZWQg dmFsdWUgYXQgdGhlIGltbWVkaWF0ZSBuZXh0IG9wcG9ydHVuaXR5LgorICAgICAgICByZXR1cm4g MF9zOworICAgIGNhc2UgQW5pbWF0aW9uRWZmZWN0UGhhc2U6OkFmdGVyOgorICAgICAgICAvLyBU aGUgZWZmZWN0IGlzIGluIGl0cyBhZnRlciBwaGFzZSwgd2hpY2ggbWVhbnMgaXQgd2lsbCBubyBs b25nZXIgdXBkYXRlIGl0cyB2YWx1ZSwgc28gaXQgZG9lbnMndCBuZWVkIGEgdGljay4KKyAgICAg ICAgcmV0dXJuIFNlY29uZHM6OmluZmluaXR5KCk7CisgICAgY2FzZSBBbmltYXRpb25FZmZlY3RQ aGFzZTo6SWRsZToKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVy biBTZWNvbmRzOjppbmZpbml0eSgpOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworICAgIHJldHVybiBTZWNvbmRzOjppbmZpbml0eSgpOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5oCmluZGV4IDhh NjViNzIxYTFiZDdlODM5YmU5Yzg2OTE2MjcwMDVmOWFkMzlhZGQuLmRhOWU3YjJhMTlhODdmZTZi MWQzODQ4M2ZjYmVlOWEwNTQ5ZjlmNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1h dGlvbi9LZXlmcmFtZUVmZmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlm cmFtZUVmZmVjdC5oCkBAIC0xNDYsNyArMTQ2LDYgQEAgcHVibGljOgogCiAgICAgLy8gRklYTUU6 IFRoZXNlIGlnbm9yZSB0aGUgZmFjdCB0aGF0IHNvbWUgdGltaW5nIGZ1bmN0aW9ucyBjYW4gcHJl dmVudCBhY2NlbGVyYXRpb24uCiAgICAgYm9vbCBpc0Fib3V0VG9SdW5BY2NlbGVyYXRlZCgpIGNv bnN0IHsgcmV0dXJuIG1fYWNjZWxlcmF0ZWRQcm9wZXJ0aWVzU3RhdGUgIT0gQWNjZWxlcmF0ZWRQ cm9wZXJ0aWVzOjpOb25lICYmIG1fbGFzdFJlY29yZGVkQWNjZWxlcmF0ZWRBY3Rpb24gIT0gQWNj ZWxlcmF0ZWRBY3Rpb246OlN0b3A7IH0KLSAgICBib29sIGlzQ29tcGxldGVseUFjY2VsZXJhdGVk KCkgY29uc3QgeyByZXR1cm4gbV9hY2NlbGVyYXRlZFByb3BlcnRpZXNTdGF0ZSA9PSBBY2NlbGVy YXRlZFByb3BlcnRpZXM6OkFsbDsgfQogCiAgICAgYm9vbCBmaWx0ZXJGdW5jdGlvbkxpc3RzTWF0 Y2goKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2ZpbHRlckZ1bmN0aW9uTGlzdHNNYXRjaDsg fQogICAgIGJvb2wgdHJhbnNmb3JtRnVuY3Rpb25MaXN0c01hdGNoKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gbV90cmFuc2Zvcm1GdW5jdGlvbkxpc3RzTWF0Y2g7IH0KQEAgLTE4Nyw2ICsxODYs NyBAQCBwcml2YXRlOgogICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHByb2Nlc3NLZXlmcmFtZXMoSlND OjpKU0dsb2JhbE9iamVjdCYsIEpTQzo6U3Ryb25nPEpTQzo6SlNPYmplY3Q+JiYpOwogICAgIHZv aWQgYWRkUGVuZGluZ0FjY2VsZXJhdGVkQWN0aW9uKEFjY2VsZXJhdGVkQWN0aW9uKTsKICAgICBi b29sIGNhbkJlQWNjZWxlcmF0ZWQoKSBjb25zdDsKKyAgICBib29sIGlzQ29tcGxldGVseUFjY2Vs ZXJhdGVkKCkgY29uc3QgeyByZXR1cm4gbV9hY2NlbGVyYXRlZFByb3BlcnRpZXNTdGF0ZSA9PSBB Y2NlbGVyYXRlZFByb3BlcnRpZXM6OkFsbDsgfQogICAgIHZvaWQgdXBkYXRlQWNjZWxlcmF0ZWRB Y3Rpb25zKCk7CiAgICAgdm9pZCBzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKFJlbmRlclN0 eWxlJiwgZG91YmxlKTsKICAgICBUaW1pbmdGdW5jdGlvbiogdGltaW5nRnVuY3Rpb25Gb3JLZXlm cmFtZUF0SW5kZXgoc2l6ZV90KSBjb25zdDsKQEAgLTIwMCw2ICsyMDAsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgY29tcHV0ZUNTU1RyYW5zaXRpb25CbGVuZGluZ0tleWZyYW1lcyhjb25zdCBSZW5k ZXJTdHlsZSogb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CiAgICAgdm9p ZCBjb21wdXRlQWNjZWxlcmF0ZWRQcm9wZXJ0aWVzU3RhdGUoKTsKICAgICB2b2lkIHNldEJsZW5k aW5nS2V5ZnJhbWVzKEtleWZyYW1lTGlzdCYpOworICAgIFNlY29uZHMgdGltZVRvTmV4dFRpY2so KSBjb25zdCBmaW5hbDsKICAgICBPcHRpb25hbDxkb3VibGU+IHByb2dyZXNzVW50aWxOZXh0U3Rl cChkb3VibGUpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgY2hlY2tGb3JNYXRjaGluZ1RyYW5zZm9y bUZ1bmN0aW9uTGlzdHMoKTsKICAgICB2b2lkIGNoZWNrRm9yTWF0Y2hpbmdGaWx0ZXJGdW5jdGlv bkxpc3RzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vV2ViQW5pbWF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9XZWJBbmltYXRpb24uY3BwCmluZGV4 IGFkMzEzMTA4YWYxNGJhYjA4YTk0Yjc1MDBlOTczYjZmNTkzYTZhMGQuLmIzOTczYzRlMzYzYTM1 NTU2Yjc4YzJjZGY1NDM4ZjZiMGM1Mzc0MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9XZWJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9X ZWJBbmltYXRpb24uY3BwCkBAIC0xMjA1LDExICsxMjA1LDYgQEAgYm9vbCBXZWJBbmltYXRpb246 OmlzUnVubmluZ0FjY2VsZXJhdGVkKCkgY29uc3QKICAgICByZXR1cm4gaXM8S2V5ZnJhbWVFZmZl Y3Q+KG1fZWZmZWN0KSAmJiBkb3duY2FzdDxLZXlmcmFtZUVmZmVjdD4oKm1fZWZmZWN0KS5pc1J1 bm5pbmdBY2NlbGVyYXRlZCgpOwogfQogCi1ib29sIFdlYkFuaW1hdGlvbjo6aXNDb21wbGV0ZWx5 QWNjZWxlcmF0ZWQoKSBjb25zdAotewotICAgIHJldHVybiBpczxLZXlmcmFtZUVmZmVjdD4obV9l ZmZlY3QpICYmIGRvd25jYXN0PEtleWZyYW1lRWZmZWN0PigqbV9lZmZlY3QpLmlzQ29tcGxldGVs eUFjY2VsZXJhdGVkKCk7Ci19Ci0KIGJvb2wgV2ViQW5pbWF0aW9uOjpuZWVkc1RpY2soKSBjb25z dAogewogICAgIHJldHVybiBwZW5kaW5nKCkgfHwgcGxheVN0YXRlKCkgPT0gUGxheVN0YXRlOjpS dW5uaW5nIHx8IG1faGFzU2NoZWR1bGVkRXZlbnRzRHVyaW5nVGljazsKQEAgLTE0NTMsOCArMTQ0 OCw2IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFdlYkFuaW1hdGlvbjo6Y29tbWl0U3R5bGVzKCkKIAog U2Vjb25kcyBXZWJBbmltYXRpb246OnRpbWVUb05leHRUaWNrKCkgY29uc3QKIHsKLSAgICBBU1NF UlQoZWZmZWN0KCkpOwotCiAgICAgaWYgKHBlbmRpbmcoKSkKICAgICAgICAgcmV0dXJuIDBfczsK IApAQCAtMTQ2MywzOSArMTQ1Niw4IEBAIFNlY29uZHMgV2ViQW5pbWF0aW9uOjp0aW1lVG9OZXh0 VGljaygpIGNvbnN0CiAgICAgaWYgKHBsYXlTdGF0ZSgpICE9IFBsYXlTdGF0ZTo6UnVubmluZyB8 fCAhcGxheWJhY2tSYXRlKQogICAgICAgICByZXR1cm4gU2Vjb25kczo6aW5maW5pdHkoKTsKIAot ICAgIGF1dG8mIGVmZmVjdCA9ICp0aGlzLT5lZmZlY3QoKTsKLSAgICBhdXRvIHRpbWluZyA9IGVm ZmVjdC5nZXRCYXNpY1RpbWluZygpOwotICAgIHN3aXRjaCAodGltaW5nLnBoYXNlKSB7Ci0gICAg Y2FzZSBBbmltYXRpb25FZmZlY3RQaGFzZTo6QmVmb3JlOgotICAgICAgICAvLyBUaGUgYW5pbWF0 aW9uIGlzIGluIGl0cyAiYmVmb3JlIiBwaGFzZSwgaW4gdGhpcyBjYXNlIHdlIGNhbiB3YWl0IHVu dGlsIGl0IGVudGVycyBpdHMgImFjdGl2ZSIgcGhhc2UuCi0gICAgICAgIHJldHVybiAoZWZmZWN0 LmRlbGF5KCkgLSB0aW1pbmcubG9jYWxUaW1lLnZhbHVlKCkpIC8gcGxheWJhY2tSYXRlOwotICAg IGNhc2UgQW5pbWF0aW9uRWZmZWN0UGhhc2U6OkFjdGl2ZToKLSAgICAgICAgaWYgKGlzQ29tcGxl dGVseUFjY2VsZXJhdGVkKCkgJiYgaXNSdW5uaW5nQWNjZWxlcmF0ZWQoKSkgewotICAgICAgICAg ICAgLy8gRnVsbHktYWNjZWxlcmF0ZWQgcnVubmluZyBDU1MgQW5pbWF0aW9ucyBuZWVkIHRvIHRy aWdnZXIgImFuaW1hdGlvbml0ZXJhdGlvbiIgZXZlbnRzLCBpbiB0aGlzIGNhc2Ugd2UgbXVzdCB3 YWl0IHVudGlsIHRoZSBuZXh0IGl0ZXJhdGlvbi4KLSAgICAgICAgICAgIGlmIChpc0NTU0FuaW1h dGlvbigpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGF1dG8gaXRlcmF0aW9uUHJvZ3Jlc3MgPSBl ZmZlY3QuZ2V0Q29tcHV0ZWRUaW1pbmcoKS5zaW1wbGVJdGVyYXRpb25Qcm9ncmVzcykKLSAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGVmZmVjdC5pdGVyYXRpb25EdXJhdGlvbigpICogKDEgLSAq aXRlcmF0aW9uUHJvZ3Jlc3MpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gRnVsbHkt YWNjZWxlcmF0ZWQgcnVubmluZyBhbmltYXRpb25zIGluIHRoZSAiYWN0aXZlIiBwaGFzZSBjYW4g d2FpdCB1bnRpbCB0aGV5IGVuZGVkLgotICAgICAgICAgICAgcmV0dXJuIChlZmZlY3QuZW5kVGlt ZSgpIC0gdGltaW5nLmxvY2FsVGltZS52YWx1ZSgpKSAvIHBsYXliYWNrUmF0ZTsKLSAgICAgICAg fQotICAgICAgICBpZiAoYXV0byBpdGVyYXRpb25Qcm9ncmVzcyA9IGVmZmVjdC5nZXRDb21wdXRl ZFRpbWluZygpLnNpbXBsZUl0ZXJhdGlvblByb2dyZXNzKSB7Ci0gICAgICAgICAgICAvLyBJbiBj YXNlIHdlJ3JlIGluIGEgcmFuZ2UgdGhhdCB1c2VzIGEgc3RlcHMoKSB0aW1pbmcgZnVuY3Rpb24s IHdlIGNhbiBjb21wdXRlIHRoZSB0aW1lIHVudGlsIHRoZSBuZXh0IHN0ZXAgc3RhcnRzLgotICAg ICAgICAgICAgaWYgKGF1dG8gcHJvZ3Jlc3NVbnRpbE5leHRTdGVwID0gZWZmZWN0LnByb2dyZXNz VW50aWxOZXh0U3RlcCgqaXRlcmF0aW9uUHJvZ3Jlc3MpKQotICAgICAgICAgICAgICAgIHJldHVy biBlZmZlY3QuaXRlcmF0aW9uRHVyYXRpb24oKSAqICpwcm9ncmVzc1VudGlsTmV4dFN0ZXAgLyBw bGF5YmFja1JhdGU7Ci0gICAgICAgIH0KLSAgICAgICAgLy8gT3RoZXIgYW5pbWF0aW9ucyBpbiB0 aGUgImFjdGl2ZSIgcGhhc2Ugd2lsbCBuZWVkIHRvIHVwZGF0ZSB0aGVpciBhbmltYXRlZCB2YWx1 ZSBhdCB0aGUgaW1tZWRpYXRlIG5leHQgb3Bwb3J0dW5pdHkuCi0gICAgICAgIHJldHVybiAwX3M7 Ci0gICAgY2FzZSBBbmltYXRpb25FZmZlY3RQaGFzZTo6QWZ0ZXI6Ci0gICAgICAgIC8vIFRoZSBh bmltYXRpb24gaXMgaW4gaXRzIGFmdGVyIHBoYXNlLCB3aGljaCBtZWFucyBpdCB3aWxsIG5vIGxv bmdlciB1cGRhdGUgaXRzIHZhbHVlLCBzbyBpdCBkb2Vucyd0IG5lZWQgYSB0aWNrLgotICAgICAg ICByZXR1cm4gU2Vjb25kczo6aW5maW5pdHkoKTsKLSAgICBjYXNlIEFuaW1hdGlvbkVmZmVjdFBo YXNlOjpJZGxlOgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJu IFNlY29uZHM6OmluZmluaXR5KCk7Ci0gICAgfQotCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 Ci0gICAgcmV0dXJuIFNlY29uZHM6OmluZmluaXR5KCk7CisgICAgQVNTRVJUKGVmZmVjdCgpKTsK KyAgICByZXR1cm4gZWZmZWN0KCktPnRpbWVUb05leHRUaWNrKCkgLyBwbGF5YmFja1JhdGU7CiB9 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9XZWJBbmltYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9XZWJBbmlt YXRpb24uaAppbmRleCA2NjY3YmZlZTY5YzBlN2JiMDE4NmQ3YmIwMmM1MmE4YzVkODBkYWY2Li5i Zjc0NTFmZjU5YjliZDRkYjVhYjE5ZTM3MDRkYmYxNTkwZTRkYWM5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hbmltYXRpb24vV2ViQW5pbWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL1dlYkFuaW1hdGlvbi5oCkBAIC0xMjgsNyArMTI4LDYgQEAgcHVibGljOgogICAg IHZvaWQgd2lsbENoYW5nZVJlbmRlcmVyKCk7CiAKICAgICBib29sIGlzUnVubmluZ0FjY2VsZXJh dGVkKCkgY29uc3Q7Ci0gICAgYm9vbCBpc0NvbXBsZXRlbHlBY2NlbGVyYXRlZCgpIGNvbnN0Owog ICAgIGJvb2wgaXNSZWxldmFudCgpIGNvbnN0IHsgcmV0dXJuIG1faXNSZWxldmFudDsgfQogICAg IHZvaWQgdXBkYXRlUmVsZXZhbmNlKCk7CiAgICAgdm9pZCBlZmZlY3RUaW1pbmdEaWRDaGFuZ2Uo KTsK