118930 2013-07-19 17:16:09 -0700 Extract computeRenderStyleForProperty and nodeOrItsAncestorNeedsStyleRecalc from ComputedStyleExtractor::propertyValue 2013-07-19 19:58:18 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 118032 118618 1 rniwa rniwa achicu betravis commit-queue esprehn+autocc glenn hyatt kling koivisto macpherson menard oldest_to_newest 910382 0 rniwa 2013-07-19 17:16:09 -0700 We need to cleanup the function before we can fix the bug 118618. 910383 1 207160 rniwa 2013-07-19 17:21:23 -0700 Created attachment 207160 Cleanup 910387 2 207160 kling 2013-07-19 17:50:07 -0700 Comment on attachment 207160 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=207160&action=review > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:1576 > + for (Node* n = styledNode; n && !needsStyleRecalc; n = n->parentNode()) // FIXME: Call parentOrShadowHostNode() instead > + needsStyleRecalc = n->needsStyleRecalc(); > + return needsStyleRecalc; We should just return (true) immediately if we encounter an ancestor that needs style recalc. 910405 3 rniwa 2013-07-19 19:58:18 -0700 Committed r152938: <http://trac.webkit.org/changeset/152938> 207160 2013-07-19 17:21:23 -0700 2013-07-19 17:50:06 -0700 Cleanup bug-118930-20130719172123.patch text/plain 4736 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA3LTE5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV4dHJhY3QgY29tcHV0ZVJlbmRl clN0eWxlRm9yUHJvcGVydHkgYW5kIG5vZGVPckl0c0FuY2VzdG9yTmVlZHNTdHlsZVJlY2FsYyBm cm9tIENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODkzMAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4dHJhY3RlZCB0d28gZnVuY3Rpb25z IGFzIGEgcHJlcGFyYXRpb24gdG8gZml4IGJ1Z3MgMTE4MDMyIGFuZCAxMTg2MTguCisKKyAgICAg ICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Om5vZGVPckl0c0FuY2VzdG9yTmVlZHNTdHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3Jl Ojpjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpDb21w dXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKToKKwogMjAxMy0wNy0xOSAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luZG93c10gQXZvaWQg cGFzc2luZyBhZGRyZXNzZXMgb2YgdGVtcG9yYXJpZXMgdG8gV2luZG93cyBBUEkuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cAkocmV2aXNpb24gMTUyODgzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NjgsNiArMTU2OCwzMSBAQCBQ YXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBDU1NDCiAgICAgcmV0dXJuIENvbXB1 dGVkU3R5bGVFeHRyYWN0b3IobV9ub2RlLCBtX2FsbG93VmlzaXRlZFN0eWxlLCBtX3BzZXVkb0Vs ZW1lbnRTcGVjaWZpZXIpLmNvcHlQcm9wZXJ0aWVzKCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9v bCBub2RlT3JJdHNBbmNlc3Rvck5lZWRzU3R5bGVSZWNhbGMoTm9kZSogc3R5bGVkTm9kZSkKK3sK KyAgICBib29sIG5lZWRzU3R5bGVSZWNhbGMgPSBzdHlsZWROb2RlLT5kb2N1bWVudCgpLT5oYXNQ ZW5kaW5nRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAgICBmb3IgKE5vZGUqIG4gPSBzdHlsZWROb2Rl OyBuICYmICFuZWVkc1N0eWxlUmVjYWxjOyBuID0gbi0+cGFyZW50Tm9kZSgpKSAvLyBGSVhNRTog Q2FsbCBwYXJlbnRPclNoYWRvd0hvc3ROb2RlKCkgaW5zdGVhZAorICAgICAgICBuZWVkc1N0eWxl UmVjYWxjID0gbi0+bmVlZHNTdHlsZVJlY2FsYygpOworICAgIHJldHVybiBuZWVkc1N0eWxlUmVj YWxjOworfQorCitzdGF0aWMgaW5saW5lIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IGNvbXB1dGVS ZW5kZXJTdHlsZUZvclByb3BlcnR5KE5vZGUqIHN0eWxlZE5vZGUsIFBzZXVkb0lkIHBzZXVkb0Vs ZW1lbnRTcGVjaWZpZXIsIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKK3sKKyAgICBSZW5kZXJP YmplY3QqIHJlbmRlcmVyID0gc3R5bGVkTm9kZS0+cmVuZGVyZXIoKTsKKworICAgIGlmIChyZW5k ZXJlciAmJiByZW5kZXJlci0+aXNDb21wb3NpdGVkKCkgJiYgQW5pbWF0aW9uQ29udHJvbGxlcjo6 c3VwcG9ydHNBY2NlbGVyYXRlZEFuaW1hdGlvbk9mUHJvcGVydHkocHJvcGVydHlJRCkpIHsKKyAg ICAgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2socmVuZGVyZXIt PmFuaW1hdGlvbigpKTsKKyAgICAgICAgUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSA9IHJlbmRl cmVyLT5hbmltYXRpb24oKS0+Z2V0QW5pbWF0ZWRTdHlsZUZvclJlbmRlcmVyKHJlbmRlcmVyKTsK KyAgICAgICAgaWYgKHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIgJiYgIXN0eWxlZE5vZGUtPmlzUHNl dWRvRWxlbWVudCgpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBjYWNoZWQgcHNldWRv IHN0eWxlIHdpbGwgb25seSBleGlzdCBpZiB0aGUgYW5pbWF0aW9uIGhhcyBiZWVuIHJ1biBhdCBs ZWFzdCBvbmNlLgorICAgICAgICAgICAgcmV0dXJuIHN0eWxlLT5nZXRDYWNoZWRQc2V1ZG9TdHls ZShwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gc3R5 bGUucmVsZWFzZSgpOworICAgIH0KKworICAgIHJldHVybiBzdHlsZWROb2RlLT5jb21wdXRlZFN0 eWxlKHN0eWxlZE5vZGUtPmlzUHNldWRvRWxlbWVudCgpID8gTk9QU0VVRE8gOiBwc2V1ZG9FbGVt ZW50U3BlY2lmaWVyKTsKK30KKwogUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4 dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIEVVcGRhdGVM YXlvdXQgdXBkYXRlTGF5b3V0KSBjb25zdAogewogICAgIE5vZGUqIHN0eWxlZE5vZGUgPSB0aGlz LT5zdHlsZWROb2RlKCk7CkBAIC0xNTg0LDM1ICsxNjA5LDE5IEBAIFBhc3NSZWZQdHI8Q1NTVmFs dWU+IENvbXB1dGVkU3R5bGVFeHRyYWMKIAogICAgICAgICBpZiAoZm9yY2VGdWxsTGF5b3V0KQog ICAgICAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0 cygpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGJvb2wgbmVlZHNTdHlsZVJlY2FsYyA9 IGRvY3VtZW50LT5oYXNQZW5kaW5nRm9yY2VkU3R5bGVSZWNhbGMoKTsKLSAgICAgICAgICAgIGZv ciAoTm9kZSogbiA9IHN0eWxlZE5vZGU7IG4gJiYgIW5lZWRzU3R5bGVSZWNhbGM7IG4gPSBuLT5w YXJlbnROb2RlKCkpCi0gICAgICAgICAgICAgICAgbmVlZHNTdHlsZVJlY2FsYyA9IG4tPm5lZWRz U3R5bGVSZWNhbGMoKTsKLSAgICAgICAgICAgIGlmIChuZWVkc1N0eWxlUmVjYWxjKQotICAgICAg ICAgICAgICAgIGRvY3VtZW50LT51cGRhdGVTdHlsZUlmTmVlZGVkKCk7Ci0gICAgICAgIH0KKyAg ICAgICAgZWxzZSBpZiAobm9kZU9ySXRzQW5jZXN0b3JOZWVkc1N0eWxlUmVjYWxjKHN0eWxlZE5v ZGUpKQorICAgICAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKIAogICAg ICAgICAvLyBUaGUgc3R5bGUgcmVjYWxjIGNvdWxkIGhhdmUgY2F1c2VkIHRoZSBzdHlsZWQgbm9k ZSB0byBiZSBkaXNjYXJkZWQgb3IgcmVwbGFjZWQKICAgICAgICAgLy8gaWYgaXQgd2FzIGEgUHNl dWRvRWxlbWVudCBzbyB3ZSBuZWVkIHRvIHVwZGF0ZSBpdC4KICAgICAgICAgc3R5bGVkTm9kZSA9 IHRoaXMtPnN0eWxlZE5vZGUoKTsKICAgICB9CiAKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gc3R5bGVkTm9kZS0+cmVuZGVyZXIoKTsKLQotICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5 bGU7Ci0gICAgaWYgKHJlbmRlcmVyICYmIHJlbmRlcmVyLT5pc0NvbXBvc2l0ZWQoKSAmJiBBbmlt YXRpb25Db250cm9sbGVyOjpzdXBwb3J0c0FjY2VsZXJhdGVkQW5pbWF0aW9uT2ZQcm9wZXJ0eShw cm9wZXJ0eUlEKSkgewotICAgICAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRh dGVCbG9jayhyZW5kZXJlci0+YW5pbWF0aW9uKCkpOwotICAgICAgICBzdHlsZSA9IHJlbmRlcmVy LT5hbmltYXRpb24oKS0+Z2V0QW5pbWF0ZWRTdHlsZUZvclJlbmRlcmVyKHJlbmRlcmVyKTsKLSAg ICAgICAgaWYgKG1fcHNldWRvRWxlbWVudFNwZWNpZmllciAmJiAhc3R5bGVkTm9kZS0+aXNQc2V1 ZG9FbGVtZW50KCkpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGNhY2hlZCBwc2V1ZG8g c3R5bGUgd2lsbCBvbmx5IGV4aXN0IGlmIHRoZSBhbmltYXRpb24gaGFzIGJlZW4gcnVuIGF0IGxl YXN0IG9uY2UuCi0gICAgICAgICAgICBzdHlsZSA9IHN0eWxlLT5nZXRDYWNoZWRQc2V1ZG9TdHls ZShtX3BzZXVkb0VsZW1lbnRTcGVjaWZpZXIpOwotICAgICAgICB9Ci0gICAgfSBlbHNlCi0gICAg ICAgIHN0eWxlID0gc3R5bGVkTm9kZS0+Y29tcHV0ZWRTdHlsZShzdHlsZWROb2RlLT5pc1BzZXVk b0VsZW1lbnQoKSA/IE5PUFNFVURPIDogbV9wc2V1ZG9FbGVtZW50U3BlY2lmaWVyKTsKLQorICAg IFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUgPSBjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0 eShzdHlsZWROb2RlLCBtX3BzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIHByb3BlcnR5SUQpOwogICAg IGlmICghc3R5bGUpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgUmVuZGVyT2JqZWN0KiByZW5k ZXJlciA9IHN0eWxlZE5vZGUtPnJlbmRlcmVyKCk7CiAgICAgcHJvcGVydHlJRCA9IENTU1Byb3Bl cnR5OjpyZXNvbHZlRGlyZWN0aW9uQXdhcmVQcm9wZXJ0eShwcm9wZXJ0eUlELCBzdHlsZS0+ZGly ZWN0aW9uKCksIHN0eWxlLT53cml0aW5nTW9kZSgpKTsKIAogICAgIHN3aXRjaCAocHJvcGVydHlJ RCkgewo=