23878 2009-02-10 14:41:02 -0800 Clean up 'fallback animating' logic for accelerated animations 2009-02-10 17:45:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 23359 1 simon.fraser simon.fraser oldest_to_newest 109192 0 simon.fraser 2009-02-10 14:41:02 -0800 Need to do minor cleanup of the 'fallback animating' logic in AnimationBase. 109199 1 27544 simon.fraser 2009-02-10 14:49:04 -0800 Created attachment 27544 Patch, changelog 109220 2 27544 hyatt 2009-02-10 17:11:46 -0800 Comment on attachment 27544 Patch, changelog r=me 109226 3 simon.fraser 2009-02-10 17:45:30 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/page/animation/AnimationBase.cpp M WebCore/page/animation/AnimationBase.h M WebCore/page/animation/ImplicitAnimation.cpp M WebCore/page/animation/KeyframeAnimation.cpp M WebCore/platform/graphics/mac/GraphicsLayerCA.h M WebCore/platform/graphics/mac/GraphicsLayerCA.mm Committed r40843 27544 2009-02-10 14:49:04 -0800 2009-02-10 17:11:46 -0800 Patch, changelog 23878_patch.txt text/plain 14240 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmE2NDY0OS4uZTZjYWU1NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAwOS0wMi0xMCAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCAiZmFsbGJhY2tBbmltYXRpbmciIGxvZ2ljIGlu IEFuaW1hdGlvbkJhc2UuIFRoaXMgZmxhZyBpbmRpY2F0ZXMKKyAgICAgICAgdGhhdCBhbmltYXRp b24gb2YgYW4gYWNjZWxlcmF0ZWQgcHJvcGVydHkgbXVzdCBydW4gaW4gc29mdHdhcmUgZm9yIHNv bWUgcmVhc29uLgorICAgICAgICAKKyAgICAgICAgQWxzbyByZW1vdmUgdXNlIG9mIHByaXZhdGUg aGVhZGVycyBpbiBHcmFwaGljc0xheWVyQ0EgcmVsYXRlZCB0byBhIGNhc2UKKyAgICAgICAgd2hl cmUgd2UgbWF5IGhhdmUgdG8gZmFsbCBiYWNrIG9uIHNvZnR3YXJlIGFuaW1hdGlvbiBvZiB0cmFu c2Zvcm0uCisKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkJhc2U6OmJsZW5kUHJvcGVydGllcyk6CisgICAgICAg ICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oOgorICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltcGxpY2l0QW5p bWF0aW9uOjphbmltYXRlKToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1h dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6YW5pbWF0ZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EubW06CisgICAgICAg IChXZWJDb3JlOjpnZXRWYWx1ZUZ1bmN0aW9uTmFtZUZvclRyYW5zZm9ybU9wZXJhdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpjYVZhbHVlRnVuY3Rpb25TdXBwb3J0ZWQpOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckNBOjpzZXRCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckNBOjpzZXRPcGFjaXR5KToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJDQTo6YW5pbWF0ZVRyYW5zZm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyQ0E6OmFuaW1hdGVGbG9hdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xh eWVyQ0E6OnNldEJhc2ljQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDQTo6c2V0S2V5ZnJhbWVBbmltYXRpb24pOgorCiAyMDA5LTAyLTA2ICBEYXJpbiBGaXNoZXIg IDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwIGIv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAppbmRleCAxNmM3NGM0Li44 ZWE2NDQyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2Uu Y3BwCisrKyBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAKQEAgLTYy Niw3ICs2MjYsNyBAQCBib29sIEFuaW1hdGlvbkJhc2U6OmJsZW5kUHJvcGVydGllcyhjb25zdCBB bmltYXRpb25CYXNlKiBhbmltLCBpbnQgcHJvcCwgUmVuZGVyUwogICAgIGlmICh3cmFwcGVyKSB7 CiAgICAgICAgIHdyYXBwZXItPmJsZW5kKGFuaW0sIGRzdCwgYSwgYiwgcHJvZ3Jlc3MpOwogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICAgICAgcmV0dXJuICF3cmFwcGVyLT5h bmltYXRpb25Jc0FjY2VsZXJhdGVkKCk7CisgICAgICAgIHJldHVybiAhd3JhcHBlci0+YW5pbWF0 aW9uSXNBY2NlbGVyYXRlZCgpIHx8IGFuaW0tPmlzRmFsbGJhY2tBbmltYXRpbmcoKTsKICNlbHNl CiAgICAgICAgIHJldHVybiB0cnVlOwogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2Uv YW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaCBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQmFzZS5oCmluZGV4IDQ0NzA0YmQuLjBkZTZkN2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFn ZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oCisrKyBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQmFzZS5oCkBAIC0yMTQsNyArMjE0LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUmVm UHRyPEFuaW1hdGlvbj4gbV9hbmltYXRpb247CiAgICAgQ29tcG9zaXRlQW5pbWF0aW9uKiBtX2Nv bXBBbmltOwotICAgIGJvb2wgbV9mYWxsYmFja0FuaW1hdGluZzsgICAgICAgLy8gdHJ1ZSBpZiBh bnkgYW5pbWF0aW9uIHJldHVybmVkIGZhbHNlIGZyb20gc3RhcnRBbmltYXRpb24oKQorICAgIGJv b2wgbV9mYWxsYmFja0FuaW1hdGluZzsgICAgICAgLy8gdHJ1ZSB3aGVuIGFuaW1hdGluZyBhbiBh Y2NlbGVyYXRlZCBwcm9wZXJ0eSBidXQgaGF2ZSB0byBmYWxsIGJhY2sgdG8gc29mdHdhcmUKICAg ICBib29sIG1fdHJhbnNmb3JtRnVuY3Rpb25MaXN0VmFsaWQ7CiAgICAgZG91YmxlIG1fdG90YWxE dXJhdGlvbiwgbV9uZXh0SXRlcmF0aW9uRHVyYXRpb247CiAgICAgCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcCBiL1dlYkNvcmUvcGFnZS9h bmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCmluZGV4IDI1YjVmOWIuLmViNjQyMDEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCisr KyBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCkBAIC03OSw3 ICs3OSw3IEBAIHZvaWQgSW1wbGljaXRBbmltYXRpb246OmFuaW1hdGUoQ29tcG9zaXRlQW5pbWF0 aW9uKiwgUmVuZGVyT2JqZWN0KiwgUmVuZGVyU3R5bGUqCiAgICAgICAgIGFuaW1hdGVkU3R5bGUg PSBSZW5kZXJTdHlsZTo6Y2xvbmUodGFyZ2V0U3R5bGUpOwogCiAgICAgYm9vbCBuZWVkc0FuaW0g PSBibGVuZFByb3BlcnRpZXModGhpcywgbV9hbmltYXRpbmdQcm9wZXJ0eSwgYW5pbWF0ZWRTdHls ZS5nZXQoKSwgbV9mcm9tU3R5bGUuZ2V0KCksIG1fdG9TdHlsZS5nZXQoKSwgcHJvZ3Jlc3MoMSwg MCwgMCkpOwotICAgIGlmIChuZWVkc0FuaW0gfHwgbV9mYWxsYmFja0FuaW1hdGluZykKKyAgICBp ZiAobmVlZHNBbmltKQogICAgICAgICBzZXRBbmltYXRpbmcoKTsKIAogICAgIC8vIEZpcmUgdGhl IHN0YXJ0IHRpbWVvdXQgaWYgbmVlZGVkCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvYW5pbWF0 aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcCBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJh bWVBbmltYXRpb24uY3BwCmluZGV4IDY3YTU2MGIuLmYyNDlmMjcgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvcGFn ZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCkBAIC0xNDUsNyArMTQ1LDcgQEAgdm9p ZCBLZXlmcmFtZUFuaW1hdGlvbjo6YW5pbWF0ZShDb21wb3NpdGVBbmltYXRpb24qLCBSZW5kZXJP YmplY3QqLCBjb25zdCBSZW5kZXIKICAgICBIYXNoU2V0PGludD46OmNvbnN0X2l0ZXJhdG9yIGVu ZFByb3BlcnRpZXMgPSBtX2tleWZyYW1lcy5lbmRQcm9wZXJ0aWVzKCk7CiAgICAgZm9yIChIYXNo U2V0PGludD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZXMuYmVnaW5Qcm9wZXJ0aWVz KCk7IGl0ICE9IGVuZFByb3BlcnRpZXM7ICsraXQpIHsKICAgICAgICAgYm9vbCBuZWVkc0FuaW0g PSBibGVuZFByb3BlcnRpZXModGhpcywgKml0LCBhbmltYXRlZFN0eWxlLmdldCgpLCBmcm9tU3R5 bGUsIHRvU3R5bGUsIHByb2dyZXNzKTsKLSAgICAgICAgaWYgKG5lZWRzQW5pbSB8fCBtX2ZhbGxi YWNrQW5pbWF0aW5nKQorICAgICAgICBpZiAobmVlZHNBbmltKQogICAgICAgICAgICAgc2V0QW5p bWF0aW5nKCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvR3JhcGhpY3NMYXllckNBLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9H cmFwaGljc0xheWVyQ0EuaAppbmRleCA1MzMyMTgyLi4zYTY5MmQzIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EuaAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EuaApAQCAtMTA5LDggKzEwOSw4 IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiAocHJvcGVydHkgPT0gQW5pbWF0ZWRQcm9wZXJ0 eUJhY2tncm91bmRDb2xvcikgPyBtX2NvbnRlbnRzTGF5ZXIuZ2V0KCkgOiBwcmltYXJ5TGF5ZXIo KTsKICAgICB9CiAKLSAgICB2b2lkIHNldEJhc2ljQW5pbWF0aW9uKEFuaW1hdGVkUHJvcGVydHlJ RCwgY29uc3QgU3RyaW5nJiBjb21wb25lbnQsIHNob3J0IGluZGV4LCB2b2lkKiBmcm9tVmFsLCB2 b2lkKiB0b1ZhbCwgYm9vbCBpc1RyYW5zaXRpb24sIGNvbnN0IEFuaW1hdGlvbiosIGRvdWJsZSB0 aW1lKTsKLSAgICB2b2lkIHNldEtleWZyYW1lQW5pbWF0aW9uKEFuaW1hdGVkUHJvcGVydHlJRCwg Y29uc3QgU3RyaW5nJiBjb21wb25lbnQsIHNob3J0IGluZGV4LCB2b2lkKiBrZXlzLCB2b2lkKiB2 YWx1ZXMsIHZvaWQqIHRpbWluZ0Z1bmN0aW9ucywgYm9vbCBpc1RyYW5zaXRpb24sIGNvbnN0IEFu aW1hdGlvbiosIGRvdWJsZSB0aW1lKTsKKyAgICB2b2lkIHNldEJhc2ljQW5pbWF0aW9uKEFuaW1h dGVkUHJvcGVydHlJRCwgVHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlLCBzaG9ydCBp bmRleCwgdm9pZCogZnJvbVZhbCwgdm9pZCogdG9WYWwsIGJvb2wgaXNUcmFuc2l0aW9uLCBjb25z dCBBbmltYXRpb24qLCBkb3VibGUgdGltZSk7CisgICAgdm9pZCBzZXRLZXlmcmFtZUFuaW1hdGlv bihBbmltYXRlZFByb3BlcnR5SUQsIFRyYW5zZm9ybU9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZSwg c2hvcnQgaW5kZXgsIHZvaWQqIGtleXMsIHZvaWQqIHZhbHVlcywgdm9pZCogdGltaW5nRnVuY3Rp b25zLCBib29sIGlzVHJhbnNpdGlvbiwgY29uc3QgQW5pbWF0aW9uKiwgZG91YmxlIHRpbWUpOwog CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUFuaW1hdGlvbihpbnQgaW5kZXgsIGJvb2wgcmVzZXQp OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xh eWVyQ0EubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0Eu bW0KaW5kZXggMzExODgwZS4uZWM2NjU2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbQpAQCAtMjksMTAgKzI5LDYgQEAKIAogI2ltcG9y dCAiR3JhcGhpY3NMYXllckNBLmgiCiAKLS8vIFRlbXBvcmFyeQotI2ltcG9ydCA8UXVhcnR6Q29y ZS9DQUFuaW1hdGlvblByaXZhdGUuaD4KLSNpbXBvcnQgPFF1YXJ0ekNvcmUvQ0FWYWx1ZUZ1bmN0 aW9uLmg+Ci0KICNpbXBvcnQgIkFuaW1hdGlvbi5oIgogI2ltcG9ydCAiQmxvY2tFeGNlcHRpb25z LmgiCiAjaW1wb3J0ICJDU3RyaW5nLmgiCkBAIC0xNjAsMjEgKzE1NiwyMiBAQCBzdGF0aWMgTlNW YWx1ZSogZ2V0VHJhbnNmb3JtRnVuY3Rpb25WYWx1ZShjb25zdCBHcmFwaGljc0xheWVyOjpUcmFu c2Zvcm1WYWx1ZSYgdAogICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMgU3RyaW5nIGdldEFuaW1h dGlvblZhbHVlRnVuY3Rpb24oVHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlIHRyYW5z Zm9ybVR5cGUpCitzdGF0aWMgTlNTdHJpbmcqIGdldFZhbHVlRnVuY3Rpb25OYW1lRm9yVHJhbnNm b3JtT3BlcmF0aW9uKFRyYW5zZm9ybU9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZSB0cmFuc2Zvcm1U eXBlKQogeworICAgIC8vIFVzZSBsaXRlcmFsIHN0cmluZ3MgdG8gYXZvaWQgbGluay10aW1lIGRl cGVuZGVuY3kgb24gdGhvc2Ugc3ltYm9scy4KICAgICBzd2l0Y2ggKHRyYW5zZm9ybVR5cGUpIHsK ICAgICAgICAgY2FzZSBUcmFuc2Zvcm1PcGVyYXRpb246OlJPVEFURToKLSAgICAgICAgICAgIHJl dHVybiAicm90YXRlWiI7CisgICAgICAgICAgICByZXR1cm4gQCJyb3RhdGVaIjsgLy8ga0NBVmFs dWVGdW5jdGlvblJvdGF0ZVo7CiAgICAgICAgIGNhc2UgVHJhbnNmb3JtT3BlcmF0aW9uOjpTQ0FM RV9YOgotICAgICAgICAgICAgcmV0dXJuICJzY2FsZVgiOworICAgICAgICAgICAgcmV0dXJuIEAi c2NhbGVYIjsgLy8ga0NBVmFsdWVGdW5jdGlvblNjYWxlWDsKICAgICAgICAgY2FzZSBUcmFuc2Zv cm1PcGVyYXRpb246OlNDQUxFX1k6Ci0gICAgICAgICAgICByZXR1cm4gInNjYWxlWSI7CisgICAg ICAgICAgICByZXR1cm4gQCJzY2FsZVkiOyAvLyBrQ0FWYWx1ZUZ1bmN0aW9uU2NhbGVZOwogICAg ICAgICBjYXNlIFRyYW5zZm9ybU9wZXJhdGlvbjo6VFJBTlNMQVRFX1g6Ci0gICAgICAgICAgICBy ZXR1cm4gInRyYW5zbGF0ZVgiOworICAgICAgICAgICAgcmV0dXJuIEAidHJhbnNsYXRlWCI7IC8v IGtDQVZhbHVlRnVuY3Rpb25UcmFuc2xhdGVYOwogICAgICAgICBjYXNlIFRyYW5zZm9ybU9wZXJh dGlvbjo6VFJBTlNMQVRFX1k6Ci0gICAgICAgICAgICByZXR1cm4gInRyYW5zbGF0ZVkiOworICAg ICAgICAgICAgcmV0dXJuIEAidHJhbnNsYXRlWSI7IC8vIGtDQVZhbHVlRnVuY3Rpb25UcmFuc2xh dGVZOwogICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAg ICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiB9CiAKQEAgLTIyNSw2ICsyMjIsMTIgQEAgc3Rh dGljIENBTGF5ZXIqIGdldFByZXNlbnRhdGlvbkxheWVyKENBTGF5ZXIqIGxheWVyKQogICAgIHJl dHVybiBwcmVzTGF5ZXI7CiB9CiAKK3N0YXRpYyBib29sIGNhVmFsdWVGdW5jdGlvblN1cHBvcnRl ZCgpCit7CisgICAgc3RhdGljIGJvb2wgc0hhdmVWYWx1ZUZ1bmN0aW9uID0gW1tDQUxheWVyIGNs YXNzXSBpbnN0YW5jZXNSZXNwb25kVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0VmFsdWVGdW5jdGlv bjopXTsKKyAgICByZXR1cm4gc0hhdmVWYWx1ZUZ1bmN0aW9uOworfQorCiBib29sIEdyYXBoaWNz TGF5ZXI6OmdyYXBoaWNzQ29udGV4dHNGbGlwcGVkKCkKIHsKICAgICByZXR1cm4gdHJ1ZTsKQEAg LTcxOSw3ICs3MjIsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0QmFja2dyb3VuZENvbG9y KGNvbnN0IENvbG9yJiBjb2xvciwgY29uc3QgQW5pbWF0aW9uKiB0cgogICAgICAgICBDR0NvbG9y UmVmIGZyb21CYWNrZ3JvdW5kQ29sb3IgPSBbcHJlc0xheWVyIGJhY2tncm91bmRDb2xvcl07CiAK ICAgICAgICAgQ0dDb2xvclJlZiBiZ0NvbG9yID0gY2dDb2xvcihjb2xvcik7Ci0gICAgICAgIHNl dEJhc2ljQW5pbWF0aW9uKEFuaW1hdGVkUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IsICIiLCAwLCBm cm9tQmFja2dyb3VuZENvbG9yLCBiZ0NvbG9yLCB0cnVlLCB0cmFuc2l0aW9uLCBiZWdpblRpbWUp OworICAgICAgICBzZXRCYXNpY0FuaW1hdGlvbihBbmltYXRlZFByb3BlcnR5QmFja2dyb3VuZENv bG9yLCBUcmFuc2Zvcm1PcGVyYXRpb246Ok5PTkUsIDAsIGZyb21CYWNrZ3JvdW5kQ29sb3IsIGJn Q29sb3IsIHRydWUsIHRyYW5zaXRpb24sIGJlZ2luVGltZSk7CiAgICAgICAgIENHQ29sb3JSZWxl YXNlKGJnQ29sb3IpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHJlbW92ZUFsbEFuaW1hdGlvbnNG b3JQcm9wZXJ0eShBbmltYXRlZFByb3BlcnR5QmFja2dyb3VuZENvbG9yKTsgICAgCkBAIC04MTks NyArODIyLDcgQEAgYm9vbCBHcmFwaGljc0xheWVyQ0E6OnNldE9wYWNpdHkoZmxvYXQgb3BhY2l0 eSwgY29uc3QgQW5pbWF0aW9uKiB0cmFuc2l0aW9uLCBkb3UKICAgICAgICAgQ0FMYXllciogcHJl c0xheWVyID0gZ2V0UHJlc2VudGF0aW9uTGF5ZXIocHJpbWFyeUxheWVyKCkpOwogICAgICAgICBm bG9hdCBmcm9tT3BhY2l0eSA9IFtwcmVzTGF5ZXIgb3BhY2l0eV07CiAgICAgICAgIGZyb21PcGFj aXR5VmFsdWUgPSBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmZyb21PcGFjaXR5XTsKLSAgICAg ICAgc2V0QmFzaWNBbmltYXRpb24oQW5pbWF0ZWRQcm9wZXJ0eU9wYWNpdHksICIiLCAwLCBmcm9t T3BhY2l0eVZhbHVlLCB0b09wYWNpdHlWYWx1ZSwgdHJ1ZSwgdHJhbnNpdGlvbiwgYmVnaW5UaW1l KTsKKyAgICAgICAgc2V0QmFzaWNBbmltYXRpb24oQW5pbWF0ZWRQcm9wZXJ0eU9wYWNpdHksIFRy YW5zZm9ybU9wZXJhdGlvbjo6Tk9ORSwgMCwgZnJvbU9wYWNpdHlWYWx1ZSwgdG9PcGFjaXR5VmFs dWUsIHRydWUsIHRyYW5zaXRpb24sIGJlZ2luVGltZSk7CiAgICAgICAgIGRpZEFuaW1hdGUgPSB0 cnVlOwogICAgIH0KIApAQCAtODU4LDYgKzg2MSwxMSBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6 YW5pbWF0ZVRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1WYWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29u cwogICAgIGJvb2wgaXNWYWxpZCwgaGFzQmlnUm90YXRpb247CiAgICAgdmFsdWVMaXN0Lm1ha2VG dW5jdGlvbkxpc3QoZnVuY3Rpb25MaXN0LCBpc1ZhbGlkLCBoYXNCaWdSb3RhdGlvbik7CiAKKyAg ICAvLyBXZSBuZWVkIHRvIGZhbGwgYmFjayB0byBzb2Z0d2FyZSBhbmltYXRpb24gaWYgd2UgZG9u J3QgaGF2ZSBzZXRWYWx1ZUZ1bmN0aW9uOiwgYW5kCisgICAgLy8gd2UgaGF2ZSBhID4gMTgwZGVn IHJvdGF0aW9uIG1peGVkIHdpdGggYW5vdGhlciB0cmFuc2Zvcm0uCisgICAgaWYgKGhhc0JpZ1Jv dGF0aW9uICYmIGZ1bmN0aW9uTGlzdC5zaXplKCkgPiAxICYmICFjYVZhbHVlRnVuY3Rpb25TdXBw b3J0ZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAogICAgIEJFR0lOX0JMT0NLX09C SkNfRVhDRVBUSU9OUwogICAgIAogICAgIC8vIFJ1bGVzIGZvciBhbmltYXRpb246CkBAIC05MjUs NyArOTMzLDcgQEAgYm9vbCBHcmFwaGljc0xheWVyQ0E6OmFuaW1hdGVUcmFuc2Zvcm0oY29uc3Qg VHJhbnNmb3JtVmFsdWVMaXN0JiB2YWx1ZUxpc3QsIGNvbnMKICAgICAgICAgICAgIC8vIFdlIHRv c3MgdGhlIGxhc3QgdGZBcnJheSB2YWx1ZSBiZWNhdXNlIGl0IGhhcyB0byBvbmUgc2hvcnRlciB0 aGFuIHRoZSBvdGhlcnMuCiAgICAgICAgICAgICBbdGZBcnJheSByZW1vdmVMYXN0T2JqZWN0XTsK ICAgICAgICAgICAgIAotICAgICAgICAgICAgc2V0S2V5ZnJhbWVBbmltYXRpb24oQW5pbWF0ZWRQ cm9wZXJ0eVdlYmtpdFRyYW5zZm9ybSwgZ2V0QW5pbWF0aW9uVmFsdWVGdW5jdGlvbihvcFR5cGUp LCBmdW5jdGlvbkluZGV4LCB0aW1lc0FycmF5LCB2YWxBcnJheSwgdGZBcnJheSwgaXNUcmFuc2l0 aW9uLCBhbmltLCBiZWdpblRpbWUpOworICAgICAgICAgICAgc2V0S2V5ZnJhbWVBbmltYXRpb24o QW5pbWF0ZWRQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybSwgb3BUeXBlLCBmdW5jdGlvbkluZGV4LCB0 aW1lc0FycmF5LCB2YWxBcnJheSwgdGZBcnJheSwgaXNUcmFuc2l0aW9uLCBhbmltLCBiZWdpblRp bWUpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBbdGltZXNBcnJheSByZWxlYXNlXTsKICAg ICAgICAgICAgIFt2YWxBcnJheSByZWxlYXNlXTsKQEAgLTk0OSw3ICs5NTcsNyBAQCBib29sIEdy YXBoaWNzTGF5ZXJDQTo6YW5pbWF0ZVRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1WYWx1ZUxpc3Qm IHZhbHVlTGlzdCwgY29ucwogICAgICAgICAgICAgICAgIHRvVmFsdWUgPSBnZXRUcmFuc2Zvcm1G dW5jdGlvblZhbHVlKHZhbHVlTGlzdC5hdCgxKSwgZnVuY3Rpb25JbmRleCwgc2l6ZSwgb3BUeXBl KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAotICAgICAgICAgICAgc2V0QmFzaWNBbmlt YXRpb24oQW5pbWF0ZWRQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybSwgZ2V0QW5pbWF0aW9uVmFsdWVG dW5jdGlvbihvcFR5cGUpLCBmdW5jdGlvbkluZGV4LCBmcm9tVmFsdWUsIHRvVmFsdWUsIGlzVHJh bnNpdGlvbiwgYW5pbSwgYmVnaW5UaW1lKTsKKyAgICAgICAgICAgIHNldEJhc2ljQW5pbWF0aW9u KEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm0sIG9wVHlwZSwgZnVuY3Rpb25JbmRleCwg ZnJvbVZhbHVlLCB0b1ZhbHVlLCBpc1RyYW5zaXRpb24sIGFuaW0sIGJlZ2luVGltZSk7CiAgICAg ICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmIChpc01hdHJpeEFuaW1hdGlvbikKQEAgLTk4MCw3 ICs5ODgsNyBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6YW5pbWF0ZUZsb2F0KEFuaW1hdGVkUHJv cGVydHlJRCBwcm9wZXJ0eSwgY29uc3QgRmxvYXRWYWx1ZQogICAgIAogICAgICAgICAvLyBpbml0 aWFsaXplIHRoZSBwcm9wZXJ0eSB0byAwCiAgICAgICAgIFthbmltYXRlZExheWVyKHByb3BlcnR5 KSBzZXRWYWx1ZTowIGZvcktleVBhdGg6cHJvcGVydHlJZFRvU3RyaW5nKHByb3BlcnR5KV07Ci0g ICAgICAgIHNldEJhc2ljQW5pbWF0aW9uKHByb3BlcnR5LCAiIiwgMCwgaXNuYW4oZnJvbVZhbCkg PyBuaWwgOiBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmZyb21WYWxdLCBpc25hbih0b1ZhbCkg PyBuaWwgOiBbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OnRvVmFsXSwgZmFsc2UsIGFuaW1hdGlv biwgYmVnaW5UaW1lKTsKKyAgICAgICAgc2V0QmFzaWNBbmltYXRpb24ocHJvcGVydHksIFRyYW5z Zm9ybU9wZXJhdGlvbjo6Tk9ORSwgMCwgaXNuYW4oZnJvbVZhbCkgPyBuaWwgOiBbTlNOdW1iZXIg bnVtYmVyV2l0aEZsb2F0OmZyb21WYWxdLCBpc25hbih0b1ZhbCkgPyBuaWwgOiBbTlNOdW1iZXIg bnVtYmVyV2l0aEZsb2F0OnRvVmFsXSwgZmFsc2UsIGFuaW1hdGlvbiwgYmVnaW5UaW1lKTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC0xMDExLDcgKzEwMTksNyBAQCBib29sIEdy YXBoaWNzTGF5ZXJDQTo6YW5pbWF0ZUZsb2F0KEFuaW1hdGVkUHJvcGVydHlJRCBwcm9wZXJ0eSwg Y29uc3QgRmxvYXRWYWx1ZQogICAgIC8vIEluaXRpYWxpemUgdGhlIHByb3BlcnR5IHRvIDAuCiAg ICAgW2FuaW1hdGVkTGF5ZXIocHJvcGVydHkpIHNldFZhbHVlOjAgZm9yS2V5UGF0aDpwcm9wZXJ0 eUlkVG9TdHJpbmcocHJvcGVydHkpXTsKICAgICAvLyBUaGVuIHNldCB0aGUgYW5pbWF0aW9uLgot ICAgIHNldEtleWZyYW1lQW5pbWF0aW9uKHByb3BlcnR5LCAiIiwgMCwgdGltZXNBcnJheSwgdmFs QXJyYXksIHRmQXJyYXksIGZhbHNlLCBhbmltYXRpb24sIGJlZ2luVGltZSk7CisgICAgc2V0S2V5 ZnJhbWVBbmltYXRpb24ocHJvcGVydHksIFRyYW5zZm9ybU9wZXJhdGlvbjo6Tk9ORSwgMCwgdGlt ZXNBcnJheSwgdmFsQXJyYXksIHRmQXJyYXksIGZhbHNlLCBhbmltYXRpb24sIGJlZ2luVGltZSk7 CiAKICAgICBbdGltZXNBcnJheSByZWxlYXNlXTsKICAgICBbdmFsQXJyYXkgcmVsZWFzZV07CkBA IC0xMDkwLDcgKzEwOTgsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNS ZWN0KCkKICAgICB9CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRCYXNpY0FuaW1hdGlv bihBbmltYXRlZFByb3BlcnR5SUQgcHJvcGVydHksIGNvbnN0IFN0cmluZyYgdmFsdWVGdW5jdGlv biwgc2hvcnQgaW5kZXgsIHZvaWQqIGZyb21WYWwsIHZvaWQqIHRvVmFsLCBib29sIGlzVHJhbnNp dGlvbiwgY29uc3QgQW5pbWF0aW9uKiB0cmFuc2l0aW9uLCBkb3VibGUgYmVnaW5UaW1lKQordm9p ZCBHcmFwaGljc0xheWVyQ0E6OnNldEJhc2ljQW5pbWF0aW9uKEFuaW1hdGVkUHJvcGVydHlJRCBw cm9wZXJ0eSwgVHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlIG9wZXJhdGlvblR5cGUs IHNob3J0IGluZGV4LCB2b2lkKiBmcm9tVmFsLCB2b2lkKiB0b1ZhbCwgYm9vbCBpc1RyYW5zaXRp b24sIGNvbnN0IEFuaW1hdGlvbiogdHJhbnNpdGlvbiwgZG91YmxlIGJlZ2luVGltZSkKIHsKICAg ICBBU1NFUlQoZnJvbVZhbCB8fCB0b1ZhbCk7CiAKQEAgLTExMjUsNyArMTEzMywxMCBAQCB2b2lk IEdyYXBoaWNzTGF5ZXJDQTo6c2V0QmFzaWNBbmltYXRpb24oQW5pbWF0ZWRQcm9wZXJ0eUlEIHBy b3BlcnR5LCBjb25zdCBTdHJpbgogICAgIC8vIHdpdGggYW4gaW5kZXggPiAwLgogICAgIFtiYXNp Y0FuaW0gc2V0QWRkaXRpdmU6cHJvcGVydHkgPT0gQW5pbWF0ZWRQcm9wZXJ0eVdlYmtpdFRyYW5z Zm9ybV07CiAgICAgW2Jhc2ljQW5pbSBzZXRGaWxsTW9kZTpAImV4dGVuZGVkIl07Ci0gICAgW2Jh c2ljQW5pbSBzZXRWYWx1ZUZ1bmN0aW9uOltDQVZhbHVlRnVuY3Rpb24gZnVuY3Rpb25XaXRoTmFt ZTp2YWx1ZUZ1bmN0aW9uXV07CisgICAgaWYgKGNhVmFsdWVGdW5jdGlvblN1cHBvcnRlZCgpKSB7 CisgICAgICAgIGlmIChOU1N0cmluZyogdmFsdWVGdW5jdGlvbk5hbWUgPSBnZXRWYWx1ZUZ1bmN0 aW9uTmFtZUZvclRyYW5zZm9ybU9wZXJhdGlvbihvcGVyYXRpb25UeXBlKSkKKyAgICAgICAgICAg IFtiYXNpY0FuaW0gc2V0VmFsdWVGdW5jdGlvbjpbQ0FWYWx1ZUZ1bmN0aW9uIGZ1bmN0aW9uV2l0 aE5hbWU6dmFsdWVGdW5jdGlvbk5hbWVdXTsKKyAgICB9CiAgICAgCiAgICAgLy8gU2V0IHRoZSBk ZWxlZ2F0ZSAoYW5kIHByb3BlcnR5IHZhbHVlKS4KICAgICBpbnQgcHJvcCA9IGlzVHJhbnNpdGlv biA/IHByb3BlcnR5IDogQW5pbWF0ZWRQcm9wZXJ0eUludmFsaWQ7CkBAIC0xMTU0LDcgKzExNjUs NyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0QmFzaWNBbmltYXRpb24oQW5pbWF0ZWRQcm9w ZXJ0eUlEIHByb3BlcnR5LCBjb25zdCBTdHJpbgogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElP TlMKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEtleWZyYW1lQW5pbWF0aW9uKEFuaW1h dGVkUHJvcGVydHlJRCBwcm9wZXJ0eSwgY29uc3QgU3RyaW5nJiB2YWx1ZUZ1bmN0aW9uLCBzaG9y dCBpbmRleCwgdm9pZCoga2V5cywgdm9pZCogdmFsdWVzLCB2b2lkKiB0aW1pbmdGdW5jdGlvbnMs IAordm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEtleWZyYW1lQW5pbWF0aW9uKEFuaW1hdGVkUHJv cGVydHlJRCBwcm9wZXJ0eSwgVHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlIG9wZXJh dGlvblR5cGUsIHNob3J0IGluZGV4LCB2b2lkKiBrZXlzLCB2b2lkKiB2YWx1ZXMsIHZvaWQqIHRp bWluZ0Z1bmN0aW9ucywgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29s IGlzVHJhbnNpdGlvbiwgY29uc3QgQW5pbWF0aW9uKiBhbmltLCBkb3VibGUgYmVnaW5UaW1lKQog ewogICAgIFBsYXRmb3JtTGF5ZXIqIGxheWVyID0gYW5pbWF0ZWRMYXllcihwcm9wZXJ0eSk7CkBA IC0xMTg5LDggKzEyMDAsMTEgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldEtleWZyYW1lQW5p bWF0aW9uKEFuaW1hdGVkUHJvcGVydHlJRCBwcm9wZXJ0eSwgY29uc3QgU3QKICAgICAvLyB3aXRo IGFuIGluZGV4ID4gMC4KICAgICBba2V5ZnJhbWVBbmltIHNldEFkZGl0aXZlOihwcm9wZXJ0eSA9 PSBBbmltYXRlZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtKSA/IFlFUyA6IE5PXTsKICAgICBba2V5 ZnJhbWVBbmltIHNldEZpbGxNb2RlOkAiZXh0ZW5kZWQiXTsKLSAgICBba2V5ZnJhbWVBbmltIHNl dFZhbHVlRnVuY3Rpb246W0NBVmFsdWVGdW5jdGlvbiBmdW5jdGlvbldpdGhOYW1lOnZhbHVlRnVu Y3Rpb25dXTsKLSAgICAKKyAgICBpZiAoY2FWYWx1ZUZ1bmN0aW9uU3VwcG9ydGVkKCkpIHsKKyAg ICAgICAgaWYgKE5TU3RyaW5nKiB2YWx1ZUZ1bmN0aW9uTmFtZSA9IGdldFZhbHVlRnVuY3Rpb25O YW1lRm9yVHJhbnNmb3JtT3BlcmF0aW9uKG9wZXJhdGlvblR5cGUpKQorICAgICAgICAgICAgW2tl eWZyYW1lQW5pbSBzZXRWYWx1ZUZ1bmN0aW9uOltDQVZhbHVlRnVuY3Rpb24gZnVuY3Rpb25XaXRo TmFtZTp2YWx1ZUZ1bmN0aW9uTmFtZV1dOworICAgIH0KKwogICAgIFtrZXlmcmFtZUFuaW0gc2V0 S2V5VGltZXM6cmVpbnRlcnByZXRfY2FzdDxpZD4oa2V5cyldOwogICAgIFtrZXlmcmFtZUFuaW0g c2V0VmFsdWVzOnJlaW50ZXJwcmV0X2Nhc3Q8aWQ+KHZhbHVlcyldOwogICAgIAo=