125267 2013-12-04 17:02:07 -0800 Add a WeakObjCPtr class 2013-12-04 17:23:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 956705 0 andersca 2013-12-04 17:02:07 -0800 Add a WeakObjCPtr class 956707 1 218472 andersca 2013-12-04 17:04:09 -0800 Created attachment 218472 Patch 956708 2 commit-queue 2013-12-04 17:05:41 -0800 Attachment 218472 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Shared/mac/WeakObjCPtr.h', u'Source/WebKit2/WebKit2.xcodeproj/project.pbxproj', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj', u'Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm', '--commit-queue']" exit_code: 1 ERROR: Source/WebKit2/Shared/mac/WeakObjCPtr.h:32: Missing spaces around / [whitespace/operators] [3] ERROR: Source/WebKit2/Shared/mac/WeakObjCPtr.h:36: objc_loadWeakRetained is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/WebKit2/Shared/mac/WeakObjCPtr.h:37: objc_initWeak is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/WebKit2/Shared/mac/WeakObjCPtr.h:38: objc_destroyWeak is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 4 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 956709 3 218472 ggaren 2013-12-04 17:08:00 -0800 Comment on attachment 218472 Patch r=me 956711 4 andersca 2013-12-04 17:23:24 -0800 Committed r160146: <http://trac.webkit.org/changeset/160146> 218472 2013-12-04 17:04:09 -0800 2013-12-04 17:08:00 -0800 Patch bug-125267-20131204170408.patch text/plain 15041 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWNmMDI0OGI0ZDJhNjVh OWYwODZjOTFjZGE5YTdlYmRlODgwMzZjOC4uYWM2YzJjZDY2YTk1NWExZjcwYmE1NjBjNWIyZWY5 M2IwMmFmMzYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEzLTEyLTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgV2Vha09i akNQdHIgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNTI2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlYWtPYmpDUHRyIGlzIGEgemVyb2luZyB3ZWFrIHJlZmVyZW5jZSBjbGFzcyB0ZW1wbGF0 ZSB0aGF0IHdpbGwgYmUgdXNlZCBmb3IgZGVsZWdhdGVzLgorCisgICAgICAgICogU2hhcmVkL21h Yy9XZWFrT2JqQ1B0ci5oOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6V2Vha09iakNQdHI6Oldl YWtPYmpDUHRyKToKKyAgICAgICAgKFdlYktpdDo6V2Vha09iakNQdHI6On5XZWFrT2JqQ1B0cik6 CisgICAgICAgIChXZWJLaXQ6OldlYWtPYmpDUHRyOjpvcGVyYXRvcj0pOgorICAgICAgICAoV2Vi S2l0OjpXZWFrT2JqQ1B0cjo6Z2V0KToKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisKKzIwMTMtMTItMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKwogICAgICAgICBNYWtlIHRoZSBlc3RpbWF0ZWRQcm9ncmVzcyBwcm9wZXJ0eSBv YnNlcnZhYmxlIHVzaW5nIEtWTwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI1MjU5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9t YWMvV2Vha09iakNQdHIuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2Vha09iakNQdHIu aApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5lZTAyZDQ3YWZmMmZmMzIyZGM4NjlmMjZmM2M4NmNiY2NkN2QwZDRjCi0t LSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWFrT2JqQ1B0ci5o CkBAIC0wLDAgKzEsNzkgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBh cmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWlu IHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVN UExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYWtPYmpDUHRyX2gKKyNk ZWZpbmUgV2Vha09iakNQdHJfaAorCisjaW5jbHVkZSA8b2JqYy9ydW50aW1lLmg+CisjaW5jbHVk ZSA8d3RmL1JldGFpblB0ci5oPgorCisjaWYgX19oYXNfaW5jbHVkZSg8b2JqYy9vYmpjLWludGVy bmFsLmg+KQorI2luY2x1ZGUgPG9iamMvb2JqYy1pbnRlcm5hbC5oPgorI2Vsc2UKK2V4dGVybiAi QyIgeworaWQgb2JqY19sb2FkV2Vha1JldGFpbmVkKGlkICopOworaWQgb2JqY19pbml0V2Vhayhp ZCAqLCBpZCk7Cit2b2lkIG9iamNfZGVzdHJveVdlYWsoaWQgKik7Cit9CisjZW5kaWYKKworbmFt ZXNwYWNlIFdlYktpdCB7CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYWtPYmpDUHRy IHsKK3B1YmxpYzoKKyAgICBXZWFrT2JqQ1B0cigpCisgICAgICAgIDogbV93ZWFrUmVmZXJlbmNl KG51bGxwdHIpCisgICAgeworICAgIH0KKworICAgIFdlYWtPYmpDUHRyKFQgKnB0cikKKyAgICB7 CisgICAgICAgIG9iamNfaW5pdFdlYWsoJm1fd2Vha1JlZmVyZW5jZSwgcHRyKTsKKyAgICB9CisK KyAgICB+V2Vha09iakNQdHIoKQorICAgIHsKKyAgICAgICAgb2JqY19kZXN0cm95V2VhaygmbV93 ZWFrUmVmZXJlbmNlKTsKKyAgICB9CisKKyAgICBXZWFrT2JqQ1B0ciYgb3BlcmF0b3I9KFQgKnB0 cikKKyAgICB7CisgICAgICAgIG9iamNfc3RvcmVXZWFrKCZtX3dlYWtSZWZlcmVuY2UsIHB0cik7 CisKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKworICAgIFJldGFpblB0cjxUPiBnZXQo KSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0TlMob2JqY19sb2FkV2Vha1JldGFp bmVkKGNvbnN0X2Nhc3Q8aWQgKj4oJm1fd2Vha1JlZmVyZW5jZSkpKTsKKyAgICB9CisKK3ByaXZh dGU6CisgICAgaWQgbV93ZWFrUmVmZXJlbmNlOworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CisKKyNlbmRpZiAvLyBXZWFrT2JqQ1B0cl9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQy Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYjA0Yjg0ZTRiODZmODk0M2FkOTNkZDA3 MDhkNTk4NWJmZjNiZjEyNS4uNzQyZGY5NDExZWJmNjlhYTNhOGE3NGY5MjEyMTY3OTMzMTAwMGJl YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagpAQCAtMjIzLDYgKzIyMyw3IEBACiAJCTFBQTU3NjAyMTQ5NkI5NzkwMEE0RUUwNiAvKiBF dmVudERpc3BhdGNoZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBNTc1RkYxNDk2QjdDMDAwQTRFRTA2IC8qIEV2ZW50 RGlzcGF0Y2hlck1lc3NhZ2VSZWNlaXZlci5jcHAgKi87IH07CiAJCTFBQTU4ODkyMTFFRTcwNDAw MDYxQjg4MiAvKiBOZXRzY2FwZVBsdWdpblN0cmVhbS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBNTg4OTAxMUVFNzA0MDAwNjFCODgyIC8qIE5ldHNj YXBlUGx1Z2luU3RyZWFtLmggKi87IH07CiAJCTFBQTU4ODkzMTFFRTcwNDAwMDYxQjg4MiAvKiBO ZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQUE1ODg5MTExRUU3MDQwMDA2MUI4ODIgLyogTmV0c2NhcGVQbHVnaW5T dHJlYW0uY3BwICovOyB9OworCQkxQUE5QkFFMTE4NEZGQUM3MDAzQjZCQzYgLyogV2Vha09iakNQ dHIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTlC QUUwMTg0RkZBQzcwMDNCNkJDNiAvKiBXZWFrT2JqQ1B0ci5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTFBQUI0QThEMTI5NkYwQTIwMDIzOTUyRiAv KiBTYW5kYm94RXh0ZW5zaW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxQUFCNEE4QzEyOTZGMEEyMDAyMzk1MkYgLyogU2FuZGJveEV4dGVuc2lvbi5o ICovOyB9OwogCQkxQUFCNEFBQTEyOTZGMTU0MDAyMzk1MkYgLyogU2FuZGJveEV4dGVuc2lvbk1h Yy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQUI0 QUE5MTI5NkYxNTQwMDIzOTUyRiAvKiBTYW5kYm94RXh0ZW5zaW9uTWFjLm1tICovOyB9OwogCQkx QUFCRkUzQTE4MjlDMUVEMDA1QjA3MEUgLyogV0tSZW1vdGVPYmplY3RJbnRlcmZhY2VJbnRlcm5h bC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBQkZF MzkxODI5QzFFRDAwNUIwNzBFIC8qIFdLUmVtb3RlT2JqZWN0SW50ZXJmYWNlSW50ZXJuYWwuaCAq LzsgfTsKQEAgLTE3NDAsNiArMTc0MSw3IEBACiAJCTFBQTU3NjAwMTQ5NkI3QzAwMEE0RUUwNiAv KiBFdmVudERpc3BhdGNoZXJNZXNzYWdlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBFdmVudERpc3BhdGNoZXJNZXNzYWdlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxQUE1ODg5MDExRUU3MDQwMDA2MUI4ODIgLyogTmV0c2NhcGVQbHVnaW5TdHJlYW0uaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTmV0c2NhcGVQbHVnaW5TdHJlYW0uaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBNTg4OTExMUVFNzA0MDAwNjFCODgyIC8q IE5ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IE5ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKKwkJMUFBOUJBRTAxODRGRkFDNzAwM0I2QkM2IC8qIFdlYWtPYmpDUHRyLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYWtPYmpDUHRyLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTFBQUI0QThDMTI5NkYwQTIwMDIzOTUyRiAvKiBTYW5kYm94RXh0ZW5zaW9u LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNhbmRib3hFeHRlbnNpb24uaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBQjRBQTkxMjk2RjE1NDAwMjM5NTJGIC8q IFNhbmRib3hFeHRlbnNpb25NYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7 IHBhdGggPSBTYW5kYm94RXh0ZW5zaW9uTWFjLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxQUFCRkUzOTE4MjlDMUVEMDA1QjA3MEUgLyogV0tSZW1vdGVPYmplY3RJbnRlcmZhY2VJ bnRlcm5hbC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS1JlbW90ZU9iamVj dEludGVyZmFjZUludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NzU3 LDYgKzQ3NTksNyBAQAogCQkJCUUxOEU2OTBGMTY5QjU5MjgwMDlCNjY3MCAvKiBTZWNJdGVtU2hp bS5tZXNzYWdlcy5pbiAqLywKIAkJCQk1MTFGOEE3NzEzOEI0NjA5MDBBOTVGNDQgLyogU2VjSXRl bVNoaW1MaWJyYXJ5LmggKi8sCiAJCQkJNTExRjhBNzgxMzhCNDYwOTAwQTk1RjQ0IC8qIFNlY0l0 ZW1TaGltTGlicmFyeS5tbSAqLywKKwkJCQkxQUE5QkFFMDE4NEZGQUM3MDAzQjZCQzYgLyogV2Vh a09iakNQdHIuaCAqLywKIAkJCQlCQ0UyMzI2MjEyMkM2Q0YzMDBENUMzNUEgLyogV2ViQ29yZUFy Z3VtZW50Q29kZXJzTWFjLm1tICovLAogCQkJCUJDMTExQjVCMTEyRjYyOTgwMDMzN0JBQiAvKiBX ZWJFdmVudEZhY3RvcnkuaCAqLywKIAkJCQlCQzExMUI1QzExMkY2Mjk4MDAzMzdCQUIgLyogV2Vi RXZlbnRGYWN0b3J5Lm1tICovLApAQCAtNTY2NCw2ICs1NjY3LDcgQEAKIAkJCQlCQzQ5ODYxODEy NEQxMEUyMDBEODM0RTEgLyogSW5qZWN0ZWRCdW5kbGVIaXRUZXN0UmVzdWx0LmggaW4gSGVhZGVy cyAqLywKIAkJCQk4NDQ3Nzg1MzE3NkZDQzA4MDBDREM3QkIgLyogSW5qZWN0ZWRCdW5kbGVIaXRU ZXN0UmVzdWx0TWVkaWFUeXBlLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzgxNDdENTEyRjY2RDMx MDA3QjJDMzIgLyogSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uLmggaW4gSGVhZGVycyAq LywKKwkJCQkxQUE5QkFFMTE4NEZGQUM3MDAzQjZCQzYgLyogV2Vha09iakNQdHIuaCBpbiBIZWFk ZXJzICovLAogCQkJCUJDNEJFRUFCMTIwQTBBNUYwMEZCQTBDNyAvKiBJbmplY3RlZEJ1bmRsZU5v ZGVIYW5kbGUuaCBpbiBIZWFkZXJzICovLAogCQkJCTM3OEUxQTRFMTgyMDhENzAwMDMxMDA3QSAv KiBXS05TVVJMLmggaW4gSGVhZGVycyAqLywKIAkJCQk1MTI5MzVFNDEyODhEOTc4MDBBNEI2OTUg LyogSW5qZWN0ZWRCdW5kbGVQYWdlQ29udGV4dE1lbnVDbGllbnQuaCBpbiBIZWFkZXJzICovLApk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDhhZDQ2 M2QyMWZiY2ZlOGQwZTRlNDVhYmNiNTI1MWYwOTI1ZTZkYTMuLjczYTI3ODIxYTkzYjUwZTg4ZGFi OTljNTM3ZWMwODgwMTg1OGNkNDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMy0xMi0wNCAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBhIFdlYWtPYmpDUHRyIGNs YXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjUy NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg QVBJIHRlc3RzIGZvciBXZWFrT2JqQ1B0ci4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mi9tYWMvV2Vha09iakNQdHIubW06IEFkZGVkLgorICAgICAgICAo VEVTVCk6CisKKzIwMTMtMTItMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KKwogICAgICAgICBNYWtlIHRoZSBlc3RpbWF0ZWRQcm9ncmVzcyBwcm9wZXJ0eSBvYnNlcnZh YmxlIHVzaW5nIEtWTwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI1MjU5CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktp dEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDkzNmIxYzhhNGUyZjNm NGViYWViY2Y3NjY2NjViNDY2ZjNlODE4NS4uYzhiOGNkOGU5ODRiZWQzYWI5NWNhMjBjNjU2OTRh ZDkxYTNiYjY5ZCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJ Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTI2LDYgKzI2LDcgQEAKIAkJ MUE5RTMyOTExODIxODdGODAwRjVEMDRDIC8qIFdLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTlFMzI4RjE4MjE4 N0Y4MDBGNUQwNEMgLyogV0tSZW1vdGVPYmplY3RSZWdpc3RyeS5tbSAqLzsgfTsKIAkJMUE5RTMy OTQxODIxOTQ1QzAwRjVEMDRDIC8qIFdLUmVtb3RlT2JqZWN0UmVnaXN0cnlfQnVuZGxlLm1tIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE5RTMyOTIxODIx OTQ1QzAwRjVEMDRDIC8qIFdLUmVtb3RlT2JqZWN0UmVnaXN0cnlfQnVuZGxlLm1tICovOyB9Owog CQkxQTlFNTJDOTEzRTY1RUY0MDA2OTE3RjUgLyogMTgtY2hhcmFjdGVycy5odG1sIGluIENvcHkg UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwNDVGOTQ2MTM4 NUMyRjgwMEMwRjNDRCAvKiAxOC1jaGFyYWN0ZXJzLmh0bWwgKi87IH07CisJCTFBQTlCQUU0MTg1 MDA0NTAwMDNCNkJDNiAvKiBXZWFrT2JqQ1B0ci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTlCQUUyMTg1MDA0NTAwMDNCNkJDNiAvKiBXZWFrT2Jq Q1B0ci5tbSAqLzsgfTsKIAkJMUFBOUU1NTkxNDk4MEE5OTAwMDAxQThBIC8qIEZ1bmN0aW9uYWwu Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBOUU1 NTcxNDk4MEE5OTAwMDAxQThBIC8qIEZ1bmN0aW9uYWwuY3BwICovOyB9OwogCQkxQURCRUZBRTEz MEM2ODlDMDBENjFEMTkgLyogRm9yY2VSZXBhaW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBREJFRkFEMTMwQzY4OUMwMEQ2MUQxOSAvKiBGb3Jj ZVJlcGFpbnQuY3BwICovOyB9OwogCQkxQURCRUZFMzEzMEM2QUExMDBENjFEMTkgLyogc2ltcGxl LWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFEQkVGQkMxMzBDNkEwMTAwRDYxRDE5IC8qIHNp bXBsZS1hY2NlbGVyYXRlZC1jb21wb3NpdGluZy5odG1sICovOyB9OwpAQCAtMzUwLDYgKzM1MSw3 IEBACiAJCTFBOUUzMjhGMTgyMTg3RjgwMEY1RDA0QyAvKiBXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5 Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gV0tSZW1vdGVPYmpl Y3RSZWdpc3RyeS5tbTsgcGF0aCA9IFdlYktpdDJPYmpDL1dLUmVtb3RlT2JqZWN0UmVnaXN0cnku bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBOUUzMjkyMTgyMTk0NUMwMEY1RDA0 QyAvKiBXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5X0J1bmRsZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLm9iamNwcDsgbmFtZSA9IFdLUmVtb3RlT2JqZWN0UmVnaXN0cnlfQnVuZGxlLm1tOyBw YXRoID0gbWFjL1dLUmVtb3RlT2JqZWN0UmVnaXN0cnlfQnVuZGxlLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxQTlFMzI5NTE4MjE5QUUxMDBGNUQwNEMgLyogV0tSZW1vdGVPYmpl Y3RSZWdpc3RyeV9TaGFyZWQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gV0tSZW1vdGVPYmplY3RSZWdpc3Ry eV9TaGFyZWQuaDsgcGF0aCA9IG1hYy9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5X1NoYXJlZC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUE5QkFFMjE4NTAwNDUwMDAzQjZCQzYgLyog V2Vha09iakNQdHIubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBX ZWFrT2JqQ1B0ci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBOUU1NTcxNDk4 MEE5OTAwMDAxQThBIC8qIEZ1bmN0aW9uYWwuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gRnVuY3Rpb25hbC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTFBREJFRkFEMTMwQzY4OUMwMEQ2MUQxOSAvKiBGb3JjZVJlcGFpbnQuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRm9yY2VSZXBhaW50LmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUFEQkVGQkMxMzBDNkEwMTAwRDYxRDE5IC8qIHNpbXBsZS1hY2Nl bGVyYXRlZC1jb21wb3NpdGluZy5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gInNp bXBsZS1hY2NlbGVyYXRlZC1jb21wb3NpdGluZy5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTEwNDQsNiArMTA0Niw3IEBACiAJCQkJQzBDNUQzQkMxNDU5OEI2RjAwQTgwMkE2 IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbSAqLywKIAkJCQlDMEM1RDNCRDE0NTk4QjZGMDBB ODAyQTYgLyogR2V0QmFja2luZ1NjYWxlRmFjdG9yX0J1bmRsZS5tbSAqLywKIAkJCQkxQUVGOTk0 ODE3QTA5RjUzMDA5OThFRjAgLyogR2V0UElEQWZ0ZXJBYm9ydGVkUHJvY2Vzc0xhdW5jaC5jcHAg Ki8sCisJCQkJMUFBOUJBRTIxODUwMDQ1MDAwM0I2QkM2IC8qIFdlYWtPYmpDUHRyLm1tICovLAog CQkJKTsKIAkJCXBhdGggPSBtYWM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtMTI3 OCw2ICsxMjgxLDcgQEAKIAkJCQk1MUZCQkI0RDE1MTNENEU5MDA4MjI3MzggLyogV2ViVmlld0Nh blBhc3RlVVJMLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMzdFMzhDMzQxNjlCN0QwMTAwODRDMjhD IC8qIFdlYlZpZXdEaWRSZW1vdmVGcmFtZUZyb21IaWVyYXJjaHkubW0gaW4gU291cmNlcyAqLywK IAkJCQk3NkUxODJEQTE1NDc1NTAxMDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRFdmVudC5jcHAg aW4gU291cmNlcyAqLywKKwkJCQkxQUE5QkFFNDE4NTAwNDUwMDAzQjZCQzYgLyogV2Vha09iakNQ dHIubW0gaW4gU291cmNlcyAqLywKIAkJCQlBNUUyMDI3MzE1QjIxODE5MDBDMTNFMTQgLyogV2lu ZG93bGVzc1dlYlZpZXdXaXRoTWVkaWEubW0gaW4gU291cmNlcyAqLywKIAkJCQlGNkI3QkU5NDE3 NDY5MjA5MDA4QTM0NDUgLyogRGlkQXNzb2NpYXRlRm9ybUNvbnRyb2xzLmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCUJDM0M0QzdGMTQ1ODdBQTYwMDI1RkI2MiAvKiBXS0Jyb3dzaW5nQ29udGV4dEdy b3VwVGVzdC5tbSBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyL21hYy9XZWFrT2JqQ1B0ci5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mi9tYWMvV2Vha09iakNQdHIubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjQ0ZWMzNGZhMzAy NDUwMzRmMmUwZjNkOWU1OWQ4ZWNiMTIxMzAxYQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9tYWMvV2Vha09iakNQdHIubW0KQEAgLTAsMCArMSw4 MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAx LiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisg KiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAq IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorCisjaW1wb3J0IDxXZWJLaXQy L1dlYWtPYmpDUHRyLmg+CisKK3VzaW5nIFdlYktpdDo6V2Vha09iakNQdHI7CisKK1RFU1QoV2Vi S2l0MiwgV2Vha09iakNQdHIpCit7CisgICAgLy8gVGVzdCBjb25zdHJ1Y3Rpb24uCisgICAgewor ICAgICAgICBOU09iamVjdCAqb2JqZWN0ID0gW1tOU09iamVjdCBhbGxvY10gaW5pdF07CisKKyAg ICAgICAgV2Vha09iakNQdHI8TlNPYmplY3Q+IHdlYWsob2JqZWN0KTsKKworICAgICAgICBFWFBF Q1RfRVEod2Vhay5nZXQoKSwgb2JqZWN0KTsKKworICAgICAgICBbb2JqZWN0IHJlbGVhc2VdOwor CisgICAgICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCAodm9pZCopbmlsKTsKKyAgICB9CisKKyAg ICAvLyBUZXN0IGFzc2lnbm1lbnQuCisgICAgeworICAgICAgICBOU09iamVjdCAqb2JqZWN0MSA9 IFtbTlNPYmplY3QgYWxsb2NdIGluaXRdOworCisgICAgICAgIFdlYWtPYmpDUHRyPE5TT2JqZWN0 PiB3ZWFrKG9iamVjdDEpOworCisgICAgICAgIEVYUEVDVF9FUSh3ZWFrLmdldCgpLCBvYmplY3Qx KTsKKworICAgICAgICBOU09iamVjdCAqb2JqZWN0MiA9IFtbTlNPYmplY3QgYWxsb2NdIGluaXRd OworCisgICAgICAgIHdlYWsgPSBvYmplY3QyOworICAgICAgICBFWFBFQ1RfRVEod2Vhay5nZXQo KSwgb2JqZWN0Mik7CisKKyAgICAgICAgW29iamVjdDEgcmVsZWFzZV07CisgICAgICAgIEVYUEVD VF9FUSh3ZWFrLmdldCgpLCBvYmplY3QyKTsKKworICAgICAgICBbb2JqZWN0MiByZWxlYXNlXTsK KyAgICAgICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksICh2b2lkKiluaWwpOworICAgIH0KKworICAg IC8vIFRlc3QgaGF2aW5nIGFuIG9iamVjdCB0aGF0IG91dGxpdmVzIGl0cyB3ZWFrIHBvaW50ZXIu CisgICAgeworICAgICAgICBOU09iamVjdCAqb2JqZWN0ID0gW1tOU09iamVjdCBhbGxvY10gaW5p dF07CisKKyAgICAgICAgeworICAgICAgICAgICAgV2Vha09iakNQdHI8TlNPYmplY3Q+IHdlYWso b2JqZWN0KTsKKworICAgICAgICAgICAgRVhQRUNUX0VRKHdlYWsuZ2V0KCksIG9iamVjdCk7Cisg ICAgICAgIH0KKworICAgICAgICBbb2JqZWN0IHJlbGVhc2VdOworICAgIH0KKworfQo=