100655 2012-10-29 04:59:16 -0700 Move seamless stylesheet collecting to DocumentStyleSheetCollection 2012-10-29 11:24:13 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89879 1 koivisto webkit-unassigned allan.jensen cmarcelo eric kling macpherson menard webkit.review.bot oldest_to_newest 753280 0 koivisto 2012-10-29 04:59:16 -0700 It is currently StyleResolver. 753291 1 171208 koivisto 2012-10-29 05:17:04 -0700 Created attachment 171208 patch 753298 2 koivisto 2012-10-29 05:38:27 -0700 http://trac.webkit.org/changeset/132787 753637 3 171208 eric 2012-10-29 11:23:40 -0700 Comment on attachment 171208 patch Thanks! 171208 2012-10-29 05:17:04 -0700 2012-10-29 11:23:40 -0700 patch seamless-collection.patch text/plain 7667 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMjc4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDEyLTEwLTI5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHNlYW1sZXNzIHN0eWxl c2hlZXQgY29sbGVjdGluZyB0byBEb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA2NTUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRoZSBjb2RlIGZy b20gU3R5bGVSZXNvbHZlciB0byBEb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLiBTdHlsZVJl c29sdmVyIHNob3VsZCBmb2N1cyBvbiByZXNvbHZpbmcgc3R5bGUuCisKKyAgICAgICAgKiBjc3Mv U3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpTdHls ZVJlc29sdmVyKToKKyAgICAgICAgCisgICAgICAgICAgICBVc2Ugc3RhbmRhcmQgY3JlYXRlKCkg cGF0dGVybi4KKworICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2 ZXIuaDoKKyAgICAgICAgKFN0eWxlUmVzb2x2ZXIpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6RG9jdW1lbnQpOgorICAgICAgICAqIGRv bS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNv bGxlY3RBY3RpdmVDU1NTdHlsZVNoZWV0c0Zyb21TZWFtbGVzc1BhcmVudHMpOgorICAgICAgICAK KyAgICAgICAgICAgIFNpbmNlIHBhcmVudCBhY3RpdmVBdXRob3JTdHlsZVNoZWV0cygpIGNvbnRh aW5zIGFsbCBzZWFtbGVzc2x5IGluaGVyaXRlZCBzaGVldHMgdG9vLCB0aGlzIGRvZXMgbm90IG5l ZWQgdG8KKyAgICAgICAgICAgIGl0ZXJhdGUgdG8gYW5jZXN0b3JzIGFueW1vcmUuCisKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVj dGlvbjo6dXBkYXRlQWN0aXZlU3R5bGVTaGVldHMpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudFN0 eWxlU2hlZXRDb2xsZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0eWxlU2hl ZXRDb2xsZWN0aW9uOjpjcmVhdGUpOgorICAgICAgICAoRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVj dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uOjpz dHlsZVNoZWV0c0ZvclN0eWxlU2hlZXRMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 U3R5bGVTaGVldENvbGxlY3Rpb246OmFjdGl2ZUF1dGhvclN0eWxlU2hlZXRzKToKKyAgICAgICAg CisgICAgICAgICAgICBhY3RpdmVBdXRob3JTdHlsZVNoZWV0cygpIG5vdyBpbmNsdWRlcyB0aGUg c3R5bGVzaGVldHMgaW5oZXJpdGVkIGZyb20gdGhlIHNlYW1sZXNzIHBhcmVudCB0b28uCisKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246Om5lZWRzVXBkYXRl QWN0aXZlU3R5bGVzaGVldHNPblN0eWxlUmVjYWxjKToKKwogMjAxMi0xMC0yOSAgQW5kcmVhcyBL bGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9uJ3QgZXhwb3NlIGltcGxlbWVu dGF0aW9uIGRldGFpbHMgb2YgU3R5bGVQcm9wZXJ0eVNldCBzdG9yYWdlLgpJbmRleDogU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAkocmV2aXNpb24gMTMyNzg2KQorKysgU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzAsMjUgKzMz MCw5IEBAIFN0eWxlUmVzb2x2ZXI6OlN0eWxlUmVzb2x2ZXIoRG9jdW1lbnQqIGQKICAgICB9CiAj ZW5kaWYKIAotICAgIGFkZFN0eWxlc2hlZXRzRnJvbVNlYW1sZXNzUGFyZW50cygpOwogICAgIGFw cGVuZEF1dGhvclN0eWxlU2hlZXRzKDAsIHN0eWxlU2hlZXRDb2xsZWN0aW9uLT5hY3RpdmVBdXRo b3JTdHlsZVNoZWV0cygpKTsKIH0KIAotdm9pZCBTdHlsZVJlc29sdmVyOjphZGRTdHlsZXNoZWV0 c0Zyb21TZWFtbGVzc1BhcmVudHMoKQotewotICAgIC8vIEJ1aWxkIGEgbGlzdCBvZiBzdHlsZXNo ZWV0IGxpc3RzIGZyb20gb3VyIGFuY2VzdG9ycywgYW5kIHdhbGsgdGhhdAotICAgIC8vIGxpc3Qg aW4gcmV2ZXJzZSBvcmRlciBzbyB0aGF0IHRoZSByb290LW1vc3Qgc2hlZXRzIGFyZSBhcHBlbmRl ZCBmaXJzdC4KLSAgICBEb2N1bWVudCogY2hpbGREb2N1bWVudCA9IGRvY3VtZW50KCk7Ci0gICAg VmVjdG9yPGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVldD4gPiogPiBhbmNlc3RvclNo ZWV0czsKLSAgICB3aGlsZSAoSFRNTElGcmFtZUVsZW1lbnQqIHBhcmVudElGcmFtZSA9IGNoaWxk RG9jdW1lbnQtPnNlYW1sZXNzUGFyZW50SUZyYW1lKCkpIHsKLSAgICAgICAgRG9jdW1lbnQqIHBh cmVudERvY3VtZW50ID0gcGFyZW50SUZyYW1lLT5kb2N1bWVudCgpOwotICAgICAgICBhbmNlc3Rv clNoZWV0cy5hcHBlbmQoJnBhcmVudERvY3VtZW50LT5zdHlsZVNoZWV0Q29sbGVjdGlvbigpLT5h Y3RpdmVBdXRob3JTdHlsZVNoZWV0cygpKTsKLSAgICAgICAgY2hpbGREb2N1bWVudCA9IHBhcmVu dERvY3VtZW50OwotICAgIH0KLSAgICBmb3IgKGludCBpID0gYW5jZXN0b3JTaGVldHMuc2l6ZSgp IC0gMTsgaSA+PSAwOyBpLS0pCi0gICAgICAgIGFwcGVuZEF1dGhvclN0eWxlU2hlZXRzKDAsICph bmNlc3RvclNoZWV0c1tpXSk7Ci19Ci0KIHZvaWQgU3R5bGVSZXNvbHZlcjo6YWRkQXV0aG9yUnVs ZXNBbmRDb2xsZWN0VXNlclJ1bGVzRnJvbVNoZWV0cyhjb25zdCBWZWN0b3I8UmVmUHRyPENTU1N0 eWxlU2hlZXQ+ID4qIHVzZXJTaGVldHMsIFJ1bGVTZXQmIHVzZXJTdHlsZSkKIHsKICAgICBpZiAo IXVzZXJTaGVldHMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgJKHJldmlzaW9u IDEzMjc4NikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQyMyw3ICs0MjMsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHN0YXRpYyBS ZW5kZXJTdHlsZSogc19zdHlsZU5vdFlldEF2YWlsYWJsZTsKIAotICAgIHZvaWQgYWRkU3R5bGVz aGVldHNGcm9tU2VhbWxlc3NQYXJlbnRzKCk7CiAgICAgdm9pZCBhZGRBdXRob3JSdWxlc0FuZENv bGxlY3RVc2VyUnVsZXNGcm9tU2hlZXRzKGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5bGVTaGVl dD4gPiosIFJ1bGVTZXQmIHVzZXJTdHlsZSk7CiAKICAgICB2b2lkIGNhY2hlQm9yZGVyQW5kQmFj a2dyb3VuZCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxMzI3ODYp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NDYsNyArNDQ2LDcgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgSwog I2lmIEVOQUJMRShNVVRBVElPTl9PQlNFUlZFUlMpCiAgICAgLCBtX211dGF0aW9uT2JzZXJ2ZXJU eXBlcygwKQogI2VuZGlmCi0gICAgLCBtX3N0eWxlU2hlZXRDb2xsZWN0aW9uKGFkb3B0UHRyKG5l dyBEb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uKHRoaXMpKSkKKyAgICAsIG1fc3R5bGVTaGVl dENvbGxlY3Rpb24oRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y3JlYXRlKHRoaXMpKQog ICAgICwgbV9yZWFkeVN0YXRlKENvbXBsZXRlKQogICAgICwgbV9zdHlsZVJlY2FsY1RpbWVyKHRo aXMsICZEb2N1bWVudDo6c3R5bGVSZWNhbGNUaW1lckZpcmVkKQogICAgICwgbV9wZW5kaW5nU3R5 bGVSZWNhbGNTaG91bGRGb3JjZShmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5jcHAJKHJldmlzaW9uIDEzMjc4NikK KysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkNTU1N0eWxlU2hlZXQu aCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIKKyNpbmNsdWRl ICJIVE1MSUZyYW1lRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxMaW5rRWxlbWVudC5oIgogI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxTdHlsZUVsZW1lbnQuaCIKQEAgLTQy OCw2ICs0MjksMTQgQEAgc3RhdGljIHZvaWQgZmlsdGVyRW5hYmxlZENTU1N0eWxlU2hlZXRzKAog ICAgIH0KIH0KIAorc3RhdGljIHZvaWQgY29sbGVjdEFjdGl2ZUNTU1N0eWxlU2hlZXRzRnJvbVNl YW1sZXNzUGFyZW50cyhWZWN0b3I8UmVmUHRyPENTU1N0eWxlU2hlZXQ+ID4mIHNoZWV0cywgRG9j dW1lbnQqIGRvY3VtZW50KQoreworICAgIEhUTUxJRnJhbWVFbGVtZW50KiBzZWFtbGVzc1BhcmVu dElGcmFtZSA9IGRvY3VtZW50LT5zZWFtbGVzc1BhcmVudElGcmFtZSgpOworICAgIGlmICghc2Vh bWxlc3NQYXJlbnRJRnJhbWUpCisgICAgICAgIHJldHVybjsKKyAgICBzaGVldHMuYXBwZW5kKHNl YW1sZXNzUGFyZW50SUZyYW1lLT5kb2N1bWVudCgpLT5zdHlsZVNoZWV0Q29sbGVjdGlvbigpLT5h Y3RpdmVBdXRob3JTdHlsZVNoZWV0cygpKTsKK30KKwogYm9vbCBEb2N1bWVudFN0eWxlU2hlZXRD b2xsZWN0aW9uOjp1cGRhdGVBY3RpdmVTdHlsZVNoZWV0cyhVcGRhdGVGbGFnIHVwZGF0ZUZsYWcp CiB7CiAgICAgaWYgKG1fZG9jdW1lbnQtPmluU3R5bGVSZWNhbGMoKSkgewpAQCAtNDQ2LDYgKzQ1 NSw3IEBAIGJvb2wgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6dXBkYXQKICAgICBjb2xs ZWN0QWN0aXZlU3R5bGVTaGVldHMoYWN0aXZlU3R5bGVTaGVldHMpOwogCiAgICAgVmVjdG9yPFJl ZlB0cjxDU1NTdHlsZVNoZWV0PiA+IGFjdGl2ZUNTU1N0eWxlU2hlZXRzOworICAgIGNvbGxlY3RB Y3RpdmVDU1NTdHlsZVNoZWV0c0Zyb21TZWFtbGVzc1BhcmVudHMoYWN0aXZlQ1NTU3R5bGVTaGVl dHMsIG1fZG9jdW1lbnQpOwogICAgIGZpbHRlckVuYWJsZWRDU1NTdHlsZVNoZWV0cyhhY3RpdmVD U1NTdHlsZVNoZWV0cywgYWN0aXZlU3R5bGVTaGVldHMpOwogCiAgICAgU3R5bGVSZXNvbHZlclVw ZGF0ZVR5cGUgc3R5bGVSZXNvbHZlclVwZGF0ZVR5cGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmgJKHJldmlzaW9uIDEzMjc4 NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmgJ KHdvcmtpbmcgY29weSkKQEAgLTQ2LDEyICs0NiwxMyBAQCBjbGFzcyBTdHlsZVNoZWV0TGlzdDsK IGNsYXNzIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24gewogICAgIFdURl9NQUtFX0ZBU1Rf QUxMT0NBVEVEOwogcHVibGljOgotICAgIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24oRG9j dW1lbnQqKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxEb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0 aW9uPiBjcmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50KSB7IHJldHVybiBhZG9wdFB0cihuZXcgRG9j dW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbihkb2N1bWVudCkpOyB9CisKICAgICB+RG9jdW1lbnRT dHlsZVNoZWV0Q29sbGVjdGlvbigpOwogCi0gICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVNo ZWV0PiA+JiBzdHlsZVNoZWV0c0ZvclN0eWxlU2hlZXRMaXN0KCkgeyByZXR1cm4gbV9zdHlsZVNo ZWV0c0ZvclN0eWxlU2hlZXRMaXN0OyB9CisgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxTdHlsZVNo ZWV0PiA+JiBzdHlsZVNoZWV0c0ZvclN0eWxlU2hlZXRMaXN0KCkgY29uc3QgeyByZXR1cm4gbV9z dHlsZVNoZWV0c0ZvclN0eWxlU2hlZXRMaXN0OyB9CiAKLSAgICBjb25zdCBWZWN0b3I8UmVmUHRy PENTU1N0eWxlU2hlZXQ+ID4mIGFjdGl2ZUF1dGhvclN0eWxlU2hlZXRzKCkgeyByZXR1cm4gbV9h Y3RpdmVBdXRob3JTdHlsZVNoZWV0czsgfQorICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTU3R5 bGVTaGVldD4gPiYgYWN0aXZlQXV0aG9yU3R5bGVTaGVldHMoKSBjb25zdCB7IHJldHVybiBtX2Fj dGl2ZUF1dGhvclN0eWxlU2hlZXRzOyB9CiAKICAgICBDU1NTdHlsZVNoZWV0KiBwYWdlVXNlclNo ZWV0KCk7CiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxDU1NTdHlsZVNoZWV0PiA+KiBwYWdlR3Jv dXBVc2VyU2hlZXRzKCkgY29uc3Q7CkBAIC02Nyw3ICs2OCw3IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgYWRkVXNlclNoZWV0KFBhc3NSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRzPiB1c2VyU2hlZXQp OwogCi0gICAgYm9vbCBuZWVkc1VwZGF0ZUFjdGl2ZVN0eWxlc2hlZXRzT25TdHlsZVJlY2FsYygp IHsgcmV0dXJuIG1fbmVlZHNVcGRhdGVBY3RpdmVTdHlsZXNoZWV0c09uU3R5bGVSZWNhbGM7IH0K KyAgICBib29sIG5lZWRzVXBkYXRlQWN0aXZlU3R5bGVzaGVldHNPblN0eWxlUmVjYWxjKCkgY29u c3QgeyByZXR1cm4gbV9uZWVkc1VwZGF0ZUFjdGl2ZVN0eWxlc2hlZXRzT25TdHlsZVJlY2FsYzsg fQogCiAgICAgZW51bSBVcGRhdGVGbGFnIHsgRnVsbFVwZGF0ZSwgT3B0aW1pemVkVXBkYXRlIH07 CiAgICAgYm9vbCB1cGRhdGVBY3RpdmVTdHlsZVNoZWV0cyhVcGRhdGVGbGFnKTsKQEAgLTEwMiw2 ICsxMDMsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmpl Y3RJbmZvKikgY29uc3Q7CiAKIHByaXZhdGU6CisgICAgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVj dGlvbihEb2N1bWVudCopOworCiAgICAgdm9pZCBjb2xsZWN0QWN0aXZlU3R5bGVTaGVldHMoVmVj dG9yPFJlZlB0cjxTdHlsZVNoZWV0PiA+Jik7CiAgICAgZW51bSBTdHlsZVJlc29sdmVyVXBkYXRl VHlwZSB7CiAgICAgICAgIFJlY29uc3RydWN0LAo=