20675 2008-09-05 15:19:35 -0700 When changing one animation in a list, don't reset other animations 2008-09-12 14:57:33 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin webkit-unassigned dino simon.fraser oldest_to_newest 90313 0 cmarrin 2008-09-05 15:19:35 -0700 Today you can have two animations running by having two values in the -webkit-animation-name. If you remove one of those names (by changing -webkit-animation-name to have only one of the names) the removed animation will stop, but the remaining one will reset and start over. It should not affect the running animation. 90315 1 23203 cmarrin 2008-09-05 15:22:47 -0700 Created attachment 23203 Patch, including LayoutTest file 90897 2 23203 hyatt 2008-09-11 15:14:27 -0700 Comment on attachment 23203 Patch, including LayoutTest file r=me 90971 3 dino 2008-09-12 14:57:33 -0700 M LayoutTests/ChangeLog A LayoutTests/animations/change-one-anim-expected.txt A LayoutTests/animations/change-one-anim.html M WebCore/ChangeLog M WebCore/page/animation/AnimationBase.cpp M WebCore/page/animation/AnimationController.cpp M WebCore/page/animation/CompositeAnimation.cpp M WebCore/page/animation/ImplicitAnimation.cpp M WebCore/page/animation/KeyframeAnimation.h Committed r36356 Required a little bit of merging thanks to a clashing patch by mitz, but i think it is ok. 23203 2008-09-05 15:22:47 -0700 2008-09-11 15:14:27 -0700 Patch, including LayoutTest file 20675.patch text/plain 15875 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjExOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDgtMDktMDUgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo ZW4gY2hhbmdpbmcgb25lIGFuaW1hdGlvbiBpbiBhIGxpc3QsIGRvbid0IHJlc2V0IG90aGVyIGFu aW1hdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNjc1CisKKyAgICAgICAgVGVzdDogYW5pbWF0aW9ucy9jaGFuZ2Utb25lLWFuaW0uaHRtbAor CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBbmltYXRpb25CYXNlOjpnZXROdW1Qcm9wZXJ0aWVzKToKKyAgICAgICAgKiBwYWdl L2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmg6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQ29udHJvbGxlci5jcHA6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQ29tcG9zaXRl QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUFuaW1hdGlvbjo6dXBk YXRlS2V5ZnJhbWVBbmltYXRpb25zKToKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9Db21wb3Np dGVBbmltYXRpb24uaDoKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9JbXBsaWNpdEFuaW1hdGlv bi5jcHA6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwOgor ICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmg6CisgICAgICAgIChX ZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6c2V0SW5kZXgpOgorCiAyMDA4LTA5LTA1ICBEYXZl IEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBydW50 aW1lIHN3aXRjaGFiaWxpdHkgb2YgdGhlIEFxdWEgbG9vayBhbmQgdGhlIG5hdGl2ZSBsb29rIG9u IFdpbmRvd3MuCkluZGV4OiBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAJ KHJldmlzaW9uIDM2MTEyKQorKysgV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTYgKzI5LDE1IEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiQW5pbWF0aW9uQmFzZS5oIgogI2luY2x1ZGUgIkFuaW1hdGlvbkNvbnRy b2xsZXIuaCIKLSNpbmNsdWRlICJLZXlmcmFtZUFuaW1hdGlvbi5oIgotI2luY2x1ZGUgIkltcGxp Y2l0QW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiQ29tcG9zaXRlQW5pbWF0aW9uLmgiCi0KICNpbmNs dWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkZsb2F0Q29u dmVyc2lvbi5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5jbHVkZSAiS2V5ZnJhbWVBbmltYXRp b24uaCIKKyNpbmNsdWRlICJJbXBsaWNpdEFuaW1hdGlvbi5oIgogI2luY2x1ZGUgIlJlbmRlck9i amVjdC5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCiAjaW5jbHVkZSAiU3lzdGVtVGltZS5o IgpAQCAtMjcwLDggKzI2OSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCAoUmVuZGVyU3R5bGU6Oipt X3NldHRlcikoY29uc3QgQ29sb3ImKTsKIH07CiAKLVZlY3RvcjxQcm9wZXJ0eVdyYXBwZXJCYXNl Kj4qIGdQcm9wZXJ0eVdyYXBwZXJzID0gMDsKLWludCBnUHJvcGVydHlXcmFwcGVyTWFwW251bUNT U1Byb3BlcnRpZXNdOworc3RhdGljIFZlY3RvcjxQcm9wZXJ0eVdyYXBwZXJCYXNlKj4qIGdQcm9w ZXJ0eVdyYXBwZXJzID0gMDsKK3N0YXRpYyBpbnQgZ1Byb3BlcnR5V3JhcHBlck1hcFtudW1DU1NQ cm9wZXJ0aWVzXTsKIAogc3RhdGljIHZvaWQgZW5zdXJlUHJvcGVydHlNYXAoKQogewpAQCAtMzcy LDYgKzM3MSw3IEBAIEFuaW1hdGlvbkJhc2U6On5BbmltYXRpb25CYXNlKCkKICAgICBpZiAobV9h bmltU3RhdGUgPT0gU1RBVEVfU1RBUlRfV0FJVF9TVFlMRV9BVkFJTEFCTEUpCiAgICAgICAgIG1f Y29tcEFuaW0tPnNldFdhaXRpbmdGb3JTdHlsZUF2YWlsYWJsZShmYWxzZSk7CiB9CisKIC8vIHN0 YXRpYwogYm9vbCBBbmltYXRpb25CYXNlOjpwcm9wZXJ0aWVzRXF1YWwoaW50IHByb3AsIGNvbnN0 IFJlbmRlclN0eWxlKiBhLCBjb25zdCBSZW5kZXJTdHlsZSogYikKIHsKQEAgLTQwOSw3ICs0MDks NiBAQCBpbnQgQW5pbWF0aW9uQmFzZTo6Z2V0TnVtUHJvcGVydGllcygpCiAgICAgZW5zdXJlUHJv cGVydHlNYXAoKTsKICAgICByZXR1cm4gZ1Byb3BlcnR5V3JhcHBlcnMtPnNpemUoKTsKIH0KLQog ICAgIAogLy8gc3RhdGljIC0gcmV0dXJuIHRydWUgaWYgd2UgbmVlZCB0byBzdGFydCBzb2Z0d2Fy ZSBhbmltYXRpb24gdGltZXJzCiBib29sIEFuaW1hdGlvbkJhc2U6OmJsZW5kUHJvcGVydGllcyhp bnQgcHJvcCwgUmVuZGVyU3R5bGUqIGRzdCwgY29uc3QgUmVuZGVyU3R5bGUqIGEsIGNvbnN0IFJl bmRlclN0eWxlKiBiLCBkb3VibGUgcHJvZykKSW5kZXg6IFdlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQmFzZS5oCShyZXZpc2lvbiAzNjExMikKKysrIFdlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw5ICsyOSw5IEBACiAjaWZuZGVm IEFuaW1hdGlvbkJhc2VfaAogI2RlZmluZSBBbmltYXRpb25CYXNlX2gKIAorI2luY2x1ZGUgIkF0 b21pY1N0cmluZy5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSAid3RmL0hhc2hNYXAu aCIKLSNpbmNsdWRlICJBdG9taWNTdHJpbmcuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCklu ZGV4OiBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAJ KHJldmlzaW9uIDM2MTEyKQorKysgV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250 cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiQW5pbWF0aW9uQ29udHJvbGxlci5oIgotCiAjaW5jbHVkZSAi Q29tcG9zaXRlQW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJUaW1l ci5oIgpJbmRleDogV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9u LmNwcAkocmV2aXNpb24gMzYxMTIpCisrKyBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0 ZUFuaW1hdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDEyICsyNywxMyBAQAogICovCiAK ICNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJDb21wb3NpdGVBbmltYXRpb24uaCIKICNp bmNsdWRlICJBbmltYXRpb25Db250cm9sbGVyLmgiCisjaW5jbHVkZSAiQ29tcG9zaXRlQW5pbWF0 aW9uLmgiCisjaW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgogI2luY2x1ZGUgIkltcGxpY2l0 QW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiS2V5ZnJhbWVBbmltYXRpb24uaCIKKyNpbmNsdWRlICJS ZW5kZXJPYmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgotI2luY2x1ZGUgIkNTU1By b3BlcnR5TmFtZXMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMDksNjUgKzExMCw2 MCBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBCiAgICAgLy8gTm90 aGluZyB0byBkbyBpZiB3ZSBkb24ndCBoYXZlIGFueSBhbmltYXRpb25zLCBhbmQgZGlkbid0IGhh dmUgYW55IGJlZm9yZQogICAgIGlmIChtX2tleWZyYW1lQW5pbWF0aW9ucy5pc0VtcHR5KCkgJiYg IXRhcmdldFN0eWxlLT5oYXNBbmltYXRpb25zKCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKKwog ICAgIC8vIE5vdGhpbmcgdG8gZG8gaWYgdGhlIGN1cnJlbnQgYW5kIHRhcmdldCBhbmltYXRpb25z IGFyZSB0aGUgc2FtZQogICAgIGlmIChjdXJyZW50U3R5bGUgJiYgY3VycmVudFN0eWxlLT5oYXNB bmltYXRpb25zKCkgJiYgdGFyZ2V0U3R5bGUtPmhhc0FuaW1hdGlvbnMoKSAmJiAqKGN1cnJlbnRT dHlsZS0+YW5pbWF0aW9ucygpKSA9PSAqKHRhcmdldFN0eWxlLT5hbmltYXRpb25zKCkpKQogICAg ICAgICByZXR1cm47CiAgICAgICAgIAotICAgIGludCBudW1BbmltcyA9IDA7Ci0gICAgYm9vbCBh bmltc0NoYW5nZWQgPSBmYWxzZTsKKyAgICAvLyBNYXJrIGFsbCBleGlzdGluZyBhbmltYXRpb25z IGFzIG5vIGxvbmdlciBhY3RpdmUKKyAgICBBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRv ciBrZmVuZCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmVuZCgpOworICAgIGZvciAoQW5pbWF0aW9u TmFtZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2tleWZyYW1lQW5pbWF0aW9ucy5iZWdpbigp OyBpdCAhPSBrZmVuZDsgKytpdCkKKyAgICAgICAgaXQtPnNlY29uZC0+c2V0SW5kZXgoLTEpOwog ICAgIAotICAgIC8vIHNlZSBpZiB0aGUgbGlzdHMgbWF0Y2gKKyAgICAvLyBOb3cgbWFyayBhbnkg c3RpbGwgYWN0aXZlIGFuaW1hdGlvbnMgYXMgYWN0aXZlIGFuZCBhZGQgYW55IG5ldyBhbmltYXRp b25zCiAgICAgaWYgKHRhcmdldFN0eWxlLT5hbmltYXRpb25zKCkpIHsKICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCB0YXJnZXRTdHlsZS0+YW5pbWF0aW9ucygpLT5zaXplKCk7ICsraSkg ewogICAgICAgICAgICAgY29uc3QgQW5pbWF0aW9uKiBhbmltID0gKCp0YXJnZXRTdHlsZS0+YW5p bWF0aW9ucygpKVtpXS5nZXQoKTsKLSAgICAgICAgICAgIAorCiAgICAgICAgICAgICBpZiAoIWFu aW0tPmlzVmFsaWRBbmltYXRpb24oKSkKLSAgICAgICAgICAgICAgICBhbmltc0NoYW5nZWQgPSB0 cnVlOwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgQXRvbWljU3RyaW5nIG5h bWUoYW5pbS0+bmFtZSgpKTsKLSAgICAgICAgICAgICAgICBLZXlmcmFtZUFuaW1hdGlvbioga2ZB bmltID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuZ2V0KG5hbWUuaW1wbCgpKTsKLSAgICAgICAgICAg ICAgICBpZiAoIWtmQW5pbSB8fCAha2ZBbmltLT5hbmltYXRpb25zTWF0Y2goYW5pbSkpCi0gICAg ICAgICAgICAgICAgICAgIGFuaW1zQ2hhbmdlZCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgZWxz ZQotICAgICAgICAgICAgICAgICAgICBpZiAoYW5pbSkgewotICAgICAgICAgICAgICAgICAgICAg ICAgLy8gYW5pbWF0aW9ucyBtYXRjaCwgYnV0IHBsYXkgc3RhdGVzIG1heSBkaWZmZXIuIHVwZGF0 ZSBpZiBuZWVkZWQKLSAgICAgICAgICAgICAgICAgICAgICAgIGtmQW5pbS0+dXBkYXRlUGxheVN0 YXRlKGFuaW0tPnBsYXlTdGF0ZSgpID09IEFuaW1QbGF5U3RhdGVQbGF5aW5nKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgICAgICAgICAgLy8gc2V0IHRoZSBzYXZl ZCBhbmltYXRpb24gdG8gdGhpcyBuZXcgb25lLCBqdXN0IGluIGNhc2UgdGhlIHBsYXkgc3RhdGUg aGFzIGNoYW5nZWQKLSAgICAgICAgICAgICAgICAgICAgICAgIGtmQW5pbS0+c2V0QW5pbWF0aW9u KGFuaW0pOwotICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgICAgICAKKyAgICAgICAgICAgIEF0b21pY1N0cmluZyBuYW1lID0gYW5pbS0+bmFt ZSgpOworCisgICAgICAgICAgICAvLyBTZWUgaWYgdGhlcmUgaXMgYSBjdXJyZW50IGFuaW1hdGlv biBmb3IgdGhpcyBuYW1lCisgICAgICAgICAgICBLZXlmcmFtZUFuaW1hdGlvbioga2ZBbmltID0g bV9rZXlmcmFtZUFuaW1hdGlvbnMuZ2V0KG5hbWUuaW1wbCgpKTsKKyAgICAgICAgICAgICAgICAK KyAgICAgICAgICAgIGlmIChrZkFuaW0pIHsKKyAgICAgICAgICAgICAgICAvLyBUaGVyZSBpcyBv bmUgc28gaXQgaXMgc3RpbGwgYWN0aXZlCisKKyAgICAgICAgICAgICAgICAvLyBBbmltYXRpb25z IG1hdGNoLCBidXQgcGxheSBzdGF0ZXMgbWF5IGRpZmZlci4gdXBkYXRlIGlmIG5lZWRlZAorICAg ICAgICAgICAgICAgIGtmQW5pbS0+dXBkYXRlUGxheVN0YXRlKGFuaW0tPnBsYXlTdGF0ZSgpID09 IEFuaW1QbGF5U3RhdGVQbGF5aW5nKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAKKyAg ICAgICAgICAgICAgICAvLyBTZXQgdGhlIHNhdmVkIGFuaW1hdGlvbiB0byB0aGlzIG5ldyBvbmUs IGp1c3QgaW4gY2FzZSB0aGUgcGxheSBzdGF0ZSBoYXMgY2hhbmdlZAorICAgICAgICAgICAgICAg IGtmQW5pbS0+c2V0QW5pbWF0aW9uKGFuaW0pOworICAgICAgICAgICAgICAgIGtmQW5pbS0+c2V0 SW5kZXgoaSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKChhbmltLT5kdXJhdGlvbigpIHx8IGFu aW0tPmRlbGF5KCkpICYmIGFuaW0tPml0ZXJhdGlvbkNvdW50KCkgJiYKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhbmltLT5rZXlmcmFtZUxpc3QoKS5nZXQoKSAmJiAh YW5pbS0+a2V5ZnJhbWVMaXN0KCktPmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIGtmQW5p bSA9IG5ldyBLZXlmcmFtZUFuaW1hdGlvbihjb25zdF9jYXN0PEFuaW1hdGlvbio+KGFuaW0pLCBy ZW5kZXJlciwgaSwgdGhpcyk7CisgICAgICAgICAgICAgICAgbV9rZXlmcmFtZUFuaW1hdGlvbnMu c2V0KGtmQW5pbS0+bmFtZSgpLmltcGwoKSwga2ZBbmltKTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICsrbnVtQW5pbXM7CiAgICAgICAgIH0KICAgICB9Ci0gICAgCi0gICAgaWYgKCFhbmlt c0NoYW5nZWQgJiYgbV9rZXlmcmFtZUFuaW1hdGlvbnMuc2l6ZSgpICE9IG51bUFuaW1zKQotICAg ICAgICBhbmltc0NoYW5nZWQgPSB0cnVlOwogCi0gICAgaWYgKCFhbmltc0NoYW5nZWQpCi0gICAg ICAgIHJldHVybjsKLQotICAgIC8vIGFuaW1hdGlvbnMgaGF2ZSBjaGFuZ2VkLCB1cGRhdGUgdGhl IGxpc3QKLSAgICByZXNldEFuaW1hdGlvbnMocmVuZGVyZXIpOwotCi0gICAgaWYgKCF0YXJnZXRT dHlsZS0+YW5pbWF0aW9ucygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBhZGQgYWxsIHRo ZSBuZXcgYW5pbWF0aW9ucwotICAgIGludCBpbmRleCA9IDA7Ci0gICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCB0YXJnZXRTdHlsZS0+YW5pbWF0aW9ucygpLT5zaXplKCk7ICsraSkgewotICAgICAg ICBjb25zdCBBbmltYXRpb24qIGFuaW0gPSAoKnRhcmdldFN0eWxlLT5hbmltYXRpb25zKCkpW2ld LmdldCgpOwotCi0gICAgICAgIGlmICghYW5pbS0+aXNWYWxpZEFuaW1hdGlvbigpKQotICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAKLSAgICAgICAgLy8gZG9uJ3QgYm90aGVyIGFk ZGluZyB0aGUgYW5pbWF0aW9uIGlmIGl0IGhhcyBubyBrZXlmcmFtZXMgb3Igd29uJ3QgYW5pbWF0 ZQotICAgICAgICBpZiAoKGFuaW0tPmR1cmF0aW9uKCkgfHwgYW5pbS0+ZGVsYXkoKSkgJiYgYW5p bS0+aXRlcmF0aW9uQ291bnQoKSAmJgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBhbmltLT5rZXlmcmFtZUxpc3QoKS5nZXQoKSAmJiAhYW5pbS0+a2V5ZnJhbWVM aXN0KCktPmlzRW1wdHkoKSkgewotICAgICAgICAgICAgS2V5ZnJhbWVBbmltYXRpb24qIGtmYW5p bSA9IG5ldyBLZXlmcmFtZUFuaW1hdGlvbihjb25zdF9jYXN0PEFuaW1hdGlvbio+KGFuaW0pLCBy ZW5kZXJlciwgaW5kZXgrKywgdGhpcyk7Ci0gICAgICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9u cy5zZXQoa2ZhbmltLT5uYW1lKCkuaW1wbCgpLCBrZmFuaW0pOwotICAgICAgICB9CisgICAgLy8g TWFrZSBhIGxpc3Qgb2YgYW5pbWF0aW9ucyB0byBiZSByZW1vdmVkCisgICAgVmVjdG9yPEF0b21p Y1N0cmluZ0ltcGwqPiBhbmltc1RvQmVSZW1vdmVkOworICAgIGtmZW5kID0gbV9rZXlmcmFtZUFu aW1hdGlvbnMuZW5kKCk7CisgICAgZm9yIChBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRv ciBpdCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGtmZW5kOyArK2l0KSB7 CisgICAgICAgIEtleWZyYW1lQW5pbWF0aW9uKiBrZkFuaW0gPSBpdC0+c2Vjb25kOworICAgICAg ICBpZiAoa2ZBbmltLT5pbmRleCgpIDwgMCkKKyAgICAgICAgICAgIGFuaW1zVG9CZVJlbW92ZWQu YXBwZW5kKGtmQW5pbS0+bmFtZSgpLmltcGwoKSk7CisgICAgfQorICAgIAorICAgIC8vIE5vdyBy ZW1vdmUgdGhlIGFuaW1hdGlvbnMgZnJvbSB0aGUgbGlzdAorICAgIGZvciAoc2l6ZV90IGogPSAw OyBqIDwgYW5pbXNUb0JlUmVtb3ZlZC5zaXplKCk7ICsraikgeworICAgICAgICBLZXlmcmFtZUFu aW1hdGlvbioga2ZBbmltID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuZ2V0KGFuaW1zVG9CZVJlbW92 ZWRbal0pOworICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9ucy5yZW1vdmUoYW5pbXNUb0JlUmVt b3ZlZFtqXSk7CisgICAgICAgIGRlbGV0ZSBrZkFuaW07CiAgICAgfQogfQogCkBAIC0yMTgsNyAr MjE0LDYgQEAgUmVuZGVyU3R5bGUqIENvbXBvc2l0ZUFuaW1hdGlvbjo6YW5pbWF0ZQogfQogCiAv LyAiYW5pbWF0aW5nIiBtZWFucyB0aGF0IHNvbWV0aGluZyBpcyBydW5uaW5nIHRoYXQgcmVxdWly ZXMgdGhlIHRpbWVyIHRvIGtlZXAgZmlyaW5nCi0vLyAoZS5nLiBhIHRyYW5zaXRpb24pCiB2b2lk IENvbXBvc2l0ZUFuaW1hdGlvbjo6c2V0QW5pbWF0aW5nKGJvb2wgaW5BbmltYXRpbmcpCiB7CiAg ICAgQ1NTUHJvcGVydHlUcmFuc2l0aW9uc01hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV90cmFu c2l0aW9ucy5lbmQoKTsKSW5kZXg6IFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5p bWF0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVB bmltYXRpb24uaAkocmV2aXNpb24gMzYxMTIpCisrKyBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0Nv bXBvc2l0ZUFuaW1hdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw4ICsyOSw4IEBACiAjaWZu ZGVmIENvbXBvc2l0ZUFuaW1hdGlvbl9oCiAjZGVmaW5lIENvbXBvc2l0ZUFuaW1hdGlvbl9oCiAK LSNpbmNsdWRlICJ3dGYvTm9uY29weWFibGUuaCIKICNpbmNsdWRlICJBdG9taWNTdHJpbmcuaCIK KyNpbmNsdWRlICJ3dGYvTm9uY29weWFibGUuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCklu ZGV4OiBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcAkocmV2 aXNpb24gMzYxMTIpCisrKyBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9u LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsMTAgKzI3LDEwIEBACiAgKi8KIAogI2luY2x1ZGUg ImNvbmZpZy5oIgorI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKKyNpbmNsdWRlICJFdmVu dE5hbWVzLmgiCiAjaW5jbHVkZSAiSW1wbGljaXRBbmltYXRpb24uaCIKICNpbmNsdWRlICJSZW5k ZXJPYmplY3QuaCIKLSNpbmNsdWRlICJFdmVudE5hbWVzLmgiCi0jaW5jbHVkZSAiQ1NTUHJvcGVy dHlOYW1lcy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKSW5kZXg6IFdlYkNvcmUvcGFnZS9h bmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFn ZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCShyZXZpc2lvbiAzNjExMikKKysrIFdl YkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNywxMSArMjcsMTEgQEAKICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVk ZSAiS2V5ZnJhbWVBbmltYXRpb24uaCIKICNpbmNsdWRlICJDb21wb3NpdGVBbmltYXRpb24uaCIK LSNpbmNsdWRlICJTeXN0ZW1UaW1lLmgiCi0jaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5j bHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIktleWZyYW1lQW5pbWF0aW9uLmgiCisjaW5j bHVkZSAiUmVuZGVyT2JqZWN0LmgiCisjaW5jbHVkZSAiU3lzdGVtVGltZS5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKSW5kZXg6IFdlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmlt YXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5p bWF0aW9uLmgJKHJldmlzaW9uIDM2MTEyKQorKysgV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlm cmFtZUFuaW1hdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02MCw2ICs2MCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldE5hbWUoY29uc3QgU3RyaW5nJiBzKSB7IG1fbmFtZSA9IHM7IH0KICAgICBj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUoKSBjb25zdCB7IHJldHVybiBtX25hbWU7IH0KICAgICBp bnQgaW5kZXgoKSBjb25zdCB7IHJldHVybiBtX2luZGV4OyB9CisgICAgdm9pZCBzZXRJbmRleChp bnQgaSkgeyBtX2luZGV4ID0gaTsgfQogCiAgICAgdmlydHVhbCBib29sIHNob3VsZEZpcmVFdmVu dHMoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDM2MTE5KQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMDgtMDktMDUgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2hhbmdpbmcgb25l IGFuaW1hdGlvbiBpbiBhIGxpc3QsIGRvbid0IHJlc2V0IG90aGVyIGFuaW1hdGlvbnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjc1CisKKyAgICAg ICAgKiBhbmltYXRpb25zL2NoYW5nZS1vbmUtYW5pbS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGFuaW1hdGlvbnMvY2hhbmdlLW9uZS1hbmltLmh0bWw6IEFkZGVkLgorCiAyMDA4LTA5 LTA0ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQmV0aCBEYWtpbi4KSW5kZXg6IExheW91dFRlc3RzL2FuaW1hdGlvbnMvY2hhbmdlLW9uZS1h bmltLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hbmltYXRpb25zL2No YW5nZS1vbmUtYW5pbS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9h bmltYXRpb25zL2NoYW5nZS1vbmUtYW5pbS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsMiBAQAorVGhpcyB0ZXN0IHBlcmZvcm1zIHR3byBhbmltYXRpb25zLCBsZWZ0IGFuZCB0 b3AuIEl0IGFuaW1hdGVzIG92ZXIgMSBzZWNvbmQuIEF0IDAuNSBzZWNvbmQgaXQgcmVtb3ZlcyB0 aGUgbGVmdCBhbmltYXRpb24gYW5kIHRoZSB0b3AgYW5pbWF0aW9uIHNob3VsZCBjb250aW51ZSBm cm9tIHdoZXJlIGl0IGxlZnQgb2ZmLgorUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvYW5pbWF0aW9u cy9jaGFuZ2Utb25lLWFuaW0uaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hbmltYXRp b25zL2NoYW5nZS1vbmUtYW5pbS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYW5p bWF0aW9ucy9jaGFuZ2Utb25lLWFuaW0uaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw5NyBA QAorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlv bmFsLy9FTiIKKyAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgorCis8 aHRtbCBsYW5nPSJlbiI+Cis8aGVhZD4KKyAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5 cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCI+CisgICAgPHRpdGxlPkFuaW1h dGlvbiB1c2luZyBtYXRyaXgoKTwvdGl0bGU+CisgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBt ZWRpYT0ic2NyZWVuIj4KKyAgICAgICAgI2JveCB7CisgICAgICAgICAgICBwb3NpdGlvbjogcmVs YXRpdmU7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgd2lkdGg6IDIw MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogIzliYjsKKyAgICAgICAgICAgIC13 ZWJraXQtYW5pbWF0aW9uLW5hbWU6IGhvcml6LCB2ZXJ0OworICAgICAgICAgICAgLXdlYmtpdC1h bmltYXRpb24tZHVyYXRpb246IDFzOworICAgICAgICAgICAgLXdlYmtpdC1hbmltYXRpb24taXRl cmF0aW9uLWNvdW50OiBpbmZpbml0ZTsKKyAgICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLWRp cmVjdGlvbjogYWx0ZXJuYXRlOworICAgICAgICAgICAgLXdlYmtpdC1hbmltYXRpb24tdGltaW5n LWZ1bmN0aW9uOiBsaW5lYXI7CisgICAgICAgICB9CisgICAgICAgICAKKyAgICAgICAgIEAtd2Vi a2l0LWtleWZyYW1lcyBob3JpeiB7CisgICAgICAgICAgICBmcm9tIHsgbGVmdDogMHB4OyB9Cisg ICAgICAgICAgICB0byB7IGxlZnQ6IDMwMHB4OyB9CisgICAgICAgICB9CisgICAgICAgICBALXdl YmtpdC1rZXlmcmFtZXMgdmVydCB7CisgICAgICAgICAgICBmcm9tIHsgdG9wOiAwcHg7IH0KKyAg ICAgICAgICAgIHRvIHsgdG9wOiAzMDBweDsgfQorICAgICAgICAgfQorICAgIDwvc3R5bGU+Cisg ICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAg ICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICAgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICB9CisgICAgCisgICAgICAgIHJlc3VsdCA9 ICJQQVNTIjsKKyAgICAgICAgY29uc3QgZGVmYXVsdFRvbGVyYW5jZSA9IDE1OworICAgIAorICAg ICAgICBjb25zdCBleHBlY3RlZCA9ICBbIDEsIDAsIDAsIDEsIDAsIDAgXTsKKyAgICAKKyAgICAg ICAgZnVuY3Rpb24gaXNFcXVhbChhY3R1YWwsIGRlc2lyZWQsIHRvbGVyYW5jZSkKKyAgICAgICAg eworICAgICAgICAgICAgaWYgKHRvbGVyYW5jZSA9PSB1bmRlZmluZWQgfHwgdG9sZXJhbmNlID09 IDApCisgICAgICAgICAgICAgICAgdG9sZXJhbmNlID0gZGVmYXVsdFRvbGVyYW5jZTsKKyAgICAg ICAgICAgIHZhciBkaWZmID0gTWF0aC5hYnMoYWN0dWFsIC0gZGVzaXJlZCk7CisgICAgICAgICAg ICByZXR1cm4gZGlmZiA8IHRvbGVyYW5jZTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9u IHJlbW92ZUFuaW0oKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgdGFyZ2V0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImJveCIpOworICAgICAgICAgICAgdmFyIGxlZnQgPSB3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLmxlZnQ7CisgICAgICAgICAgICB0YXJnZXQuc3R5bGUu d2Via2l0QW5pbWF0aW9uTmFtZSA9ICJ2ZXJ0IjsKKyAgICAgICAgICAgIHRhcmdldC5zdHlsZS5s ZWZ0ID0gbGVmdDsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgZnVuY3Rpb24gc25hcHNo b3QoKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImJveCIpOworICAgICAgICAgICAgdmFyIGxlZnQgPSBwYXJzZUludCh3aW5kb3cu Z2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLmxlZnQpOworICAgICAgICAgICAgdmFyIHRvcCA9IHBh cnNlSW50KHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRhcmdldCkudG9wKTsKKworICAgICAgICAg ICAgaWYgKCFpc0VxdWFsKGxlZnQsIDE1MCkpIHsKKyAgICAgICAgICAgICAgICByZXN1bHQgPSAi RkFJTCgnbGVmdCcgd2FzOiIrbGVmdCsiLCBleHBlY3RlZDoxNTApIjsKKyAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIWlzRXF1YWwodG9wLCAy MjUpKSB7CisgICAgICAgICAgICAgICAgcmVzdWx0ID0gIkZBSUwoJ3RvcCcgd2FzOiIrdG9wKyIs IGV4cGVjdGVkOjIyNSkiOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkKKyAgICAgICAgeworICAgICAg ICAgICAgc2V0VGltZW91dCgicmVtb3ZlQW5pbSgpIiwgNTAwKTsKKyAgICAgICAgICAgIHNldFRp bWVvdXQoInNuYXBzaG90KCkiLCA3NTApOworICAgICAgICAgICAgCisgICAgICAgICAgICB3aW5k b3cuc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgncmVzdWx0JykuaW5uZXJIVE1MID0gcmVzdWx0OworICAgICAgICAgICAgICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICAgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgIH0sIDgwMCk7Cisg ICAgICAgIH0KKworICAgICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCd3ZWJraXRBbmlt YXRpb25TdGFydCcsIHN0YXJ0LCBmYWxzZSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KK1RoaXMgdGVzdCBwZXJmb3JtcyB0d28gYW5pbWF0aW9ucywgbGVmdCBhbmQgdG9wLiBJdCBh bmltYXRlcyBvdmVyIDEgc2Vjb25kLgorQXQgMC41IHNlY29uZCBpdCByZW1vdmVzIHRoZSBsZWZ0 IGFuaW1hdGlvbiBhbmQgdGhlIHRvcCBhbmltYXRpb24gc2hvdWxkIGNvbnRpbnVlCitmcm9tIHdo ZXJlIGl0IGxlZnQgb2ZmLgorPGRpdiBpZD0iYm94Ij4KKzwvZGl2PgorPGRpdiBpZD0icmVzdWx0 Ij4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=