56783 2011-03-21 17:02:42 -0700 Actually hook up WebKit2 logging on Mac. 2011-06-18 11:58:03 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 beidson beidson darin webkit.review.bot oldest_to_newest 371027 0 beidson 2011-03-21 17:02:42 -0700 Actually hook up WebKit2 logging on Mac. 371031 1 86389 beidson 2011-03-21 17:04:24 -0700 Created attachment 86389 Patch v1 371037 2 webkit.review.bot 2011-03-21 17:07:07 -0700 Attachment 86389 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/Platform/Logging.h:26: #ifndef header guard has wrong style, please use: WTF_Logging_h [build/header_guard] [5] Source/WebKit2/Platform/Logging.h:44: The parameter name "channel" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 371066 3 86389 bweinstein 2011-03-21 17:42:12 -0700 Comment on attachment 86389 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=86389&action=review Please fix the style issues also. > Source/WebKit2/Platform/mac/Logging.mac.mm:35 > + if (logLevelString) { Can this be an early return instead? > Source/WebKit2/UIProcess/WebContext.cpp:131 > +#endif I think a blank line after the #endif would be slightly more pleasing on the eye. 371072 4 beidson 2011-03-21 17:45:42 -0700 (In reply to comment #3) > (From update of attachment 86389 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86389&action=review > > Please fix the style issues also. Fixed the argument name. Can't fix the header guard - each logging header needs to be unique. Breakage ensues otherwise. > > > Source/WebKit2/Platform/mac/Logging.mac.mm:35 > > + if (logLevelString) { > > Can this be an early return instead? Probably > > > Source/WebKit2/UIProcess/WebContext.cpp:131 > > +#endif > > I think a blank line after the #endif would be slightly more pleasing on the eye. K 371073 5 beidson 2011-03-21 17:47:36 -0700 Landed in r81628 371084 6 beidson 2011-03-21 17:58:56 -0700 r81631 fixed the mac release build. 86389 2011-03-21 17:04:24 -0700 2011-03-21 17:42:12 -0700 Patch v1 ptu.txt text/plain 9286 beidson SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNjE5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMjEgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01Njc4MworICAgICAgICBBY3R1YWxseSBob29rIHVwIFdlYktpdDIgbG9nZ2luZyBvbiBNYWMu CisKKyAgICAgICAgKiBQbGF0Zm9ybS9Mb2dnaW5nLmNwcDoKKyAgICAgICAgKFdlYktpdDo6aW5p dGlhbGl6ZUxvZ0NoYW5uZWwpOgorICAgICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAg ICAgKiBQbGF0Zm9ybS9tYWMvTG9nZ2luZy5tYWMubW06IEFkZGVkLgorICAgICAgICAoV2ViS2l0 Ojppbml0aWFsaXplTG9nQ2hhbm5lbCk6CisgCisgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OldlYkNvbnRleHQpOiBJbml0aWFs aXplIGxvZ2dpbmcgaWYgbmVjZXNzYXJ5LgorCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qOgorCiAyMDExLTAzLTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuY3BwCShyZXZpc2lvbiA4MTU4NSkKKysrIFNvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxNSArMjgs MTkgQEAKIAogI2lmICFMT0dfRElTQUJMRUQKIAorbmFtZXNwYWNlIFdlYktpdCB7CisKIFdURkxv Z0NoYW5uZWwgTG9nU2Vzc2lvblN0YXRlID0geyAweDAwMDAwMDAxLCAiV2ViS2l0MkxvZ0xldmVs IiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogV1RGTG9nQ2hhbm5lbCBMb2dDb250ZXh0TWVudSAgPSB7 IDB4MDAwMDAwMDIsICJXZWJLaXQyTG9nTGV2ZWwiLCBXVEZMb2dDaGFubmVsT2ZmIH07CiBXVEZM b2dDaGFubmVsIExvZ1RleHRJbnB1dCAgICA9IHsgMHgwMDAwMDAwNCwgIldlYktpdDJMb2dMZXZl bCIsIFdURkxvZ0NoYW5uZWxPZmYgfTsKIFdURkxvZ0NoYW5uZWwgTG9nVmlldyAgICAgICAgID0g eyAweDAwMDAwMDA4LCAiV2ViS2l0MkxvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mZiB9OwogCi1z dGF0aWMgaW5saW5lIHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwoV1RGTG9nQ2hhbm5lbCogY2hh bm5lbCkKKyNpZiAhUExBVEZPUk0oTUFDKQordm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZM b2dDaGFubmVsKiBjaGFubmVsKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGlzIGEgYnVpbGQgZml4 LiAgRWFjaCBwbGF0Zm9ybSB3aWxsIG5lZWQgdG8gZGVmaW5lIHRoZWlyIG93biBpbml0aWFsaXpl TG9nQ2hhbm5lbCgpLgorICAgIC8vIEZJWE1FOiBFYWNoIHBsYXRmb3JtIHdpbGwgbmVlZCB0byBk ZWZpbmUgdGhlaXIgb3duIGluaXRpYWxpemVMb2dDaGFubmVsKCkuCiB9CisjZW5kaWYKIAogdm9p ZCBpbml0aWFsaXplTG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpCiB7CkBAIC01MSw0ICs1NSw2IEBA IHZvaWQgaW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkoKQogICAgIGluaXRpYWxpemVM b2dDaGFubmVsKCZMb2dWaWV3KTsKIH0KIAorfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKICNlbmRp ZiAvLyBMT0dfRElTQUJMRUQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgJKHJldmlz aW9uIDgxNTg1KQorKysgU291cmNlL1dlYktpdDIvUGxhdGZvcm0vTG9nZ2luZy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yMyw4ICsyMyw4IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAotI2lmbmRlZiBMb2dnaW5nX2gKLSNkZWZpbmUgTG9nZ2luZ19oCisjaWZuZGVm IFdlYktpdExvZ2dpbmdfaAorI2RlZmluZSBXZWJLaXRMb2dnaW5nX2gKIAogI2luY2x1ZGUgPHd0 Zi9Bc3NlcnRpb25zLmg+CiAKQEAgLTM0LDE2ICszNCwxNyBAQAogI2RlZmluZSBMT0dfQ0hBTk5F TF9QUkVGSVggTG9nCiAjZW5kaWYKIAotRVhURVJOX0NfQkVHSU4KK25hbWVzcGFjZSBXZWJLaXQg ewogCiBleHRlcm4gV1RGTG9nQ2hhbm5lbCBMb2dDb250ZXh0TWVudTsKIGV4dGVybiBXVEZMb2dD aGFubmVsIExvZ1Nlc3Npb25TdGF0ZTsKIGV4dGVybiBXVEZMb2dDaGFubmVsIExvZ1RleHRJbnB1 dDsKIGV4dGVybiBXVEZMb2dDaGFubmVsIExvZ1ZpZXc7CiAKK3ZvaWQgaW5pdGlhbGl6ZUxvZ0No YW5uZWwoV1RGTG9nQ2hhbm5lbCogY2hhbm5lbCk7CiB2b2lkIGluaXRpYWxpemVMb2dDaGFubmVs c0lmTmVjZXNzYXJ5KHZvaWQpOwogCi1FWFRFUk5fQ19FTkQKK30gLy8gbmFtZXNwYWNlIFdlYktp dAogCiAjZW5kaWYgLy8gTE9HX0RJU0FCTEVECiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL21hYy9Mb2dnaW5nLm1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9tYWMvTG9nZ2luZy5tYWMubW0JKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0Mi9Q bGF0Zm9ybS9tYWMvTG9nZ2luZy5tYWMubW0JKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDQgQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgor CituYW1lc3BhY2UgV2ViS2l0IHsKKwordm9pZCBpbml0aWFsaXplTG9nQ2hhbm5lbChXVEZMb2dD aGFubmVsKiBjaGFubmVsKQoreworICAgIGNoYW5uZWwtPnN0YXRlID0gV1RGTG9nQ2hhbm5lbE9m ZjsKKyAgICBOU1N0cmluZyAqbG9nTGV2ZWxTdHJpbmcgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5k YXJkVXNlckRlZmF1bHRzXSBvYmplY3RGb3JLZXk6W05TU3RyaW5nIHN0cmluZ1dpdGhVVEY4U3Ry aW5nOmNoYW5uZWwtPmRlZmF1bHROYW1lXV07CisgICAgaWYgKGxvZ0xldmVsU3RyaW5nKSB7Cisg ICAgICAgIHVuc2lnbmVkIGxvZ0xldmVsOworICAgICAgICBpZiAoIVtbTlNTY2FubmVyIHNjYW5u ZXJXaXRoU3RyaW5nOmxvZ0xldmVsU3RyaW5nXSBzY2FuSGV4SW50OiZsb2dMZXZlbF0pCisgICAg ICAgICAgICBOU0xvZyhAInVuYWJsZSB0byBwYXJzZSBoZXggdmFsdWUgZm9yICVzICglQCksIGxv Z2dpbmcgaXMgb2ZmIiwgY2hhbm5lbC0+ZGVmYXVsdE5hbWUsIGxvZ0xldmVsU3RyaW5nKTsKKyAg ICAgICAgaWYgKChsb2dMZXZlbCAmIGNoYW5uZWwtPm1hc2spID09IGNoYW5uZWwtPm1hc2spCisg ICAgICAgICAgICBjaGFubmVsLT5zdGF0ZSA9IFdURkxvZ0NoYW5uZWxPbjsKKyAgICB9Cit9CisK K30gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJD b250ZXh0LmNwcAkocmV2aXNpb24gODE1ODUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRl ICJEb3dubG9hZFByb3h5LmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxlQXJyYXkuaCIKICNpbmNsdWRl ICJJbmplY3RlZEJ1bmRsZU1lc3NhZ2VLaW5kcy5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNp bmNsdWRlICJSdW5Mb29wLmgiCiAjaW5jbHVkZSAiU2FuZGJveEV4dGVuc2lvbi5oIgogI2luY2x1 ZGUgIlRleHRDaGVja2VyLmgiCkBAIC0xMjUsNiArMTI2LDkgQEAgV2ViQ29udGV4dDo6V2ViQ29u dGV4dChQcm9jZXNzTW9kZWwgcHJvYwogICAgICwgbV9zaG91bGRQYWludE5hdGl2ZUNvbnRyb2xz KHRydWUpCiAjZW5kaWYKIHsKKyNpZm5kZWYgTkRFQlVHCisgICAgV2ViS2l0Ojppbml0aWFsaXpl TG9nQ2hhbm5lbHNJZk5lY2Vzc2FyeSgpOworI2VuZGlmCiAgICAgY29udGV4dHMoKS5hcHBlbmQo dGhpcyk7CiAKICAgICBhZGRMYW5ndWFnZUNoYW5nZU9ic2VydmVyKHRoaXMsIGxhbmd1YWdlQ2hh bmdlZCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCShyZXZpc2lvbiA4MTU4NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMzA5LDYgKzMwOSw3 IEBACiAJCTUxNTM1NjlDMTI5MUIxRDIwMDA3NDlEQyAvKiBXZWJQYWdlQ29udGV4dE1lbnVDbGll bnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE1 MzU2OUExMjkxQjFEMjAwMDc0OURDIC8qIFdlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAgKi87 IH07CiAJCTUxNTM1NjlEMTI5MUIxRDIwMDA3NDlEQyAvKiBXZWJQYWdlQ29udGV4dE1lbnVDbGll bnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNTM1 NjlCMTI5MUIxRDIwMDA3NDlEQyAvKiBXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaCAqLzsgfTsK IAkJNTE1NzhCODMxMjA5RUNFRjAwQTM3QzRBIC8qIFdlYkRhdGEuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxNTc4QjgyMTIwOUVDRUYwMEEzN0M0QSAv KiBXZWJEYXRhLmggKi87IH07CisJCTUxNjBCRkUxMTMzODFERjkwMDkxODk5OSAvKiBMb2dnaW5n Lm1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUx NjBCRkUwMTMzODFERjkwMDkxODk5OSAvKiBMb2dnaW5nLm1hYy5tbSAqLzsgfTsKIAkJNTE2QTRB NUQxMjBBMkNDRDAwQzA1QjdGIC8qIFdlYkVycm9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTZBNEE1QjEyMEEyQ0NEMDBDMDVCN0YgLyogV2ViRXJy b3IuaCAqLzsgfTsKIAkJNTE4NzFCNUIxMjdDQjg5RDAwRjc2MjMyIC8qIFdlYkNvbnRleHRNZW51 LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxODcx QjU5MTI3Q0I4OUQwMEY3NjIzMiAvKiBXZWJDb250ZXh0TWVudS5jcHAgKi87IH07CiAJCTUxODcx QjVDMTI3Q0I4OUQwMEY3NjIzMiAvKiBXZWJDb250ZXh0TWVudS5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE4NzFCNUExMjdDQjg5RDAwRjc2MjMyIC8q IFdlYkNvbnRleHRNZW51LmggKi87IH07CkBAIC0xMTY0LDYgKzExNjUsNyBAQAogCQk1MTUzNTY5 QTEyOTFCMUQyMDAwNzQ5REMgLyogV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxNTM1NjlCMTI5MUIxRDIwMDA3NDlE QyAvKiBXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTUxNTc4QjgyMTIwOUVDRUYwMEEzN0M0QSAvKiBXZWJEYXRhLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkRhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJNTE2MEJGRTAxMzM4MURGOTAwOTE4OTk5IC8qIExvZ2dpbmcubWFjLm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gTG9nZ2luZy5tYWMubW07IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxNkE0QTVCMTIwQTJDQ0QwMEMwNUI3RiAvKiBXZWJF cnJvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJFcnJvci5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MTdBMzNCMzEzMEIzMDhDMDBGODBDQjUgLyogV0tB cHBsaWNhdGlvbkNhY2hlTWFuYWdlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNTE3QTMzQjQxMzBCMzA4QzAwRjgwQ0I1IC8qIFdLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tBcHBsaWNhdGlv bkNhY2hlTWFuYWdlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTk1NSw2ICsx OTU3LDcgQEAKIAkJMUE3RTgxNEUxMTUyRDIyNDAwMDM2OTVCIC8qIG1hYyAqLyA9IHsKIAkJCWlz YSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJNTE2MEJGRTAxMzM4MURGOTAwOTE4 OTk5IC8qIExvZ2dpbmcubWFjLm1tICovLAogCQkJCTFBMjRCNUYwMTFGNTMxRTgwMEMzODI2OSAv KiBNYWNoVXRpbGl0aWVzLmNwcCAqLywKIAkJCQkxQTI0QjVGMTExRjUzMUU4MDBDMzgyNjkgLyog TWFjaFV0aWxpdGllcy5oICovLAogCQkJCUMwRTNBQTQ4MTIwOUU0NTAwMEE0OUQwMSAvKiBNb2R1 bGVNYWMubW0gKi8sCkBAIC00MTQ2LDYgKzQxNDksNyBAQAogCQkJCTUxMUIyNEFBMTMyRTA5NzIw MDA2NUEwQyAvKiBXZWJJY29uRGF0YWJhc2UuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTFEMDJG NjQxMzJFQzVCOTAwQkVBQTk2IC8qIFdlYkljb25EYXRhYmFzZU1lc3NhZ2VSZWNlaXZlci5jcHAg aW4gU291cmNlcyAqLywKIAkJCQk1MUQwMkY2QjEzMkVDNzM3MDBCRUFBOTYgLyogV2ViSWNvbkRh dGFiYXNlUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJNTE2MEJG RTExMzM4MURGOTAwOTE4OTk5IC8qIExvZ2dpbmcubWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkp OwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07Cg==