58285 2011-04-11 16:33:44 -0700 CompositeAnimation is cleared while an AnimationBase is waiting for notification 2011-04-11 17:39:10 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 dino dino cmarrin simon.fraser webkit.review.bot oldest_to_newest 383671 0 dino 2011-04-11 16:33:44 -0700 <rdar://problem/9243181> <rdar://problem/9241918> <rdar://problem/9239320> From Apple crash reporter, multiple instances of the AnimationControllerPrivate sending out notifications to animations that no longer have a valid CompositeAnimation. 383681 1 89121 dino 2011-04-11 16:55:09 -0700 Created attachment 89121 Patch 383683 2 webkit.review.bot 2011-04-11 16:56:56 -0700 Attachment 89121 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/page/animation/AnimationBase.cpp:932: One line control clauses should not use braces. [whitespace/braces] [4] Source/WebCore/page/animation/AnimationBase.cpp:1205: One line control clauses should not use braces. [whitespace/braces] [4] Source/WebCore/page/animation/AnimationBase.cpp:1264: One line control clauses should not use braces. [whitespace/braces] [4] Source/WebCore/page/animation/AnimationBase.cpp:1378: One line control clauses should not use braces. [whitespace/braces] [4] Source/WebCore/page/animation/AnimationBase.cpp:1402: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 5 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 383687 3 89124 dino 2011-04-11 17:01:00 -0700 Created attachment 89124 Patch Must have passed wrong args to check-webkit-style :( 383696 4 89124 simon.fraser 2011-04-11 17:09:00 -0700 Comment on attachment 89124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89124&action=review > Source/WebCore/page/animation/AnimationBase.cpp:929 > + // Exit if we have no CompositeAnimation This and all the other same comments are not useful. The code says it. 383716 5 dino 2011-04-11 17:39:10 -0700 http://trac.webkit.org/changeset/83542 89121 2011-04-11 16:55:09 -0700 2011-04-11 17:01:00 -0700 Patch companim-missing.patch text/plain 6221 dino ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOTIzMWE4Li40M2NkZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTEtMDQtMTEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODI4NQorICAgICAgICBDb21wb3NpdGVBbmltYXRpb24g aXMgY2xlYXJlZCB3aGlsZSBhbiBBbmltYXRpb25CYXNlIGlzIHdhaXRpbmcgZm9yIG5vdGlmaWNh dGlvbgorCisgICAgICAgIE9jY2FzaW9uYWxseSBoYXJkd2FyZSBhbmltYXRpb25zIHdvdWxkIHRy aWdnZXIgYSBzdGF0ZSB3aGVyZQorICAgICAgICB0aGV5IHdvdWxkIHRlbGwgdGhlIEFuaW1hdGlv bkNvbnRyb2xsZXJQcml2YXRlIHRoYXQgaXQgc2hvdWxkIG5vdGlmeQorICAgICAgICBhbnkgd2Fp dGluZyBhbmltYXRpb25zIHRoYXQgdGhleSBhcmUgcmVhZHkgdG8gc3RhcnQsIGV2ZW4gdGhvdWdo CisgICAgICAgIHRoZSBSZW5kZXJPYmplY3QgaGFkIGdvbmUgYXdheSBhbmQgaGVuY2UgdGhlIENv bXBvc2l0ZUFuaW1hdGlvbgorICAgICAgICBoYWQgYmVlbiBkZXN0cm95ZWQuIFRoZSBmaXggaXMg dG8gemVybyB0aGUgcG9pbnRlciBmcm9tIEFuaW1hdGlvbkJhc2UKKyAgICAgICAgd2hlbiB0aGUg Q29tcG9zaXRlQW5pbWF0aW9uIGRlc3RydWN0b3IgcnVucyAob3IgaXRzIGFuaW1hdGlvbnMgYXJl CisgICAgICAgIGNsZWFyZWQpIGFuZCB0ZXN0IHRoZSB2YWxpZGl0eSBvZiB0aGUgQ29tcG9zaXRl QW5pbWF0aW9uIGJlZm9yZSBpdAorICAgICAgICBpcyB1c2VkIGluIEFuaW1hdGlvbkJhc2UuCisK KyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZSk6CisgICAgICAgIChXZWJD b3JlOjpBbmltYXRpb25CYXNlOjpmaXJlQW5pbWF0aW9uRXZlbnRzSWZOZWVkZWQpOgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkFuaW1hdGlvbkJhc2U6OmZyZWV6ZUF0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpB bmltYXRpb25CYXNlOjpiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUpOgorICAgICAgICAtIHRlc3Qg dGhhdCB0aGUgQ29tcG9zaXRlQW5pbWF0aW9uIGV4aXN0cworICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0FuaW1hdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkJhc2U6OmNs ZWFyKToKKyAgICAgICAgLSByZW5hbWUgY2xlYXJSZW5kZXJlcigpIHRvIGNsZWFyKCkgYXMgaXQg bm93IGFsc28gY2xlYXJzIHRoZSBDb21wb3NpdGVBbmltYXRpb24KKyAgICAgICAgKiBwYWdlL2Fu aW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9z aXRlQW5pbWF0aW9uOjpjbGVhclJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKToKKyAgICAgICAgLSBjYWxsIGNs ZWFyKCkgcmF0aGVyIHRoYW4gY2xlYXJSZW5kZXJlcigpCisKIDIwMTEtMDQtMTEgIFNlcmdpbyBW aWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg TWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vQW5pbWF0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Bbmlt YXRpb25CYXNlLmNwcAppbmRleCAwZmU5OGJlLi4wMGU4ZTMwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcApAQCAtOTI2LDYgKzkyNiwxMSBA QCBib29sIEFuaW1hdGlvbkJhc2U6OmFuaW1hdGlvbnNNYXRjaChjb25zdCBBbmltYXRpb24qIGFu aW0pIGNvbnN0CiAKIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1T dGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiB7CisgICAgLy8gRXhpdCBpZiB3ZSBoYXZl IG5vIENvbXBvc2l0ZUFuaW1hdGlvbgorICAgIGlmICghbV9jb21wQW5pbSkgeworICAgICAgICBy ZXR1cm47CisgICAgfQorCiAgICAgLy8gSWYgd2UgZ2V0IEFuaW1hdGlvblN0YXRlSW5wdXRSZXN0 YXJ0QW5pbWF0aW9uIHRoZW4gd2UgZm9yY2UgYSBuZXcgYW5pbWF0aW9uLCByZWdhcmRsZXNzIG9m IHN0YXRlLgogICAgIGlmIChpbnB1dCA9PSBBbmltYXRpb25TdGF0ZUlucHV0TWFrZU5ldykgewog ICAgICAgICBpZiAobV9hbmltU3RhdGUgPT0gQW5pbWF0aW9uU3RhdGVTdGFydFdhaXRTdHlsZUF2 YWlsYWJsZSkKQEAgLTExOTQsNiArMTE5OSwxMSBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0 ZVN0YXRlTWFjaGluZShBbmltU3RhdGVJbnB1dCBpbnB1dCwgZG91YmxlIHBhcmFtKQogICAgIAog dm9pZCBBbmltYXRpb25CYXNlOjpmaXJlQW5pbWF0aW9uRXZlbnRzSWZOZWVkZWQoKQogeworICAg IC8vIEV4aXQgaWYgd2UgaGF2ZSBubyBDb21wb3NpdGVBbmltYXRpb24KKyAgICBpZiAoIW1fY29t cEFuaW0pIHsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8vIElmIHdlIGFyZSB3YWl0 aW5nIGZvciB0aGUgZGVsYXkgdGltZSB0byBleHBpcmUgYW5kIGl0IGhhcywgZ28gdG8gdGhlIG5l eHQgc3RhdGUKICAgICBpZiAobV9hbmltU3RhdGUgIT0gQW5pbWF0aW9uU3RhdGVTdGFydFdhaXRU aW1lciAmJiBtX2FuaW1TdGF0ZSAhPSBBbmltYXRpb25TdGF0ZUxvb3BpbmcgJiYgbV9hbmltU3Rh dGUgIT0gQW5pbWF0aW9uU3RhdGVFbmRpbmcpCiAgICAgICAgIHJldHVybjsKQEAgLTEyNDgsNiAr MTI1OCwxMSBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OmZpcmVBbmltYXRpb25FdmVudHNJZk5lZWRl ZCgpCiAKIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlUGxheVN0YXRlKEVBbmltUGxheVN0YXRl IHBsYXlTdGF0ZSkKIHsKKyAgICAvLyBFeGl0IGlmIHdlIGhhdmUgbm8gQ29tcG9zaXRlQW5pbWF0 aW9uCisgICAgaWYgKCFtX2NvbXBBbmltKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAg ICAvLyBXaGVuIHdlIGdldCBoZXJlLCB3ZSBjYW4gaGF2ZSBvbmUgb2YgNCBkZXNpcmVkIHN0YXRl czogcnVubmluZywgcGF1c2VkLCBzdXNwZW5kZWQsIHBhdXNlZCAmIHN1c3BlbmRlZC4KICAgICAv LyBUaGUgc3RhdGUgbWFjaGluZSBjYW4gYmUgaW4gb25lIG9mIHR3byBzdGF0ZXM6IHJ1bm5pbmcs IHBhdXNlZC4KICAgICAvLyBTZXQgdGhlIHN0YXRlIG1hY2hpbmUgdG8gdGhlIGRlc2lyZWQgc3Rh dGUuCkBAIC0xMzU3LDYgKzEzNzIsMTEgQEAgdm9pZCBBbmltYXRpb25CYXNlOjpnb0ludG9FbmRp bmdPckxvb3BpbmdTdGF0ZSgpCiAgIAogdm9pZCBBbmltYXRpb25CYXNlOjpmcmVlemVBdFRpbWUo ZG91YmxlIHQpCiB7CisgICAgLy8gRXhpdCBpZiB3ZSBoYXZlIG5vIENvbXBvc2l0ZUFuaW1hdGlv bgorICAgIGlmICghbV9jb21wQW5pbSkgeworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg aWYgKCFtX3N0YXJ0VGltZSkgewogICAgICAgICAvLyBJZiB3ZSBoYXZlbid0IHN0YXJ0ZWQgeWV0 LCBqdXN0IGdlbmVyYXRlIHRoZSBzdGFydCBldmVudCBub3cKICAgICAgICAgbV9jb21wQW5pbS0+ YW5pbWF0aW9uQ29udHJvbGxlcigpLT5yZWNlaXZlZFN0YXJ0VGltZVJlc3BvbnNlKGN1cnJlbnRU aW1lKCkpOwpAQCAtMTM3Niw2ICsxMzk2LDExIEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6ZnJlZXpl QXRUaW1lKGRvdWJsZSB0KQogCiBkb3VibGUgQW5pbWF0aW9uQmFzZTo6YmVnaW5BbmltYXRpb25V cGRhdGVUaW1lKCkgY29uc3QKIHsKKyAgICAvLyBFeGl0IGlmIHdlIGhhdmUgbm8gQ29tcG9zaXRl QW5pbWF0aW9uCisgICAgaWYgKCFtX2NvbXBBbmltKSB7CisgICAgICAgIHJldHVybiAwOworICAg IH0KKwogICAgIHJldHVybiBtX2NvbXBBbmltLT5hbmltYXRpb25Db250cm9sbGVyKCktPmJlZ2lu QW5pbWF0aW9uVXBkYXRlVGltZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1h dGlvbi9BbmltYXRpb25CYXNlLmgKaW5kZXggMWFiMTRlMy4uYzA3ZjY2ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaApAQCAtNTQsNyArNTQsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB+QW5pbWF0aW9uQmFzZSgpIHsgfQogCiAgICAgUmVuZGVy T2JqZWN0KiByZW5kZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0OyB9Ci0gICAgdm9pZCBj bGVhclJlbmRlcmVyKCkgeyBtX29iamVjdCA9IDA7IH0KKyAgICB2b2lkIGNsZWFyKCkgeyBtX29i amVjdCA9IDA7IG1fY29tcEFuaW0gPSAwOyB9CiAgICAgCiAgICAgZG91YmxlIGR1cmF0aW9uKCkg Y29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBv c2l0ZUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3Np dGVBbmltYXRpb24uY3BwCmluZGV4IDI0NGQ0ZGQuLjI5YjMyZWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcApAQCAtNjAs NyArNjAsNyBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6Y2xlYXJSZW5kZXJlcigpCiAgICAg ICAgIGZvciAoQ1NTUHJvcGVydHlUcmFuc2l0aW9uc01hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBt X3RyYW5zaXRpb25zLmJlZ2luKCk7IGl0ICE9IHRyYW5zaXRpb25zRW5kOyArK2l0KSB7CiAgICAg ICAgICAgICBJbXBsaWNpdEFuaW1hdGlvbiogdHJhbnNpdGlvbiA9IGl0LT5zZWNvbmQuZ2V0KCk7 CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9sbGVyKCktPmFuaW1hdGlvbldpbGxCZVJlbW92 ZWQodHJhbnNpdGlvbik7Ci0gICAgICAgICAgICB0cmFuc2l0aW9uLT5jbGVhclJlbmRlcmVyKCk7 CisgICAgICAgICAgICB0cmFuc2l0aW9uLT5jbGVhcigpOwogICAgICAgICB9CiAgICAgfQogICAg IGlmICghbV9rZXlmcmFtZUFuaW1hdGlvbnMuaXNFbXB0eSgpKSB7CkBAIC02OSw3ICs2OSw3IEBA IHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpjbGVhclJlbmRlcmVyKCkKICAgICAgICAgZm9yIChB bmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fa2V5ZnJhbWVBbmltYXRpb25z LmJlZ2luKCk7IGl0ICE9IGFuaW1hdGlvbnNFbmQ7ICsraXQpIHsKICAgICAgICAgICAgIEtleWZy YW1lQW5pbWF0aW9uKiBhbmltID0gaXQtPnNlY29uZC5nZXQoKTsKICAgICAgICAgICAgIGFuaW1h dGlvbkNvbnRyb2xsZXIoKS0+YW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChhbmltKTsKLSAgICAgICAg ICAgIGFuaW0tPmNsZWFyUmVuZGVyZXIoKTsKKyAgICAgICAgICAgIGFuaW0tPmNsZWFyKCk7CiAg ICAgICAgIH0KICAgICB9CiB9CkBAIC0yNjQsNyArMjY0LDcgQEAgdm9pZCBDb21wb3NpdGVBbmlt YXRpb246OnVwZGF0ZUtleWZyYW1lQW5pbWF0aW9ucyhSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBS ZW5kZXIKICAgICAgICAgaWYgKGtleWZyYW1lQW5pbS0+aW5kZXgoKSA8IDApIHsKICAgICAgICAg ICAgIGFuaW1zVG9CZVJlbW92ZWQuYXBwZW5kKGtleWZyYW1lQW5pbS0+bmFtZSgpLmltcGwoKSk7 CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9sbGVyKCktPmFuaW1hdGlvbldpbGxCZVJlbW92 ZWQoa2V5ZnJhbWVBbmltKTsKLSAgICAgICAgICAgIGtleWZyYW1lQW5pbS0+Y2xlYXJSZW5kZXJl cigpOworICAgICAgICAgICAga2V5ZnJhbWVBbmltLT5jbGVhcigpOwogICAgICAgICB9CiAgICAg fQogICAgIAo= 89124 2011-04-11 17:01:00 -0700 2011-04-11 17:09:00 -0700 Patch companim-missing.patch text/plain 6176 dino ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOTIzMWE4Li40M2NkZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTEtMDQtMTEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODI4NQorICAgICAgICBDb21wb3NpdGVBbmltYXRpb24g aXMgY2xlYXJlZCB3aGlsZSBhbiBBbmltYXRpb25CYXNlIGlzIHdhaXRpbmcgZm9yIG5vdGlmaWNh dGlvbgorCisgICAgICAgIE9jY2FzaW9uYWxseSBoYXJkd2FyZSBhbmltYXRpb25zIHdvdWxkIHRy aWdnZXIgYSBzdGF0ZSB3aGVyZQorICAgICAgICB0aGV5IHdvdWxkIHRlbGwgdGhlIEFuaW1hdGlv bkNvbnRyb2xsZXJQcml2YXRlIHRoYXQgaXQgc2hvdWxkIG5vdGlmeQorICAgICAgICBhbnkgd2Fp dGluZyBhbmltYXRpb25zIHRoYXQgdGhleSBhcmUgcmVhZHkgdG8gc3RhcnQsIGV2ZW4gdGhvdWdo CisgICAgICAgIHRoZSBSZW5kZXJPYmplY3QgaGFkIGdvbmUgYXdheSBhbmQgaGVuY2UgdGhlIENv bXBvc2l0ZUFuaW1hdGlvbgorICAgICAgICBoYWQgYmVlbiBkZXN0cm95ZWQuIFRoZSBmaXggaXMg dG8gemVybyB0aGUgcG9pbnRlciBmcm9tIEFuaW1hdGlvbkJhc2UKKyAgICAgICAgd2hlbiB0aGUg Q29tcG9zaXRlQW5pbWF0aW9uIGRlc3RydWN0b3IgcnVucyAob3IgaXRzIGFuaW1hdGlvbnMgYXJl CisgICAgICAgIGNsZWFyZWQpIGFuZCB0ZXN0IHRoZSB2YWxpZGl0eSBvZiB0aGUgQ29tcG9zaXRl QW5pbWF0aW9uIGJlZm9yZSBpdAorICAgICAgICBpcyB1c2VkIGluIEFuaW1hdGlvbkJhc2UuCisK KyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZSk6CisgICAgICAgIChXZWJD b3JlOjpBbmltYXRpb25CYXNlOjpmaXJlQW5pbWF0aW9uRXZlbnRzSWZOZWVkZWQpOgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkFuaW1hdGlvbkJhc2U6OmZyZWV6ZUF0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpB bmltYXRpb25CYXNlOjpiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUpOgorICAgICAgICAtIHRlc3Qg dGhhdCB0aGUgQ29tcG9zaXRlQW5pbWF0aW9uIGV4aXN0cworICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0FuaW1hdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkJhc2U6OmNs ZWFyKToKKyAgICAgICAgLSByZW5hbWUgY2xlYXJSZW5kZXJlcigpIHRvIGNsZWFyKCkgYXMgaXQg bm93IGFsc28gY2xlYXJzIHRoZSBDb21wb3NpdGVBbmltYXRpb24KKyAgICAgICAgKiBwYWdlL2Fu aW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9z aXRlQW5pbWF0aW9uOjpjbGVhclJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 ZUFuaW1hdGlvbjo6dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKToKKyAgICAgICAgLSBjYWxsIGNs ZWFyKCkgcmF0aGVyIHRoYW4gY2xlYXJSZW5kZXJlcigpCisKIDIwMTEtMDQtMTEgIFNlcmdpbyBW aWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg TWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vQW5pbWF0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Bbmlt YXRpb25CYXNlLmNwcAppbmRleCAwZmU5OGJlLi4zNWMxOGJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcApAQCAtOTI2LDYgKzkyNiwxMCBA QCBib29sIEFuaW1hdGlvbkJhc2U6OmFuaW1hdGlvbnNNYXRjaChjb25zdCBBbmltYXRpb24qIGFu aW0pIGNvbnN0CiAKIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1T dGF0ZUlucHV0IGlucHV0LCBkb3VibGUgcGFyYW0pCiB7CisgICAgLy8gRXhpdCBpZiB3ZSBoYXZl IG5vIENvbXBvc2l0ZUFuaW1hdGlvbgorICAgIGlmICghbV9jb21wQW5pbSkKKyAgICAgICAgcmV0 dXJuOworCiAgICAgLy8gSWYgd2UgZ2V0IEFuaW1hdGlvblN0YXRlSW5wdXRSZXN0YXJ0QW5pbWF0 aW9uIHRoZW4gd2UgZm9yY2UgYSBuZXcgYW5pbWF0aW9uLCByZWdhcmRsZXNzIG9mIHN0YXRlLgog ICAgIGlmIChpbnB1dCA9PSBBbmltYXRpb25TdGF0ZUlucHV0TWFrZU5ldykgewogICAgICAgICBp ZiAobV9hbmltU3RhdGUgPT0gQW5pbWF0aW9uU3RhdGVTdGFydFdhaXRTdHlsZUF2YWlsYWJsZSkK QEAgLTExOTQsNiArMTE5OCwxMCBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFj aGluZShBbmltU3RhdGVJbnB1dCBpbnB1dCwgZG91YmxlIHBhcmFtKQogICAgIAogdm9pZCBBbmlt YXRpb25CYXNlOjpmaXJlQW5pbWF0aW9uRXZlbnRzSWZOZWVkZWQoKQogeworICAgIC8vIEV4aXQg aWYgd2UgaGF2ZSBubyBDb21wb3NpdGVBbmltYXRpb24KKyAgICBpZiAoIW1fY29tcEFuaW0pCisg ICAgICAgIHJldHVybjsKKwogICAgIC8vIElmIHdlIGFyZSB3YWl0aW5nIGZvciB0aGUgZGVsYXkg dGltZSB0byBleHBpcmUgYW5kIGl0IGhhcywgZ28gdG8gdGhlIG5leHQgc3RhdGUKICAgICBpZiAo bV9hbmltU3RhdGUgIT0gQW5pbWF0aW9uU3RhdGVTdGFydFdhaXRUaW1lciAmJiBtX2FuaW1TdGF0 ZSAhPSBBbmltYXRpb25TdGF0ZUxvb3BpbmcgJiYgbV9hbmltU3RhdGUgIT0gQW5pbWF0aW9uU3Rh dGVFbmRpbmcpCiAgICAgICAgIHJldHVybjsKQEAgLTEyNDgsNiArMTI1NiwxMCBAQCB2b2lkIEFu aW1hdGlvbkJhc2U6OmZpcmVBbmltYXRpb25FdmVudHNJZk5lZWRlZCgpCiAKIHZvaWQgQW5pbWF0 aW9uQmFzZTo6dXBkYXRlUGxheVN0YXRlKEVBbmltUGxheVN0YXRlIHBsYXlTdGF0ZSkKIHsKKyAg ICAvLyBFeGl0IGlmIHdlIGhhdmUgbm8gQ29tcG9zaXRlQW5pbWF0aW9uCisgICAgaWYgKCFtX2Nv bXBBbmltKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBXaGVuIHdlIGdldCBoZXJlLCB3ZSBj YW4gaGF2ZSBvbmUgb2YgNCBkZXNpcmVkIHN0YXRlczogcnVubmluZywgcGF1c2VkLCBzdXNwZW5k ZWQsIHBhdXNlZCAmIHN1c3BlbmRlZC4KICAgICAvLyBUaGUgc3RhdGUgbWFjaGluZSBjYW4gYmUg aW4gb25lIG9mIHR3byBzdGF0ZXM6IHJ1bm5pbmcsIHBhdXNlZC4KICAgICAvLyBTZXQgdGhlIHN0 YXRlIG1hY2hpbmUgdG8gdGhlIGRlc2lyZWQgc3RhdGUuCkBAIC0xMzU3LDYgKzEzNjksMTAgQEAg dm9pZCBBbmltYXRpb25CYXNlOjpnb0ludG9FbmRpbmdPckxvb3BpbmdTdGF0ZSgpCiAgIAogdm9p ZCBBbmltYXRpb25CYXNlOjpmcmVlemVBdFRpbWUoZG91YmxlIHQpCiB7CisgICAgLy8gRXhpdCBp ZiB3ZSBoYXZlIG5vIENvbXBvc2l0ZUFuaW1hdGlvbgorICAgIGlmICghbV9jb21wQW5pbSkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgaWYgKCFtX3N0YXJ0VGltZSkgewogICAgICAgICAvLyBJZiB3 ZSBoYXZlbid0IHN0YXJ0ZWQgeWV0LCBqdXN0IGdlbmVyYXRlIHRoZSBzdGFydCBldmVudCBub3cK ICAgICAgICAgbV9jb21wQW5pbS0+YW5pbWF0aW9uQ29udHJvbGxlcigpLT5yZWNlaXZlZFN0YXJ0 VGltZVJlc3BvbnNlKGN1cnJlbnRUaW1lKCkpOwpAQCAtMTM3Niw2ICsxMzkyLDEwIEBAIHZvaWQg QW5pbWF0aW9uQmFzZTo6ZnJlZXplQXRUaW1lKGRvdWJsZSB0KQogCiBkb3VibGUgQW5pbWF0aW9u QmFzZTo6YmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKCkgY29uc3QKIHsKKyAgICAvLyBFeGl0IGlm IHdlIGhhdmUgbm8gQ29tcG9zaXRlQW5pbWF0aW9uCisgICAgaWYgKCFtX2NvbXBBbmltKQorICAg ICAgICByZXR1cm4gMDsKKwogICAgIHJldHVybiBtX2NvbXBBbmltLT5hbmltYXRpb25Db250cm9s bGVyKCktPmJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKaW5kZXggMWFiMTRlMy4uYzA3ZjY2ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaApAQCAt NTQsNyArNTQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+QW5pbWF0aW9uQmFzZSgpIHsgfQog CiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0OyB9 Ci0gICAgdm9pZCBjbGVhclJlbmRlcmVyKCkgeyBtX29iamVjdCA9IDA7IH0KKyAgICB2b2lkIGNs ZWFyKCkgeyBtX29iamVjdCA9IDA7IG1fY29tcEFuaW0gPSAwOyB9CiAgICAgCiAgICAgZG91Ymxl IGR1cmF0aW9uKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5p bWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1h dGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCmluZGV4IDI0NGQ0ZGQuLjI5YjMyZWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9u LmNwcApAQCAtNjAsNyArNjAsNyBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6Y2xlYXJSZW5k ZXJlcigpCiAgICAgICAgIGZvciAoQ1NTUHJvcGVydHlUcmFuc2l0aW9uc01hcDo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX3RyYW5zaXRpb25zLmJlZ2luKCk7IGl0ICE9IHRyYW5zaXRpb25zRW5kOyAr K2l0KSB7CiAgICAgICAgICAgICBJbXBsaWNpdEFuaW1hdGlvbiogdHJhbnNpdGlvbiA9IGl0LT5z ZWNvbmQuZ2V0KCk7CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9sbGVyKCktPmFuaW1hdGlv bldpbGxCZVJlbW92ZWQodHJhbnNpdGlvbik7Ci0gICAgICAgICAgICB0cmFuc2l0aW9uLT5jbGVh clJlbmRlcmVyKCk7CisgICAgICAgICAgICB0cmFuc2l0aW9uLT5jbGVhcigpOwogICAgICAgICB9 CiAgICAgfQogICAgIGlmICghbV9rZXlmcmFtZUFuaW1hdGlvbnMuaXNFbXB0eSgpKSB7CkBAIC02 OSw3ICs2OSw3IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpjbGVhclJlbmRlcmVyKCkKICAg ICAgICAgZm9yIChBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fa2V5ZnJh bWVBbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGFuaW1hdGlvbnNFbmQ7ICsraXQpIHsKICAgICAg ICAgICAgIEtleWZyYW1lQW5pbWF0aW9uKiBhbmltID0gaXQtPnNlY29uZC5nZXQoKTsKICAgICAg ICAgICAgIGFuaW1hdGlvbkNvbnRyb2xsZXIoKS0+YW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChhbmlt KTsKLSAgICAgICAgICAgIGFuaW0tPmNsZWFyUmVuZGVyZXIoKTsKKyAgICAgICAgICAgIGFuaW0t PmNsZWFyKCk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0yNjQsNyArMjY0LDcgQEAgdm9pZCBD b21wb3NpdGVBbmltYXRpb246OnVwZGF0ZUtleWZyYW1lQW5pbWF0aW9ucyhSZW5kZXJPYmplY3Qq IHJlbmRlcmVyLCBSZW5kZXIKICAgICAgICAgaWYgKGtleWZyYW1lQW5pbS0+aW5kZXgoKSA8IDAp IHsKICAgICAgICAgICAgIGFuaW1zVG9CZVJlbW92ZWQuYXBwZW5kKGtleWZyYW1lQW5pbS0+bmFt ZSgpLmltcGwoKSk7CiAgICAgICAgICAgICBhbmltYXRpb25Db250cm9sbGVyKCktPmFuaW1hdGlv bldpbGxCZVJlbW92ZWQoa2V5ZnJhbWVBbmltKTsKLSAgICAgICAgICAgIGtleWZyYW1lQW5pbS0+ Y2xlYXJSZW5kZXJlcigpOworICAgICAgICAgICAga2V5ZnJhbWVBbmltLT5jbGVhcigpOwogICAg ICAgICB9CiAgICAgfQogICAgIAo=