6106 2005-12-16 01:54:27 -0800 DOMString should hold its impl in a RefPtr 2005-12-16 14:25:21 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P4 Normal --- 1 eric eric oldest_to_newest 26033 0 eric 2005-12-16 01:54:27 -0800 DOMString should hold it's impl in a RefPtr Simplifies a bit of code. Patch attached. 26034 1 5104 eric 2005-12-16 01:58:44 -0800 Created attachment 5104 Proposed patch. Also does a little cleanup. 26051 2 5104 darin 2005-12-16 07:30:45 -0800 Comment on attachment 5104 Proposed patch. A couple refinements you could do before landing: With this change, ~DOMString, DOMString(const DOMString &), and DOMString::operator= don't need to be explicitly declared or implemented. The default generated ones will do the right thing without any code. (The same would be true of the default constructor except that as I recall the default constructor is only generated if you don't delcare any others.) Also, you should replace tabs with spaces in these files (patches show many tabs). 26067 3 eric 2005-12-16 14:25:21 -0800 I made darin's suggested fixes before landing. 5104 2005-12-16 01:58:44 -0800 2005-12-16 07:30:45 -0800 Proposed patch. dom_ref.patch text/plain 7495 eric SW5kZXg6IGRvbV9zdHJpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJD b3JlL2todG1sL2RvbS9kb21fc3RyaW5nLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMwpk aWZmIC1wIC11IC1yMS4yMyBkb21fc3RyaW5nLmNwcAotLS0gZG9tX3N0cmluZy5jcHAJNCBEZWMg MjAwNSAyMzoxNDoyNiAtMDAwMAkxLjIzCisrKyBkb21fc3RyaW5nLmNwcAkxNiBEZWMgMjAwNSAw OTo1OToyMyAtMDAwMApAQCAtMzAsODUgKzMwLDU1IEBAIG5hbWVzcGFjZSBET00gewogCiBET01T dHJpbmc6OkRPTVN0cmluZyhjb25zdCBRQ2hhciAqc3RyLCB1aW50IGxlbikKIHsKLSAgICBpZiAo IXN0cikgewotICAgICAgICBtX2ltcGwgPSAwOworICAgIGlmICghc3RyKQogICAgICAgICByZXR1 cm47Ci0gICAgfQogICAgIAogICAgIGlmIChsZW4gPT0gMCkKICAgICAgICAgbV9pbXBsID0gRE9N U3RyaW5nSW1wbDo6ZW1wdHkoKTsKICAgICBlbHNlCiAgICAgICAgIG1faW1wbCA9IG5ldyBET01T dHJpbmdJbXBsKHN0ciwgbGVuKTsKLSAgICBtX2ltcGwtPnJlZigpOwogfQogCiBET01TdHJpbmc6 OkRPTVN0cmluZyhjb25zdCBRU3RyaW5nICZzdHIpCiB7Ci0gICAgaWYgKHN0ci5pc051bGwoKSkg ewotCW1faW1wbCA9IDA7CisgICAgaWYgKHN0ci5pc051bGwoKSkKIAlyZXR1cm47Ci0gICAgfQog ICAgIAogICAgIGlmIChzdHIuaXNFbXB0eSgpKQogICAgICAgICBtX2ltcGwgPSBET01TdHJpbmdJ bXBsOjplbXB0eSgpOwogICAgIGVsc2UgCiAgICAgICAgIG1faW1wbCA9IG5ldyBET01TdHJpbmdJ bXBsKHN0ci51bmljb2RlKCksIHN0ci5sZW5ndGgoKSk7Ci0gICAgbV9pbXBsLT5yZWYoKTsKIH0K IAogRE9NU3RyaW5nOjpET01TdHJpbmcoY29uc3QgY2hhciAqc3RyKQogewotICAgIGlmICghc3Ry KSB7Ci0JbV9pbXBsID0gMDsKKyAgICBpZiAoIXN0cikKIAlyZXR1cm47Ci0gICAgfQogCiAgICAg aW50IGwgPSBzdHJsZW4oc3RyKTsKICAgICBpZiAobCA9PSAwKQogICAgICAgICBtX2ltcGwgPSBE T01TdHJpbmdJbXBsOjplbXB0eSgpOwogICAgIGVsc2UKICAgICAgICAgbV9pbXBsID0gbmV3IERP TVN0cmluZ0ltcGwoc3RyLCBsKTsKLSAgICBtX2ltcGwtPnJlZigpOwotfQotCi1ET01TdHJpbmc6 OkRPTVN0cmluZyhET01TdHJpbmdJbXBsICppKQotewotICAgIG1faW1wbCA9IGk7Ci0gICAgaWYo bV9pbXBsKSBtX2ltcGwtPnJlZigpOwotfQotCi1ET01TdHJpbmc6OkRPTVN0cmluZyhjb25zdCBE T01TdHJpbmcgJm90aGVyKQotewotICAgIG1faW1wbCA9IG90aGVyLm1faW1wbDsKLSAgICBpZiht X2ltcGwpIG1faW1wbC0+cmVmKCk7CiB9CiAKIERPTVN0cmluZyAmRE9NU3RyaW5nOjpvcGVyYXRv ciA9KGNvbnN0IERPTVN0cmluZyAmb3RoZXIpCiB7Ci0gICAgaWYgKCBtX2ltcGwgIT0gb3RoZXIu bV9pbXBsICkgewotICAgIGlmKG1faW1wbCkgbV9pbXBsLT5kZXJlZigpOwotICAgIG1faW1wbCA9 IG90aGVyLm1faW1wbDsKLSAgICBpZihtX2ltcGwpIG1faW1wbC0+cmVmKCk7Ci0gICAgfQorICAg IGlmIChtX2ltcGwgIT0gb3RoZXIubV9pbXBsKQorICAgICAgICBtX2ltcGwgPSBvdGhlci5tX2lt cGw7CiAgICAgcmV0dXJuICp0aGlzOwogfQogCiBET01TdHJpbmcgJkRPTVN0cmluZzo6b3BlcmF0 b3IgKz0gKGNvbnN0IERPTVN0cmluZyAmc3RyKQogewotICAgIGlmKHN0ci5tX2ltcGwpCi0gICAg ewotICAgICAgICBpZighbV9pbXBsKQotICAgICAgICB7CisgICAgaWYgKHN0ci5tX2ltcGwpIHsK KyAgICAgICAgaWYgKCFtX2ltcGwpIHsKICAgICAgICAgICAgIC8vICMjIyBGSVhNRSEhIQogICAg ICAgICAgICAgbV9pbXBsID0gc3RyLm1faW1wbDsKLSAgICAgICAgICAgIG1faW1wbC0+cmVmKCk7 CiAgICAgICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgICAgIH0KLQlET01TdHJpbmdJbXBsICpp ID0gbV9pbXBsLT5jb3B5KCk7Ci0JbV9pbXBsLT5kZXJlZigpOwotCW1faW1wbCA9IGk7Ci0JbV9p bXBsLT5yZWYoKTsKLQltX2ltcGwtPmFwcGVuZChzdHIubV9pbXBsKTsKKwltX2ltcGwgPSBtX2lt cGwtPmNvcHkoKTsKKwltX2ltcGwtPmFwcGVuZChzdHIubV9pbXBsLmdldCgpKTsKICAgICB9CiAg ICAgcmV0dXJuICp0aGlzOwogfQpAQCAtMTI2LDEzICs5NiwxMCBAQCBET01TdHJpbmcgb3BlcmF0 b3IgKyAoY29uc3QgRE9NU3RyaW5nICZhCiAKIHZvaWQgRE9NU3RyaW5nOjppbnNlcnQoRE9NU3Ry aW5nIHN0ciwgdWludCBwb3MpCiB7Ci0gICAgaWYoIW1faW1wbCkKLSAgICB7CisgICAgaWYgKCFt X2ltcGwpCiAJbV9pbXBsID0gc3RyLm1faW1wbC0+Y29weSgpOwotCW1faW1wbC0+cmVmKCk7Ci0g ICAgfQogICAgIGVsc2UKLQltX2ltcGwtPmluc2VydChzdHIubV9pbXBsLCBwb3MpOworCW1faW1w bC0+aW5zZXJ0KHN0ci5tX2ltcGwuZ2V0KCksIHBvcyk7CiB9CiAKIApAQCAtMTQwLDcgKzEwNyw4 IEBAIGNvbnN0IFFDaGFyICZET01TdHJpbmc6Om9wZXJhdG9yIFtdKHVuc2kKIHsKICAgICBzdGF0 aWMgY29uc3QgUUNoYXIgbnVsbENoYXIgPSAwOwogCi0gICAgaWYoIW1faW1wbCB8fCBpID49IG1f aW1wbC0+bCApIHJldHVybiBudWxsQ2hhcjsKKyAgICBpZiAoIW1faW1wbCB8fCBpID49IG1faW1w bC0+bCApCisgICAgICAgIHJldHVybiBudWxsQ2hhcjsKIAogICAgIHJldHVybiAqKG1faW1wbC0+ cytpKTsKIH0KQEAgLTE0OCwxMCArMTE2LDExIEBAIGNvbnN0IFFDaGFyICZET01TdHJpbmc6Om9w ZXJhdG9yIFtdKHVuc2kKIGludCBET01TdHJpbmc6OmZpbmQoY29uc3QgUUNoYXIgYywgaW50IHN0 YXJ0KSBjb25zdAogewogICAgIHVuc2lnbmVkIGludCBsID0gc3RhcnQ7Ci0gICAgaWYoIW1faW1w bCB8fCBsID49IG1faW1wbC0+bCApIHJldHVybiAtMTsKLSAgICB3aGlsZSggbCA8IG1faW1wbC0+ bCApCi0gICAgewotCWlmKCAqKG1faW1wbC0+cytsKSA9PSBjICkgcmV0dXJuIGw7CisgICAgaWYg KCFtX2ltcGwgfHwgbCA+PSBtX2ltcGwtPmwgKQorICAgICAgICByZXR1cm4gLTE7CisgICAgd2hp bGUobCA8IG1faW1wbC0+bCkgeworCWlmICgqKG1faW1wbC0+cytsKSA9PSBjKQorICAgICAgICAg ICAgcmV0dXJuIGw7CiAJbCsrOwogICAgIH0KICAgICByZXR1cm4gLTE7CkBAIC0xNTksMTggKzEy OCwyMSBAQCBpbnQgRE9NU3RyaW5nOjpmaW5kKGNvbnN0IFFDaGFyIGMsIGludCBzCiAKIHVpbnQg RE9NU3RyaW5nOjpsZW5ndGgoKSBjb25zdAogewotICAgIGlmKCFtX2ltcGwpIHJldHVybiAwOwor ICAgIGlmICghbV9pbXBsKQorICAgICAgICByZXR1cm4gMDsKICAgICByZXR1cm4gbV9pbXBsLT5s OwogfQogCiB2b2lkIERPTVN0cmluZzo6dHJ1bmNhdGUoIHVuc2lnbmVkIGludCBsZW4gKQogewot ICAgIGlmKG1faW1wbCkgbV9pbXBsLT50cnVuY2F0ZShsZW4pOworICAgIGlmIChtX2ltcGwpCisg ICAgICAgIG1faW1wbC0+dHJ1bmNhdGUobGVuKTsKIH0KIAogdm9pZCBET01TdHJpbmc6OnJlbW92 ZSh1bnNpZ25lZCBpbnQgcG9zLCBpbnQgbGVuKQogewotICBpZihtX2ltcGwpIG1faW1wbC0+cmVt b3ZlKHBvcywgbGVuKTsKKyAgaWYgKG1faW1wbCkKKyAgICBtX2ltcGwtPnJlbW92ZShwb3MsIGxl bik7CiB9CiAKIERPTVN0cmluZyBET01TdHJpbmc6OnN1YnN0cmluZyh1bnNpZ25lZCBpbnQgcG9z LCB1bnNpZ25lZCBpbnQgbGVuKSBjb25zdApAQCAtMTgyLDI1ICsxNTQsMjkgQEAgRE9NU3RyaW5n IERPTVN0cmluZzo6c3Vic3RyaW5nKHVuc2lnbmVkIAogCiBET01TdHJpbmcgRE9NU3RyaW5nOjpz cGxpdCh1bnNpZ25lZCBpbnQgcG9zKQogewotICBpZighbV9pbXBsKSByZXR1cm4gRE9NU3RyaW5n KCk7Ci0gIHJldHVybiBtX2ltcGwtPnNwbGl0KHBvcyk7CisgICAgaWYgKCFtX2ltcGwpCisgICAg ICAgIHJldHVybiBET01TdHJpbmcoKTsKKyAgICByZXR1cm4gbV9pbXBsLT5zcGxpdChwb3MpOwog fQogCiBET01TdHJpbmcgRE9NU3RyaW5nOjpsb3dlcigpIGNvbnN0CiB7Ci0gIGlmKCFtX2ltcGwp IHJldHVybiBET01TdHJpbmcoKTsKLSAgcmV0dXJuIG1faW1wbC0+bG93ZXIoKTsKKyAgICBpZiAo IW1faW1wbCkKKyAgICAgICAgcmV0dXJuIERPTVN0cmluZygpOworICAgIHJldHVybiBtX2ltcGwt Pmxvd2VyKCk7CiB9CiAKIERPTVN0cmluZyBET01TdHJpbmc6OnVwcGVyKCkgY29uc3QKIHsKLSAg aWYoIW1faW1wbCkgcmV0dXJuIERPTVN0cmluZygpOwotICByZXR1cm4gbV9pbXBsLT51cHBlcigp OworICAgIGlmICghbV9pbXBsKQorICAgICAgICByZXR1cm4gRE9NU3RyaW5nKCk7CisgICAgcmV0 dXJuIG1faW1wbC0+dXBwZXIoKTsKIH0KIAogYm9vbCBET01TdHJpbmc6OnBlcmNlbnRhZ2UoaW50 ICZfcGVyY2VudGFnZSkgY29uc3QKIHsKLSAgICBpZighbV9pbXBsIHx8ICFtX2ltcGwtPmwpIHJl dHVybiBmYWxzZTsKKyAgICBpZiAoIW1faW1wbCB8fCAhbV9pbXBsLT5sKQorICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICBpZiAoICoobV9pbXBsLT5zK21faW1wbC0+bC0xKSAhPSBRQ2hhcign JScpKQogICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIxMSwyNyArMTg3LDMxIEBAIGJvb2wgRE9N U3RyaW5nOjpwZXJjZW50YWdlKGludCAmX3BlcmNlbnQKIAogUUNoYXIgKkRPTVN0cmluZzo6dW5p Y29kZSgpIGNvbnN0CiB7Ci0gICAgaWYoIW1faW1wbCkgcmV0dXJuIDA7CisgICAgaWYgKCFtX2lt cGwpCisgICAgICAgIHJldHVybiAwOwogICAgIHJldHVybiBtX2ltcGwtPnM7CiB9CiAKIFFTdHJp bmcgRE9NU3RyaW5nOjpxc3RyaW5nKCkgY29uc3QKIHsKLSAgICBpZighbV9pbXBsKSByZXR1cm4g UVN0cmluZzo6bnVsbDsKKyAgICBpZiAoIW1faW1wbCkKKyAgICAgICAgcmV0dXJuIFFTdHJpbmc6 Om51bGw7CiAKICAgICByZXR1cm4gUVN0cmluZyhtX2ltcGwtPnMsIG1faW1wbC0+bCk7CiB9CiAK IGludCBET01TdHJpbmc6OnRvSW50KCkgY29uc3QKIHsKLSAgICBpZighbV9pbXBsKSByZXR1cm4g MDsKKyAgICBpZiAoIW1faW1wbCkKKyAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gbV9p bXBsLT50b0ludCgpOwogfQogCiBET01TdHJpbmcgRE9NU3RyaW5nOjpjb3B5KCkgY29uc3QKIHsK LSAgICBpZighbV9pbXBsKSByZXR1cm4gRE9NU3RyaW5nKCk7CisgICAgaWYgKCFtX2ltcGwpCisg ICAgICAgIHJldHVybiBET01TdHJpbmcoKTsKICAgICByZXR1cm4gbV9pbXBsLT5jb3B5KCk7CiB9 CiAKQEAgLTI5OSw5ICsyNzksOSBAQCBib29sIG9wZXJhdG9yPT0oIGNvbnN0IERPTVN0cmluZyAm YSwgY29uCiAgICAgCiAgICAgdW5zaWduZWQgaW50IGwgPSBhLmxlbmd0aCgpOwogCi0gICAgaWYo IGwgIT0gYi5sZW5ndGgoKSApIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIGwgIT0gYi5sZW5ndGgo KSApIHJldHVybiBmYWxzZTsKIAotICAgIGlmKCFtZW1jbXAoYS51bmljb2RlKCksIGIudW5pY29k ZSgpLCBsKnNpemVvZihRQ2hhcikpKQorICAgIGlmICghbWVtY21wKGEudW5pY29kZSgpLCBiLnVu aWNvZGUoKSwgbCpzaXplb2YoUUNoYXIpKSkKIAlyZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gZmFs c2U7CiB9CkBAIC0zMTAsMTYgKzI5MCwxNiBAQCBib29sIG9wZXJhdG9yPT0oIGNvbnN0IERPTVN0 cmluZyAmYSwgY29uCiB7CiAgICAgdW5zaWduZWQgaW50IGwgPSBhLmxlbmd0aCgpOwogCi0gICAg aWYoIGwgIT0gYi5sZW5ndGgoKSApIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIGwgIT0gYi5sZW5n dGgoKSApIHJldHVybiBmYWxzZTsKIAotICAgIGlmKCFtZW1jbXAoYS51bmljb2RlKCksIGIudW5p Y29kZSgpLCBsKnNpemVvZihRQ2hhcikpKQorICAgIGlmICghbWVtY21wKGEudW5pY29kZSgpLCBi LnVuaWNvZGUoKSwgbCpzaXplb2YoUUNoYXIpKSkKIAlyZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKIGJvb2wgb3BlcmF0b3I9PSggY29uc3QgRE9NU3RyaW5nICZhLCBjb25zdCBj aGFyICpiICkKIHsKLSAgICBET01TdHJpbmdJbXBsICphaW1wbCA9IGEubV9pbXBsOworICAgIERP TVN0cmluZ0ltcGwgKmFpbXBsID0gYS5tX2ltcGwuZ2V0KCk7CiAgICAgCiAgICAgaWYgKCFiKQog ICAgICAgICByZXR1cm4gIWFpbXBsOwpJbmRleDogZG9tX3N0cmluZy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNT IGZpbGU6IC9jdnMvcm9vdC9XZWJDb3JlL2todG1sL2RvbS9kb21fc3RyaW5nLmgsdgpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuMTUKZGlmZiAtcCAtdSAtcjEuMTUgZG9tX3N0cmluZy5oCi0tLSBkb21f c3RyaW5nLmgJMjkgQXVnIDIwMDUgMjE6Mjk6MTEgLTAwMDAJMS4xNQorKysgZG9tX3N0cmluZy5o CTE2IERlYyAyMDA1IDA5OjU5OjIzIC0wMDAwCkBAIC01MiwxNyArNTIsMTcgQEAgcHVibGljOgog ICAgIC8qKgogICAgICAqIGRlZmF1bHQgY29uc3RydWN0b3IuIEdpdmVzIGFuIGVtcHR5IERPTVN0 cmluZwogICAgICAqLwotICAgIERPTVN0cmluZygpIDogbV9pbXBsKDApIHsgfQorICAgIERPTVN0 cmluZygpIHsgfQogCiAgICAgRE9NU3RyaW5nKGNvbnN0IFFDaGFyICpzdHIsIHVpbnQgbGVuKTsK ICAgICBET01TdHJpbmcoY29uc3QgUVN0cmluZyAmKTsKICAgICBET01TdHJpbmcoY29uc3QgY2hh ciAqc3RyKTsKLSAgICBET01TdHJpbmcoRE9NU3RyaW5nSW1wbCAqaSk7Ci0gICAgfkRPTVN0cmlu ZygpIHsgaWYobV9pbXBsKSBtX2ltcGwtPmRlcmVmKCk7IH0KKyAgICBET01TdHJpbmcoRE9NU3Ry aW5nSW1wbCAqaSkgOiBtX2ltcGwoaSkgeyB9CisgICAgfkRPTVN0cmluZygpIHsgfQogCiAKICAg ICAvLyBhc3NpZ24gYW5kIGNvcHkKLSAgICBET01TdHJpbmcoY29uc3QgRE9NU3RyaW5nICZzdHIp OworICAgIERPTVN0cmluZyhjb25zdCBET01TdHJpbmcgJnN0cikgOiBtX2ltcGwoc3RyLm1faW1w bCkgeyB9CiAgICAgRE9NU3RyaW5nICZvcGVyYXRvciA9KGNvbnN0IERPTVN0cmluZyAmc3RyKTsK IAogICAgIC8qKgpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgKiBAaW50ZXJuYWwg Z2V0IGEgaGFuZGxlIHRvIHRoZSBpbWxlbWVudGF0aW9uIG9mIHRoZSBET01TdHJpbmcKICAgICAg KiBVc2UgYXQgb3duIHJpc2shISEKICAgICAgKi8KLSAgICBET01TdHJpbmdJbXBsICppbXBsKCkg Y29uc3QgeyByZXR1cm4gbV9pbXBsOyB9CisgICAgRE9NU3RyaW5nSW1wbCAqaW1wbCgpIGNvbnN0 IHsgcmV0dXJuIG1faW1wbC5nZXQoKTsgfQogCiAjaWZkZWYgX19PQkpDX18KICAgICBET01TdHJp bmcoTlNTdHJpbmcgKik7CkBAIC0xMzAsNyArMTMwLDcgQEAgcHVibGljOgogI2VuZGlmCiAKIHBy b3RlY3RlZDoKLSAgICBET01TdHJpbmdJbXBsICptX2ltcGw7CisgICAgUmVmUHRyPERPTVN0cmlu Z0ltcGw+IG1faW1wbDsKIH07CiAKIERPTVN0cmluZyBvcGVyYXRvciArIChjb25zdCBET01TdHJp bmcgJmEsIGNvbnN0IERPTVN0cmluZyAmYik7Cg==