12401 2007-01-24 16:54:35 -0800 Avoid unnecessary allocations in CSS 2007-01-26 09:29:47 -0800 1 1 1 Unclassified WebKit CSS 420+ Mac OS X 10.4 RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned ejalbert oldest_to_newest 32711 0 bdakin 2007-01-24 16:54:35 -0800 From <rdar://problem/4946877> * SUMMARY Patch attached which avoids several unnecessary allocations, cutting down on time in malloc and free. 1. css/MediaQueryEvaluator.cpp, css/MediaQueryEvaluator.h, css/cssstyleselector.cpp Add a special method to the MediaQueryEvaluator class to avoid unnecessary turning a char * into a String object. 2. loader/Cache.cpp Don't turn a KURL's underlying String into another identical KURL. Or, even better, you could change the prototype to createResource to just take a String& instead of a KURL& and pass the url.url() to that, which is what createResource really wants to be doing anyway (since it only ever uses the String), but is no less work. 32709 1 12655 bdakin 2007-01-24 16:56:00 -0800 Created attachment 12655 Nate's patch Here is the patch attached to the radar bug. 32706 2 12655 darin 2007-01-24 16:59:13 -0800 Comment on attachment 12655 Nate's patch Looks good. r=me 32696 3 mjs 2007-01-24 17:12:27 -0800 I don't think change #2 will actually save any allocations, since creating a KURL from the DeprecatedString inside another KURL won't actually call malloc. It will needlessly reparse it though, so still a good change. This needs a ChangeLog and should be run through regression tests. 32507 4 darin 2007-01-26 09:29:47 -0800 I ran the regression tests and wrote a change log. Committed revision 19156. 12655 2007-01-24 16:56:00 -0800 2007-01-24 16:59:13 -0800 Nate's patch WebCore.patch text/plain 2177 bdakin SW5kZXg6IGNzcy9NZWRpYVF1ZXJ5RXZhbHVhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY3NzL01lZGlh UXVlcnlFdmFsdWF0b3IuaAkocmV2aXNpb24gMTUxODkpCisrKyBjc3MvTWVkaWFRdWVyeUV2YWx1 YXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3MCw3IEBACiAgICAgfk1lZGlhUXVlcnlF dmFsdWF0b3IoKTsKIAogICAgIGJvb2wgbWVkaWFUeXBlTWF0Y2goY29uc3QgU3RyaW5nJiBtZWRp YVR5cGVUb01hdGNoKSBjb25zdDsKKyAgICBib29sIG1lZGlhVHlwZU1hdGNoU3BlY2lmaWMoY29u c3QgY2hhciogbWVkaWFUeXBlVG9NYXRjaCkgY29uc3Q7CiAKICAgICAvKiogRXZhbHVhdGVzIGEg bGlzdCBvZiBtZWRpYSBxdWVyaWVzICovCiAgICAgYm9vbCBldmFsKGNvbnN0IE1lZGlhTGlzdCog cXVlcnkpIGNvbnN0OwpJbmRleDogY3NzL2Nzc3N0eWxlc2VsZWN0b3IuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIGNzcy9jc3NzdHlsZXNlbGVjdG9yLmNwcAkocmV2aXNpb24gMTUxODkpCisrKyBjc3MvY3Nz c3R5bGVzZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1NSw3ICs3NTUsNyBAQAogICAg ICAgICBtYXRjaFJ1bGVzKGRlZmF1bHRRdWlya3NTdHlsZSwgZmlyc3RVQVJ1bGUsIGxhc3RVQVJ1 bGUpOwogCiAgICAgLy8gMy4gSWYgb3VyIG1lZGl1bSBpcyBwcmludCwgdGhlbiB3ZSBtYXRjaCBy dWxlcyBmcm9tIHRoZSBwcmludCBzaGVldC4KLSAgICBpZiAobV9tZWRpdW0tPm1lZGlhVHlwZU1h dGNoKCJwcmludCIpKQorICAgIGlmIChtX21lZGl1bS0+bWVkaWFUeXBlTWF0Y2hTcGVjaWZpYygi cHJpbnQiKSkKICAgICAgICAgbWF0Y2hSdWxlcyhkZWZhdWx0UHJpbnRTdHlsZSwgZmlyc3RVQVJ1 bGUsIGxhc3RVQVJ1bGUpOwogICAgICAgICAKICAgICAvLyA0LiBJZiB3ZSdyZSBpbiB2aWV3IHNv dXJjZSBtb2RlLCB0aGVuIHdlIG1hdGNoIHJ1bGVzIGZyb20gdGhlIHZpZXcgc291cmNlIHN0eWxl IHNoZWV0LgpJbmRleDogY3NzL01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IGNzcy9NZWRpYVF1ZXJ5RXZhbHVhdG9yLmNwcAkocmV2aXNpb24gMTUxODkpCisrKyBjc3MvTWVk aWFRdWVyeUV2YWx1YXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw2ICsxMDAsMTEgQEAK ICAgICAgICAgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobWVkaWFUeXBlVG9NYXRjaCwgbV9tZWRpYVR5 cGUpOwogfQogCitib29sIE1lZGlhUXVlcnlFdmFsdWF0b3I6Om1lZGlhVHlwZU1hdGNoU3BlY2lm aWMoY29uc3QgY2hhciogbWVkaWFUeXBlVG9NYXRjaCkgY29uc3QKK3sKKyAgICByZXR1cm4gZXF1 YWxJZ25vcmluZ0Nhc2UobV9tZWRpYVR5cGUsIG1lZGlhVHlwZVRvTWF0Y2gpOworfQorCiBzdGF0 aWMgYm9vbCBhcHBseVJlc3RyaWN0b3IoTWVkaWFRdWVyeTo6UmVzdHJpY3RvciByLCBib29sIHZh bHVlKQogewogICAgIHJldHVybiByID09IE1lZGlhUXVlcnk6Ok5vdCA/ICF2YWx1ZSA6IHZhbHVl OwpJbmRleDogbG9hZGVyL0NhY2hlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBsb2FkZXIvQ2FjaGUuY3Bw CShyZXZpc2lvbiAxNTE4OSkKKysrIGxvYWRlci9DYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTkxLDcgKzkxLDcgQEAKIAogICAgIGlmICghcmVzb3VyY2UpIHsKICAgICAgICAgLy8gVGhlIHJl c291cmNlIGRvZXMgbm90IGV4aXN0LiAgQ3JlYXRlIGl0LgotICAgICAgICByZXNvdXJjZSA9IGNy ZWF0ZVJlc291cmNlKHR5cGUsIGRvY0xvYWRlciwgdXJsLnVybCgpLCBleHBpcmVEYXRlLCBjaGFy c2V0KTsKKyAgICAgICAgcmVzb3VyY2UgPSBjcmVhdGVSZXNvdXJjZSh0eXBlLCBkb2NMb2FkZXIs IHVybCwgZXhwaXJlRGF0ZSwgY2hhcnNldCk7CiAgICAgICAgIEFTU0VSVChyZXNvdXJjZSk7CiAg ICAgICAgIHJlc291cmNlLT5zZXRJbkNhY2hlKCFkaXNhYmxlZCgpKTsKICAgICAgICAgaWYgKCFk aXNhYmxlZCgpKQo=