96791 2012-09-14 08:26:37 -0700 Web Inspector: OwnPtr and RefPtr reported by pointer can be double counted by the memory instrumentation 2012-09-17 00:43:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys alph apavlov benjamin bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 720785 0 yurys 2012-09-14 08:26:37 -0700 MemoryInstrumentation::addObjectImpl(const OwnPtr<T>* const... MemoryInstrumentation::addObjectImpl(const RefPtr<T>* const.. Should check if the smart pointer has already been visited before counting its size. 720789 1 164160 yurys 2012-09-14 08:29:31 -0700 Created attachment 164160 Patch 720792 2 164160 loislo 2012-09-14 08:32:37 -0700 Comment on attachment 164160 Patch lgtm 721734 3 164160 apavlov 2012-09-17 00:40:06 -0700 Comment on attachment 164160 Patch rs=me 721736 4 yurys 2012-09-17 00:43:13 -0700 Committed r128721: <http://trac.webkit.org/changeset/128721> 164160 2012-09-14 08:29:31 -0700 2012-09-17 00:40:06 -0700 Patch bug-96791-20120914192902.patch text/plain 5944 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDFmNmFmNmJiMDNmMWQ1NTBiNmI3ODIy N2E0ODc2ODI5NWQwOWExMTEuLjNiYmViNTU1MTU0MDZhNWRjYjE2ODM1ZmFkZTdlM2M0ZjBjYTFh MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogT3duUHRyIGFuZCBS ZWZQdHIgcmVwb3J0ZWQgYnkgcG9pbnRlciBjYW4gYmUgZG91YmxlIGNvdW50ZWQgYnkgdGhlIG1l bW9yeSBpbnN0cnVtZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2NzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6 Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbCk6IGNoZWNrIGlmIHRoZSBzbWFy dCBwb2ludGVyIGhhcyBhbHJlYWR5CisgICAgICAgIGJlZW4gdmlzaXRlZCBiZWZvcmUgY291bnRp bmcgaXRzIHNpemUuCisKIDIwMTItMDktMTQgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5NSTogcmVtb3ZlIGN1cnJlbnQg dHJhaXRzIGhlbHBlciBjbGFzcyBiZWNhdXNlIGl0IGlzIGN1c3RvbWl6aW5nIHRoZSBpbnN0cnVt ZW50YXRpb24gYXQgYSB3cm9uZyBwbGFjZSBhbmQgaXMgbm90IG5lY2Vzc2FyeSBhdCB0aGUgbW9t ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAyZWY5ZTdmMWE3NzJhNzM0ODVjZWU4 MDk5N2NkMGZkYjc1MjZiMDE3Li44MzQ0NDMxMTZjY2IzZDIyZGE1MTgzMzEwMDdkMjliM2FlNzg0 Y2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5 LTE0ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IE93blB0ciBhbmQgUmVmUHRyIHJlcG9ydGVkIGJ5IHBvaW50ZXIgY2FuIGJl IGRvdWJsZSBjb3VudGVkIGJ5IHRoZSBtZW1vcnkgaW5zdHJ1bWVudGF0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc5MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCBwb2ludGVycyB0 byBSZWZQdHIgYW5kIE93blB0ciB3b24ndCBiZSBkb3VibGUgY291bnRlZCBieQorICAgICAgICB0 aGUgbWVtb3J5IGluc3RydW1lbnRhdGlvbi4KKworICAgICAgICAqIHRlc3RzL01lbW9yeUluc3Ry dW1lbnRhdGlvblRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChUd29Qb2lu dGVyc1RvUmVmUHRyKToKKyAgICAgICAgKFdlYkNvcmU6OlR3b1BvaW50ZXJzVG9SZWZQdHI6OlR3 b1BvaW50ZXJzVG9SZWZQdHIpOgorICAgICAgICAoV2ViQ29yZTo6VHdvUG9pbnRlcnNUb1JlZlB0 cjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VEVTVCk6CisgICAgICAg IChUd29Qb2ludGVyc1RvT3duUHRyKToKKyAgICAgICAgKFdlYkNvcmU6OlR3b1BvaW50ZXJzVG9P d25QdHI6OlR3b1BvaW50ZXJzVG9Pd25QdHIpOgorICAgICAgICAoV2ViQ29yZTo6VHdvUG9pbnRl cnNUb093blB0cjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorCiAyMDEyLTA5LTE0ICBLZWlzaGkgSGF0 dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlZmFjdG9yIHRpbWUgZm9ybWF0 IHJlbGF0ZWQgbWV0aG9kcyBvbiBMb2NhbGVXaW4vTWFjL0lDVSBzbyB0aGF0IHRoZXkgb3ZlcnJp ZGUgTG9jYWxpemVyIG1ldGhvZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUlu c3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgK aW5kZXggMDRjYThkMjBlMDZkY2Y2YzA5ZWFlM2NkNjgzOTcxN2IyZjg4ODcwNi4uMWI5NjFiMGFm NmYwNGFjMWE0NGY3OThlOTZlZjhlYTZiYThlZTQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93 dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5z dHJ1bWVudGF0aW9uLmgKQEAgLTIzOCw3ICsyMzgsNyBAQCB2b2lkIE1lbW9yeUluc3RydW1lbnRh dGlvbjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChjb25zdCBSZWZQdHI8VD4qIGNvbnN0JiBv YgogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRP YmplY3RJbXBsKGNvbnN0IE93blB0cjxUPiogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0VHlw ZSBvd25lck9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKLSAgICBp ZiAob3duaW5nVHlwZSA9PSBieVBvaW50ZXIpCisgICAgaWYgKG93bmluZ1R5cGUgPT0gYnlQb2lu dGVyICYmICF2aXNpdGVkKG9iamVjdCkpCiAgICAgICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9i amVjdFR5cGUsIHNpemVvZigqb2JqZWN0KSk7CiAgICAgYWRkT2JqZWN0SW1wbChvYmplY3QtPmdl dCgpLCBvd25lck9iamVjdFR5cGUsIGJ5UG9pbnRlcik7CiB9CkBAIC0yNDYsNyArMjQ2LDcgQEAg dm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgT3duUHRyPFQ+ KiBjb25zdCYgb2JqZWN0LCBNZW1vcnkKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9y eUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbChjb25zdCBSZWZQdHI8VD4qIGNvbnN0JiBv YmplY3QsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBNZW1vcnlPd25pbmdUeXBl IG93bmluZ1R5cGUpCiB7Ci0gICAgaWYgKG93bmluZ1R5cGUgPT0gYnlQb2ludGVyKQorICAgIGlm IChvd25pbmdUeXBlID09IGJ5UG9pbnRlciAmJiAhdmlzaXRlZChvYmplY3QpKQogICAgICAgICBj b3VudE9iamVjdFNpemUob3duZXJPYmplY3RUeXBlLCBzaXplb2YoKm9iamVjdCkpOwogICAgIGFk ZE9iamVjdEltcGwob2JqZWN0LT5nZXQoKSwgb3duZXJPYmplY3RUeXBlLCBieVBvaW50ZXIpOwog fQpAQCAtMjU0LDEwICsyNTQsMTAgQEAgdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9i amVjdEltcGwoY29uc3QgUmVmUHRyPFQ+KiBjb25zdCYgb2JqZWN0LCBNZW1vcnkKIHRlbXBsYXRl PHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbChj b25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwg TWVtb3J5T3duaW5nVHlwZSBvd25pbmdUeXBlKQogewotICAgIGlmICghb2JqZWN0IHx8IHZpc2l0 ZWQob2JqZWN0KSkKLSAgICAgICAgcmV0dXJuOwogICAgIGlmIChvd25pbmdUeXBlID09IGJ5UmVm ZXJlbmNlKQogICAgICAgICByZXR1cm47CisgICAgaWYgKCFvYmplY3QgfHwgdmlzaXRlZChvYmpl Y3QpKQorICAgICAgICByZXR1cm47CiAgICAgY291bnRPYmplY3RTaXplKG93bmVyT2JqZWN0VHlw ZSwgc2l6ZW9mKFQpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAKaW5kZXggNGEwYTNjZjgxZmVi MDlmYmU5MTNkM2MxMDI5NjkyYTYzZTY1OWYxMC4uNjFiNjczMDU0Mzg3YzIwMGNiOTEwZTI5NjVk NGYxOGE1MjY2MzM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9N ZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwCkBAIC0yNzUsNSArMjc1LDU2IEBA IFRFU1QoTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdCwgdmlzaXRTdHJpbmdzKQogICAgIH0KIH0K IAorCitjbGFzcyBUd29Qb2ludGVyc1RvUmVmUHRyIHsKK3B1YmxpYzoKKyAgICBUd29Qb2ludGVy c1RvUmVmUHRyKGNvbnN0IFJlZlB0cjxTdHJpbmdJbXBsPiYgdmFsdWUpIDogbV9wdHIxKCZ2YWx1 ZSksIG1fcHRyMigmdmFsdWUpICB7IH0KKyAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9y eU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CisgICAgeworICAgICAgICBNZW1v cnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzLCBXZWJDb3JlTWVtb3J5VHlw ZXM6OkRPTSk7CisgICAgICAgIGluZm8uYWRkTWVtYmVyKG1fcHRyMSk7CisgICAgICAgIGluZm8u YWRkTWVtYmVyKG1fcHRyMik7CisgICAgfQorCisgICAgY29uc3QgUmVmUHRyPFN0cmluZ0ltcGw+ KiBtX3B0cjE7CisgICAgY29uc3QgUmVmUHRyPFN0cmluZ0ltcGw+KiBtX3B0cjI7Cit9OworCitU RVNUKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3QsIHJlZlB0clB0cikKK3sKKyAgICBSZWZQdHI8 U3RyaW5nSW1wbD4gcmVmUHRyOworICAgIFR3b1BvaW50ZXJzVG9SZWZQdHIgcm9vdChyZWZQdHIp OworICAgIFZpc2l0ZWRPYmplY3RzIHZpc2l0ZWRPYmplY3RzOworICAgIE1lbW9yeUluc3RydW1l bnRhdGlvbkltcGwgaW1wbCh2aXNpdGVkT2JqZWN0cyk7CisgICAgaW1wbC5hZGRSb290T2JqZWN0 KHJvb3QpOworICAgIEVYUEVDVF9FUShzaXplb2YoUmVmUHRyPFN0cmluZ0ltcGw+KSwgaW1wbC5y ZXBvcnRlZFNpemVGb3JBbGxUeXBlcygpKTsKKyAgICBFWFBFQ1RfRVEoMSwgdmlzaXRlZE9iamVj dHMuc2l6ZSgpKTsKK30KKworY2xhc3MgVHdvUG9pbnRlcnNUb093blB0ciB7CitwdWJsaWM6Cisg ICAgVHdvUG9pbnRlcnNUb093blB0cihjb25zdCBPd25QdHI8Tm90SW5zdHJ1bWVudGVkPiYgdmFs dWUpIDogbV9wdHIxKCZ2YWx1ZSksIG1fcHRyMigmdmFsdWUpICB7IH0KKyAgICB2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0Cisg ICAgeworICAgICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlz LCBXZWJDb3JlTWVtb3J5VHlwZXM6OkRPTSk7CisgICAgICAgIGluZm8uYWRkTWVtYmVyKG1fcHRy MSk7CisgICAgICAgIGluZm8uYWRkTWVtYmVyKG1fcHRyMik7CisgICAgfQorCisgICAgY29uc3Qg T3duUHRyPE5vdEluc3RydW1lbnRlZD4qIG1fcHRyMTsKKyAgICBjb25zdCBPd25QdHI8Tm90SW5z dHJ1bWVudGVkPiogbV9wdHIyOworfTsKKworVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0 LCBvd25QdHJQdHIpCit7CisgICAgT3duUHRyPE5vdEluc3RydW1lbnRlZD4gb3duUHRyOworICAg IFR3b1BvaW50ZXJzVG9Pd25QdHIgcm9vdChvd25QdHIpOworICAgIFZpc2l0ZWRPYmplY3RzIHZp c2l0ZWRPYmplY3RzOworICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwgaW1wbCh2aXNpdGVk T2JqZWN0cyk7CisgICAgaW1wbC5hZGRSb290T2JqZWN0KHJvb3QpOworICAgIEVYUEVDVF9FUShz aXplb2YoT3duUHRyPE5vdEluc3RydW1lbnRlZD4pLCBpbXBsLnJlcG9ydGVkU2l6ZUZvckFsbFR5 cGVzKCkpOworICAgIEVYUEVDVF9FUSgxLCB2aXNpdGVkT2JqZWN0cy5zaXplKCkpOworfQorCiB9 IC8vIG5hbWVzcGFjZQogCg==