53343 2011-01-28 15:56:37 -0800 Add CoreAnimationRenderer class 2011-01-28 16:06:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 341815 0 andersca 2011-01-28 15:56:37 -0800 Add CoreAnimationRenderer class 341821 1 80517 andersca 2011-01-28 16:01:40 -0800 Created attachment 80517 Patch 341827 2 80517 sam 2011-01-28 16:05:06 -0800 Comment on attachment 80517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80517&action=review > Source/WebKit2/Shared/mac/CoreAnimationRenderer.mm:31 > +#import <OPenGL/CGLMacro.h> This looks to have odd case. 341829 3 andersca 2011-01-28 16:06:53 -0800 Committed r77012: <http://trac.webkit.org/changeset/77012> 80517 2011-01-28 16:01:40 -0800 2011-01-28 16:05:06 -0800 Patch bug-53343-20110128160139.patch text/plain 12414 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MDA5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDEtMjggIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQ29yZUFuaW1hdGlvblJlbmRlcmVyIGNsYXNzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzM0MworCisg ICAgICAgICogU2hhcmVkL21hYy9Db3JlQW5pbWF0aW9uUmVuZGVyZXIuaDogQWRkZWQuCisgICAg ICAgICogU2hhcmVkL21hYy9Db3JlQW5pbWF0aW9uUmVuZGVyZXIubW06IEFkZGVkLgorCisgICAg ICAgIChXZWJLaXQ6OkNvcmVBbmltYXRpb25SZW5kZXJlcjo6Q29yZUFuaW1hdGlvblJlbmRlcmVy KToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgdW5kZXJseWluZyBDQVJlbmRlcmVyIG9iamVjdCBh bmQgaG9vayB1cCBhIG5vdGlmaWNhdGlvbiBvYnNlcnZlci4KKworICAgICAgICAoV2ViS2l0OjpD b3JlQW5pbWF0aW9uUmVuZGVyZXI6On5Db3JlQW5pbWF0aW9uUmVuZGVyZXIpOgorICAgICAgICBB c3NlcnQgdGhhdCB0aGUgY2xpZW50IGlzIG51bGwuIEl0IGhhcyBiZWVuIHNldCB0byBudWxsIGJ5 IHRoZSBjYWxsIHRvIGludmFsaWRhdGUoKS4KKworICAgICAgICAoV2ViS2l0OjpDb3JlQW5pbWF0 aW9uUmVuZGVyZXI6OnNldEJvdW5kcyk6CisgICAgICAgIFVwZGF0ZSB0aGUgYm91bmRzIG9uIHRo ZSBDQVJlbmRlcmVyIGFuZCB0aGUgcm9vdCBsYXllci4KKworICAgICAgICAoV2ViS2l0OjpDb3Jl QW5pbWF0aW9uUmVuZGVyZXI6OnJlbmRlcik6CisgICAgICAgIEFzayB0aGUgcmVuZGVyZXIgdG8g cmVuZGVyIGFuZCByZXR1cm4gdGhlIG5leHQgZnJhbWUgdGltZS4KKworICAgICAgICAoV2ViS2l0 OjpDb3JlQW5pbWF0aW9uUmVuZGVyZXI6OmludmFsaWRhdGUpOgorICAgICAgICBSZW1vdmUgdGhl IGNoYW5nZSBvYnNlcnZlciBhbmQgcmVzZXQgdGhlIGNsaWVudC4KKworICAgICAgICAoV2ViS2l0 OjpDb3JlQW5pbWF0aW9uUmVuZGVyZXI6OnJlbmRlcmVyRGlkQ2hhbmdlKToKKyAgICAgICAgQ2Fs bCB0aGUgY2xpZW50IG1lbWJlciBmdW5jdGlvbi4KKworICAgICAgICAqIFdlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRkIG5ldyBmaWxlcy4KKwogMjAxMS0wMS0y OCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0NvcmVB bmltYXRpb25SZW5kZXJlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9t YWMvQ29yZUFuaW1hdGlvblJlbmRlcmVyLmgJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL0NvcmVBbmltYXRpb25SZW5kZXJlci5oCShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDY5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoK KyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZP UiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBI T1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4K KyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0Ug T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBDb3JlQW5pbWF0aW9uUmVuZGVyZXJfaAor I2RlZmluZSBDb3JlQW5pbWF0aW9uUmVuZGVyZXJfaAorCisjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQ dHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi9SZXRhaW5Q dHIuaD4KKworT0JKQ19DTEFTUyBDQUxheWVyOworT0JKQ19DTEFTUyBDQVJlbmRlcmVyOworCit0 eXBlZGVmIHN0cnVjdCBfQ0dMQ29udGV4dE9iamVjdCogQ0dMQ29udGV4dE9iajsKKworbmFtZXNw YWNlIFdlYktpdCB7CisKK2NsYXNzIENvcmVBbmltYXRpb25SZW5kZXJlciA6IHB1YmxpYyBSZWZD b3VudGVkPENvcmVBbmltYXRpb25SZW5kZXJlcj4geworcHVibGljOgorICAgIGNsYXNzIENsaWVu dCB7CisgICAgcHVibGljOgorICAgICAgICB2aXJ0dWFsIH5DbGllbnQoKSB7IH0KKyAgICAgICAg dmlydHVhbCB2b2lkIHJlbmRlcmVyRGlkQ2hhbmdlKENvcmVBbmltYXRpb25SZW5kZXJlciopID0g MDsKKyAgICB9OworCisgICAgc3RhdGljIFBhc3NSZWZQdHI8Q29yZUFuaW1hdGlvblJlbmRlcmVy PiBjcmVhdGUoQ2xpZW50KiwgQ0dMQ29udGV4dE9iaiwgQ0FMYXllciAqKTsKKyAgICB+Q29yZUFu aW1hdGlvblJlbmRlcmVyKCk7CisKKyAgICB2b2lkIGludmFsaWRhdGUoKTsKKworICAgIHZvaWQg c2V0Qm91bmRzKENHUmVjdCk7CisgICAgdm9pZCByZW5kZXIoQ0ZUaW1lSW50ZXJ2YWwgZnJhbWVU aW1lLCBDVlRpbWVTdGFtcCosIENGVGltZUludGVydmFsJiBuZXh0RnJhbWVUaW1lKTsKKworcHJp dmF0ZToKKyAgICBDb3JlQW5pbWF0aW9uUmVuZGVyZXIoQ2xpZW50KiwgQ0dMQ29udGV4dE9iaiwg Q0FMYXllciAqKTsKKworICAgIHN0YXRpYyB2b2lkIHJlbmRlcmVyRGlkQ2hhbmdlKHZvaWQqKTsK KyAgICB2b2lkIHJlbmRlcmVyRGlkQ2hhbmdlKCk7CisKKyAgICBDbGllbnQqIG1fY2xpZW50Owor ICAgIENHTENvbnRleHRPYmogbV9jZ2xDb250ZXh0OworICAgIFJldGFpblB0cjxDQVJlbmRlcmVy PiBtX3JlbmRlcmVyOworfTsgICAgCisgICAgCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2Vu ZGlmIC8vIENvcmVBbmltYXRpb25SZW5kZXJlcl9oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL0NvcmVBbmltYXRpb25SZW5kZXJlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL0NvcmVBbmltYXRpb25SZW5kZXJlci5tbQkocmV2aXNpb24gMCkKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29yZUFuaW1hdGlvblJlbmRlcmVyLm1tCShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDEwMCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5o IgorI2ltcG9ydCAiQ29yZUFuaW1hdGlvblJlbmRlcmVyLmgiCisKKyNpbXBvcnQgPFdlYktpdFN5 c3RlbUludGVyZmFjZS5oPgorI2ltcG9ydCA8UXVhcnR6Q29yZS9RdWFydHpDb3JlLmg+CisjaW1w b3J0IDxPUGVuR0wvQ0dMTWFjcm8uaD4KKworLy8gVGhlIENHTE1hY3JvLmggaGVhZGVyIGFkZHMg YW4gaW1wbGljaXQgQ0dMQ29udGV4dE9iaiBwYXJhbWV0ZXIgdG8gYWxsIE9wZW5HTCBjYWxscywK Ky8vIHdoaWNoIGlzIGdvb2QgYmVjYXVzZSBpdCBhbGxvd3MgdXMgdG8gbWFrZSBPcGVuR0wgY2Fs bHMgd2l0aG91dCBzYXZpbmcgYW5kIHJlc3RvcmluZyB0aGUKKy8vIGN1cnJlbnQgY29udGV4dC4g VGhlIGNvbnRleHQgYXJndW1lbnQgaXMgbmFtZWQgImNnbF9jdHgiIGJ5IGRlZmF1bHQsIHNvIHdl IHRoZSBtYWNybworLy8gYmVsb3cgdG8gZGVjbGFyZSB0aGlzIHZhcmlhYmxlLgorI2RlZmluZSBE RUNMQVJFX0dMX0NPTlRFWFRfVkFSSUFCTEUobmFtZSkgXAorICAgIENHTENvbnRleHRPYmogY2ds X2N0eCA9IChuYW1lKQorCituYW1lc3BhY2UgV2ViS2l0IHsKKworUGFzc1JlZlB0cjxDb3JlQW5p bWF0aW9uUmVuZGVyZXI+IENvcmVBbmltYXRpb25SZW5kZXJlcjo6Y3JlYXRlKENsaWVudCogY2xp ZW50LCBDR0xDb250ZXh0T2JqIGNnbENvbnRleHRPYmosIENBTGF5ZXIgKmxheWVyKQoreworICAg IHJldHVybiBhZG9wdFJlZihuZXcgQ29yZUFuaW1hdGlvblJlbmRlcmVyKGNsaWVudCwgY2dsQ29u dGV4dE9iaiwgbGF5ZXIpKTsKK30KKworQ29yZUFuaW1hdGlvblJlbmRlcmVyOjpDb3JlQW5pbWF0 aW9uUmVuZGVyZXIoQ2xpZW50KiBjbGllbnQsIENHTENvbnRleHRPYmogY2dsQ29udGV4dE9iaiwg Q0FMYXllciAqbGF5ZXIpCisgICAgOiBtX2NsaWVudChjbGllbnQpCisgICAgLCBtX2NnbENvbnRl eHQoY2dsQ29udGV4dE9iaikKKyAgICAsIG1fcmVuZGVyZXIoW0NBUmVuZGVyZXIgcmVuZGVyZXJX aXRoQ0dMQ29udGV4dDptX2NnbENvbnRleHQgb3B0aW9uczpuaWxdKQoreworICAgIFttX3JlbmRl cmVyLmdldCgpIHNldExheWVyOmxheWVyXTsKKworICAgIFdLQ0FSZW5kZXJlckFkZENoYW5nZU5v dGlmaWNhdGlvbk9ic2VydmVyKG1fcmVuZGVyZXIuZ2V0KCksIHJlbmRlcmVyRGlkQ2hhbmdlLCB0 aGlzKTsKK30KKworQ29yZUFuaW1hdGlvblJlbmRlcmVyOjp+Q29yZUFuaW1hdGlvblJlbmRlcmVy KCkKK3sKKyAgICBBU1NFUlQoIW1fY2xpZW50KTsKK30KKwordm9pZCBDb3JlQW5pbWF0aW9uUmVu ZGVyZXI6OnNldEJvdW5kcyhDR1JlY3QgYm91bmRzKQoreworICAgIFttX3JlbmRlcmVyLmdldCgp IHNldEJvdW5kczpib3VuZHNdOworCisgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtD QVRyYW5zYWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllFU107CisgICAgW1ttX3JlbmRlcmVyLmdl dCgpIGxheWVyXSBzZXRGcmFtZTpib3VuZHNdOworICAgIFtDQVRyYW5zYWN0aW9uIGNvbW1pdF07 Cit9CisKK3ZvaWQgQ29yZUFuaW1hdGlvblJlbmRlcmVyOjpyZW5kZXIoQ0ZUaW1lSW50ZXJ2YWwg ZnJhbWVUaW1lLCBDVlRpbWVTdGFtcCogdGltZVN0YW1wLCBDRlRpbWVJbnRlcnZhbCYgbmV4dEZy YW1lVGltZSkKK3sKKyAgICBbbV9yZW5kZXJlci5nZXQoKSBiZWdpbkZyYW1lQXRUaW1lOmZyYW1l VGltZSB0aW1lU3RhbXA6dGltZVN0YW1wXTsKKyAgICBbbV9yZW5kZXJlci5nZXQoKSByZW5kZXJd OworICAgIG5leHRGcmFtZVRpbWUgPSBbbV9yZW5kZXJlci5nZXQoKSBuZXh0RnJhbWVUaW1lXTsK KyAgICBbbV9yZW5kZXJlci5nZXQoKSBlbmRGcmFtZV07Cit9CisKK3ZvaWQgQ29yZUFuaW1hdGlv blJlbmRlcmVyOjppbnZhbGlkYXRlKCkKK3sKKyAgICBBU1NFUlQobV9jbGllbnQpOworCisgICAg V0tDQVJlbmRlcmVyUmVtb3ZlQ2hhbmdlTm90aWZpY2F0aW9uT2JzZXJ2ZXIobV9yZW5kZXJlci5n ZXQoKSwgcmVuZGVyZXJEaWRDaGFuZ2UsIHRoaXMpOworICAgIG1fY2xpZW50ID0gMDsKK30KKwor dm9pZCBDb3JlQW5pbWF0aW9uUmVuZGVyZXI6OnJlbmRlcmVyRGlkQ2hhbmdlKHZvaWQqIGNvbnRl eHQpCit7CisgICAgc3RhdGljX2Nhc3Q8Q29yZUFuaW1hdGlvblJlbmRlcmVyKj4oY29udGV4dCkt PnJlbmRlcmVyRGlkQ2hhbmdlKCk7Cit9CisKK3ZvaWQgQ29yZUFuaW1hdGlvblJlbmRlcmVyOjpy ZW5kZXJlckRpZENoYW5nZSgpCit7CisgICAgQVNTRVJUKG1fY2xpZW50KTsKKworICAgIG1fY2xp ZW50LT5yZW5kZXJlckRpZENoYW5nZSh0aGlzKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCShyZXZpc2lvbiA3NzAwNikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTc2LDYgKzE3Niw4IEBACiAJ CTFBOTEwMTBCMTI2OEM4Q0EwMDE4NDJGNSAvKiBGaW5kSW5kaWNhdG9yV2luZG93Lm1tIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE5MTAxMDkxMjY4QzhD QTAwMTg0MkY1IC8qIEZpbmRJbmRpY2F0b3JXaW5kb3cubW0gKi87IH07CiAJCTFBOTYzNkJDMTJG MzQ4NDkwMDc4QTA2MiAvKiBTaGFyZWFibGVTdXJmYWNlLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBOTYzNkJBMTJGMzQ4NDkwMDc4QTA2MiAvKiBT aGFyZWFibGVTdXJmYWNlLmNwcCAqLzsgfTsKIAkJMUE5NjM2QkQxMkYzNDg0OTAwNzhBMDYyIC8q IFNoYXJlYWJsZVN1cmZhY2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBOTYzNkJCMTJGMzQ4NDkwMDc4QTA2MiAvKiBTaGFyZWFibGVTdXJmYWNlLmgg Ki87IH07CisJCTFBOTYzOUY3MTJGMzhFQ0QwMDc4QTA2MiAvKiBDb3JlQW5pbWF0aW9uUmVuZGVy ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBOTYz OUY1MTJGMzhFQ0QwMDc4QTA2MiAvKiBDb3JlQW5pbWF0aW9uUmVuZGVyZXIuaCAqLzsgfTsKKwkJ MUE5NjM5RjgxMkYzOEVDRDAwNzhBMDYyIC8qIENvcmVBbmltYXRpb25SZW5kZXJlci5tbSBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBOTYzOUY2MTJGMzhF Q0QwMDc4QTA2MiAvKiBDb3JlQW5pbWF0aW9uUmVuZGVyZXIubW0gKi87IH07CiAJCTFBQTFDQzVE MTAwRkExQTEwMDc4REVCQyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTFDQzVDMTAwRkExQTEwMDc4REVC QyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayAqLzsgfTsKIAkJMUFBMUNEMDcxMDBGQTFCQTAwNzhE RUJDIC8qIENhcmJvbi5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQUExQ0QwNjEwMEZBMUJBMDA3OERFQkMgLyogQ2FyYm9uLmZyYW1l d29yayAqLzsgfTsKIAkJMUFBMkU1MUQxMkU0QzA1RTAwQkM0OTY2IC8qIENHVXRpbGl0aWVzLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUEyRTUxQjEy RTRDMDVFMDBCQzQ5NjYgLyogQ0dVdGlsaXRpZXMuaCAqLzsgfTsKQEAgLTkyMiw2ICs5MjQsOCBA QAogCQkxQTkxMDEwOTEyNjhDOENBMDAxODQyRjUgLyogRmluZEluZGljYXRvcldpbmRvdy5tbSAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEZpbmRJbmRpY2F0b3JXaW5k b3cubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBOTYzNkJBMTJGMzQ4NDkwMDc4 QTA2MiAvKiBTaGFyZWFibGVTdXJmYWNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFNoYXJlYWJsZVN1cmZhY2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxQTk2MzZCQjEyRjM0ODQ5MDA3OEEwNjIgLyogU2hhcmVhYmxlU3VyZmFjZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTaGFyZWFibGVTdXJmYWNlLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBOTYzOUY1MTJGMzhFQ0QwMDc4QTA2MiAvKiBDb3JlQW5p bWF0aW9uUmVuZGVyZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ29yZUFu aW1hdGlvblJlbmRlcmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBOTYzOUY2 MTJGMzhFQ0QwMDc4QTA2MiAvKiBDb3JlQW5pbWF0aW9uUmVuZGVyZXIubW0gKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBDb3JlQW5pbWF0aW9uUmVuZGVyZXIubW07IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBQTFDNzlBMTAwRTdGQzUwMDc4REVCQyAvKiBX ZWJDb3JlLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBwYXRoID0gV2ViQ29yZS5mcmFtZXdvcms7IHNv dXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTFBQTFDN0RFMTAwRTg0NkUwMDc4 REVCQyAvKiBKYXZhU2NyaXB0Q29yZS5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgcGF0aCA9IEphdmFT Y3JpcHRDb3JlLmZyYW1ld29yazsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsK IAkJMUFBMUNDNUMxMDBGQTFBMTAwNzhERUJDIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gd3JhcHBlci5mcmFt ZXdvcms7IG5hbWUgPSBRdWFydHpDb3JlLmZyYW1ld29yazsgcGF0aCA9IC9TeXN0ZW0vTGlicmFy eS9GcmFtZXdvcmtzL1F1YXJ0ekNvcmUuZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0 ZT4iOyB9OwpAQCAtMjM1OSw2ICsyMzYzLDggQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hp bGRyZW4gPSAoCiAJCQkJMUE2RjlGQjYxMUUxNDA4NTAwREIxMzcxIC8qIENvbW1hbmRMaW5lTWFj LmNwcCAqLywKKwkJCQkxQTk2MzlGNTEyRjM4RUNEMDA3OEEwNjIgLyogQ29yZUFuaW1hdGlvblJl bmRlcmVyLmggKi8sCisJCQkJMUE5NjM5RjYxMkYzOEVDRDAwNzhBMDYyIC8qIENvcmVBbmltYXRp b25SZW5kZXJlci5tbSAqLywKIAkJCQlDMDJCRkYxRDEyNTE1MDJFMDA5Q0NCRUEgLyogTmF0aXZl V2ViS2V5Ym9hcmRFdmVudE1hYy5tbSAqLywKIAkJCQlDNTc0QTU3RjEyRTY2NjgxMDAyREZFOTgg LyogUGFzdGVib2FyZFR5cGVzLmggKi8sCiAJCQkJQzU3NEE1ODAxMkU2NjY4MTAwMkRGRTk4IC8q IFBhc3RlYm9hcmRUeXBlcy5tbSAqLywKQEAgLTMxMDgsNiArMzExNCw3IEBACiAJCQkJMUExODZF RUExMkVGNzYxODAwOEU1RjM3IC8qIExheWVyVHJlZUhvc3QuaCBpbiBIZWFkZXJzICovLAogCQkJ CUJGQTYxNzlGMTJGMEI5OUQwMDMzRTBDQSAvKiBXS1ZpZXdQcml2YXRlLmggaW4gSGVhZGVycyAq LywKIAkJCQkxQTk2MzZCRDEyRjM0ODQ5MDA3OEEwNjIgLyogU2hhcmVhYmxlU3VyZmFjZS5oIGlu IEhlYWRlcnMgKi8sCisJCQkJMUE5NjM5RjcxMkYzOEVDRDAwNzhBMDYyIC8qIENvcmVBbmltYXRp b25SZW5kZXJlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1l bnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkBAIC0zNTc2LDYgKzM1ODMsNyBAQAogCQkJCTFB MTg3MTg1MTJFRjk4NzcwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0TWFjLm1tIGluIFNvdXJjZXMg Ki8sCiAJCQkJNjUwMUJEMUExMkYxMjQzNDAwRTlGMjQ4IC8qIFdLQnVuZGxlSW5zcGVjdG9yLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCTFBOTYzNkJDMTJGMzQ4NDkwMDc4QTA2MiAvKiBTaGFyZWFi bGVTdXJmYWNlLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTFBOTYzOUY4MTJGMzhFQ0QwMDc4QTA2 MiAvKiBDb3JlQW5pbWF0aW9uUmVuZGVyZXIubW0gaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQly dW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsK