22093 2008-11-05 18:11:28 -0800 Don't keep decoded stylesheet data in cache 2008-11-06 23:23:09 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 97762 0 koivisto 2008-11-05 18:11:28 -0800 Don't keep decoded stylesheet string around in the cache. There are no sharing benefits and performance benefits are negligible. 97763 1 24930 koivisto 2008-11-05 18:14:57 -0800 Created attachment 24930 patch Decode stylesheet data on demand 97766 2 24930 mitz 2008-11-05 18:38:39 -0800 Comment on attachment 24930 patch > + https://bugs.webkit.org/post_bug.cgi Bad link. r=me 97767 3 koivisto 2008-11-05 18:41:10 -0800 Sending WebCore/ChangeLog Sending WebCore/loader/CachedCSSStyleSheet.cpp Sending WebCore/loader/CachedCSSStyleSheet.h Transmitting file data ... Committed revision 38147. 97924 4 koivisto 2008-11-06 22:49:06 -0800 This caused regression in fast/encoding/css-charset-default.xhtml 97925 5 24966 koivisto 2008-11-06 22:56:31 -0800 Created attachment 24966 fix the regression 97926 6 24966 mitz 2008-11-06 23:11:33 -0800 Comment on attachment 24966 fix the regression You could use a file static for the decoded text and save the cost of a String in every CachedCSSStyleSheet, but would not be very elegant. + if (!m_decodedSheetText.isNull()) I thought you could write just if (m_decodedSheetText) but perhaps you can't. r=me 97927 7 koivisto 2008-11-06 23:17:58 -0800 (In reply to comment #6) > (From update of attachment 24966 [edit]) > You could use a file static for the decoded text and save the cost of a String > in every CachedCSSStyleSheet, but would not be very elegant. Not very elegant plus there is bound to be some crazy way this recurses... > + if (!m_decodedSheetText.isNull()) > > I thought you could write just if (m_decodedSheetText) but perhaps you can't. True. All these fancy operators. Fixed. > > r=me > 97928 8 koivisto 2008-11-06 23:23:09 -0800 Sending WebCore/ChangeLog Sending WebCore/loader/CachedCSSStyleSheet.cpp Sending WebCore/loader/CachedCSSStyleSheet.h Transmitting file data ... Committed revision 38213. 24930 2008-11-05 18:14:57 -0800 2008-11-05 18:38:39 -0800 patch cache-text-decode-css.patch text/plain 3087 koivisto SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODE0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDgtMTEtMDUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvcG9zdF9idWcuY2dpCisgICAgICAgIERvbid0 IGtlZXAgZGVjb2RlZCBzdHlsZXNoZWV0IGRhdGEgaW4gY2FjaGUKKyAgICAgICAgCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82MzQzNTg4PgorCisgICAgICAgIERvbid0IGtlZXAgZGVjb2RlZCBz dHlsZXNoZWV0IHN0cmluZyBhcm91bmQgaW4gdGhlIGNhY2hlLiBUaGVyZSBhcmUgbm8gc2hhcmlu ZyBiZW5lZml0cyBhbmQKKyAgICAgICAgcGVyZm9ybWFuY2UgYmVuZWZpdHMgYXJlIG5lZ2xpZ2li bGUgKG5vIG1lYXN1cmVkIFBMVCBpbXBhY3QpLiBSZWR1Y2VzIG1lbW9yeSBjb25zdW1wdGlvbiBv ZgorICAgICAgICBzdHlsZSBzaGVldCBkYXRhIGluIGNhY2hlIGJ5IDIvMyBpbiBjb21tb24gY2Fz ZS4gIAorCisgICAgICAgICogbG9hZGVyL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2FjaGVkQ1NTU3R5bGVTaGVldDo6c2hlZXRUZXh0KToKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZENTU1N0eWxlU2hlZXQ6OmRhdGEpOgorICAgICAgICAqIGxvYWRlci9DYWNo ZWRDU1NTdHlsZVNoZWV0Lmg6CisKIDIwMDgtMTEtMDUgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KIAogICAgICAgICBCdWcgMjE1OTY6IFdlYkNvcmU6OkNhY2hlIHNob3VsZCB1 c2UgcGFyc2VkIFByYWdtYSBhbmQgQ2FjaGUtQ29udHJvbCBoZWFkZXJzCkluZGV4OiBXZWJDb3Jl L2xvYWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xv YWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAkocmV2aXNpb24gMzgxMTgpCisrKyBXZWJDb3Jl L2xvYWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiAr NjUsMTYgQEAgU3RyaW5nIENhY2hlZENTU1N0eWxlU2hlZXQ6OmVuY29kaW5nKCkgYwogewogICAg IHJldHVybiBtX2RlY29kZXItPmVuY29kaW5nKCkubmFtZSgpOwogfQorICAgIAorY29uc3QgU3Ry aW5nIENhY2hlZENTU1N0eWxlU2hlZXQ6OnNoZWV0VGV4dChib29sIGVuZm9yY2VNSU1FVHlwZSkg Y29uc3QgCit7IAorICAgIGlmICghbV9kYXRhIHx8IG1fZGF0YS0+aXNFbXB0eSgpIHx8ICFjYW5V c2VTaGVldChlbmZvcmNlTUlNRVR5cGUpKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAg CisgICAgU3RyaW5nIHJlc3VsdCA9IG1fZGVjb2Rlci0+ZGVjb2RlKG1fZGF0YS0+ZGF0YSgpLCBl bmNvZGVkU2l6ZSgpKTsKKyAgICByZXN1bHQgKz0gbV9kZWNvZGVyLT5mbHVzaCgpOworICAgIHJl dHVybiByZXN1bHQ7Cit9CiAKIHZvaWQgQ2FjaGVkQ1NTU3R5bGVTaGVldDo6ZGF0YShQYXNzUmVm UHRyPFNoYXJlZEJ1ZmZlcj4gZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCiB7CkBAIC03Mywx MCArODMsNiBAQCB2b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OmRhdGEoUGFzc1JlZlB0CiAKICAg ICBtX2RhdGEgPSBkYXRhOwogICAgIHNldEVuY29kZWRTaXplKG1fZGF0YS5nZXQoKSA/IG1fZGF0 YS0+c2l6ZSgpIDogMCk7Ci0gICAgaWYgKG1fZGF0YS5nZXQoKSkgewotICAgICAgICBtX3NoZWV0 ID0gbV9kZWNvZGVyLT5kZWNvZGUobV9kYXRhLT5kYXRhKCksIGVuY29kZWRTaXplKCkpOwotICAg ICAgICBtX3NoZWV0ICs9IG1fZGVjb2Rlci0+Zmx1c2goKTsKLSAgICB9CiAgICAgbV9sb2FkaW5n ID0gZmFsc2U7CiAgICAgY2hlY2tOb3RpZnkoKTsKIH0KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0Nh Y2hlZENTU1N0eWxlU2hlZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9DYWNoZWRD U1NTdHlsZVNoZWV0LmgJKHJldmlzaW9uIDM4MTE4KQorKysgV2ViQ29yZS9sb2FkZXIvQ2FjaGVk Q1NTU3R5bGVTaGVldC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MiwxMCArNDIsMTAgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBDYWNoZWRDU1NTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYg VVJMLCBjb25zdCBTdHJpbmcmIGNoYXJzZXQpOwogICAgICAgICB2aXJ0dWFsIH5DYWNoZWRDU1NT dHlsZVNoZWV0KCk7CiAKLSAgICAgICAgY29uc3QgU3RyaW5nIHNoZWV0VGV4dChib29sIGVuZm9y Y2VNSU1FVHlwZSA9IHRydWUpIGNvbnN0IHsgcmV0dXJuIGNhblVzZVNoZWV0KGVuZm9yY2VNSU1F VHlwZSkgPyBtX3NoZWV0IDogIiI7IH0KKyAgICAgICAgY29uc3QgU3RyaW5nIHNoZWV0VGV4dChi b29sIGVuZm9yY2VNSU1FVHlwZSA9IHRydWUpIGNvbnN0OwogCiAgICAgICAgIHZpcnR1YWwgdm9p ZCBhZGRDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQqKTsKLSAKKwogICAgICAgICB2aXJ0dWFs IHZvaWQgc2V0RW5jb2RpbmcoY29uc3QgU3RyaW5nJik7CiAgICAgICAgIHZpcnR1YWwgU3RyaW5n IGVuY29kaW5nKCkgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkYXRhKFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiBkYXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCk7CkBAIC01OSw3ICs1OSw2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBjYW5Vc2VTaGVldChib29sIGVu Zm9yY2VNSU1FVHlwZSkgY29uc3Q7CiAKICAgICBwcm90ZWN0ZWQ6Ci0gICAgICAgIFN0cmluZyBt X3NoZWV0OwogICAgICAgICBSZWZQdHI8VGV4dFJlc291cmNlRGVjb2Rlcj4gbV9kZWNvZGVyOwog ICAgIH07CiAK 24966 2008-11-06 22:56:31 -0800 2008-11-06 23:11:33 -0800 fix the regression cache-text-decode-css-2.patch text/plain 2804 koivisto SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODIxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMTEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5MworICAgICAgICAKKyAg ICAgICAgRGVsYXlpbmcgdGhlIHRleHQgZGVjb2RpbmcgY2F1c2VkIHJlZ3Jlc3Npb24gc2luY2Ug dGhlIGRlY29kaW5nCisgICAgICAgIGFsc28gZGV0ZXJtaW5lcyB0aGUgZW5jb2RpbmcgaW4gY2Fz ZSBvZiBAY2hhcnNldCBydWxlLiAKKyAgICAgICAgCisgICAgICAgIERlY29kZSBpbW1lZGlhdGVs eSBpbiBkYXRhKCkgYW5kIGtlZXAgdGhlIGRlY29kZWQgc3RyaW5nIGFyb3VuZAorICAgICAgICBk dXJpbmcgdGhlIGNoZWNrTm90aWZ5KCkuCisKKyAgICAgICAgKiBsb2FkZXIvQ2FjaGVkQ1NTU3R5 bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRDU1NTdHlsZVNoZWV0OjpzaGVl dFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkQ1NTU3R5bGVTaGVldDo6ZGF0YSk6Cisg ICAgICAgICogbG9hZGVyL0NhY2hlZENTU1N0eWxlU2hlZXQuaDoKKwogMjAwOC0xMS0wNiAgQWxl eGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAko cmV2aXNpb24gMzgyMDkpCisrKyBXZWJDb3JlL2xvYWRlci9DYWNoZWRDU1NTdHlsZVNoZWV0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNzEsOSArNzEsMTMgQEAgY29uc3QgU3RyaW5nIENhY2hlZENT U1N0eWxlU2hlZXQ6OnNoZWV0VAogICAgIGlmICghbV9kYXRhIHx8IG1fZGF0YS0+aXNFbXB0eSgp IHx8ICFjYW5Vc2VTaGVldChlbmZvcmNlTUlNRVR5cGUpKQogICAgICAgICByZXR1cm4gU3RyaW5n KCk7CiAgICAgCi0gICAgU3RyaW5nIHJlc3VsdCA9IG1fZGVjb2Rlci0+ZGVjb2RlKG1fZGF0YS0+ ZGF0YSgpLCBlbmNvZGVkU2l6ZSgpKTsKLSAgICByZXN1bHQgKz0gbV9kZWNvZGVyLT5mbHVzaCgp OwotICAgIHJldHVybiByZXN1bHQ7CisgICAgaWYgKCFtX2RlY29kZWRTaGVldFRleHQuaXNOdWxs KCkpCisgICAgICAgIHJldHVybiBtX2RlY29kZWRTaGVldFRleHQ7CisgICAgCisgICAgLy8gRG9u J3QgY2FjaGUgdGhlIGRlY29kZWQgdGV4dCwgcmVnZW5lcmF0aW5nIGlzIGNoZWFwIGFuZCBpdCBj YW4gdXNlIHF1aXRlIGEgYml0IG9mIG1lbW9yeQorICAgIFN0cmluZyBzaGVldFRleHQgPSBtX2Rl Y29kZXItPmRlY29kZShtX2RhdGEtPmRhdGEoKSwgbV9kYXRhLT5zaXplKCkpOworICAgIHNoZWV0 VGV4dCArPSBtX2RlY29kZXItPmZsdXNoKCk7CisgICAgcmV0dXJuIHNoZWV0VGV4dDsKIH0KIAog dm9pZCBDYWNoZWRDU1NTdHlsZVNoZWV0OjpkYXRhKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBk YXRhLCBib29sIGFsbERhdGFSZWNlaXZlZCkKQEAgLTgzLDggKzg3LDE1IEBAIHZvaWQgQ2FjaGVk Q1NTU3R5bGVTaGVldDo6ZGF0YShQYXNzUmVmUHQKIAogICAgIG1fZGF0YSA9IGRhdGE7CiAgICAg c2V0RW5jb2RlZFNpemUobV9kYXRhLmdldCgpID8gbV9kYXRhLT5zaXplKCkgOiAwKTsKKyAgICAv LyBEZWNvZGUgdGhlIGRhdGEgdG8gZmluZCBvdXQgdGhlIGVuY29kaW5nIGFuZCBrZWVwIHRoZSBz aGVldCB0ZXh0IGFyb3VuZCBkdXJpbmcgY2hlY2tOb3RpZnkoKQorICAgIGlmIChtX2RhdGEpIHsK KyAgICAgICAgbV9kZWNvZGVkU2hlZXRUZXh0ID0gbV9kZWNvZGVyLT5kZWNvZGUobV9kYXRhLT5k YXRhKCksIG1fZGF0YS0+c2l6ZSgpKTsKKyAgICAgICAgbV9kZWNvZGVkU2hlZXRUZXh0ICs9IG1f ZGVjb2Rlci0+Zmx1c2goKTsKKyAgICB9CiAgICAgbV9sb2FkaW5nID0gZmFsc2U7CiAgICAgY2hl Y2tOb3RpZnkoKTsKKyAgICAvLyBDbGVhciB0aGUgZGVjb2RlZCB0ZXh0IGFzIGl0IGlzIHVubGlr ZWx5IHRvIGJlIG5lZWRlZCBpbW1lZGlhdGVseSBhZ2FpbiBhbmQgaXMgY2hlYXAgdG8gcmVnZW5l cmF0ZS4KKyAgICBtX2RlY29kZWRTaGVldFRleHQgPSBTdHJpbmcoKTsKIH0KIAogdm9pZCBDYWNo ZWRDU1NTdHlsZVNoZWV0OjpjaGVja05vdGlmeSgpCkluZGV4OiBXZWJDb3JlL2xvYWRlci9DYWNo ZWRDU1NTdHlsZVNoZWV0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvQ2FjaGVkQ1NT U3R5bGVTaGVldC5oCShyZXZpc2lvbiAzODIwOSkKKysrIFdlYkNvcmUvbG9hZGVyL0NhY2hlZENT U1N0eWxlU2hlZXQuaAkod29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIFJlZlB0cjxUZXh0UmVzb3VyY2VE ZWNvZGVyPiBtX2RlY29kZXI7CisgICAgICAgIFN0cmluZyBtX2RlY29kZWRTaGVldFRleHQ7CiAg ICAgfTsKIAogfQo=