119676 2013-08-12 03:10:32 -0700 Move some Document recalcStyle code to StyleResolveTree 2013-08-12 03:24:38 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc kangil.han kling oldest_to_newest 916222 0 koivisto 2013-08-12 03:10:32 -0700 This is the usual starting point for tree resolve. 916223 1 208524 koivisto 2013-08-12 03:14:40 -0700 Created attachment 208524 patch 916226 2 208524 kling 2013-08-12 03:19:30 -0700 Comment on attachment 208524 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208524&action=review r=me > Source/WebCore/style/StyleResolveTree.cpp:299 > + for (Node* child = document->firstChild(); child; child = child->nextSibling()) { > + if (!child->isElementNode()) > + continue; > + Element* elementChild = toElement(child); We should make ElementTraversal support this case. 916229 3 koivisto 2013-08-12 03:24:38 -0700 http://trac.webkit.org/changeset/153938 208524 2013-08-12 03:14:40 -0700 2013-08-12 03:19:29 -0700 patch document-resolve.patch text/plain 4641 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzkzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA4LTEyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHNvbWUgRG9jdW1lbnQg cmVjYWxjU3R5bGUgY29kZSB0byBTdHlsZVJlc29sdmVUcmVlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk2NzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRoZSBjb2RlIHRoYXQgcmVzb2x2ZXMg dGhlIGRvY3VtZW50IGFuZCBjaGlsZCBzdHlsZXMgdG8gU3R5bGU6OnJlc29sdmVUcmVlKERvY3Vt ZW50KikuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OnJlY2FsY1N0eWxlKToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVJlc29sdmVUcmVl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpyZXNvbHZlVHJlZSk6CisgICAgICAgICog c3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5oOgorCiAyMDEzLTA4LTEyICBHYWJvciBSYXBjc2FueWkg IDxyZ2Fib3JAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgYnVpbGRmaXgg Zm9yIHdlYmF1ZGlvLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxNTM5 MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNDYsNyArMTQ2LDYgQEAKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlNoYWRv d1Jvb3QuaCIKICNpbmNsdWRlICJTdHlsZVByb3BlcnR5U2V0LmgiCi0jaW5jbHVkZSAiU3R5bGVS ZXNvbHZlRm9yRG9jdW1lbnQuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAjaW5jbHVk ZSAiU3R5bGVTaGVldENvbnRlbnRzLmgiCiAjaW5jbHVkZSAiU3R5bGVTaGVldExpc3QuaCIKQEAg LTE3NzcsMjUgKzE3NzYsMTIgQEAgdm9pZCBEb2N1bWVudDo6cmVjYWxjU3R5bGUoU3R5bGU6OkNo YW5nZQogICAgICAgICBpZiAobV9wZW5kaW5nU3R5bGVSZWNhbGNTaG91bGRGb3JjZSkKICAgICAg ICAgICAgIGNoYW5nZSA9IFN0eWxlOjpGb3JjZTsKIAotICAgICAgICAvLyBSZWNhbGN1bGF0aW5n IHRoZSByb290IHN0eWxlIChvbiB0aGUgZG9jdW1lbnQpIGlzIG5vdCBuZWVkZWQgaW4gdGhlIGNv bW1vbiBjYXNlLgotICAgICAgICBpZiAoKGNoYW5nZSA9PSBTdHlsZTo6Rm9yY2UpIHx8IChzaG91 bGREaXNwbGF5U2VhbWxlc3NseVdpdGhQYXJlbnQoKSAmJiAoY2hhbmdlID49IFN0eWxlOjpJbmhl cml0KSkpIHsKLSAgICAgICAgICAgIC8vIHN0eWxlIHNlbGVjdG9yIG1heSBzZXQgdGhpcyBhZ2Fp biBkdXJpbmcgcmVjYWxjCisgICAgICAgIGlmIChjaGFuZ2UgPT0gU3R5bGU6OkZvcmNlKSB7Cisg ICAgICAgICAgICAvLyBUaGlzIG1heSBnZXQgc2V0IGFnYWluIGR1cmluZyBzdHlsZSByZXNvbHZl LgogICAgICAgICAgICAgbV9oYXNOb2Rlc1dpdGhQbGFjZWhvbGRlclN0eWxlID0gZmFsc2U7Ci0K LSAgICAgICAgICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gZG9jdW1lbnRTdHlsZSA9IFN0eWxlOjpy ZXNvbHZlRm9yRG9jdW1lbnQodGhpcyk7Ci0KLSAgICAgICAgICAgIFN0eWxlOjpDaGFuZ2UgZG9j dW1lbnRDaGFuZ2UgPSBTdHlsZTo6ZGV0ZXJtaW5lQ2hhbmdlKGRvY3VtZW50U3R5bGUuZ2V0KCks IHJlbmRlcmVyKCktPnN0eWxlKCksIHNldHRpbmdzKCkpOwotICAgICAgICAgICAgaWYgKGRvY3Vt ZW50Q2hhbmdlICE9IFN0eWxlOjpOb0NoYW5nZSkKLSAgICAgICAgICAgICAgICByZW5kZXJlcigp LT5zZXRTdHlsZShkb2N1bWVudFN0eWxlLnJlbGVhc2UoKSk7CiAgICAgICAgIH0KIAotICAgICAg ICBmb3IgKE5vZGUqIG4gPSBmaXJzdENoaWxkKCk7IG47IG4gPSBuLT5uZXh0U2libGluZygpKSB7 Ci0gICAgICAgICAgICBpZiAoIW4tPmlzRWxlbWVudE5vZGUoKSkKLSAgICAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQobik7Ci0g ICAgICAgICAgICBpZiAoY2hhbmdlID49IFN0eWxlOjpJbmhlcml0IHx8IGVsZW1lbnQtPmNoaWxk TmVlZHNTdHlsZVJlY2FsYygpIHx8IGVsZW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSkKLSAgICAg ICAgICAgICAgICBTdHlsZTo6cmVzb2x2ZVRyZWUoZWxlbWVudCwgY2hhbmdlKTsKLSAgICAgICAg fQorICAgICAgICByZXNvbHZlVHJlZSh0aGlzLCBjaGFuZ2UpOwogCiAjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogICAgICAgICBpZiAodmlldygpKQpJbmRleDogU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAJKHJldmlzaW9uIDE1MzkzMikKKysrIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z NCw2ICszNCw3IEBACiAjaW5jbHVkZSAiUmVuZGVyVGV4dC5oIgogI2luY2x1ZGUgIlNldHRpbmdz LmgiCiAjaW5jbHVkZSAiU2hhZG93Um9vdC5oIgorI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZUZvckRv Y3VtZW50LmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlci5oIgogI2luY2x1ZGUgIlRleHQuaCIK IApAQCAtMjgxLDYgKzI4MiwyNSBAQCB2b2lkIHJlc29sdmVUcmVlKEVsZW1lbnQqIGN1cnJlbnQs IENoYW5nCiAgICAgICAgIGN1cnJlbnQtPmRpZFJlY2FsY1N0eWxlKGNoYW5nZSk7CiB9CiAKK3Zv aWQgcmVzb2x2ZVRyZWUoRG9jdW1lbnQqIGRvY3VtZW50LCBDaGFuZ2UgY2hhbmdlKQoreworICAg IGJvb2wgcmVzb2x2ZVJvb3RTdHlsZSA9IGNoYW5nZSA9PSBGb3JjZSB8fCAoZG9jdW1lbnQtPnNo b3VsZERpc3BsYXlTZWFtbGVzc2x5V2l0aFBhcmVudCgpICYmIGNoYW5nZSA+PSBJbmhlcml0KTsK KyAgICBpZiAocmVzb2x2ZVJvb3RTdHlsZSkgeworICAgICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+ IGRvY3VtZW50U3R5bGUgPSByZXNvbHZlRm9yRG9jdW1lbnQoZG9jdW1lbnQpOworCisgICAgICAg IFN0eWxlOjpDaGFuZ2UgZG9jdW1lbnRDaGFuZ2UgPSBkZXRlcm1pbmVDaGFuZ2UoZG9jdW1lbnRT dHlsZS5nZXQoKSwgZG9jdW1lbnQtPnJlbmRlcmVyKCktPnN0eWxlKCksIGRvY3VtZW50LT5zZXR0 aW5ncygpKTsKKyAgICAgICAgaWYgKGRvY3VtZW50Q2hhbmdlICE9IE5vQ2hhbmdlKQorICAgICAg ICAgICAgZG9jdW1lbnQtPnJlbmRlcmVyKCktPnNldFN0eWxlKGRvY3VtZW50U3R5bGUucmVsZWFz ZSgpKTsKKyAgICB9CisKKyAgICBmb3IgKE5vZGUqIGNoaWxkID0gZG9jdW1lbnQtPmZpcnN0Q2hp bGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKKyAgICAgICAgaWYg KCFjaGlsZC0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAg IEVsZW1lbnQqIGVsZW1lbnRDaGlsZCA9IHRvRWxlbWVudChjaGlsZCk7CisgICAgICAgIGlmIChj aGFuZ2UgPj0gSW5oZXJpdCB8fCBlbGVtZW50Q2hpbGQtPmNoaWxkTmVlZHNTdHlsZVJlY2FsYygp IHx8IGVsZW1lbnRDaGlsZC0+bmVlZHNTdHlsZVJlY2FsYygpKQorICAgICAgICAgICAgcmVzb2x2 ZVRyZWUoZWxlbWVudENoaWxkLCBjaGFuZ2UpOworICAgIH0KIH0KIAogfQorfQpJbmRleDogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuaAkocmV2aXNpb24gMTUzOTMyKQorKysg U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0yOCw2ICsyOCw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRG9jdW1lbnQ7 CiBjbGFzcyBFbGVtZW50OwogY2xhc3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBTZXR0aW5nczsKQEAg LTM3LDYgKzM4LDcgQEAgbmFtZXNwYWNlIFN0eWxlIHsKIGVudW0gQ2hhbmdlIHsgTm9DaGFuZ2Us IE5vSW5oZXJpdCwgSW5oZXJpdCwgRGV0YWNoLCBGb3JjZSB9OwogCiB2b2lkIHJlc29sdmVUcmVl KEVsZW1lbnQqLCBDaGFuZ2UpOwordm9pZCByZXNvbHZlVHJlZShEb2N1bWVudCosIENoYW5nZSk7 CiAKIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUqLCBjb25zdCBSZW5k ZXJTdHlsZSosIFNldHRpbmdzKik7CiAK