48844 2010-11-02 09:46:34 -0700 Make RenderStyle::playState() return typed value and cleanup naming in Animation code" 2010-11-02 10:21:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin oldest_to_newest 303426 0 cmarrin 2010-11-02 09:46:34 -0700 Make RenderStyle::playState() return typed value and cleanup naming in Animation code" 303432 1 72689 cmarrin 2010-11-02 09:51:39 -0700 Created attachment 72689 Patch 303436 2 72689 aroben 2010-11-02 09:56:39 -0700 Comment on attachment 72689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72689&action=review > WebCore/page/animation/CompositeAnimation.h:102 > - bool m_isSuspended; > + bool m_suspended; I think this is a step in the wrong direction, but I guess consistency is a good thing. > WebCore/platform/animation/Animation.h:137 > - unsigned m_playState : 2; > + EAnimPlayState m_playState : 2; You need to keep this an unsigned bitfield. Enum bitfields are signed under MSVC, and that will screw up comparison operations. You should cast to EAnimPlayState in the getter. 303452 3 cmarrin 2010-11-02 10:21:14 -0700 Made change suggested by Adam and landed in http://trac.webkit.org/changeset/71125 72689 2010-11-02 09:51:39 -0700 2010-11-02 09:56:39 -0700 Patch bug-48844-20101102095139.patch text/plain 10531 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMTEtMDIgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1h a2UgUmVuZGVyU3R5bGU6OnBsYXlTdGF0ZSgpIHJldHVybiB0eXBlZCB2YWx1ZSBhbmQgY2xlYW51 cCBuYW1pbmcgaW4gQW5pbWF0aW9uIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ4ODQ0CisKKyAgICAgICAgcGxheVN0YXRlKCkgZnVuY3Rpb24g d2FzIHJldHVybmluZyB1bnNpZ25lZCB2YWx1ZSwgYnV0IHRoZXJlIGlzIGEgRUFuaW1QbGF5U3Rh dGUKKyAgICAgICAgZW51bSB0eXBlIHdoaWNoIGhhcyB0aGUgbGVnYWwgcGxheVN0YXRlIHZhbHVl cy4gVGhpcyB0eXBlIGlzIG5vdyB1c2VkIGV2ZXJ5d2hlcmUuCisgICAgICAgIEkgYWxzbyBjaGFu Z2VkIHRoZSBuYW1pbmcgb2YgdGhlIG1faXNTdXNwZW5kZWQgdG8gbV9zdXNwZW5kZWQgdG8gbWF0 Y2ggdGhlIHN0eWxlCisgICAgICAgIGVsc2V3aGVyZSBpbiB0aGUgY29kZS4KKworICAgICAgICAq IHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5p bWF0aW9uQmFzZTo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9B bmltYXRpb25CYXNlLmg6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6 Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnVw ZGF0ZUFuaW1hdGlvblRpbWVyKToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVB bmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0aW9uOjp1cGRh dGVLZXlmcmFtZUFuaW1hdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0 aW9uOjpzdXNwZW5kQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVBbmlt YXRpb246OnJlc3VtZUFuaW1hdGlvbnMpOgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0NvbXBv c2l0ZUFuaW1hdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0aW9uOjpz dXNwZW5kZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0aW9uOjpDb21wb3Np dGVBbmltYXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uaDoK KyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbjo6cGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNv cmU6OkFuaW1hdGlvbjo6c2V0UGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlv bjo6aW5pdGlhbEFuaW1hdGlvblBsYXlTdGF0ZSk6CisKIDIwMTAtMTEtMDEgIFpoZW55YW8gTW8g IDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpJ bmRleDogV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCShyZXZpc2lvbiA3 MDkzOCkKKysrIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyMDYsOCArMTIwNiw5IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6ZmlyZUFu aW1hdGlvbkV2ZW50c0kKICAgICB9CiB9CiAKLXZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlUGxh eVN0YXRlKGJvb2wgcnVuKQordm9pZCBBbmltYXRpb25CYXNlOjp1cGRhdGVQbGF5U3RhdGUoRUFu aW1QbGF5U3RhdGUgcGxheVN0YXRlKQogeworICAgIGJvb2wgcnVuID0gcGxheVN0YXRlID09IEFu aW1QbGF5U3RhdGVQbGF5aW5nOwogICAgIGlmIChwYXVzZWQoKSA9PSBydW4gfHwgaXNOZXcoKSkK ICAgICAgICAgdXBkYXRlU3RhdGVNYWNoaW5lKHJ1biA/IEFuaW1hdGlvblN0YXRlSW5wdXRQbGF5 U3RhdGVSdW5uaW5nIDogQW5pbWF0aW9uU3RhdGVJbnB1dFBsYXlTdGF0ZVBhdXNlZCwgLTEpOwog fQpJbmRleDogV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgJKHJldmlzaW9uIDcw OTM4KQorKysgV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpZm5kZWYgQW5pbWF0aW9uQmFzZV9oCiAjZGVmaW5l IEFuaW1hdGlvbkJhc2VfaAogCisjaW5jbHVkZSAiUmVuZGVyU3R5bGVDb25zdGFudHMuaCIKICNp bmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5o PgogCkBAIC0xMDIsNyArMTAzLDcgQEAgcHVibGljOgogICAgIH0KIAogICAgIC8vIENhbGxlZCB0 byBjaGFuZ2UgdG8gb3IgZnJvbSBwYXVzZWQgc3RhdGUKLSAgICB2b2lkIHVwZGF0ZVBsYXlTdGF0 ZShib29sIHJ1bm5pbmcpOworICAgIHZvaWQgdXBkYXRlUGxheVN0YXRlKEVBbmltUGxheVN0YXRl KTsKICAgICBib29sIHBsYXlTdGF0ZVBsYXlpbmcoKSBjb25zdDsKIAogICAgIGJvb2wgd2FpdGlu Z1RvU3RhcnQoKSBjb25zdCB7IHJldHVybiBtX2FuaW1TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZU5l dyB8fCBtX2FuaW1TdGF0ZSA9PSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFRpbWVyOyB9CkluZGV4 OiBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAJKHJl dmlzaW9uIDcwOTM4KQorKysgV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9s bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCBib29sIEFuaW1hdGlvbkNv bnRyb2xsZXJQcml2YXRlOjpjbGVhcihSCiAgICAgaWYgKCFhbmltYXRpb24pCiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICBhbmltYXRpb24tPmNsZWFyUmVuZGVyZXIoKTsKLSAgICByZXR1cm4g YW5pbWF0aW9uLT5pc1N1c3BlbmRlZCgpOworICAgIHJldHVybiBhbmltYXRpb24tPnN1c3BlbmRl ZCgpOwogfQogCiB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjp1cGRhdGVBbmltYXRp b25UaW1lcihib29sIGNhbGxTZXRDaGFuZ2VkLyogPSBmYWxzZSovKQpAQCAtOTIsNyArOTIsNyBA QCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjp1cGRhdGVBCiAgICAgUmVuZGVyT2Jq ZWN0QW5pbWF0aW9uTWFwOjpjb25zdF9pdGVyYXRvciBhbmltYXRpb25zRW5kID0gbV9jb21wb3Np dGVBbmltYXRpb25zLmVuZCgpOwogICAgIGZvciAoUmVuZGVyT2JqZWN0QW5pbWF0aW9uTWFwOjpj b25zdF9pdGVyYXRvciBpdCA9IG1fY29tcG9zaXRlQW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBh bmltYXRpb25zRW5kOyArK2l0KSB7CiAgICAgICAgIENvbXBvc2l0ZUFuaW1hdGlvbiogY29tcEFu aW0gPSBpdC0+c2Vjb25kLmdldCgpOwotICAgICAgICBpZiAoIWNvbXBBbmltLT5pc1N1c3BlbmRl ZCgpICYmIGNvbXBBbmltLT5oYXNBbmltYXRpb25zKCkpIHsKKyAgICAgICAgaWYgKCFjb21wQW5p bS0+c3VzcGVuZGVkKCkgJiYgY29tcEFuaW0tPmhhc0FuaW1hdGlvbnMoKSkgewogICAgICAgICAg ICAgZG91YmxlIHQgPSBjb21wQW5pbS0+dGltZVRvTmV4dFNlcnZpY2UoKTsKICAgICAgICAgICAg IGlmICh0ICE9IC0xICYmICh0IDwgbmVlZHNTZXJ2aWNlIHx8IG5lZWRzU2VydmljZSA9PSAtMSkp CiAgICAgICAgICAgICAgICAgbmVlZHNTZXJ2aWNlID0gdDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9h bmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAJKHJldmlzaW9uIDcwOTM4KQorKysg V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMjksNyArMjI5LDcgQEAgdm9pZCBDb21wb3NpdGVBbmltYXRpb246OnVwZGF0ZUtl eWZyYW1lQQogICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIG9uZSBpcyBzdGlsbCBhY3RpdmUu CiAKICAgICAgICAgICAgICAgICAgICAgLy8gQW5pbWF0aW9ucyBtYXRjaCwgYnV0IHBsYXkgc3Rh dGVzIG1heSBkaWZmZXIuIFVwZGF0ZSBpZiBuZWVkZWQuCi0gICAgICAgICAgICAgICAgICAgIGtl eWZyYW1lQW5pbS0+dXBkYXRlUGxheVN0YXRlKGFuaW0tPnBsYXlTdGF0ZSgpID09IEFuaW1QbGF5 U3RhdGVQbGF5aW5nKTsKKyAgICAgICAgICAgICAgICAgICAga2V5ZnJhbWVBbmltLT51cGRhdGVQ bGF5U3RhdGUoYW5pbS0+cGxheVN0YXRlKCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAKICAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHRoZSBzYXZlZCBhbmltYXRpb24gdG8g dGhpcyBuZXcgb25lLCBqdXN0IGluIGNhc2UgdGhlIHBsYXkgc3RhdGUgaGFzIGNoYW5nZWQuCiAg ICAgICAgICAgICAgICAgICAgIGtleWZyYW1lQW5pbS0+c2V0QW5pbWF0aW9uKGFuaW0pOwpAQCAt Mzg2LDE3ICszODYsMTcgQEAgUGFzc1JlZlB0cjxLZXlmcmFtZUFuaW1hdGlvbj4gQ29tcG9zaXRl QQogCiB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6c3VzcGVuZEFuaW1hdGlvbnMoKQogewotICAg IGlmIChtX2lzU3VzcGVuZGVkKQorICAgIGlmIChtX3N1c3BlbmRlZCkKICAgICAgICAgcmV0dXJu OwogCi0gICAgbV9pc1N1c3BlbmRlZCA9IHRydWU7CisgICAgbV9zdXNwZW5kZWQgPSB0cnVlOwog CiAgICAgaWYgKCFtX2tleWZyYW1lQW5pbWF0aW9ucy5pc0VtcHR5KCkpIHsKICAgICAgICAgbV9r ZXlmcmFtZUFuaW1hdGlvbnMuY2hlY2tDb25zaXN0ZW5jeSgpOwogICAgICAgICBBbmltYXRpb25O YW1lTWFwOjpjb25zdF9pdGVyYXRvciBhbmltYXRpb25zRW5kID0gbV9rZXlmcmFtZUFuaW1hdGlv bnMuZW5kKCk7CiAgICAgICAgIGZvciAoQW5pbWF0aW9uTmFtZU1hcDo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBtX2tleWZyYW1lQW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBhbmltYXRpb25zRW5kOyAr K2l0KSB7CiAgICAgICAgICAgICBpZiAoS2V5ZnJhbWVBbmltYXRpb24qIGFuaW0gPSBpdC0+c2Vj b25kLmdldCgpKQotICAgICAgICAgICAgICAgIGFuaW0tPnVwZGF0ZVBsYXlTdGF0ZShmYWxzZSk7 CisgICAgICAgICAgICAgICAgYW5pbS0+dXBkYXRlUGxheVN0YXRlKEFuaW1QbGF5U3RhdGVQYXVz ZWQpOwogICAgICAgICB9CiAgICAgfQogICAgIGlmICghbV90cmFuc2l0aW9ucy5pc0VtcHR5KCkp IHsKQEAgLTQwNCwxNyArNDA0LDE3IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpzdXNwZW5k QW5pbWF0aW8KICAgICAgICAgZm9yIChDU1NQcm9wZXJ0eVRyYW5zaXRpb25zTWFwOjpjb25zdF9p dGVyYXRvciBpdCA9IG1fdHJhbnNpdGlvbnMuYmVnaW4oKTsgaXQgIT0gdHJhbnNpdGlvbnNFbmQ7 ICsraXQpIHsKICAgICAgICAgICAgIEltcGxpY2l0QW5pbWF0aW9uKiBhbmltID0gaXQtPnNlY29u ZC5nZXQoKTsKICAgICAgICAgICAgIGlmIChhbmltICYmIGFuaW0tPmhhc1N0eWxlKCkpCi0gICAg ICAgICAgICAgICAgYW5pbS0+dXBkYXRlUGxheVN0YXRlKGZhbHNlKTsKKyAgICAgICAgICAgICAg ICBhbmltLT51cGRhdGVQbGF5U3RhdGUoQW5pbVBsYXlTdGF0ZVBhdXNlZCk7CiAgICAgICAgIH0K ICAgICB9CiB9CiAKIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpyZXN1bWVBbmltYXRpb25zKCkK IHsKLSAgICBpZiAoIW1faXNTdXNwZW5kZWQpCisgICAgaWYgKCFtX3N1c3BlbmRlZCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgbV9pc1N1c3BlbmRlZCA9IGZhbHNlOworICAgIG1fc3VzcGVuZGVk ID0gZmFsc2U7CiAKICAgICBpZiAoIW1fa2V5ZnJhbWVBbmltYXRpb25zLmlzRW1wdHkoKSkgewog ICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9ucy5jaGVja0NvbnNpc3RlbmN5KCk7CkBAIC00MjIs NyArNDIyLDcgQEAgdm9pZCBDb21wb3NpdGVBbmltYXRpb246OnJlc3VtZUFuaW1hdGlvbgogICAg ICAgICBmb3IgKEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFt ZUFuaW1hdGlvbnMuYmVnaW4oKTsgaXQgIT0gYW5pbWF0aW9uc0VuZDsgKytpdCkgewogICAgICAg ICAgICAgS2V5ZnJhbWVBbmltYXRpb24qIGFuaW0gPSBpdC0+c2Vjb25kLmdldCgpOwogICAgICAg ICAgICAgaWYgKGFuaW0gJiYgYW5pbS0+cGxheVN0YXRlUGxheWluZygpKQotICAgICAgICAgICAg ICAgIGFuaW0tPnVwZGF0ZVBsYXlTdGF0ZSh0cnVlKTsKKyAgICAgICAgICAgICAgICBhbmltLT51 cGRhdGVQbGF5U3RhdGUoQW5pbVBsYXlTdGF0ZVBsYXlpbmcpOwogICAgICAgICB9CiAgICAgfQog CkBAIC00MzEsNyArNDMxLDcgQEAgdm9pZCBDb21wb3NpdGVBbmltYXRpb246OnJlc3VtZUFuaW1h dGlvbgogICAgICAgICBmb3IgKENTU1Byb3BlcnR5VHJhbnNpdGlvbnNNYXA6OmNvbnN0X2l0ZXJh dG9yIGl0ID0gbV90cmFuc2l0aW9ucy5iZWdpbigpOyBpdCAhPSB0cmFuc2l0aW9uc0VuZDsgKytp dCkgewogICAgICAgICAgICAgSW1wbGljaXRBbmltYXRpb24qIGFuaW0gPSBpdC0+c2Vjb25kLmdl dCgpOwogICAgICAgICAgICAgaWYgKGFuaW0gJiYgYW5pbS0+aGFzU3R5bGUoKSkKLSAgICAgICAg ICAgICAgICBhbmltLT51cGRhdGVQbGF5U3RhdGUodHJ1ZSk7CisgICAgICAgICAgICAgICAgYW5p bS0+dXBkYXRlUGxheVN0YXRlKEFuaW1QbGF5U3RhdGVQbGF5aW5nKTsKICAgICAgICAgfQogICAg IH0KIH0KSW5kZXg6IFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24u aAkocmV2aXNpb24gNzA5MzgpCisrKyBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFu aW1hdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgc3VzcGVuZEFuaW1hdGlvbnMoKTsKICAgICB2b2lkIHJlc3VtZUFuaW1hdGlvbnMoKTsK LSAgICBib29sIGlzU3VzcGVuZGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc1N1c3BlbmRlZDsgfQor ICAgIGJvb2wgc3VzcGVuZGVkKCkgY29uc3QgeyByZXR1cm4gbV9zdXNwZW5kZWQ7IH0KICAgICAK ICAgICBib29sIGhhc0FuaW1hdGlvbnMoKSBjb25zdCAgeyByZXR1cm4gIW1fdHJhbnNpdGlvbnMu aXNFbXB0eSgpIHx8ICFtX2tleWZyYW1lQW5pbWF0aW9ucy5pc0VtcHR5KCk7IH0KIApAQCAtODQs NyArODQsNyBAQCBwcml2YXRlOgogICAgIENvbXBvc2l0ZUFuaW1hdGlvbihBbmltYXRpb25Db250 cm9sbGVyUHJpdmF0ZSogYW5pbWF0aW9uQ29udHJvbGxlcikKICAgICAgICAgOiBtX2FuaW1hdGlv bkNvbnRyb2xsZXIoYW5pbWF0aW9uQ29udHJvbGxlcikKICAgICAgICAgLCBtX251bVN0eWxlQXZh aWxhYmxlV2FpdGVycygwKQotICAgICAgICAsIG1faXNTdXNwZW5kZWQoZmFsc2UpCisgICAgICAg ICwgbV9zdXNwZW5kZWQoZmFsc2UpCiAgICAgewogICAgIH0KIApAQCAtOTksNyArOTksNyBAQCBw cml2YXRlOgogICAgIEFuaW1hdGlvbk5hbWVNYXAgbV9rZXlmcmFtZUFuaW1hdGlvbnM7CiAgICAg VmVjdG9yPEF0b21pY1N0cmluZ0ltcGwqPiBtX2tleWZyYW1lQW5pbWF0aW9uT3JkZXJNYXA7CiAg ICAgdW5zaWduZWQgbV9udW1TdHlsZUF2YWlsYWJsZVdhaXRlcnM7Ci0gICAgYm9vbCBtX2lzU3Vz cGVuZGVkOworICAgIGJvb2wgbV9zdXNwZW5kZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uaAkocmV2aXNpb24g NzA5MzgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uaAkod29ya2lu ZyBjb3B5KQpAQCAtOTMsNyArOTMsNyBAQCBwdWJsaWM6CiAgICAgZW51bSB7IEl0ZXJhdGlvbkNv dW50SW5maW5pdGUgPSAtMSB9OwogICAgIGludCBpdGVyYXRpb25Db3VudCgpIGNvbnN0IHsgcmV0 dXJuIG1faXRlcmF0aW9uQ291bnQ7IH0KICAgICBjb25zdCBTdHJpbmcmIG5hbWUoKSBjb25zdCB7 IHJldHVybiBtX25hbWU7IH0KLSAgICB1bnNpZ25lZCBwbGF5U3RhdGUoKSBjb25zdCB7IHJldHVy biBtX3BsYXlTdGF0ZTsgfQorICAgIEVBbmltUGxheVN0YXRlIHBsYXlTdGF0ZSgpIGNvbnN0IHsg cmV0dXJuIG1fcGxheVN0YXRlOyB9CiAgICAgaW50IHByb3BlcnR5KCkgY29uc3QgeyByZXR1cm4g bV9wcm9wZXJ0eTsgfQogICAgIGNvbnN0IFBhc3NSZWZQdHI8VGltaW5nRnVuY3Rpb24+IHRpbWlu Z0Z1bmN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV90aW1pbmdGdW5jdGlvbjsgfQogCkBAIC0xMDMs NyArMTAzLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RmlsbE1vZGUodW5zaWduZWQgZikgeyBt X2ZpbGxNb2RlID0gZjsgbV9maWxsTW9kZVNldCA9IHRydWU7IH0KICAgICB2b2lkIHNldEl0ZXJh dGlvbkNvdW50KGludCBjKSB7IG1faXRlcmF0aW9uQ291bnQgPSBjOyBtX2l0ZXJhdGlvbkNvdW50 U2V0ID0gdHJ1ZTsgfQogICAgIHZvaWQgc2V0TmFtZShjb25zdCBTdHJpbmcmIG4pIHsgbV9uYW1l ID0gbjsgbV9uYW1lU2V0ID0gdHJ1ZTsgfQotICAgIHZvaWQgc2V0UGxheVN0YXRlKHVuc2lnbmVk IGQpIHsgbV9wbGF5U3RhdGUgPSBkOyBtX3BsYXlTdGF0ZVNldCA9IHRydWU7IH0KKyAgICB2b2lk IHNldFBsYXlTdGF0ZShFQW5pbVBsYXlTdGF0ZSBkKSB7IG1fcGxheVN0YXRlID0gZDsgbV9wbGF5 U3RhdGVTZXQgPSB0cnVlOyB9CiAgICAgdm9pZCBzZXRQcm9wZXJ0eShpbnQgdCkgeyBtX3Byb3Bl cnR5ID0gdDsgbV9wcm9wZXJ0eVNldCA9IHRydWU7IH0KICAgICB2b2lkIHNldFRpbWluZ0Z1bmN0 aW9uKFBhc3NSZWZQdHI8VGltaW5nRnVuY3Rpb24+IGYpIHsgbV90aW1pbmdGdW5jdGlvbiA9IGY7 IG1fdGltaW5nRnVuY3Rpb25TZXQgPSB0cnVlOyB9CiAKQEAgLTEzNCw3ICsxMzQsNyBAQCBwcml2 YXRlOgogICAgIHVuc2lnbmVkIG1fZGlyZWN0aW9uIDogMTsgLy8gQW5pbWF0aW9uRGlyZWN0aW9u CiAgICAgdW5zaWduZWQgbV9maWxsTW9kZSA6IDI7CiAKLSAgICB1bnNpZ25lZCBtX3BsYXlTdGF0 ZSAgICAgOiAyOworICAgIEVBbmltUGxheVN0YXRlIG1fcGxheVN0YXRlICAgICA6IDI7CiAKICAg ICBib29sIG1fZGVsYXlTZXQgICAgICAgICAgOiAxOwogICAgIGJvb2wgbV9kaXJlY3Rpb25TZXQg ICAgICA6IDE7CkBAIC0xNTUsNyArMTU1LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB1bnNpZ25l ZCBpbml0aWFsQW5pbWF0aW9uRmlsbE1vZGUoKSB7IHJldHVybiBBbmltYXRpb25GaWxsTW9kZU5v bmU7IH0KICAgICBzdGF0aWMgaW50IGluaXRpYWxBbmltYXRpb25JdGVyYXRpb25Db3VudCgpIHsg cmV0dXJuIDE7IH0KICAgICBzdGF0aWMgU3RyaW5nIGluaXRpYWxBbmltYXRpb25OYW1lKCkgeyBy ZXR1cm4gU3RyaW5nKCJub25lIik7IH0KLSAgICBzdGF0aWMgdW5zaWduZWQgaW5pdGlhbEFuaW1h dGlvblBsYXlTdGF0ZSgpIHsgcmV0dXJuIEFuaW1QbGF5U3RhdGVQbGF5aW5nOyB9CisgICAgc3Rh dGljIEVBbmltUGxheVN0YXRlIGluaXRpYWxBbmltYXRpb25QbGF5U3RhdGUoKSB7IHJldHVybiBB bmltUGxheVN0YXRlUGxheWluZzsgfQogICAgIHN0YXRpYyBpbnQgaW5pdGlhbEFuaW1hdGlvblBy b3BlcnR5KCkgeyByZXR1cm4gY0FuaW1hdGVBbGw7IH0KICAgICBzdGF0aWMgUGFzc1JlZlB0cjxU aW1pbmdGdW5jdGlvbj4gaW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKCkgeyByZXR1cm4g Q3ViaWNCZXppZXJUaW1pbmdGdW5jdGlvbjo6Y3JlYXRlKCk7IH0KIH07Cg==