95219 2012-08-28 11:07:01 -0700 Cache and share parsed imported stylesheets 2012-09-14 12:06:22 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 77745 1 koivisto webkit-unassigned cmarcelo japhet kling macpherson menard webkit.review.bot oldest_to_newest 706529 0 koivisto 2012-08-28 11:07:01 -0700 We currently cache and share parsed data structures of stylesheets loaded with <link>. We should do the same with stylesheets loaded using @import rules as they are also fairly common. 706542 1 161018 koivisto 2012-08-28 11:18:19 -0700 Created attachment 161018 patch Mutation-of-shared-import case could probably use a test case. Not sure if that is covered. 706547 2 161018 kling 2012-08-28 11:22:07 -0700 Comment on attachment 161018 patch View in context: https://bugs.webkit.org/attachment.cgi?id=161018&action=review Awesome. r=me > Source/WebCore/css/StyleRuleImport.cpp:62 > -void StyleRuleImport::setCSSStyleSheet(const String& url, const KURL& baseURL, const String& charset, const CachedCSSStyleSheet*) > +void StyleRuleImport::setCSSStyleSheet(const String& url, const KURL& baseURL, const String& charset, const CachedCSSStyleSheet* ) ORLY? 708482 3 koivisto 2012-08-30 04:07:36 -0700 http://trac.webkit.org/changeset/127123 Turned out we have test coverage for import mutations too. 721011 4 ap 2012-09-14 12:06:12 -0700 Rolled out in <http://trac.webkit.org/changeset/128637>, because this depended on an earlier patch that had to be rolled out. 161018 2012-08-28 11:18:19 -0700 2012-09-14 12:06:22 -0700 patch imported-stylesheet-cache-2.patch text/plain 7336 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjg5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTI4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBDYWNoZSBhbmQgc2hhcmUgcGFy c2VkIGltcG9ydGVkIHN0eWxlc2hlZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05NTIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlIGN1cnJlbnRseSBjYWNoZSBhbmQgc2hhcmUgcGFyc2VkIGRhdGEg c3RydWN0dXJlcyBvZiBzdHlsZXNoZWV0cyBsb2FkZWQgd2l0aCA8bGluaz4uIFdlIHNob3VsZCBk bworICAgICAgICB0aGUgc2FtZSB3aXRoIHN0eWxlc2hlZXRzIGxvYWRlZCB1c2luZyBAaW1wb3J0 IHJ1bGVzIGFzIHRoZXkgYXJlIGFsc28gZmFpcmx5IGNvbW1vbi4KKyAgICAgICAgCisgICAgICAg IFRoaXMgcGF0Y2ggYWRkcyBzdXBwb3J0IGZvciBjYWNoaW5nIGFuZCBzaGFyaW5nIHN0eWxlc2hl ZXRzIGxvYWRlZCB1c2luZyBAaW1wb3J0IHJ1bGVzLiBPbmx5IGxlYWYKKyAgICAgICAgc3R5bGVz aGVldHMgKHRoYXQgZG9uJ3QgaGF2ZSBAaW1wb3J0IHJ1bGVzIHRoZW1zZWx2ZXMpIGNhbiBiZSBj YWNoZWQgZm9yIG5vdy4KKworICAgICAgICAqIGNzcy9DU1NJbXBvcnRSdWxlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU0ltcG9ydFJ1bGU6OnJlYXR0YWNoU3R5bGVTaGVldENvbnRlbnRzKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGNzcy9DU1NJbXBvcnRSdWxlLmg6CisgICAg ICAgIChDU1NJbXBvcnRSdWxlKToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTaGVldC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNoZWV0Ojp3aWxsTXV0YXRlUnVsZXMpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVTaGVldDo6cmVhdHRhY2hDU1NPTVdyYXBwZXJzKToKKyAgICAg ICAgKiBjc3MvQ1NTU3R5bGVTaGVldC5oOgorICAgICAgICAoQ1NTU3R5bGVTaGVldCk6CisgICAg ICAgICogY3NzL1N0eWxlUnVsZUltcG9ydC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1 bGVJbXBvcnQ6OnNldENTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSdWxl SW1wb3J0OjpyZWF0dGFjaFN0eWxlU2hlZXRDb250ZW50cyk6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKiBjc3MvU3R5bGVSdWxlSW1wb3J0Lmg6CisgICAgICAgIChTdHlsZVJ1bGVJbXBv cnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZENTU1N0eWxlU2hlZXQ6OnNhdmVQYXJzZWRTdHlsZVNoZWV0 KToKKwogMjAxMi0wOC0yOCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAg ICAgW05ldyBNdWx0aWNvbHVtbl0gUmVuYW1lIHNvbWUgZmxvdyB0aHJlYWQgbWV0aG9kcyBhbmQg cmVnaW9uIG1ldGhvZHMvbWVtYmVycyB0byBtYWtlIHRoZW0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NJbXBvcnRSdWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTSW1wb3J0UnVsZS5jcHAJKHJldmlzaW9uIDEyNjcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NJbXBvcnRSdWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsNiArODYsMTIgQEAgdm9p ZCBDU1NJbXBvcnRSdWxlOjpyZXBvcnREZXNjZW5kYW50TWVtbwogICAgIGluZm8uYWRkSW5zdHJ1 bWVudGVkTWVtYmVyKG1fc3R5bGVTaGVldENTU09NV3JhcHBlcik7CiB9CiAKK3ZvaWQgQ1NTSW1w b3J0UnVsZTo6cmVhdHRhY2hTdHlsZVNoZWV0Q29udGVudHMoKQoreworICAgIEFTU0VSVChtX3N0 eWxlU2hlZXRDU1NPTVdyYXBwZXIpOworICAgIG1faW1wb3J0UnVsZS0+cmVhdHRhY2hTdHlsZVNo ZWV0Q29udGVudHMobV9zdHlsZVNoZWV0Q1NTT01XcmFwcGVyLT5jb250ZW50cygpKTsKK30KKwog Q1NTU3R5bGVTaGVldCogQ1NTSW1wb3J0UnVsZTo6c3R5bGVTaGVldCgpIGNvbnN0CiB7IAogICAg IGlmICghbV9pbXBvcnRSdWxlLT5zdHlsZVNoZWV0KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTSW1wb3J0UnVsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJ bXBvcnRSdWxlLmgJKHJldmlzaW9uIDEyNjcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJ bXBvcnRSdWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDggQEAgcHVibGljOgogCiAg ICAgdm9pZCByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNv bnN0OwogCisgICAgdm9pZCByZWF0dGFjaFN0eWxlU2hlZXRDb250ZW50cygpOworCiBwcml2YXRl OgogICAgIENTU0ltcG9ydFJ1bGUoU3R5bGVSdWxlSW1wb3J0KiwgQ1NTU3R5bGVTaGVldCopOwog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCShyZXZpc2lvbiAxMjY3MTcp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE1MSw3ICsxNTEsNyBAQCB2b2lkIENTU1N0eWxlU2hlZXQ6OndpbGxNdXRhdGVSdWxlcygp CiAgICAgbV9jb250ZW50cy0+c2V0TXV0YWJsZSgpOwogCiAgICAgLy8gQW55IGV4aXN0aW5nIENT U09NIHdyYXBwZXJzIG5lZWQgdG8gYmUgY29ubmVjdGVkIHRvIHRoZSBjb3BpZWQgY2hpbGQgcnVs ZXMuCi0gICAgcmVhdHRhY2hDaGlsZFJ1bGVDU1NPTVdyYXBwZXJzKCk7CisgICAgcmVhdHRhY2hD U1NPTVdyYXBwZXJzKCk7CiB9CiAKIHZvaWQgQ1NTU3R5bGVTaGVldDo6ZGlkTXV0YXRlUnVsZXMo KQpAQCAtMTcwLDggKzE3MCwxMSBAQCB2b2lkIENTU1N0eWxlU2hlZXQ6OmRpZE11dGF0ZSgpCiAg ICAgb3duZXItPnN0eWxlUmVzb2x2ZXJDaGFuZ2VkKERlZmVyUmVjYWxjU3R5bGUpOwogfQogCi12 b2lkIENTU1N0eWxlU2hlZXQ6OnJlYXR0YWNoQ2hpbGRSdWxlQ1NTT01XcmFwcGVycygpCit2b2lk IENTU1N0eWxlU2hlZXQ6OnJlYXR0YWNoQ1NTT01XcmFwcGVycygpCiB7CisgICAgaWYgKG1fb3du ZXJSdWxlKQorICAgICAgICBtX293bmVyUnVsZS0+cmVhdHRhY2hTdHlsZVNoZWV0Q29udGVudHMo KTsKKwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2NoaWxkUnVsZUNTU09NV3JhcHBl cnMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgaWYgKCFtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnNb aV0pCiAgICAgICAgICAgICBjb250aW51ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNoZWV0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hl ZXQuaAkocmV2aXNpb24gMTI2NzE3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hl ZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDcgKzEwMyw2IEBAIHB1YmxpYzoKICAgICB2b2lk IGRpZE11dGF0ZSgpOwogICAgIAogICAgIHZvaWQgY2xlYXJDaGlsZFJ1bGVDU1NPTVdyYXBwZXJz KCk7Ci0gICAgdm9pZCByZWF0dGFjaENoaWxkUnVsZUNTU09NV3JhcHBlcnMoKTsKIAogICAgIFN0 eWxlU2hlZXRDb250ZW50cyogY29udGVudHMoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRzLmdl dCgpOyB9CiAKQEAgLTExNyw2ICsxMTYsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgU3RyaW5n IHR5cGUoKSBjb25zdCB7IHJldHVybiAidGV4dC9jc3MiOyB9CiAKICAgICBib29sIGNhbkFjY2Vz c1J1bGVzKCkgY29uc3Q7CisgICAgdm9pZCByZWF0dGFjaENTU09NV3JhcHBlcnMoKTsKICAgICAK ICAgICBSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRzPiBtX2NvbnRlbnRzOwogICAgIGJvb2wgbV9p c0lubGluZVN0eWxlc2hlZXQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1w b3J0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1wb3J0 LmNwcAkocmV2aXNpb24gMTI2NzE3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZUlt cG9ydC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAgU3R5bGVSdWxlSW1wb3J0 Ojp+U3R5bGVSdWxlSW1wb3J0KCkKICAgICAgICAgbV9jYWNoZWRTaGVldC0+cmVtb3ZlQ2xpZW50 KHRoaXMpOwogfQogCi12b2lkIFN0eWxlUnVsZUltcG9ydDo6c2V0Q1NTU3R5bGVTaGVldChjb25z dCBTdHJpbmcmIHVybCwgY29uc3QgS1VSTCYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiBjaGFyc2V0 LCBjb25zdCBDYWNoZWRDU1NTdHlsZVNoZWV0KikKK3ZvaWQgU3R5bGVSdWxlSW1wb3J0OjpzZXRD U1NTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBLVVJMJiBiYXNlVVJMLCBjb25z dCBTdHJpbmcmIGNoYXJzZXQsIGNvbnN0IENhY2hlZENTU1N0eWxlU2hlZXQqICkKIHsKICAgICBB U1NFUlQobV9sb2FkQ29udGV4dCk7CiAgICAgQVNTRVJUKCFtX3N0eWxlU2hlZXQpOwpAQCAtNzIs MTAgKzcyLDE2IEBAIHZvaWQgU3R5bGVSdWxlSW1wb3J0OjpzZXRDU1NTdHlsZVNoZWV0KGMKICAg ICAgICAgcGFyc2VyQ29udGV4dC5iYXNlVVJMID0gYmFzZVVSTDsKICAgICBwYXJzZXJDb250ZXh0 LmNoYXJzZXQgPSBjaGFyc2V0OwogCi0gICAgbV9zdHlsZVNoZWV0ID0gU3R5bGVTaGVldENvbnRl bnRzOjpjcmVhdGUodXJsLCBwYXJzZXJDb250ZXh0KTsKLSAgICBtX3N0eWxlU2hlZXQtPnBhcnNl QXV0aG9yU3R5bGVTaGVldChtX2NhY2hlZFNoZWV0LmdldCgpLCBsb2FkQ29udGV4dC0+cm9vdFN0 eWxlU2hlZXQuZ2V0KCkpOworICAgIG1fc3R5bGVTaGVldCA9IG1fY2FjaGVkU2hlZXQtPnJlc3Rv cmVQYXJzZWRTdHlsZVNoZWV0KHBhcnNlckNvbnRleHQpOwogCisgICAgaWYgKCFtX3N0eWxlU2hl ZXQpIHsKKyAgICAgICAgbV9zdHlsZVNoZWV0ID0gU3R5bGVTaGVldENvbnRlbnRzOjpjcmVhdGUo dXJsLCBwYXJzZXJDb250ZXh0KTsKKyAgICAgICAgbV9zdHlsZVNoZWV0LT5wYXJzZUF1dGhvclN0 eWxlU2hlZXQobV9jYWNoZWRTaGVldC5nZXQoKSwgbG9hZENvbnRleHQtPnJvb3RTdHlsZVNoZWV0 LmdldCgpKTsKKyAgICB9CiAgICAgbG9hZENvbnRleHQtPnJvb3RTdHlsZVNoZWV0LT5jb250ZW50 cygpLT5jaGVja0xvYWRDb21wbGV0ZWQoKTsKKworICAgIGlmIChtX3N0eWxlU2hlZXQtPmlzQ2Fj aGVhYmxlKCkpCisgICAgICAgIG1fY2FjaGVkU2hlZXQtPnNhdmVQYXJzZWRTdHlsZVNoZWV0KG1f c3R5bGVTaGVldCk7CiB9CiAKIGJvb2wgU3R5bGVSdWxlSW1wb3J0Ojppc0xvYWRpbmcoKSBjb25z dApAQCAtMTI3LDYgKzEzMywxMSBAQCB2b2lkIFN0eWxlUnVsZUltcG9ydDo6cmVxdWVzdFN0eWxl U2hlZXQoCiAgICAgbV9jYWNoZWRTaGVldC0+YWRkQ2xpZW50KHRoaXMpOwogfQogCit2b2lkIFN0 eWxlUnVsZUltcG9ydDo6cmVhdHRhY2hTdHlsZVNoZWV0Q29udGVudHMoU3R5bGVTaGVldENvbnRl bnRzKiBjb250ZW50cykKK3sKKyAgICBtX3N0eWxlU2hlZXQgPSBjb250ZW50czsKK30KKwogdm9p ZCBTdHlsZVJ1bGVJbXBvcnQ6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShNZW1vcnlPYmpl Y3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAogewogICAgIE1lbW9yeUNsYXNzSW5mbyBp bmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q1NTKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1wb3J0LmgJKHJldmlzaW9uIDEyNjcxNykK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuaAkod29ya2luZyBjb3B5KQpA QCAtNTEsNiArNTEsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlcG9ydERlc2NlbmRhbnRNZW1v cnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CiAKKyAgICB2b2lkIHJlYXR0YWNoU3R5 bGVTaGVldENvbnRlbnRzKFN0eWxlU2hlZXRDb250ZW50cyopOworCiBwcml2YXRlOgogICAgIFN0 eWxlUnVsZUltcG9ydChjb25zdCBTdHJpbmcmIGhyZWYsIFBhc3NSZWZQdHI8TWVkaWFRdWVyeVNl dD4pOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVT aGVldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZENTU1N0eWxlU2hlZXQuY3BwCShyZXZpc2lvbiAxMjY3MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkQ1NTU3R5bGVTaGVldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5 Myw3ICsxOTMsOCBAQCBQYXNzUmVmUHRyPFN0eWxlU2hlZXRDb250ZW50cz4gQ2FjaGVkQ1NTCiB2 b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OnNhdmVQYXJzZWRTdHlsZVNoZWV0KFBhc3NSZWZQdHI8 U3R5bGVTaGVldENvbnRlbnRzPiBzaGVldCkKIHsKICAgICBBU1NFUlQoc2hlZXQgJiYgc2hlZXQt PmlzQ2FjaGVhYmxlKCkpOwotCisgICAgaWYgKG1fcGFyc2VkU3R5bGVTaGVldENhY2hlID09IHNo ZWV0KQorICAgICAgICByZXR1cm47CiAgICAgaWYgKG1fcGFyc2VkU3R5bGVTaGVldENhY2hlKQog ICAgICAgICBtX3BhcnNlZFN0eWxlU2hlZXRDYWNoZS0+cmVtb3ZlZEZyb21NZW1vcnlDYWNoZSgp OwogICAgIG1fcGFyc2VkU3R5bGVTaGVldENhY2hlID0gc2hlZXQ7Cg==