37603 2010-04-14 13:49:09 -0700 Add WKRetainPtr helper class as private header 2010-04-14 14:08:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned webkit.review.bot oldest_to_newest 212545 0 sam 2010-04-14 13:49:09 -0700 Add WKRetainPtr helper class as private header 212551 1 53362 sam 2010-04-14 13:55:07 -0700 Created attachment 53362 patch 212555 2 webkit.review.bot 2010-04-14 13:57:15 -0700 Attachment 53362 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit2/UIProcess/API/cpp/WKRetainPtr.h:95: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 212557 3 53362 andersca 2010-04-14 13:58:00 -0700 Comment on attachment 53362 patch > + > +#define DECLARE_RETAIN_RELEASE_OVERLOADS(WKType) \ > + inline void WKRetain(WKType##Ref p) { WKType##Retain(p); } \ > + inline void WKRelease(WKType##Ref p) { WKType##Release(p); } \ > + // end of macro > + > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKContext) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKFrame) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKFramePolicyListener) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKPage) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKPageNamespace) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKPreferences) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKString) > +DECLARE_RETAIN_RELEASE_OVERLOADS(WKURL) > + > +#undef DECLARE_RETAIN_RELEASE_OVERLOADS Could you add a fixme about adding these overloads to the respective headers (when compiling as C++). > +template <typename T> inline void WKRetainPtr<T>::adoptCF(PtrType optr) This shouldn't be here. > +template <typename T> inline void WKRetainPtr<T>::adoptNS(PtrType optr) Nor should this. Looks good otherwise! r=me 212561 4 sam 2010-04-14 14:08:58 -0700 Landed in r57605. 53362 2010-04-14 13:55:07 -0700 2010-04-14 13:58:00 -0700 patch patch.diff text/plain 11223 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzYwMykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMTQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV0tS ZXRhaW5QdHIgaGVscGVyIGNsYXNzIGFzIHByaXZhdGUgaGVhZGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzYwMworCisgICAgICAgIFdLUmV0YWlu UHRyIGlzIGp1c3QgbGlrZSBSZXRhaW5QdHIsIGJ1dCB3b3JrcyBmb3IgV0sgdHlwZXMgaW5zdGVh ZCBvZgorICAgICAgICBDRi9OUyB0eXBlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvY3Bw OiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2NwcC9XS1JldGFpblB0ci5oOiBBZGRl ZC4KKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IEFkZCBuZXcg ZmlsZS4KKyAgICAgICAgKiB3aW4vV2ViS2l0Mi52Y3Byb2o6IERpdHRvLgorCiAyMDEwLTA0LTE0 ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5k ZXJzIENhcmxzc29uLgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2NwcC9XS1JldGFpblB0 ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9jcHAvV0tSZXRhaW5QdHIu aAkocmV2aXNpb24gMCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9jcHAvV0tSZXRhaW5QdHIu aAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyMjIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJ QlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdL UmV0YWluUHRyX2gKKyNkZWZpbmUgV0tSZXRhaW5QdHJfaAorCisjaW5jbHVkZSA8V2ViS2l0Mi9X ZWJLaXQyLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCisjZGVmaW5lIERFQ0xBUkVfUkVUQUlO X1JFTEVBU0VfT1ZFUkxPQURTKFdLVHlwZSkgXAorICAgIGlubGluZSB2b2lkIFdLUmV0YWluKFdL VHlwZSMjUmVmIHApIHsgV0tUeXBlIyNSZXRhaW4ocCk7IH0gXAorICAgIGlubGluZSB2b2lkIFdL UmVsZWFzZShXS1R5cGUjI1JlZiBwKSB7IFdLVHlwZSMjUmVsZWFzZShwKTsgfSBcCisgICAgLy8g ZW5kIG9mIG1hY3JvCisKK0RFQ0xBUkVfUkVUQUlOX1JFTEVBU0VfT1ZFUkxPQURTKFdLQ29udGV4 dCkKK0RFQ0xBUkVfUkVUQUlOX1JFTEVBU0VfT1ZFUkxPQURTKFdLRnJhbWUpCitERUNMQVJFX1JF VEFJTl9SRUxFQVNFX09WRVJMT0FEUyhXS0ZyYW1lUG9saWN5TGlzdGVuZXIpCitERUNMQVJFX1JF VEFJTl9SRUxFQVNFX09WRVJMT0FEUyhXS1BhZ2UpCitERUNMQVJFX1JFVEFJTl9SRUxFQVNFX09W RVJMT0FEUyhXS1BhZ2VOYW1lc3BhY2UpCitERUNMQVJFX1JFVEFJTl9SRUxFQVNFX09WRVJMT0FE UyhXS1ByZWZlcmVuY2VzKQorREVDTEFSRV9SRVRBSU5fUkVMRUFTRV9PVkVSTE9BRFMoV0tTdHJp bmcpCitERUNMQVJFX1JFVEFJTl9SRUxFQVNFX09WRVJMT0FEUyhXS1VSTCkKKworI3VuZGVmIERF Q0xBUkVfUkVUQUlOX1JFTEVBU0VfT1ZFUkxPQURTCisKK2VudW0gV0tBZG9wdFRhZyB7IEFkb3B0 V0sgfTsKKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+CitjbGFzcyBXS1JldGFpblB0ciB7CitwdWJs aWM6CisgICAgdHlwZWRlZiBUIFB0clR5cGU7CisKKyAgICBXS1JldGFpblB0cigpCisgICAgICAg IDogbV9wdHIoMCkKKyAgICB7CisgICAgfQorCisgICAgV0tSZXRhaW5QdHIoUHRyVHlwZSBwdHIp CisgICAgICAgIDogbV9wdHIocHRyKQorICAgIHsKKyAgICAgICAgaWYgKHB0cikKKyAgICAgICAg ICAgIHJldGFpbldLUHRyKHB0cik7CisgICAgfQorCisgICAgV0tSZXRhaW5QdHIoV0tBZG9wdFRh ZywgUHRyVHlwZSBwdHIpCisgICAgICAgIDogbV9wdHIocHRyKQorICAgIHsKKyAgICB9CisgICAg CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+CisgICAgV0tSZXRhaW5QdHIoY29uc3QgV0tSZXRh aW5QdHI8VT4mIG8pCisgICAgICAgIDogbV9wdHIoby5nZXQoKSkKKyAgICB7CisgICAgICAgIGlm IChQdHJUeXBlIHB0ciA9IG1fcHRyKQorICAgICAgICAgICAgV0tSZXRhaW4ocHRyKTsKKyAgICB9 CisgICAgCisgICAgV0tSZXRhaW5QdHIoY29uc3QgV0tSZXRhaW5QdHImIG8pCisgICAgICAgIDog bV9wdHIoby5tX3B0cikKKyAgICB7CisgICAgICAgIGlmIChQdHJUeXBlIHB0ciA9IG1fcHRyKQor ICAgICAgICAgICAgV0tSZXRhaW4ocHRyKTsKKyAgICB9CisKKyAgICB+UmV0YWluUHRyKCkKKyAg ICB7CisgICAgICAgIGlmIChQdHJUeXBlIHB0ciA9IG1fcHRyKQorICAgICAgICAgICAgV0tSZWxl YXNlKHB0cik7CisgICAgfQorCisgICAgUHRyVHlwZSBnZXQoKSBjb25zdCB7IHJldHVybiBtX3B0 cjsgfQorICAgIFB0clR5cGUgcmVsZWFzZVJlZigpIHsgUHRyVHlwZSB0bXAgPSBtX3B0cjsgbV9w dHIgPSAwOyByZXR1cm4gdG1wOyB9CisgICAgCisgICAgUHRyVHlwZSBvcGVyYXRvci0+KCkgY29u c3QgeyByZXR1cm4gbV9wdHI7IH0KKyAgICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJu ICFtX3B0cjsgfQorCisgICAgLy8gVGhpcyBjb252ZXJzaW9uIG9wZXJhdG9yIGFsbG93cyBpbXBs aWNpdCBjb252ZXJzaW9uIHRvIGJvb2wgYnV0IG5vdCB0byBvdGhlciBpbnRlZ2VyIHR5cGVzLgor ICAgIHR5cGVkZWYgUHRyVHlwZSBXS1JldGFpblB0cjo6KlVuc3BlY2lmaWVkQm9vbFR5cGU7Cisg ICAgb3BlcmF0b3IgVW5zcGVjaWZpZWRCb29sVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHRyID8g JldLUmV0YWluUHRyOjptX3B0ciA6IDA7IH0KKworICAgIFdLUmV0YWluUHRyJiBvcGVyYXRvcj0o Y29uc3QgV0tSZXRhaW5QdHImKTsKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gV0tSZXRhaW5Q dHImIG9wZXJhdG9yPShjb25zdCBXS1JldGFpblB0cjxVPiYpOworICAgIFdLUmV0YWluUHRyJiBv cGVyYXRvcj0oUHRyVHlwZSk7CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IFdLUmV0YWluUHRy JiBvcGVyYXRvcj0oVSopOworCisgICAgdm9pZCBhZG9wdChQdHJUeXBlKTsKKyAgICB2b2lkIHN3 YXAoV0tSZXRhaW5QdHImKTsKKworcHJpdmF0ZToKKyAgICBQdHJUeXBlIG1fcHRyOworfTsKKwor dGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSBXS1JldGFpblB0cjxUPiYgV0tSZXRhaW5QdHI8 VD46Om9wZXJhdG9yPShjb25zdCBXS1JldGFpblB0cjxUPiYgbykKK3sKKyAgICBQdHJUeXBlIG9w dHIgPSBvLmdldCgpOworICAgIGlmIChvcHRyKQorICAgICAgICBXS1JldGFpbihvcHRyKTsKKyAg ICBQdHJUeXBlIHB0ciA9IG1fcHRyOworICAgIG1fcHRyID0gb3B0cjsKKyAgICBpZiAocHRyKQor ICAgICAgICBXS1JlbGVhc2UocHRyKTsKKyAgICByZXR1cm4gKnRoaXM7Cit9CisKK3RlbXBsYXRl IDx0eXBlbmFtZSBUPiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gaW5saW5lIFdLUmV0YWluUHRyPFQ+ JiBXS1JldGFpblB0cjxUPjo6b3BlcmF0b3I9KGNvbnN0IFdLUmV0YWluUHRyPFU+JiBvKQorewor ICAgIFB0clR5cGUgb3B0ciA9IG8uZ2V0KCk7CisgICAgaWYgKG9wdHIpCisgICAgICAgIFdLUmV0 YWluKG9wdHIpOworICAgIFB0clR5cGUgcHRyID0gbV9wdHI7CisgICAgbV9wdHIgPSBvcHRyOwor ICAgIGlmIChwdHIpCisgICAgICAgIFdLUmVsZWFzZShwdHIpOworICAgIHJldHVybiAqdGhpczsK K30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSBXS1JldGFpblB0cjxUPiYgV0tSZXRh aW5QdHI8VD46Om9wZXJhdG9yPShQdHJUeXBlIG9wdHIpCit7CisgICAgaWYgKG9wdHIpCisgICAg ICAgIFdLUmV0YWluKG9wdHIpOworICAgIFB0clR5cGUgcHRyID0gbV9wdHI7CisgICAgbV9wdHIg PSBvcHRyOworICAgIGlmIChwdHIpCisgICAgICAgIFdLUmVsZWFzZShwdHIpOworICAgIHJldHVy biAqdGhpczsKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSB2b2lkIFdLUmV0YWlu UHRyPFQ+OjphZG9wdENGKFB0clR5cGUgb3B0cikKK3sKKyAgICBQdHJUeXBlIHB0ciA9IG1fcHRy OworICAgIG1fcHRyID0gb3B0cjsKKyAgICBpZiAocHRyKQorICAgICAgICBXS1JlbGVhc2UocHRy KTsKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSB2b2lkIFdLUmV0YWluUHRyPFQ+ OjphZG9wdE5TKFB0clR5cGUgb3B0cikKK3sKKyAgICBhZG9wdE5TUmVmZXJlbmNlKG9wdHIpOwor ICAgIAorICAgIFB0clR5cGUgcHRyID0gbV9wdHI7CisgICAgbV9wdHIgPSBvcHRyOworICAgIGlm IChwdHIpCisgICAgICAgIFdLUmVsZWFzZShwdHIpOworfQorCit0ZW1wbGF0ZSA8dHlwZW5hbWUg VD4gdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGlubGluZSBXS1JldGFpblB0cjxUPiYgV0tSZXRhaW5Q dHI8VD46Om9wZXJhdG9yPShVKiBvcHRyKQoreworICAgIGlmIChvcHRyKQorICAgICAgICBXS1Jl dGFpbihvcHRyKTsKKyAgICBQdHJUeXBlIHB0ciA9IG1fcHRyOworICAgIG1fcHRyID0gb3B0cjsK KyAgICBpZiAocHRyKQorICAgICAgICBXS1JlbGVhc2UocHRyKTsKKyAgICByZXR1cm4gKnRoaXM7 Cit9CisKK3RlbXBsYXRlIDxjbGFzcyBUPiBpbmxpbmUgdm9pZCBXS1JldGFpblB0cjxUPjo6c3dh cChXS1JldGFpblB0cjxUPiYgbykKK3sKKyAgICBzdGQ6OnN3YXAobV9wdHIsIG8ubV9wdHIpOwor fQorCit0ZW1wbGF0ZSA8Y2xhc3MgVD4gaW5saW5lIHZvaWQgc3dhcChXS1JldGFpblB0cjxUPiYg YSwgV0tSZXRhaW5QdHI8VD4mIGIpCit7CisgICAgYS5zd2FwKGIpOworfQorCit0ZW1wbGF0ZSA8 dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBXS1Jl dGFpblB0cjxUPiYgYSwgY29uc3QgV0tSZXRhaW5QdHI8VT4mIGIpCit7IAorICAgIHJldHVybiBh LmdldCgpID09IGIuZ2V0KCk7IAorfQorCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgdHlwZW5hbWUg VT4gaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBXS1JldGFpblB0cjxUPiYgYSwgVSogYikK K3sgCisgICAgcmV0dXJuIGEuZ2V0KCkgPT0gYjsgCit9CisKK3RlbXBsYXRlIDx0eXBlbmFtZSBU LCB0eXBlbmFtZSBVPiBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KFQqIGEsIGNvbnN0IFdLUmV0YWlu UHRyPFU+JiBiKSAKK3sKKyAgICByZXR1cm4gYSA9PSBiLmdldCgpOyAKK30KKwordGVtcGxhdGUg PHR5cGVuYW1lIFQsIHR5cGVuYW1lIFU+IGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgV0tS ZXRhaW5QdHI8VD4mIGEsIGNvbnN0IFdLUmV0YWluUHRyPFU+JiBiKQoreyAKKyAgICByZXR1cm4g YS5nZXQoKSAhPSBiLmdldCgpOyAKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQsIHR5cGVuYW1l IFU+IGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgV0tSZXRhaW5QdHI8VD4mIGEsIFUqIGIp Cit7CisgICAgcmV0dXJuIGEuZ2V0KCkgIT0gYjsgCit9CisKK3RlbXBsYXRlIDx0eXBlbmFtZSBU LCB0eXBlbmFtZSBVPiBpbmxpbmUgYm9vbCBvcGVyYXRvciE9KFQqIGEsIGNvbnN0IFdLUmV0YWlu UHRyPFU+JiBiKQoreyAKKyAgICByZXR1cm4gYSAhPSBiLmdldCgpOyAKK30KKworfSAvLyBuYW1l c3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBXS1JldGFpblB0cl9oCkluZGV4OiBXZWJLaXQyL1dl YktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dl YktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNTc2MDEpCisrKyBXZWJL aXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAt MTE4LDYgKzExOCw3IEBACiAJCUJDODY5OUI3MTE2QUFEQUEwMDJBOTI1QiAvKiBXS1ZpZXdJbnRl cm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM4 Njk5QjQxMTZBQURBQTAwMkE5MjVCIC8qIFdLVmlld0ludGVybmFsLmggKi87IH07CiAJCUJDODc4 MEZDMTE2MUMyQjgwMENDMjc2OCAvKiBQbGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzg3ODBGQjExNjFDMkI4 MDBDQzI3NjggLyogUGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmllci5oICovOyB9OwogCQlCQzg3REZB QTEwMTgxMDE0MDA1NjQyMTYgLyogbGliaWN1Y29yZS5keWxpYiBpbiBGcmFtZXdvcmtzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDODdERkE5MTAxODEwMTQwMDU2NDIxNiAv KiBsaWJpY3Vjb3JlLmR5bGliICovOyB9OworCQlCQzhBNTAxNTExNzY1RjU2MDA3NTc1NzMgLyog V0tSZXRhaW5QdHIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEJDOEE1MDE0MTE3NjVGNTYwMDc1NzU3MyAvKiBXS1JldGFpblB0ci5oICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUJDOTYzRDZCMTEzREQxOTIw MDU3NEJFMiAvKiBXZWJQYWdlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEJDOTYzRDZBMTEzREQxOTIwMDU3NEJFMiAvKiBXZWJQYWdlLmNwcCAqLzsg fTsKIAkJQkM5NjNENkUxMTNERDFBNTAwNTc0QkUyIC8qIFdlYlBhZ2VNYWMubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzk2M0Q2RDExM0REMUE1MDA1 NzRCRTIgLyogV2ViUGFnZU1hYy5tbSAqLzsgfTsKIAkJQkM5QjM4QTExMEY1MzhCRTAwNDQzQTE1 IC8qIFdlYkZyYW1lUHJveHkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEJDOUIzODlGMTBGNTM4QkUwMDQ0M0ExNSAvKiBXZWJGcmFtZVByb3h5LmggKi87 IH07CkBAIC0zMDcsNiArMzA4LDcgQEAKIAkJQkM4NzgwRkIxMTYxQzJCODAwQ0MyNzY4IC8qIFBs YXRmb3JtUHJvY2Vzc0lkZW50aWZpZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gUGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmllci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQlCQzg3REZBOTEwMTgxMDE0MDA1NjQyMTYgLyogbGliaWN1Y29yZS5keWxpYiAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9ICJjb21waWxlZC5tYWNo LW8uZHlsaWIiOyBuYW1lID0gbGliaWN1Y29yZS5keWxpYjsgcGF0aCA9IC91c3IvbGliL2xpYmlj dWNvcmUuZHlsaWI7IHNvdXJjZVRyZWUgPSAiPGFic29sdXRlPiI7IH07CiAJCUJDOEE1MDEwMTE3 NjVBRjcwMDc1NzU3MyAvKiBJbmZvLnBsaXN0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5wbGlzdC54bWw7IG5h bWUgPSBJbmZvLnBsaXN0OyBwYXRoID0gV2ViUHJvY2Vzcy9JbmZvLnBsaXN0OyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQlCQzhBNTAxNDExNzY1RjU2MDA3NTc1NzMgLyogV0tSZXRhaW5Q dHIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tSZXRhaW5QdHIuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkM5NjNENkExMTNERDE5MjAwNTc0QkUyIC8qIFdl YlBhZ2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViUGFnZS5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDOTYzRDZEMTEzREQxQTUwMDU3NEJF MiAvKiBXZWJQYWdlTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRo ID0gV2ViUGFnZU1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkM5QjM4OUYx MEY1MzhCRTAwNDQzQTE1IC8qIFdlYkZyYW1lUHJveHkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gV2ViRnJhbWVQcm94eS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtNjA5LDYgKzYxMSw3IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQlCQzExMUI0NzExMkY2MTY5 MDAzMzdCQUIgLyogbWFjICovLAogCQkJCUJDMEMzNzY2MTBGODA3NjYwMDc2RDdDQiAvKiBDICov LAorCQkJCUJDOEE1MDEzMTE3NjVGNDUwMDc1NzU3MyAvKiBjcHAgKi8sCiAJCQkpOwogCQkJcGF0 aCA9IEFQSTsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC03NjAsNiArNzYzLDE0IEBA CiAJCQluYW1lID0gV2ViUHJvY2VzczsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CiAJCX07 CisJCUJDOEE1MDEzMTE3NjVGNDUwMDc1NzU3MyAvKiBjcHAgKi8gPSB7CisJCQlpc2EgPSBQQlhH cm91cDsKKwkJCWNoaWxkcmVuID0gKAorCQkJCUJDOEE1MDE0MTE3NjVGNTYwMDc1NzU3MyAvKiBX S1JldGFpblB0ci5oICovLAorCQkJKTsKKwkJCXBhdGggPSBjcHA7CisJCQlzb3VyY2VUcmVlID0g Ijxncm91cD4iOworCQl9OwogCQlCQzk2M0Q2QzExM0REMTk1MDA1NzRCRTIgLyogbWFjICovID0g ewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKQEAgLTg2OSw2ICs4ODAsNyBA QAogCQkJCUJDMjBFQzA2MTE2RUY3RkYwMDA5NEE1MCAvKiBXS1N0cmluZ0NGLmggaW4gSGVhZGVy cyAqLywKIAkJCQlCQzIwRUQ2NjExNkY5NzExMDAwOTRBNTAgLyogV0tVUkxDRi5oIGluIEhlYWRl cnMgKi8sCiAJCQkJQkMxMzFCQzkxMTcyNkMyODAwQjY5NzI3IC8qIENvcmVJUENNZXNzYWdlS2lu ZHMuaCBpbiBIZWFkZXJzICovLAorCQkJCUJDOEE1MDE1MTE3NjVGNTYwMDc1NzU3MyAvKiBXS1Jl dGFpblB0ci5oIGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQ b3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkluZGV4OiBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJv ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkocmV2aXNpb24gNTc1 NDEpCisrKyBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtMTQ0 MCw2ICsxNDQwLDE0IEBACiAJCQkJCQk8L0ZpbGVDb25maWd1cmF0aW9uPg0KIAkJCQkJPC9GaWxl Pg0KIAkJCQk8L0ZpbHRlcj4NCisJCQkJPEZpbHRlcg0KKwkJCQkJTmFtZT0iY3BwIg0KKwkJCQkJ Pg0KKwkJCQkJPEZpbGUNCisJCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFVJUHJvY2Vzc1xBUElcY3Bw XFdLUmV0YWluUHRyLmgiDQorCQkJCQkJPg0KKwkJCQkJPC9GaWxlPg0KKwkJCQk8L0ZpbHRlcj4N CiAJCQk8L0ZpbHRlcj4NCiAJCQk8RmlsdGVyDQogCQkJCU5hbWU9IkxhdW5jaGVyIg0K