41015 2010-06-22 15:19:22 -0700 Change the encode functions to be specializations of a class template 2010-06-22 16:23:10 -0700 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 241479 0 andersca 2010-06-22 15:19:22 -0700 Change the encode functions to be specializations of a class template 241480 1 59420 andersca 2010-06-22 15:20:57 -0700 Created attachment 59420 Patch 241483 2 59420 mitz 2010-06-22 15:27:33 -0700 Comment on attachment 59420 Patch > Index: WebKit/mac/ChangeLog > =================================================================== > --- WebKit/mac/ChangeLog (revision 61630) > +++ WebKit/mac/ChangeLog (working copy) > @@ -1,3 +1,12 @@ > +2010-06-22 Anders Carlsson <andersca@apple.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Change the encode functions to be specializations of a class template > + https://bugs.webkit.org/show_bug.cgi?id=41015 > + > + * Plugins/Hosted/NetscapePluginHostProxy.h: > + > 2010-06-22 Anders Carlsson <andersca@apple.com> > > Reviewed by Sam Weinig. > Index: WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h > =================================================================== > --- WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h (revision 61627) > +++ WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.h (working copy) > @@ -84,11 +84,7 @@ private: > mach_port_t m_clientPort; > mach_port_t m_portSet; > > -#ifdef USE_LIBDISPATCH > - dispatch_source_t m_clientPortSource; > -#else > RetainPtr<CFRunLoopSourceRef> m_clientPortSource; > -#endif > mach_port_t m_pluginHostPort; > RetainPtr<CFMachPortRef> m_deadNameNotificationPort; > This doesn’t seem to be related. Please don’t land it as part of this patch. 241524 3 andersca 2010-06-22 16:23:10 -0700 Committed r61634: <http://trac.webkit.org/changeset/61634> 59420 2010-06-22 15:20:57 -0700 2010-06-22 15:27:33 -0700 Patch bug-41015-20100622152056.patch text/plain 12197 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTYzMCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDaGFuZ2UgdGhlIGVuY29kZSBmdW5jdGlvbnMgdG8gYmUgc3BlY2lhbGl6YXRpb25zIG9mIGEg Y2xhc3MgdGVtcGxhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQxMDE1CisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50Q29kZXIu aDogQWRkZWQuCisgICAgICAgIChDb3JlSVBDOjpBcmd1bWVudENvZGVyOjplbmNvZGUpOgorICAg ICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRFbmNvZGVyLmg6CisgICAgICAgIChDb3Jl SVBDOjpBcmd1bWVudEVuY29kZXI6OmVuY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYkNvcmVU eXBlQXJndW1lbnRNYXJzaGFsbGluZy5oOgorICAgICAgICAoQ29yZUlQQzo6KToKKyAgICAgICAg KiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTAtMDYtMjIgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT YW0gV2VpbmlnLgpJbmRleDogV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50Q29kZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRDb2Rlci5o CShyZXZpc2lvbiAwKQorKysgV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50Q29kZXIu aAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAx MCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBg QVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1F UkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFS RSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklC VVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0Yg TElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgQXJn dW1lbnRDb2Rlcl9oCisjZGVmaW5lIEFyZ3VtZW50Q29kZXJfaAorCisjaW5jbHVkZSA8d3RmL1R5 cGVUcmFpdHMuaD4KKworbmFtZXNwYWNlIENvcmVJUEMgeworCitjbGFzcyBBcmd1bWVudERlY29k ZXI7CitjbGFzcyBBcmd1bWVudEVuY29kZXI7CisgICAgCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBz dHJ1Y3QgQXJndW1lbnRDb2RlciB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5j b2RlciogZW5jb2RlciwgY29uc3QgVCYgdCkKKyAgICB7CisgICAgICAgIHQuZW5jb2RlKCplbmNv ZGVyKTsKKyAgICB9Cit9OworCit9CisKKyNlbmRpZiAvLyBBcmd1bWVudENvZGVyX2gKSW5kZXg6 IFdlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Bcmd1bWVudEVuY29kZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQXJndW1lbnRFbmNvZGVyLmgJKHJldmlzaW9uIDYx NjI3KQorKysgV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0FyZ3VtZW50RW5jb2Rlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIEFyZ3VtZW50RW5jb2Rlcl9oCiAj ZGVmaW5lIEFyZ3VtZW50RW5jb2Rlcl9oCiAKKyNpbmNsdWRlICJBcmd1bWVudENvZGVyLmgiCiAj aW5jbHVkZSAiQXR0YWNobWVudC5oIgogI2luY2x1ZGUgPHd0Zi9UeXBlVHJhaXRzLmg+CiAjaW5j bHVkZSA8d3RmL1ZlY3Rvci5oPgpAQCAtMzQsMTUgKzM1LDYgQEAgbmFtZXNwYWNlIENvcmVJUEMg ewogCiBjbGFzcyBBcmd1bWVudEVuY29kZXI7CiAKLW5hbWVzcGFjZSBBcmd1bWVudENvZGVycyB7 Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5j b2RlciwgY29uc3QgVCYgdCkKLXsKLSAgICB0LmVuY29kZShlbmNvZGVyKTsKLX0KLQotfQotCiBj bGFzcyBBcmd1bWVudEVuY29kZXIgewogcHVibGljOgogICAgIGV4cGxpY2l0IEFyZ3VtZW50RW5j b2Rlcih1aW50NjRfdCBkZXN0aW5hdGlvbklEKTsKQEAgLTYxLDcgKzUzLDcgQEAgcHVibGljOgog ICAgIC8vIEdlbmVyaWMgdHlwZSBlbmNvZGUgZnVuY3Rpb24uCiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgVD4gdm9pZCBlbmNvZGUoY29uc3QgVCYgdCkKICAgICB7Ci0gICAgICAgIEFyZ3VtZW50Q29k ZXJzOjplbmNvZGU8VD4oKnRoaXMsIHQpOworICAgICAgICBBcmd1bWVudENvZGVyPFQ+OjplbmNv ZGUodGhpcywgdCk7CiAgICAgfQogCiAgICAgdWludDhfdCogYnVmZmVyKCkgY29uc3QgeyByZXR1 cm4gbV9idWZmZXI7IH0KSW5kZXg6IFdlYktpdDIvU2hhcmVkL1dlYkNvcmVUeXBlQXJndW1lbnRN YXJzaGFsbGluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYkNvcmVUeXBlQXJn dW1lbnRNYXJzaGFsbGluZy5oCShyZXZpc2lvbiA2MTYyNykKKysrIFdlYktpdDIvU2hhcmVkL1dl YkNvcmVUeXBlQXJndW1lbnRNYXJzaGFsbGluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxNyAr MzQsNDMgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtU3RyaW5nLmg+CiAKIG5hbWVzcGFj ZSBDb3JlSVBDIHsKKwordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpJ bnRQb2ludD4geworICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29k ZXIsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwKQorICAgIHsKKyAgICAgICAgZW5jb2Rlci0+ ZW5jb2RlKENvcmVJUEM6OkluKHAueCgpLCBwLnkoKSkpOworICAgIH07Cit9OworCit0ZW1wbGF0 ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkludFNpemU+IHsKKyAgICBzdGF0aWMg dm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpJbnRT aXplJiBzKQorICAgIHsKKyAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKHMud2lk dGgoKSwgcy5oZWlnaHQoKSkpOworICAgIH07Cit9OworCit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1 bWVudENvZGVyPFdlYkNvcmU6OkludFJlY3Q+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJn dW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByKQorICAgIHsK KyAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKHIubG9jYXRpb24oKSwgci5zaXpl KCkpKTsKKyAgICB9OworfTsKKwordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJD b3JlOjpTdHJpbmc+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBl bmNvZGVyLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHN0cmluZykKKyAgICB7CisgICAgICAgIHVp bnQzMl90IGxlbmd0aCA9IHN0cmluZy5sZW5ndGgoKTsKKyAgICAgICAgZW5jb2Rlci0+ZW5jb2Rl KGxlbmd0aCk7CisgICAgICAgIGVuY29kZXItPmVuY29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8 Y29uc3QgdWludDhfdCo+KHN0cmluZy5jaGFyYWN0ZXJzKCkpLCBsZW5ndGggKiBzaXplb2YoVUNo YXIpKTsKKyAgICB9Cit9OworCiBuYW1lc3BhY2UgQXJndW1lbnRDb2RlcnMgewogCiAvLyBGSVhN RTogSW50UG9pbnQvSW50U2l6ZS9JbnRSZWN0L0Zsb2F0UG9pbnQvRmxvYXRTaXplL0Zsb2F0UmVj dCBzaG91bGQgYWxsCiAvLyBiZSBhYmxlIHRvIGJlIHRyZWF0ZWQgYXMgUE9ELWxpa2UgdHlwZXMg YW5kIHRodXMgbWVtY3B5LWFibGUuICAKIAogLy8gV2ViQ29yZTo6SW50UG9pbnQKLXRlbXBsYXRl PD4gaW5saW5lIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmIHApCi17Ci0gICAgZW5jb2Rlci5lbmNvZGUoQ29yZUlQQzo6SW4ocC54 KCksIHAueSgpKSk7Ci19Ci0KIHRlbXBsYXRlPD4gaW5saW5lIGJvb2wgZGVjb2RlKEFyZ3VtZW50 RGVjb2RlciYgZGVjb2RlciwgV2ViQ29yZTo6SW50UG9pbnQmIHApCiB7CiAgICAgaW50IHg7CkBA IC01OCwxMSArODQsNiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBib29sIGRlY29kZShBcmd1bWVudERl CiB9CiAKIC8vIFdlYkNvcmU6OkludFNpemUKLXRlbXBsYXRlPD4gaW5saW5lIHZvaWQgZW5jb2Rl KEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcykKLXsK LSAgICBlbmNvZGVyLmVuY29kZShDb3JlSVBDOjpJbihzLndpZHRoKCksIHMuaGVpZ2h0KCkpKTsK LX0KLQogdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNv ZGVyLCBXZWJDb3JlOjpJbnRTaXplJiBzKQogewogICAgIGludCB3aWR0aDsKQEAgLTc2LDExICs5 Nyw2IEBAIHRlbXBsYXRlPD4gaW5saW5lIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGUKIH0KIAogLy8g V2ViQ29yZTo6SW50UmVjdAotdGVtcGxhdGU8PiBpbmxpbmUgdm9pZCBlbmNvZGUoQXJndW1lbnRF bmNvZGVyJiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByKQotewotICAgIGVuY29k ZXIuZW5jb2RlKENvcmVJUEM6OkluKHIubG9jYXRpb24oKSwgci5zaXplKCkpKTsKLX0KLQogdGVt cGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBXZWJD b3JlOjpJbnRSZWN0JiByKQogewogICAgIFdlYkNvcmU6OkludFBvaW50IGxvY2F0aW9uOwpAQCAt OTQsMTEgKzExMCw2IEBAIHRlbXBsYXRlPD4gaW5saW5lIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGUK IH0KIAogLy8gV2ViQ29yZTo6RmxvYXRQb2ludAotdGVtcGxhdGU8PiBpbmxpbmUgdm9pZCBlbmNv ZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBw KQotewotICAgIGVuY29kZXIuZW5jb2RlKENvcmVJUEM6OkluKHAueCgpLCBwLnkoKSkpOwotfQot CiB0ZW1wbGF0ZTw+IGlubGluZSBib29sIGRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29kZXIs IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHApCiB7CiAgICAgZmxvYXQgeDsKQEAgLTExMiwxMSArMTIz LDYgQEAgdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZQogfQogCiAvLyBX ZWJDb3JlOjpGbG9hdFNpemUKLXRlbXBsYXRlPD4gaW5saW5lIHZvaWQgZW5jb2RlKEFyZ3VtZW50 RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiBzKQotewotICAgIGVu Y29kZXIuZW5jb2RlKENvcmVJUEM6OkluKHMud2lkdGgoKSwgcy5oZWlnaHQoKSkpOwotfQotCiB0 ZW1wbGF0ZTw+IGlubGluZSBib29sIGRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFdl YkNvcmU6OkZsb2F0U2l6ZSYgcykKIHsKICAgICBmbG9hdCB3aWR0aDsKQEAgLTEzMCwxMSArMTM2 LDYgQEAgdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZQogfQogCiAvLyBX ZWJDb3JlOjpGbG9hdFJlY3QKLXRlbXBsYXRlPD4gaW5saW5lIHZvaWQgZW5jb2RlKEFyZ3VtZW50 RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiByKQotewotICAgIGVu Y29kZXIuZW5jb2RlKENvcmVJUEM6OkluKHIubG9jYXRpb24oKSwgci5zaXplKCkpKTsKLX0KLQog dGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBX ZWJDb3JlOjpGbG9hdFJlY3QmIHIpCiB7CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGlv bjsKQEAgLTE0OCwxMyArMTQ5LDYgQEAgdGVtcGxhdGU8PiBpbmxpbmUgYm9vbCBkZWNvZGUoQXJn dW1lbnREZQogfQogCiAvLyBXZWJDb3JlOjpTdHJpbmcKLXRlbXBsYXRlPD4gaW5saW5lIHZvaWQg ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBz KQotewotICAgIHVpbnQzMl90IGxlbmd0aCA9IHMubGVuZ3RoKCk7Ci0gICAgZW5jb2Rlci5lbmNv ZGUobGVuZ3RoKTsKLSAgICBlbmNvZGVyLmVuY29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29u c3QgdWludDhfdCo+KHMuY2hhcmFjdGVycygpKSwgbGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7Ci19 Ci0KIHRlbXBsYXRlPD4gaW5saW5lIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2Rl ciwgV2ViQ29yZTo6U3RyaW5nJiBzKQogewogICAgIHVpbnQzMl90IGxlbmd0aDsKSW5kZXg6IFdl YktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiA2MTYyNykK KysrIFdlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNv cHkpCkBAIC00MCw2ICs0MCw3IEBACiAJCTFBRUZDQzEyMTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVn aW5JbmZvU3RvcmUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBRUZDQzEwMTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVnaW5JbmZvU3RvcmUuaCAqLzsgfTsK IAkJMUFFRkNDMTMxMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZS5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUVGQ0MxMTExRDAxRjk2 MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmNwcCAqLzsgfTsKIAkJMUFFRkNDQkQxMUQwMkM1 RTAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZU1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRUZDQ0JDMTFEMDJDNUUwMDgyMTlEMyAvKiBQbHVn aW5JbmZvU3RvcmVNYWMubW0gKi87IH07CisJCTFBRUZEMjc5MTFEMTZDODEwMDgyMTlEMyAvKiBB cmd1bWVudENvZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAxQUVGRDI3ODExRDE2QzgxMDA4MjE5RDMgLyogQXJndW1lbnRDb2Rlci5oICovOyB9Owog CQkxQUYzMDYwQTExMUI1OTlFMDBGOTY0MzYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgaW4gRnJhbWV3 b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4REMyRUY1QjA0ODZBNjk0 MDA5OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgKi87IH07CiAJCTVEQUQ3MjlDMTE2RkY4NjIw MEVFNTM5NiAvKiBBcHBLaXQuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMDg2N0Q2QTVGRTg0MDMwN0MwMkFBQzA3IC8qIEFwcEtpdC5m cmFtZXdvcmsgKi87IH07CiAJCThEQzJFRjUzMDQ4NkE2OTQwMDk4QjIxNiAvKiBJbmZvUGxpc3Qu c3RyaW5ncyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MDg5QzE2NjZGRTg0MTE1OEMwMkFBQzA3IC8qIEluZm9QbGlzdC5zdHJpbmdzICovOyB9OwpAQCAt MjU5LDYgKzI2MCw3IEBACiAJCTFBRUZDQzEwMTFEMDFGOTYwMDgyMTlEMyAvKiBQbHVnaW5JbmZv U3RvcmUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUGx1Z2luSW5mb1N0b3Jl Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBRUZDQzExMTFEMDFGOTYwMDgyMTlE MyAvKiBQbHVnaW5JbmZvU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gUGx1Z2luSW5mb1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MUFFRkNDQkMxMUQwMkM1RTAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZU1hYy5tbSAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFBsdWdpbkluZm9TdG9yZU1hYy5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUFFRkQyNzgxMUQxNkM4MTAwODIxOUQzIC8q IEFyZ3VtZW50Q29kZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQXJndW1l bnRDb2Rlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzMkRCQ0Y1RTAzNzBBREVF MDBDOTE3ODMgLyogV2ViS2l0MlByZWZpeC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBXZWJLaXQyUHJlZml4Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVEQUQ3 Mjk0MTE2RkY3MEIwMEVFNTM5NiAvKiBXZWJQcm9jZXNzLnhjY29uZmlnICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4 dC54Y2NvbmZpZzsgcGF0aCA9IFdlYlByb2Nlc3MueGNjb25maWc7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTVEQUQ3M0YxMTE2RkY5MEMwMEVFNTM5NiAvKiBCYXNlVGFyZ2V0LnhjY29u ZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsgcGF0aCA9IEJhc2VUYXJnZXQueGNjb25maWc7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC01NjIsNiArNTY0LDcgQEAKIAkJCWlzYSA9 IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCiAJCQkJQkNDNTZGNzUxMTU5OTU1RTAwMUNDQUY5 IC8qIG1hYyAqLywKKwkJCQkxQUVGRDI3ODExRDE2QzgxMDA4MjE5RDMgLyogQXJndW1lbnRDb2Rl ci5oICovLAogCQkJCUJDMDMyRDlEMTBGNDM3RDEwMDU4QzE1QSAvKiBBcmd1bWVudERlY29kZXIu Y3BwICovLAogCQkJCUJDMDMyRDlFMTBGNDM3RDEwMDU4QzE1QSAvKiBBcmd1bWVudERlY29kZXIu aCAqLywKIAkJCQlCQzAzMkQ5RjEwRjQzN0QxMDA1OEMxNUEgLyogQXJndW1lbnRFbmNvZGVyLmNw cCAqLywKQEAgLTEwMzgsNiArMTA0MSw3IEBACiAJCQkJMUFFRkNDMTIxMUQwMUY5NjAwODIxOUQz IC8qIFBsdWdpbkluZm9TdG9yZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkNERTA1OUIxMUNEQThB RTAwRTQxQUYxIC8qIFdlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJQkNCNzM0NkUxMUNFRTNGRjAwRUM1MDAyIC8qIFdlYlByb2Nlc3NQcm94eU1lc3Nh Z2VLaW5kcy5oIGluIEhlYWRlcnMgKi8sCisJCQkJMUFFRkQyNzkxMUQxNkM4MTAwODIxOUQzIC8q IEFyZ3VtZW50Q29kZXIuaCBpbiBIZWFkZXJzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYxNjMwKQor KysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAor MjAxMC0wNi0yMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgZW5j b2RlIGZ1bmN0aW9ucyB0byBiZSBzcGVjaWFsaXphdGlvbnMgb2YgYSBjbGFzcyB0ZW1wbGF0ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEwMTUKKwor ICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdFByb3h5Lmg6CisKIDIw MTAtMDYtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0L21hYy9QbHVnaW5zL0hvc3Rl ZC9OZXRzY2FwZVBsdWdpbkhvc3RQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1 Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0UHJveHkuaAkocmV2aXNpb24gNjE2MjcpCisr KyBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdFByb3h5LmgJKHdv cmtpbmcgY29weSkKQEAgLTg0LDExICs4NCw3IEBAIHByaXZhdGU6CiAgICAgbWFjaF9wb3J0X3Qg bV9jbGllbnRQb3J0OwogICAgIG1hY2hfcG9ydF90IG1fcG9ydFNldDsKICAgICAKLSNpZmRlZiBV U0VfTElCRElTUEFUQ0gKLSAgICBkaXNwYXRjaF9zb3VyY2VfdCBtX2NsaWVudFBvcnRTb3VyY2U7 Ci0jZWxzZQogICAgIFJldGFpblB0cjxDRlJ1bkxvb3BTb3VyY2VSZWY+IG1fY2xpZW50UG9ydFNv dXJjZTsKLSNlbmRpZgogICAgIG1hY2hfcG9ydF90IG1fcGx1Z2luSG9zdFBvcnQ7CiAgICAgUmV0 YWluUHRyPENGTWFjaFBvcnRSZWY+IG1fZGVhZE5hbWVOb3RpZmljYXRpb25Qb3J0OwogICAgIAo=