42569 2010-07-19 08:10:46 -0700 [EFL] Fix some EFL theme issues 2010-07-19 09:06:29 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 antognolli+webkit webkit-unassigned barbieri commit-queue lucas.de.marchi oldest_to_newest 253217 0 antognolli+webkit 2010-07-19 08:10:46 -0700 [EFL] Fix some EFL theme issues 253224 1 61957 antognolli+webkit 2010-07-19 08:13:56 -0700 Created attachment 61957 Patch 253232 2 61957 tonikitoo 2010-07-19 08:24:49 -0700 Comment on attachment 61957 Patch > + Keep a pointer to theme filename and check for it correctly. What was wrong previously? from what I understood, instead of having 'theme' and 'file' variables you changed to only have 'file', or you really fixing a problem? 253237 3 barbieri 2010-07-19 08:37:04 -0700 (In reply to comment #2) > (From update of attachment 61957 [details]) > > > + Keep a pointer to theme filename and check for it correctly. > > What was wrong previously? from what I understood, instead of having 'theme' and 'file' variables you changed to only have 'file', or you really fixing a problem? The good old annoyance of storing "const char*" that is return of a dynamically allocated String::utf8().data(). Now it is being stored in CString and used as CString::data(), for immediate use, retaining the memory. 253238 4 lucas.de.marchi 2010-07-19 08:38:51 -0700 (In reply to comment #2) > (From update of attachment 61957 [details]) > > > + Keep a pointer to theme filename and check for it correctly. > > What was wrong previously? from what I understood, instead of having 'theme' and 'file' variables you changed to only have 'file', or you really fixing a problem? He was fixing a problem: > - file = edjeThemeRecursive().utf8().data(); The object returned by .utf8() will die as soon as .data() is returned. Thus 'file' will point for a memory area that is not allocated anymore. 253246 5 61957 commit-queue 2010-07-19 09:06:25 -0700 Comment on attachment 61957 Patch Clearing flags on attachment: 61957 Committed r63666: <http://trac.webkit.org/changeset/63666> 253247 6 commit-queue 2010-07-19 09:06:29 -0700 All reviewed patches have been landed. Closing bug. 61957 2010-07-19 08:13:56 -0700 2010-07-19 09:06:25 -0700 Patch bug-42569-20100719121354.patch text/plain 2297 antognolli+webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDI5OGNlYTA3N2RkOTI3ODM1NzZjZDVmZmExYmNlYjYzM2Y1MmJjNS4uNWI0YjMzMzYzODljMDU5 MzMyMjFmNmUzNjc3MTVhMWY3MzAyMDFhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNy0xOSAgUmFm YWVsIEFudG9nbm9sbGkgIDxhbnRvZ25vbGxpQHByb2Z1c2lvbi5tb2JpPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEZpeCBzb21lIEVGTCB0 aGVtZSBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQyNTY5CisKKyAgICAgICAgS2VlcCBhIHBvaW50ZXIgdG8gdGhlbWUgZmlsZW5hbWUgYW5k IGNoZWNrIGZvciBpdCBjb3JyZWN0bHkuCisgICAgICAgIFJlZHVjZSB0aGUgc2NvcGUgb2Ygc29t ZSB2YXJpYWJsZXMuCisgICAgICAgIERvbid0IHRlc3QgZm9yIHBsYXRmb3JtV2lkZ2V0KCkgc2lu Y2Ugd2UgYXJlIG5vdCB1c2luZyBpdC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIG5ldyBm dW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1dpZGdldEVmbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpXaWRnZXQ6OmFwcGx5Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6 OldpZGdldDo6c2V0Q3Vyc29yKToKKwogMjAxMC0wNy0xOSAgQW5kcmVhcyBLbGluZyAgPGFuZHJl YXMua2xpbmdAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUg Q2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvV2lkZ2V0RWZs LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1dpZGdldEVmbC5jcHAKaW5kZXggNzI1ZTU2ZjA2 MWUxM2I5ZmZmZTcxM2Y5NDI0YjcyN2NlOWIzMTNmMC4uYjNhYTk4N2VhMDRhNzFjZjYzNmZiMjYw Nzk4NjNlNjhiZGU1ODZmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvV2lkZ2V0 RWZsLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2VmbC9XaWRnZXRFZmwuY3BwCkBAIC0yMjks MjEgKzIyOSwxNiBAQCB2b2lkIFdpZGdldDo6YXBwbHlGYWxsYmFja0N1cnNvcigpCiAKIHZvaWQg V2lkZ2V0OjphcHBseUN1cnNvcigpCiB7Ci0gICAgY29uc3QgY2hhciAqZmlsZSA9IDA7Ci0gICAg RXZhc19Db29yZCB4LCB5OwotCi0gICAgU3RyaW5nIHRoZW1lID0gZWRqZVRoZW1lUmVjdXJzaXZl KCk7Ci0gICAgaWYgKCF0aGVtZS5pc051bGwoKSkKLSAgICAgICAgZmlsZSA9IGVkamVUaGVtZVJl Y3Vyc2l2ZSgpLnV0ZjgoKS5kYXRhKCk7CisgICAgQ1N0cmluZyBmaWxlID0gZWRqZVRoZW1lUmVj dXJzaXZlKCkudXRmOCgpOwogCiAgICAgbV9kYXRhLT5tX2N1cnNvck9iamVjdCA9IGVkamVfb2Jq ZWN0X2FkZChldmFzKCkpOwotICAgIGlmIChmaWxlICYmICFlZGplX29iamVjdF9maWxlX3NldCht X2RhdGEtPm1fY3Vyc29yT2JqZWN0LCBmaWxlLCBtX2RhdGEtPm1fY3Vyc29yR3JvdXAudXRmOCgp LmRhdGEoKSkpIHsKKyAgICBpZiAoIWZpbGUuaXNOdWxsKCkgJiYgIWVkamVfb2JqZWN0X2ZpbGVf c2V0KG1fZGF0YS0+bV9jdXJzb3JPYmplY3QsIGZpbGUuZGF0YSgpLCBtX2RhdGEtPm1fY3Vyc29y R3JvdXAudXRmOCgpLmRhdGEoKSkpIHsKICAgICAgICAgZXZhc19vYmplY3RfZGVsKG1fZGF0YS0+ bV9jdXJzb3JPYmplY3QpOwogICAgICAgICBtX2RhdGEtPm1fY3Vyc29yT2JqZWN0ID0gMDsKICAg ICAgICAgZWNvcmVfZXZhc19vYmplY3RfY3Vyc29yX3NldChlY29yZUV2YXMoKSwgMCwgMCwgMCwg MCk7CiAgICAgICAgIGFwcGx5RmFsbGJhY2tDdXJzb3IoKTsKICAgICB9IGVsc2UgewotICAgICAg ICBFdmFzX0Nvb3JkIHcsIGg7CisgICAgICAgIEV2YXNfQ29vcmQgeCwgeSwgdywgaDsKICAgICAg ICAgY29uc3QgY2hhciAqZDsKIAogICAgICAgICBlZGplX29iamVjdF9zaXplX21pbl9nZXQobV9k YXRhLT5tX2N1cnNvck9iamVjdCwgJncsICZoKTsKQEAgLTI2Niw3ICsyNjEsNyBAQCB2b2lkIFdp ZGdldDo6YXBwbHlDdXJzb3IoKQogCiB2b2lkIFdpZGdldDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNv ciYgY3Vyc29yKQogewotICAgIGlmICghcGxhdGZvcm1XaWRnZXQoKSB8fCAhZXZhcygpKQorICAg IGlmICghZXZhcygpKQogICAgICAgICAgcmV0dXJuOwogCiAgICAgY29uc3QgY2hhciAqZ3JvdXAg PSBjdXJzb3IuaW1wbCgpOwo=