6468 2006-01-10 05:29:03 -0800 Remove CFDictionary from KWQObject.* 2006-01-19 00:17:42 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P4 Normal --- 1 eric eric oldest_to_newest 28132 0 eric 2006-01-10 05:29:03 -0800 Remove CFDictionary from KWQObject.* Attached patch does just that. 28133 1 5597 eric 2006-01-10 05:29:27 -0800 Created attachment 5597 proposed patch. 28137 2 5597 darin 2006-01-10 07:05:11 -0800 Comment on attachment 5597 proposed patch. It seems strange to have a takeRunLoopTimer function in KWQObjectTimer since all of KWQObjectTimer's fields are public. If we're going to have a function to set a data member, then I think this should be a class with private data members. But if we're going to be a struct with public data members then it seems we should just use assignment instead of an inline function that does the assignment. Otherwise, looks great. r=me 5597 2006-01-10 05:29:27 -0800 2006-01-10 07:05:11 -0800 proposed patch. object.patch text/plain 6033 eric SW5kZXg6IGt3cS9LV1FPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGt3cS9LV1FPYmplY3QuY3Bw CShyZXZpc2lvbiAxMTk3OCkKKysrIGt3cS9LV1FPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNyw5ICsyNywxNCBAQAogI2ltcG9ydCAiS1dRT2JqZWN0LmgiCiAKICNpbXBvcnQgPGt4bWxj b3JlL0Fzc2VydGlvbnMuaD4KLSNpbXBvcnQgPGt4bWxjb3JlL0Zhc3RNYWxsb2MuaD4KKyNpbXBv cnQgPGt4bWxjb3JlL0hhc2hNYXAuaD4KIAogc3RydWN0IEtXUU9iamVjdFRpbWVyIHsKKyAgICBL V1FPYmplY3RUaW1lcihRT2JqZWN0ICp0YXJnZXQsIGludCB0aW1lcklkLCBib29sIGRlZmVyZWQg PSBmYWxzZSk7CisgICAgCisgICAgdm9pZCBkZWxldGVUaW1lcigpOworICAgIHZvaWQgdGFrZVJ1 bkxvb3BUaW1lcihDRlJ1bkxvb3BUaW1lclJlZiBsb29wVGltZXIpOyAKKwogICAgIFFPYmplY3Qg KnRhcmdldDsKICAgICBpbnQgdGltZXJJZDsKICAgICBDRlJ1bkxvb3BUaW1lclJlZiBydW5Mb29w VGltZXI7IC8vIG5vbi0wIGZvciBydW5uaW5nIHRpbWVycwpAQCAtMzcsMTAgKzQyLDIzIEBACiAg ICAgYm9vbCBkZWxldGVkOwogfTsKIAorS1dRT2JqZWN0VGltZXI6OktXUU9iamVjdFRpbWVyKFFP YmplY3QgKnRndCwgaW50IGlkLCBib29sIGRlZmVyKQorICAgIDogdGFyZ2V0KHRndCksIHRpbWVy SWQoaWQpLCBydW5Mb29wVGltZXIoMCksIGRlZmVycmVkKGRlZmVyKSwgZGVsZXRlZChmYWxzZSkK K3sKK30KKwordm9pZCBLV1FPYmplY3RUaW1lcjo6dGFrZVJ1bkxvb3BUaW1lcihDRlJ1bkxvb3BU aW1lclJlZiBsb29wVGltZXIpCit7CisgICAgcnVuTG9vcFRpbWVyID0gbG9vcFRpbWVyOworfQor CiBjb25zdCBRT2JqZWN0ICpRT2JqZWN0Ojpfc2VuZGVyOwogYm9vbCBRT2JqZWN0OjpfZGVmZXJz VGltZXJzOwogCi1zdGF0aWMgQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiB0aW1lckRpY3Rpb25hcmll czsKK3R5cGVkZWYgSGFzaE1hcDxpbnQsIEtXUU9iamVjdFRpbWVyKiwgUG9pbnRlckhhc2g8aW50 PiA+IElkVG9UaW1lck1hcDsKK3R5cGVkZWYgSGFzaE1hcDxjb25zdCBRT2JqZWN0KiwgSWRUb1Rp bWVyTWFwKiwgUG9pbnRlckhhc2g8Y29uc3QgUU9iamVjdCo+ID4gT2JqZWN0VG9UaW1lcnNNYXA7 CisKK3N0YXRpYyBPYmplY3RUb1RpbWVyc01hcCAqdGltZXJNYXBzOwogc3RhdGljIENGTXV0YWJs ZUFycmF5UmVmIGRlZmVycmVkVGltZXJzOwogc3RhdGljIENGUnVuTG9vcFRpbWVyUmVmIHNlbmRE ZWZlcnJlZFRpbWVyRXZlbnRzVGltZXI7CiBzdGF0aWMgaW50IGxhc3RUaW1lcklkVXNlZDsKQEAg LTE0NCwzMCArMTYyLDI0IEBACiAgICAgQVNTRVJUKHRpbWVySWQgPiAwKTsKICAgICBBU1NFUlQo dGltZXJJZCA8PSBsYXN0VGltZXJJZFVzZWQpOwogCi0gICAgaWYgKCF0aW1lckRpY3Rpb25hcmll cykKLSAgICAgICAgdGltZXJEaWN0aW9uYXJpZXMgPSBDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxl KDAsIDAsIDAsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKTsKKyAgICBpZiAoIXRp bWVyTWFwcykKKyAgICAgICAgdGltZXJNYXBzID0gbmV3IE9iamVjdFRvVGltZXJzTWFwOwogCi0g ICAgQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiB0aW1lcnMgPSAoQ0ZNdXRhYmxlRGljdGlvbmFyeVJl ZilDRkRpY3Rpb25hcnlHZXRWYWx1ZSh0aW1lckRpY3Rpb25hcmllcywgdGhpcyk7CisgICAgSWRU b1RpbWVyTWFwICp0aW1lcnMgPSB0aW1lck1hcHMtPmdldCh0aGlzKTsKICAgICBpZiAoIXRpbWVy cykgewotICAgICAgICB0aW1lcnMgPSBDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKDAsIDAsIDAs IDApOwotICAgICAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZSh0aW1lckRpY3Rpb25hcmllcywgdGhp cywgdGltZXJzKTsKLSAgICAgICAgQ0ZSZWxlYXNlKHRpbWVycyk7CisgICAgICAgIHRpbWVycyA9 IG5ldyBJZFRvVGltZXJNYXA7CisgICAgICAgIHRpbWVyTWFwcy0+c2V0KHRoaXMsIHRpbWVycyk7 CiAgICAgfQogCi0gICAgQVNTRVJUKCFDRkRpY3Rpb25hcnlHZXRWYWx1ZSh0aW1lcnMsIHJlaW50 ZXJwcmV0X2Nhc3Q8dm9pZCAqPih0aW1lcklkKSkpOworICAgIEFTU0VSVCghdGltZXJzLT5jb250 YWlucyh0aW1lcklkKSk7CiAKLSAgICBLV1FPYmplY3RUaW1lciAqdGltZXIgPSBzdGF0aWNfY2Fz dDxLV1FPYmplY3RUaW1lciAqPihmYXN0TWFsbG9jKHNpemVvZihLV1FPYmplY3RUaW1lcikpKTsK LSAgICB0aW1lci0+dGFyZ2V0ID0gdGhpczsKLSAgICB0aW1lci0+dGltZXJJZCA9IHRpbWVySWQ7 CisgICAgS1dRT2JqZWN0VGltZXIgKnRpbWVyID0gbmV3IEtXUU9iamVjdFRpbWVyKHRoaXMsIHRp bWVySWQpOwogICAgIENGUnVuTG9vcFRpbWVyQ29udGV4dCBjb250ZXh0ID0geyAwLCB0aW1lciwg MCwgMCwgMCB9OwogICAgIENGUnVuTG9vcFRpbWVyUmVmIHJ1bkxvb3BUaW1lciA9IENGUnVuTG9v cFRpbWVyQ3JlYXRlKDAsIENGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgpICsgbmV4dEZpcmVJbnRl cnZhbCAqIDAuMDAxLAogICAgICAgICByZXBlYXRJbnRlcnZhbCAqIDAuMDAxLCAwLCAwLCB0aW1l ckZpcmVkLCAmY29udGV4dCk7Ci0gICAgdGltZXItPnJ1bkxvb3BUaW1lciA9IHJ1bkxvb3BUaW1l cjsKLSAgICB0aW1lci0+ZGVmZXJyZWQgPSBmYWxzZTsKLSAgICB0aW1lci0+ZGVsZXRlZCA9IGZh bHNlOworICAgIHRpbWVyLT50YWtlUnVuTG9vcFRpbWVyKHJ1bkxvb3BUaW1lcik7CisgICAgdGlt ZXJzLT5zZXQodGltZXJJZCwgdGltZXIpOwogCi0gICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUodGlt ZXJzLCByZWludGVycHJldF9jYXN0PHZvaWQgKj4odGltZXJJZCksIHRpbWVyKTsKLQogICAgIENG UnVuTG9vcEFkZFRpbWVyKENGUnVuTG9vcEdldEN1cnJlbnQoKSwgcnVuTG9vcFRpbWVyLCBrQ0ZS dW5Mb29wRGVmYXVsdE1vZGUpOwogfQogCkBAIC0xNzUsNTcgKzE4Nyw1NiBAQAogewogICAgIG5l eHRGaXJlSW50ZXJ2YWwgPSAtMTsKICAgICByZXBlYXRJbnRlcnZhbCA9IC0xOwotICAgIGlmICgh dGltZXJEaWN0aW9uYXJpZXMpCisgICAgaWYgKCF0aW1lck1hcHMpCiAgICAgICAgIHJldHVybjsK LSAgICBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIHRpbWVycyA9IChDRk11dGFibGVEaWN0aW9uYXJ5 UmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKHRpbWVyRGljdGlvbmFyaWVzLCB0aGlzKTsKKyAgICBJ ZFRvVGltZXJNYXAgKnRpbWVycyA9IHRpbWVyTWFwcy0+Z2V0KHRoaXMpOwogICAgIGlmICghdGlt ZXJzKQogICAgICAgICByZXR1cm47Ci0gICAgS1dRT2JqZWN0VGltZXIgKnRpbWVyID0gKEtXUU9i amVjdFRpbWVyICopQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUodGltZXJzLCByZWludGVycHJldF9jYXN0 PHZvaWQgKj4odGltZXJJZCkpOworICAgIEtXUU9iamVjdFRpbWVyICp0aW1lciA9IHRpbWVycy0+ Z2V0KHRpbWVySWQpOwogICAgIGlmICghdGltZXIpCiAgICAgICAgIHJldHVybjsKICAgICBuZXh0 RmlyZUludGVydmFsID0gKGludCkoKENGUnVuTG9vcFRpbWVyR2V0TmV4dEZpcmVEYXRlKHRpbWVy LT5ydW5Mb29wVGltZXIpIC0gQ0ZBYnNvbHV0ZVRpbWVHZXRDdXJyZW50KCkpICogMTAwMCk7CiAg ICAgcmVwZWF0SW50ZXJ2YWwgPSAoaW50KShDRlJ1bkxvb3BUaW1lckdldEludGVydmFsKHRpbWVy LT5ydW5Mb29wVGltZXIpICogMTAwMCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRlbGV0ZVRpbWVyKEtX UU9iamVjdFRpbWVyICp0aW1lcikKK3ZvaWQgS1dRT2JqZWN0VGltZXI6OmRlbGV0ZVRpbWVyKCkK IHsKLSAgICBDRlJ1bkxvb3BUaW1lckludmFsaWRhdGUodGltZXItPnJ1bkxvb3BUaW1lcik7Ci0g ICAgQ0ZSZWxlYXNlKHRpbWVyLT5ydW5Mb29wVGltZXIpOworICAgIENGUnVuTG9vcFRpbWVySW52 YWxpZGF0ZShydW5Mb29wVGltZXIpOworICAgIENGUmVsZWFzZShydW5Mb29wVGltZXIpOwogCi0g ICAgaWYgKHRpbWVyLT5kZWZlcnJlZCkKLSAgICAgICAgdGltZXItPmRlbGV0ZWQgPSB0cnVlOwor ICAgIGlmIChkZWZlcnJlZCkKKyAgICAgICAgZGVsZXRlZCA9IHRydWU7CiAgICAgZWxzZQotICAg ICAgICBmYXN0RnJlZSh0aW1lcik7CisgICAgICAgIGRlbGV0ZSB0aGlzOwogfQogCiB2b2lkIFFP YmplY3Q6OmtpbGxUaW1lcihpbnQgdGltZXJJZCkKIHsKLSAgICBpZiAoIXRpbWVyRGljdGlvbmFy aWVzKQorICAgIGlmICghdGltZXJNYXBzKQogICAgICAgICByZXR1cm47Ci0gICAgQ0ZNdXRhYmxl RGljdGlvbmFyeVJlZiB0aW1lcnMgPSAoQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZilDRkRpY3Rpb25h cnlHZXRWYWx1ZSh0aW1lckRpY3Rpb25hcmllcywgdGhpcyk7CisgICAgSWRUb1RpbWVyTWFwICp0 aW1lcnMgPSB0aW1lck1hcHMtPmdldCh0aGlzKTsKICAgICBpZiAoIXRpbWVycykKICAgICAgICAg cmV0dXJuOwotICAgIEtXUU9iamVjdFRpbWVyICp0aW1lciA9IChLV1FPYmplY3RUaW1lciAqKUNG RGljdGlvbmFyeUdldFZhbHVlKHRpbWVycywgcmVpbnRlcnByZXRfY2FzdDx2b2lkICo+KHRpbWVy SWQpKTsKLSAgICBpZiAoIXRpbWVyKQotICAgICAgICByZXR1cm47Ci0gICAgZGVsZXRlVGltZXIo dGltZXIpOwotICAgIENGRGljdGlvbmFyeVJlbW92ZVZhbHVlKHRpbWVycywgcmVpbnRlcnByZXRf Y2FzdDx2b2lkICo+KHRpbWVySWQpKTsKKyAgICBLV1FPYmplY3RUaW1lciAqdGltZXIgPSB0aW1l cnMtPmdldCh0aW1lcklkKTsKKyAgICBpZiAodGltZXIpIHsKKyAgICAgICAgdGltZXItPmRlbGV0 ZVRpbWVyKCk7CisgICAgICAgIHRpbWVycy0+cmVtb3ZlKHRpbWVySWQpOworICAgIH0KIH0KIAot c3RhdGljIHZvaWQgZGVsZXRlT25lVGltZXIoY29uc3Qgdm9pZCAqa2V5LCBjb25zdCB2b2lkICp2 YWx1ZSwgdm9pZCAqY29udGV4dCkKLXsKLSAgICBkZWxldGVUaW1lcigoS1dRT2JqZWN0VGltZXIg Kil2YWx1ZSk7Ci19Ci0KIHZvaWQgUU9iamVjdDo6a2lsbFRpbWVycygpCiB7Ci0gICAgaWYgKCF0 aW1lckRpY3Rpb25hcmllcykKKyAgICBpZiAoIXRpbWVyTWFwcykKICAgICAgICAgcmV0dXJuOwot ICAgIENGTXV0YWJsZURpY3Rpb25hcnlSZWYgdGltZXJzID0gKENGTXV0YWJsZURpY3Rpb25hcnlS ZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUodGltZXJEaWN0aW9uYXJpZXMsIHRoaXMpOworICAgIElk VG9UaW1lck1hcCAqdGltZXJzID0gdGltZXJNYXBzLT5nZXQodGhpcyk7CiAgICAgaWYgKCF0aW1l cnMpCiAgICAgICAgIHJldHVybjsKLSAgICBDRkRpY3Rpb25hcnlBcHBseUZ1bmN0aW9uKHRpbWVy cywgZGVsZXRlT25lVGltZXIsIDApOwotICAgIENGRGljdGlvbmFyeVJlbW92ZVZhbHVlKHRpbWVy RGljdGlvbmFyaWVzLCB0aGlzKTsKKyAgICAKKyAgICBJZFRvVGltZXJNYXA6Oml0ZXJhdG9yIGVu ZCA9IHRpbWVycy0+ZW5kKCk7CisgICAgZm9yIChJZFRvVGltZXJNYXA6Oml0ZXJhdG9yIGl0ID0g dGltZXJzLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAgICAgIGl0LT5zZWNvbmQtPmRl bGV0ZVRpbWVyKCk7CisgICAgdGltZXJNYXBzLT5yZW1vdmUodGhpcyk7CisgICAgZGVsZXRlIHRp bWVyczsKIH0KIAogc3RhdGljIHZvaWQgc2VuZERlZmVycmVkVGltZXJFdmVudChjb25zdCB2b2lk ICp2YWx1ZSwgdm9pZCAqY29udGV4dCkKQEAgLTIzNCwxMyArMjQ1LDEzIEBACiAgICAgaWYgKCF0 aW1lcikKICAgICAgICAgcmV0dXJuOwogICAgIGlmICh0aW1lci0+ZGVsZXRlZCkgewotICAgICAg ICBmYXN0RnJlZSh0aW1lcik7CisgICAgICAgIGRlbGV0ZSB0aW1lcjsKICAgICAgICAgcmV0dXJu OwogICAgIH0KICAgICBRVGltZXJFdmVudCBldmVudCh0aW1lci0+dGltZXJJZCk7CiAgICAgdGlt ZXItPnRhcmdldC0+dGltZXJFdmVudCgmZXZlbnQpOwogICAgIGlmICh0aW1lci0+ZGVsZXRlZCkg ewotICAgICAgICBmYXN0RnJlZSh0aW1lcik7CisgICAgICAgIGRlbGV0ZSB0aW1lcjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KICAgICB0aW1lci0+ZGVmZXJyZWQgPSBmYWxzZTsK