22189 2008-11-11 15:46:33 -0800 Track CachedScript decoded data 2008-11-11 16:37:37 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 98381 0 sam 2008-11-11 15:46:33 -0800 Patch forthcoming. 98382 1 25078 sam 2008-11-11 15:53:48 -0800 Created attachment 25078 patch 98383 2 25078 mitz 2008-11-11 15:58:44 -0800 Comment on attachment 25078 patch > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 38320) > +++ ChangeLog (working copy) > @@ -1,3 +1,19 @@ > +2008-11-11 Sam Weinig <sam@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Fix for https://bugs.webkit.org/show_bug.cgi?id=22189 > + Track CachedScript decoded data > + > + * loader/CachedResource.h: > + (WebCore::CachedResource::allClientsRemoved): > + (WebCore::CachedResource::destroyDecodedData): > + * loader/CachedScript.cpp: > + (WebCore::CachedScript::script): > + (WebCore::CachedScript::data): > + (WebCore::CachedScript::destroyDecodedData): > + * loader/CachedScript.h: > + You could explain the code changes. > + if (m_script.isNull() && m_data) { You can write this as (!m_script && m_data). r=me 98390 3 sam 2008-11-11 16:37:37 -0800 Fixed in r38321. 25078 2008-11-11 15:53:48 -0800 2008-11-11 15:58:44 -0800 patch trackData.diff text/plain 3446 sam SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM4MzIw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDgtMTEt MTEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjE4OQorICAgICAgICBUcmFjayBDYWNoZWRTY3JpcHQgZGVjb2Rl ZCBkYXRhCisKKyAgICAgICAgKiBsb2FkZXIvQ2FjaGVkUmVzb3VyY2UuaDoKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZFJlc291cmNlOjphbGxDbGllbnRzUmVtb3ZlZCk6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRSZXNvdXJjZTo6ZGVzdHJveURlY29kZWREYXRhKToKKyAgICAgICAgKiBsb2Fk ZXIvQ2FjaGVkU2NyaXB0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFNjcmlwdDo6c2Ny aXB0KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFNjcmlwdDo6ZGF0YSk6CisgICAgICAgIChX ZWJDb3JlOjpDYWNoZWRTY3JpcHQ6OmRlc3Ryb3lEZWNvZGVkRGF0YSk6CisgICAgICAgICogbG9h ZGVyL0NhY2hlZFNjcmlwdC5oOgorCiAyMDA4LTExLTExICBDYW1lcm9uIFp3YXJpY2ggIDx6d2Fy aWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KSW5kZXg6 IGxvYWRlci9DYWNoZWRSZXNvdXJjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxvYWRlci9DYWNoZWRSZXNv dXJjZS5oCShyZXZpc2lvbiAzODMwMSkKKysrIGxvYWRlci9DYWNoZWRSZXNvdXJjZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC05Niw3ICs5Niw3IEBAIHB1YmxpYzoKICAgICBQcmVsb2FkUmVzdWx0IHBy ZWxvYWRSZXN1bHQoKSBjb25zdCB7IHJldHVybiBtX3ByZWxvYWRSZXN1bHQ7IH0KICAgICB2b2lk IHNldFJlcXVlc3RlZEZyb21OZXR3b3JraW5nTGF5ZXIoKSB7IG1fcmVxdWVzdGVkRnJvbU5ldHdv cmtpbmdMYXllciA9IHRydWU7IH0KICAgICAgICAgCi0gICAgdmlydHVhbCB2b2lkIGFsbENsaWVu dHNSZW1vdmVkKCkgeyB9OworICAgIHZpcnR1YWwgdm9pZCBhbGxDbGllbnRzUmVtb3ZlZCgpIHsg fQogCiAgICAgdW5zaWduZWQgY291bnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudHMuc2l6ZSgp OyB9CiAKQEAgLTE0OCw3ICsxNDgsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBlcnJvck9jY3VycmVk KCkgY29uc3QgeyByZXR1cm4gbV9lcnJvck9jY3VycmVkOyB9CiAgICAgYm9vbCBzZW5kUmVzb3Vy Y2VMb2FkQ2FsbGJhY2tzKCkgY29uc3QgeyByZXR1cm4gbV9zZW5kUmVzb3VyY2VMb2FkQ2FsbGJh Y2tzOyB9CiAgICAgCi0gICAgdmlydHVhbCB2b2lkIGRlc3Ryb3lEZWNvZGVkRGF0YSgpIHt9Owor ICAgIHZpcnR1YWwgdm9pZCBkZXN0cm95RGVjb2RlZERhdGEoKSB7IH0KIAogICAgIHZvaWQgc2V0 RG9jTG9hZGVyKERvY0xvYWRlciogZG9jTG9hZGVyKSB7IG1fZG9jTG9hZGVyID0gZG9jTG9hZGVy OyB9CiAgICAgCkluZGV4OiBsb2FkZXIvQ2FjaGVkU2NyaXB0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBs b2FkZXIvQ2FjaGVkU2NyaXB0LmNwcAkocmV2aXNpb24gMzgzMDEpCisrKyBsb2FkZXIvQ2FjaGVk U2NyaXB0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsMTYgQEAgU3RyaW5nIENhY2hl ZFNjcmlwdDo6ZW5jb2RpbmcoKSBjb25zdAogICAgIHJldHVybiBtX2VuY29kaW5nLm5hbWUoKTsK IH0KIAorY29uc3QgU3RyaW5nJiBDYWNoZWRTY3JpcHQ6OnNjcmlwdCgpIGNvbnN0Cit7CisgICAg aWYgKG1fc2NyaXB0LmlzTnVsbCgpICYmIG1fZGF0YSkgeworICAgICAgICBtX3NjcmlwdCA9IG1f ZW5jb2RpbmcuZGVjb2RlKG1fZGF0YS0+ZGF0YSgpLCBlbmNvZGVkU2l6ZSgpKTsKKyAgICAgICAg c2V0RGVjb2RlZFNpemUobV9zY3JpcHQubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpKTsKKyAgICB9 CisKKyAgICByZXR1cm4gbV9zY3JpcHQ7Cit9CisKIHZvaWQgQ2FjaGVkU2NyaXB0OjpkYXRhKFBh c3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKIHsKICAg ICBpZiAoIWFsbERhdGFSZWNlaXZlZCkKQEAgLTc3LDggKzg3LDYgQEAgdm9pZCBDYWNoZWRTY3Jp cHQ6OmRhdGEoUGFzc1JlZlB0cjxTaGFyZQogCiAgICAgbV9kYXRhID0gZGF0YTsKICAgICBzZXRF bmNvZGVkU2l6ZShtX2RhdGEuZ2V0KCkgPyBtX2RhdGEtPnNpemUoKSA6IDApOwotICAgIGlmICht X2RhdGEuZ2V0KCkpCi0gICAgICAgIG1fc2NyaXB0ID0gbV9lbmNvZGluZy5kZWNvZGUobV9kYXRh LT5kYXRhKCksIGVuY29kZWRTaXplKCkpOwogICAgIG1fbG9hZGluZyA9IGZhbHNlOwogICAgIGNo ZWNrTm90aWZ5KCk7CiB9CkBAIC0xMDAsNCArMTA4LDEwIEBAIHZvaWQgQ2FjaGVkU2NyaXB0Ojpl cnJvcigpCiAgICAgY2hlY2tOb3RpZnkoKTsKIH0KIAordm9pZCBDYWNoZWRTY3JpcHQ6OmRlc3Ry b3lEZWNvZGVkRGF0YSgpCit7CisgICAgbV9zY3JpcHQgPSBTdHJpbmcoKTsKKyAgICBzZXREZWNv ZGVkU2l6ZSgwKTsKIH0KKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogbG9hZGVyL0Nh Y2hlZFNjcmlwdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxvYWRlci9DYWNoZWRTY3JpcHQuaAkocmV2aXNp b24gMzgzMDEpCisrKyBsb2FkZXIvQ2FjaGVkU2NyaXB0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQw LDcgKzQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBDYWNoZWRTY3JpcHQoY29u c3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY2hhcnNldCk7CiAgICAgICAgIHZpcnR1YWwg fkNhY2hlZFNjcmlwdCgpOwogCi0gICAgICAgIGNvbnN0IFN0cmluZyYgc2NyaXB0KCkgY29uc3Qg eyByZXR1cm4gbV9zY3JpcHQ7IH0KKyAgICAgICAgY29uc3QgU3RyaW5nJiBzY3JpcHQoKSBjb25z dDsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2xpZW50KENhY2hlZFJlc291cmNlQ2xpZW50 Kik7CiAKQEAgLTUzLDYgKzUzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZv aWQgY2hlY2tOb3RpZnkoKTsKIAorICAgICAgICB2aXJ0dWFsIHZvaWQgZGVzdHJveURlY29kZWRE YXRhKCk7CisKICAgICBwcml2YXRlOgogICAgICAgICBTdHJpbmcgbV9zY3JpcHQ7CiAgICAgICAg IFRleHRFbmNvZGluZyBtX2VuY29kaW5nOwo=