30980 2009-10-31 12:44:03 -0700 Cleanup in wx code: avoid unnecessary wxString::mb_str() calls 2009-11-04 10:14:08 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED P4 Normal --- 0 vz-webkit webkit-unassigned commit-queue oldest_to_newest 159573 0 42258 vz-webkit 2009-10-31 12:44:03 -0700 Created attachment 42258 Patch removing unnecessary wxString::mb_str() calls While debugging the bug 30977 I noticed that in a few places in the code there were ugly-looking explicit conversions between wxString and WebCore::String. They seem to be unnecessary as there is already an implicit ctor in String from wxString so IMO we should be simply using it because just "baseUrl" looks much better than "static_cast<const char*>(baseUrl.mb_str(wxConvUTF8))". So I attach a patch which simply removes these calls. 160161 1 42258 eric 2009-11-03 12:12:40 -0800 Comment on attachment 42258 Patch removing unnecessary wxString::mb_str() calls Please don't remove the Reviewed by NOBODY (OOPS!). line. That's used by our scripts when landing to fill in who reviewed the patch. OTherwise this looks fine. You can post a new patch for use with the commit-queue, or find someone to land this manually for you. 160412 2 42476 vz-webkit 2009-11-04 04:07:28 -0800 Created attachment 42476 Same patch but with "Review" lines preserved. Sorry for removing these lines, I didn't realize they were necessary. I'm resubmitting exactly the same patch but amended to preserve these lines untouched. 160483 3 42476 commit-queue 2009-11-04 10:14:04 -0800 Comment on attachment 42476 Same patch but with "Review" lines preserved. Clearing flags on attachment: 42476 Committed r50516: <http://trac.webkit.org/changeset/50516> 160484 4 commit-queue 2009-11-04 10:14:08 -0800 All reviewed patches have been landed. Closing bug. 42258 2009-10-31 12:44:03 -0700 2009-11-04 04:07:28 -0800 Patch removing unnecessary wxString::mb_str() calls no-mb_str.diff text/plain 3554 vz-webkit Y29tbWl0IDEyYWNhYmVjODY1OTQzYzM4YTc3MTQ1YTUzMWM1MjhjMmRlNTQ0ZGMKQXV0aG9yOiBW YWRpbSBaZWl0bGluIDx2YWRpbUB3eHdpZGdldHMub3JnPgpEYXRlOiAgIFNhdCBPY3QgMzEgMjA6 Mzk6MDAgMjAwOSArMDEwMAoKICAgIEF2b2lkIHVubmVjZXNzYXJ5IHd4U3RyaW5nOjptYl9zdHIo KSBjYWxscyBpbiB3eCBjb2RlLgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNDljMzkyYS4uOTcxMjRkMSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMCBAQAorMjAw OS0xMC0zMSAgVmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CisKKyAgICAgICAg W3d4XSBTbWFsbCBjbGVhbnVwOiBhdm9pZCB1bm5lY2Vzc2FyeSB3eFN0cmluZzo6bWJfc3RyKCkg Y2FsbHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250UGxhdGZvcm1EYXRh V3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y29tcHV0ZUhhc2gp OgorCiAyMDA5LTEwLTI3ICBWYWRpbSBaZWl0bGluICA8dmFkaW1Ad3h3aWRnZXRzLm9yZz4KIAog ICAgICAgICBbd3hdIEZpeCBoYW5kbGluZyBvZiBhbHBoYSBjaGFubmVsIHdoZW4gdXNpbmcgd3hX aWRnZXRzIDIuOTogaXQgd2FzCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3d4L0ZvbnRQbGF0Zm9ybURhdGFXeC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4 L0ZvbnRQbGF0Zm9ybURhdGFXeC5jcHAKaW5kZXggNTY2YTI3Zi4uMzVjZGZjMCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250UGxhdGZvcm1EYXRhV3guY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3JtRGF0YVd4LmNwcApA QCAtMTExLDcgKzExMSw3IEBAIHVuc2lnbmVkIEZvbnRQbGF0Zm9ybURhdGE6OmNvbXB1dGVIYXNo KCkgY29uc3QgewogICAgICAgICAvLyBhIGZvbnQgd2hvc2UgcHJvcGVydGllcyBhcmUgZXF1YWwg c2hvdWxkIGdlbmVyYXRlIHRoZSBzYW1lIGhhc2gKICAgICAgICAgdWludHB0cl90IGhhc2hDb2Rl c1s2XSA9IHsgdGhpc0ZvbnQtPkdldFBvaW50U2l6ZSgpLCB0aGlzRm9udC0+R2V0RmFtaWx5KCks IHRoaXNGb250LT5HZXRTdHlsZSgpLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRoaXNGb250LT5HZXRXZWlnaHQoKSwgdGhpc0ZvbnQtPkdldFVuZGVybGluZWQoKSwgCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmdJbXBsOjpjb21wdXRlSGFz aCh0aGlzRm9udC0+R2V0RmFjZU5hbWUoKS5tYl9zdHIod3hDb252VVRGOCkpIH07CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmdJbXBsOjpjb21wdXRlSGFzaCh0aGlz Rm9udC0+R2V0RmFjZU5hbWUoKSkgfTsKICAgICAgICAgCiAgICAgICAgIHJldHVybiBTdHJpbmdJ bXBsOjpjb21wdXRlSGFzaChyZWludGVycHJldF9jYXN0PFVDaGFyKj4oaGFzaENvZGVzKSwgc2l6 ZW9mKGhhc2hDb2RlcykgLyBzaXplb2YoVUNoYXIpKTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdC93 eC9DaGFuZ2VMb2cgYi9XZWJLaXQvd3gvQ2hhbmdlTG9nCmluZGV4IDA0MmM0NjguLmVhZGM2Y2Ig MTAwNjQ0Ci0tLSBhL1dlYktpdC93eC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3d4L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDExIEBACisyMDA5LTEwLTMxICBWYWRpbSBaZWl0bGluICA8dmFkaW1Ad3h3 aWRnZXRzLm9yZz4KKworICAgICAgICBbd3hdIFNtYWxsIGNsZWFudXA6IGF2b2lkIHVubmVjZXNz YXJ5IHd4U3RyaW5nOjptYl9zdHIoKSBjYWxscy4KKworICAgICAgICAqIFdlYkZyYW1lLmNwcDoK KyAgICAgICAgKHd4V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2UpOgorICAgICAgICAod3hXZWJGcmFt ZTo6TG9hZFVSTCk6CisKIDIwMDktMTAtMTggIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRlcnNA Z21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcCBiL1dlYktpdC93eC9XZWJGcmFtZS5jcHAKaW5k ZXggMzhiM2UzZi4uNmYyODJjYyAxMDA2NDQKLS0tIGEvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcAor KysgYi9XZWJLaXQvd3gvV2ViRnJhbWUuY3BwCkBAIC0xNDYsOSArMTQ2LDkgQEAgd3hTdHJpbmcg d3hXZWJGcmFtZTo6R2V0UGFnZVNvdXJjZSgpCiB2b2lkIHd4V2ViRnJhbWU6OlNldFBhZ2VTb3Vy Y2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29uc3Qgd3hTdHJpbmcmIGJhc2VVcmwpCiB7CiAg ICAgaWYgKG1faW1wbC0+ZnJhbWUgJiYgbV9pbXBsLT5mcmFtZS0+bG9hZGVyKCkpIHsKLSAgICAg ICAgV2ViQ29yZTo6S1VSTCB1cmwoV2ViQ29yZTo6S1VSTCgpLCBzdGF0aWNfY2FzdDxjb25zdCBj aGFyKj4oYmFzZVVybC5tYl9zdHIod3hDb252VVRGOCkpKTsKKyAgICAgICAgV2ViQ29yZTo6S1VS TCB1cmwoV2ViQ29yZTo6S1VSTCgpLCBiYXNlVXJsKTsKIAotICAgICAgICB3eENoYXJCdWZmZXIg Y2hhckJ1ZmZlcihzb3VyY2UubWJfc3RyKHd4Q29udlVURjgpKTsKKyAgICAgICAgY29uc3Qgd3hD aGFyQnVmZmVyIGNoYXJCdWZmZXIoc291cmNlLnV0Zjhfc3RyKCkpOwogICAgICAgICBjb25zdCBj aGFyKiBjb250ZW50cyA9IGNoYXJCdWZmZXI7CiAKICAgICAgICAgV1RGOjpQYXNzUmVmUHRyPFdl YkNvcmU6OlNoYXJlZEJ1ZmZlcj4gc2hhcmVkQnVmZmVyID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVy OjpjcmVhdGUoY29udGVudHMsIHN0cmxlbihjb250ZW50cykpOwpAQCAtMjA2LDcgKzIwNiw3IEBA IGJvb2wgd3hXZWJGcmFtZTo6RmluZFN0cmluZyhjb25zdCB3eFN0cmluZyYgc3RyaW5nLCBib29s IGZvcndhcmQsIGJvb2wgY2FzZVNlbnNpCiB2b2lkIHd4V2ViRnJhbWU6OkxvYWRVUkwoY29uc3Qg d3hTdHJpbmcmIHVybCkKIHsKICAgICBpZiAobV9pbXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1l LT5sb2FkZXIoKSkgewotICAgICAgICBXZWJDb3JlOjpLVVJMIGt1cmwgPSBXZWJDb3JlOjpLVVJM KFdlYkNvcmU6OktVUkwoKSwgc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KHVybC5tYl9zdHIod3hD b252VVRGOCkpLCBXZWJDb3JlOjpVVEY4RW5jb2RpbmcoKSk7CisgICAgICAgIFdlYkNvcmU6OktV Ukwga3VybCA9IFdlYkNvcmU6OktVUkwoV2ViQ29yZTo6S1VSTCgpLCB1cmwsIFdlYkNvcmU6OlVU RjhFbmNvZGluZygpKTsKICAgICAgICAgLy8gTkI6IFRoaXMgaXMgYW4gdWdseSBmaXgsIGJ1dCBD VVJMIHdvbid0IGxvYWQgc3ViLXJlc291cmNlcyBpZiB0aGUKICAgICAgICAgLy8gcHJvdG9jb2wg aXMgb21pdHRlZDsgc2FkbHksIGl0IHdpbGwgbm90IGVtaXQgYW4gZXJyb3IsIGVpdGhlciwgc28K ICAgICAgICAgLy8gdGhlcmUncyBubyB3YXkgZm9yIHVzIHRvIGNhdGNoIHRoaXMgcHJvYmxlbSB0 aGUgY29ycmVjdCB3YXkgeWV0Lgo= 42476 2009-11-04 04:07:28 -0800 2009-11-04 10:14:04 -0800 Same patch but with "Review" lines preserved. no-mb_str.diff text/plain 3632 vz-webkit Y29tbWl0IGEzNDAxYjcwOGIzNWZmN2ExNTA2ODAwNzg3MmQwMGI0MjQ5MTc5MmIKQXV0aG9yOiBW YWRpbSBaZWl0bGluIDx2YWRpbUB3eHdpZGdldHMub3JnPgpEYXRlOiAgIFNhdCBPY3QgMzEgMjA6 Mzk6MDAgMjAwOSArMDEwMAoKICAgIEF2b2lkIHVubmVjZXNzYXJ5IHd4U3RyaW5nOjptYl9zdHIo KSBjYWxscyBpbiB3eCBjb2RlLgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggNDljMzkyYS4uYzc2MTAzZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAw OS0xMC0zMSAgVmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW3d4XSBTbWFsbCBjbGVhbnVw OiBhdm9pZCB1bm5lY2Vzc2FyeSB3eFN0cmluZzo6bWJfc3RyKCkgY2FsbHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250UGxhdGZvcm1EYXRhV3guY3BwOgorICAgICAgICAo V2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y29tcHV0ZUhhc2gpOgorCiAyMDA5LTEwLTI3ICBW YWRpbSBaZWl0bGluICA8dmFkaW1Ad3h3aWRnZXRzLm9yZz4KIAogICAgICAgICBbd3hdIEZpeCBo YW5kbGluZyBvZiBhbHBoYSBjaGFubmVsIHdoZW4gdXNpbmcgd3hXaWRnZXRzIDIuOTogaXQgd2Fz CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURh dGFXeC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGFX eC5jcHAKaW5kZXggNTY2YTI3Zi4uMzVjZGZjMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93eC9Gb250UGxhdGZvcm1EYXRhV3guY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3JtRGF0YVd4LmNwcApAQCAtMTExLDcgKzExMSw3IEBA IHVuc2lnbmVkIEZvbnRQbGF0Zm9ybURhdGE6OmNvbXB1dGVIYXNoKCkgY29uc3QgewogICAgICAg ICAvLyBhIGZvbnQgd2hvc2UgcHJvcGVydGllcyBhcmUgZXF1YWwgc2hvdWxkIGdlbmVyYXRlIHRo ZSBzYW1lIGhhc2gKICAgICAgICAgdWludHB0cl90IGhhc2hDb2Rlc1s2XSA9IHsgdGhpc0ZvbnQt PkdldFBvaW50U2l6ZSgpLCB0aGlzRm9udC0+R2V0RmFtaWx5KCksIHRoaXNGb250LT5HZXRTdHls ZSgpLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXNGb250LT5HZXRX ZWlnaHQoKSwgdGhpc0ZvbnQtPkdldFVuZGVybGluZWQoKSwgCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBTdHJpbmdJbXBsOjpjb21wdXRlSGFzaCh0aGlzRm9udC0+R2V0RmFj ZU5hbWUoKS5tYl9zdHIod3hDb252VVRGOCkpIH07CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBTdHJpbmdJbXBsOjpjb21wdXRlSGFzaCh0aGlzRm9udC0+R2V0RmFjZU5hbWUo KSkgfTsKICAgICAgICAgCiAgICAgICAgIHJldHVybiBTdHJpbmdJbXBsOjpjb21wdXRlSGFzaChy ZWludGVycHJldF9jYXN0PFVDaGFyKj4oaGFzaENvZGVzKSwgc2l6ZW9mKGhhc2hDb2RlcykgLyBz aXplb2YoVUNoYXIpKTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdC93eC9DaGFuZ2VMb2cgYi9XZWJL aXQvd3gvQ2hhbmdlTG9nCmluZGV4IDA0MmM0NjguLjY5YzAzODEgMTAwNjQ0Ci0tLSBhL1dlYktp dC93eC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3d4L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDA5LTEwLTMxICBWYWRpbSBaZWl0bGluICA8dmFkaW1Ad3h3aWRnZXRzLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbd3hdIFNtYWxsIGNs ZWFudXA6IGF2b2lkIHVubmVjZXNzYXJ5IHd4U3RyaW5nOjptYl9zdHIoKSBjYWxscy4KKworICAg ICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAgKHd4V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2Up OgorICAgICAgICAod3hXZWJGcmFtZTo6TG9hZFVSTCk6CisKIDIwMDktMTAtMTggIEtldmluIFdh dHRlcnMgIDxrZXZpbndhdHRlcnNAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtl dmluIE9sbGl2aWVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcCBiL1dlYktp dC93eC9XZWJGcmFtZS5jcHAKaW5kZXggMzhiM2UzZi4uNmYyODJjYyAxMDA2NDQKLS0tIGEvV2Vi S2l0L3d4L1dlYkZyYW1lLmNwcAorKysgYi9XZWJLaXQvd3gvV2ViRnJhbWUuY3BwCkBAIC0xNDYs OSArMTQ2LDkgQEAgd3hTdHJpbmcgd3hXZWJGcmFtZTo6R2V0UGFnZVNvdXJjZSgpCiB2b2lkIHd4 V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29uc3Qgd3hT dHJpbmcmIGJhc2VVcmwpCiB7CiAgICAgaWYgKG1faW1wbC0+ZnJhbWUgJiYgbV9pbXBsLT5mcmFt ZS0+bG9hZGVyKCkpIHsKLSAgICAgICAgV2ViQ29yZTo6S1VSTCB1cmwoV2ViQ29yZTo6S1VSTCgp LCBzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oYmFzZVVybC5tYl9zdHIod3hDb252VVRGOCkpKTsK KyAgICAgICAgV2ViQ29yZTo6S1VSTCB1cmwoV2ViQ29yZTo6S1VSTCgpLCBiYXNlVXJsKTsKIAot ICAgICAgICB3eENoYXJCdWZmZXIgY2hhckJ1ZmZlcihzb3VyY2UubWJfc3RyKHd4Q29udlVURjgp KTsKKyAgICAgICAgY29uc3Qgd3hDaGFyQnVmZmVyIGNoYXJCdWZmZXIoc291cmNlLnV0Zjhfc3Ry KCkpOwogICAgICAgICBjb25zdCBjaGFyKiBjb250ZW50cyA9IGNoYXJCdWZmZXI7CiAKICAgICAg ICAgV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gc2hhcmVkQnVmZmVyID0g V2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUoY29udGVudHMsIHN0cmxlbihjb250ZW50cykp OwpAQCAtMjA2LDcgKzIwNiw3IEBAIGJvb2wgd3hXZWJGcmFtZTo6RmluZFN0cmluZyhjb25zdCB3 eFN0cmluZyYgc3RyaW5nLCBib29sIGZvcndhcmQsIGJvb2wgY2FzZVNlbnNpCiB2b2lkIHd4V2Vi RnJhbWU6OkxvYWRVUkwoY29uc3Qgd3hTdHJpbmcmIHVybCkKIHsKICAgICBpZiAobV9pbXBsLT5m cmFtZSAmJiBtX2ltcGwtPmZyYW1lLT5sb2FkZXIoKSkgewotICAgICAgICBXZWJDb3JlOjpLVVJM IGt1cmwgPSBXZWJDb3JlOjpLVVJMKFdlYkNvcmU6OktVUkwoKSwgc3RhdGljX2Nhc3Q8Y29uc3Qg Y2hhcio+KHVybC5tYl9zdHIod3hDb252VVRGOCkpLCBXZWJDb3JlOjpVVEY4RW5jb2RpbmcoKSk7 CisgICAgICAgIFdlYkNvcmU6OktVUkwga3VybCA9IFdlYkNvcmU6OktVUkwoV2ViQ29yZTo6S1VS TCgpLCB1cmwsIFdlYkNvcmU6OlVURjhFbmNvZGluZygpKTsKICAgICAgICAgLy8gTkI6IFRoaXMg aXMgYW4gdWdseSBmaXgsIGJ1dCBDVVJMIHdvbid0IGxvYWQgc3ViLXJlc291cmNlcyBpZiB0aGUK ICAgICAgICAgLy8gcHJvdG9jb2wgaXMgb21pdHRlZDsgc2FkbHksIGl0IHdpbGwgbm90IGVtaXQg YW4gZXJyb3IsIGVpdGhlciwgc28KICAgICAgICAgLy8gdGhlcmUncyBubyB3YXkgZm9yIHVzIHRv IGNhdGNoIHRoaXMgcHJvYmxlbSB0aGUgY29ycmVjdCB3YXkgeWV0Lgo=