125968 2013-12-18 18:32:29 -0800 CSS: Fall back to cache-less cascade when encountering explicitly inherited value. 2013-12-18 19:10:02 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard oldest_to_newest 961222 0 kling 2013-12-18 18:32:29 -0800 Three asserting tests: http://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK1%20(Tests)/r160806%20(1196)/results.html 961223 1 219600 kling 2013-12-18 18:33:13 -0800 Created attachment 219600 Patch Bit quick, bit dirty. 961226 2 219600 koivisto 2013-12-18 18:39:06 -0800 Comment on attachment 219600 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219600&action=review > Source/WebCore/css/StyleResolver.cpp:4273 > +bool StyleResolver::CascadedProperties::addMatches(const MatchResult& matchResult, bool important, int startIndex, int endIndex, bool inheritedOnly) Argument return might end up reading better. 961237 3 219600 commit-queue 2013-12-18 19:10:00 -0800 Comment on attachment 219600 Patch Clearing flags on attachment: 219600 Committed r160820: <http://trac.webkit.org/changeset/160820> 961238 4 commit-queue 2013-12-18 19:10:02 -0800 All reviewed patches have been landed. Closing bug. 219600 2013-12-18 18:33:13 -0800 2013-12-18 19:10:00 -0800 Patch bug-125968.diff text/plain 7254 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzODkxODQ0Li45NGJhNTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIg QEAKIDIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENTUzogRmFsbCBiYWNrIHRvIGNhY2hlLWxlc3MgY2FzY2FkZSB3aGVuIGVuY291bnRlcmlu ZyBleHBsaWNpdGx5IGluaGVyaXRlZCB2YWx1ZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzEyNTk2OD4KKworICAgICAgICBXaGVuIGVuY291bnRlcmluZyBhbiBleHBsaWNpdGx5IGlu aGVyaXRlZCB2YWx1ZSBmb3IgYSBwcm9wZXJ0eSB0aGF0J3Mgbm90CisgICAgICAgICJzdGF0aWNh bGx5IGluaGVyaXRlZCIsIGRyb3Agb3V0IG9mIHRoZSBtYXRjaGVkIHByb3BlcnRpZXMgY2FjaGUg cGF0aAorICAgICAgICBpbW1lZGlhdGVseSBpbnN0ZWFkIG9mIHdhaXRpbmcgZm9yIHNvbWUgY29p bmNpZGVuY2UgdG8gdHJpZ2dlciBpdCBsYXRlciBvbi4KKworICAgICAgICBGaXhlcyAzIGFzc2Vy dGluZyB0YWJsZSB0ZXN0czoKKworICAgICAgICAtIGZhc3QvdGFibGUvYm9yZGVyLWNvbGxhcHNp bmcvY2FjaGVkLTY5Mjk2Lmh0bWwKKyAgICAgICAgLSB0YWJsZXMvbW96aWxsYS9idWdzL2J1ZzI3 MDM4LTMuaHRtbAorICAgICAgICAtIHRhYmxlcy9tb3ppbGxhX2V4cGVjdGVkX2ZhaWx1cmVzL21h cnZpbi9iYWNrZ3JfYm9yZGVyLXRhYmxlLXJvdy1ncm91cC5odG1sCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKzIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xp bmdAYXBwbGUuY29tPgorCiAgICAgICAgIERvbid0IHdhc3RlIGN5Y2xlcyBvbiB6ZXJvaW5nIGV2 ZXJ5IENhc2NhZGVkUHJvcGVydGllczo6UHJvcGVydHkuCiAgICAgICAgIDxodHRwczovL3dlYmtp dC5vcmcvYi8xMjU5NjY+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJl c29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBj ZjdmMmI4Li4xNWY0NWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNv bHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0y MDQsNyArMjA0LDcgQEAgcHVibGljOgogICAgIH07CiAKICAgICBQcm9wZXJ0eSYgcHJvcGVydHko Q1NTUHJvcGVydHlJRCk7Ci0gICAgdm9pZCBhZGRNYXRjaGVzKGNvbnN0IE1hdGNoUmVzdWx0Jiwg Ym9vbCBpbXBvcnRhbnQsIGludCBzdGFydEluZGV4LCBpbnQgZW5kSW5kZXgsIGJvb2wgaW5oZXJp dGVkT25seSk7CisgICAgYm9vbCBhZGRNYXRjaGVzKGNvbnN0IE1hdGNoUmVzdWx0JiwgYm9vbCBp bXBvcnRhbnQsIGludCBzdGFydEluZGV4LCBpbnQgZW5kSW5kZXgsIGJvb2wgaW5oZXJpdGVkT25s eSk7CiAKICAgICB2b2lkIHNldChDU1NQcm9wZXJ0eUlELCBDU1NWYWx1ZSYsIHVuc2lnbmVkIGxp bmtNYXRjaFR5cGUpOwogICAgIHZvaWQgc2V0RGVmZXJyZWQoQ1NTUHJvcGVydHlJRCwgQ1NTVmFs dWUmLCB1bnNpZ25lZCBsaW5rTWF0Y2hUeXBlKTsKQEAgLTIxMiw3ICsyMTIsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBhcHBseURlZmVycmVkUHJvcGVydGllcyhTdHlsZVJlc29sdmVyJik7CiAKIHBy aXZhdGU6Ci0gICAgdm9pZCBhZGRTdHlsZVByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9wZXJ0aWVz JiwgU3R5bGVSdWxlJiwgYm9vbCBpc0ltcG9ydGFudCwgYm9vbCBpbmhlcml0ZWRPbmx5LCBQcm9w ZXJ0eVdoaXRlbGlzdFR5cGUsIHVuc2lnbmVkIGxpbmtNYXRjaFR5cGUpOworICAgIGJvb2wgYWRk U3R5bGVQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVydGllcyYsIFN0eWxlUnVsZSYsIGJvb2wg aXNJbXBvcnRhbnQsIGJvb2wgaW5oZXJpdGVkT25seSwgUHJvcGVydHlXaGl0ZWxpc3RUeXBlLCB1 bnNpZ25lZCBsaW5rTWF0Y2hUeXBlKTsKICAgICBzdGF0aWMgdm9pZCBzZXRQcm9wZXJ0eUludGVy bmFsKFByb3BlcnR5JiwgQ1NTUHJvcGVydHlJRCwgQ1NTVmFsdWUmLCB1bnNpZ25lZCBsaW5rTWF0 Y2hUeXBlKTsKIAogICAgIFByb3BlcnR5IG1fcHJvcGVydGllc1tudW1DU1NQcm9wZXJ0aWVzICsg MV07CkBAIC0xODMwLDggKzE4MzAsOSBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hl ZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0LCBjb25zdAogICAgICAg ICAvLyBjYW4gbG9vayBhdCB0aGVtIGxhdGVyIHRvIGZpZ3VyZSBvdXQgaWYgdGhpcyBpcyBhIHN0 eWxlZCBmb3JtIGNvbnRyb2wgb3Igbm90LgogICAgICAgICBzdGF0ZS5zZXRMaW5lSGVpZ2h0VmFs dWUobnVsbHB0cik7CiAgICAgICAgIENhc2NhZGVkUHJvcGVydGllcyBjYXNjYWRlKGRpcmVjdGlv biwgd3JpdGluZ01vZGUpOwotICAgICAgICBjYXNjYWRlLmFkZE1hdGNoZXMobWF0Y2hSZXN1bHQs IGZhbHNlLCBtYXRjaFJlc3VsdC5yYW5nZXMuZmlyc3RVQVJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdl cy5sYXN0VUFSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOwotICAgICAgICBjYXNjYWRlLmFkZE1h dGNoZXMobWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVBUnVsZSwg bWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RVQVJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSk7CisgICAg ICAgIGlmICghY2FzY2FkZS5hZGRNYXRjaGVzKG1hdGNoUmVzdWx0LCBmYWxzZSwgbWF0Y2hSZXN1 bHQucmFuZ2VzLmZpcnN0VUFSdWxlLCBtYXRjaFJlc3VsdC5yYW5nZXMubGFzdFVBUnVsZSwgYXBw bHlJbmhlcml0ZWRPbmx5KQorICAgICAgICAgICAgfHwgIWNhc2NhZGUuYWRkTWF0Y2hlcyhtYXRj aFJlc3VsdCwgdHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0VUFSdWxlLCBtYXRjaFJlc3Vs dC5yYW5nZXMubGFzdFVBUnVsZSwgYXBwbHlJbmhlcml0ZWRPbmx5KSkKKyAgICAgICAgICAgIHJl dHVybiBhcHBseU1hdGNoZWRQcm9wZXJ0aWVzKG1hdGNoUmVzdWx0LCBlbGVtZW50LCBEb05vdFVz ZU1hdGNoZWRQcm9wZXJ0aWVzQ2FjaGUpOwogCiAgICAgICAgIGFwcGx5Q2FzY2FkZWRQcm9wZXJ0 aWVzKGNhc2NhZGUsIGZpcnN0Q1NTUHJvcGVydHksIENTU1Byb3BlcnR5TGluZUhlaWdodCk7CiAg ICAgICAgIHVwZGF0ZUZvbnQoKTsKQEAgLTE4NDEsMTAgKzE4NDIsMTEgQEAgdm9pZCBTdHlsZVJl c29sdmVyOjphcHBseU1hdGNoZWRQcm9wZXJ0aWVzKGNvbnN0IE1hdGNoUmVzdWx0JiBtYXRjaFJl c3VsdCwgY29uc3QKICAgICB9CiAKICAgICBDYXNjYWRlZFByb3BlcnRpZXMgY2FzY2FkZShkaXJl Y3Rpb24sIHdyaXRpbmdNb2RlKTsKLSAgICBjYXNjYWRlLmFkZE1hdGNoZXMobWF0Y2hSZXN1bHQs IGZhbHNlLCAwLCBtYXRjaFJlc3VsdC5tYXRjaGVkUHJvcGVydGllcy5zaXplKCkgLSAxLCBhcHBs eUluaGVyaXRlZE9ubHkpOwotICAgIGNhc2NhZGUuYWRkTWF0Y2hlcyhtYXRjaFJlc3VsdCwgdHJ1 ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0QXV0aG9yUnVsZSwgbWF0Y2hSZXN1bHQucmFuZ2Vz Lmxhc3RBdXRob3JSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOwotICAgIGNhc2NhZGUuYWRkTWF0 Y2hlcyhtYXRjaFJlc3VsdCwgdHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0VXNlclJ1bGUs IG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VXNlclJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSk7Ci0g ICAgY2FzY2FkZS5hZGRNYXRjaGVzKG1hdGNoUmVzdWx0LCB0cnVlLCBtYXRjaFJlc3VsdC5yYW5n ZXMuZmlyc3RVQVJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VUFSdWxlLCBhcHBseUluaGVy aXRlZE9ubHkpOworICAgIGlmICghY2FzY2FkZS5hZGRNYXRjaGVzKG1hdGNoUmVzdWx0LCBmYWxz ZSwgMCwgbWF0Y2hSZXN1bHQubWF0Y2hlZFByb3BlcnRpZXMuc2l6ZSgpIC0gMSwgYXBwbHlJbmhl cml0ZWRPbmx5KQorICAgICAgICB8fCAhY2FzY2FkZS5hZGRNYXRjaGVzKG1hdGNoUmVzdWx0LCB0 cnVlLCBtYXRjaFJlc3VsdC5yYW5nZXMuZmlyc3RBdXRob3JSdWxlLCBtYXRjaFJlc3VsdC5yYW5n ZXMubGFzdEF1dGhvclJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSkKKyAgICAgICAgfHwgIWNhc2Nh ZGUuYWRkTWF0Y2hlcyhtYXRjaFJlc3VsdCwgdHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0 VXNlclJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VXNlclJ1bGUsIGFwcGx5SW5oZXJpdGVk T25seSkKKyAgICAgICAgfHwgIWNhc2NhZGUuYWRkTWF0Y2hlcyhtYXRjaFJlc3VsdCwgdHJ1ZSwg bWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0VUFSdWxlLCBtYXRjaFJlc3VsdC5yYW5nZXMubGFzdFVB UnVsZSwgYXBwbHlJbmhlcml0ZWRPbmx5KSkKKyAgICAgICAgcmV0dXJuIGFwcGx5TWF0Y2hlZFBy b3BlcnRpZXMobWF0Y2hSZXN1bHQsIGVsZW1lbnQsIERvTm90VXNlTWF0Y2hlZFByb3BlcnRpZXND YWNoZSk7CiAKICAgICBzdGF0ZS5zZXRMaW5lSGVpZ2h0VmFsdWUobnVsbHB0cik7CiAKQEAgLTQy MzcsNyArNDIzOSw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6Q2FzY2FkZWRQcm9wZXJ0aWVzOjpz ZXREZWZlcnJlZChDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYKICAgICBtX2RlZmVycmVkUHJv cGVydGllcy5hcHBlbmQocHJvcGVydHkpOwogfQogCi12b2lkIFN0eWxlUmVzb2x2ZXI6OkNhc2Nh ZGVkUHJvcGVydGllczo6YWRkU3R5bGVQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVydGllcyYg cHJvcGVydGllcywgU3R5bGVSdWxlJiwgYm9vbCBpc0ltcG9ydGFudCwgYm9vbCBpbmhlcml0ZWRP bmx5LCBQcm9wZXJ0eVdoaXRlbGlzdFR5cGUgcHJvcGVydHlXaGl0ZWxpc3RUeXBlLCB1bnNpZ25l ZCBsaW5rTWF0Y2hUeXBlKQorYm9vbCBTdHlsZVJlc29sdmVyOjpDYXNjYWRlZFByb3BlcnRpZXM6 OmFkZFN0eWxlUHJvcGVydGllcyhjb25zdCBTdHlsZVByb3BlcnRpZXMmIHByb3BlcnRpZXMsIFN0 eWxlUnVsZSYsIGJvb2wgaXNJbXBvcnRhbnQsIGJvb2wgaW5oZXJpdGVkT25seSwgUHJvcGVydHlX aGl0ZWxpc3RUeXBlIHByb3BlcnR5V2hpdGVsaXN0VHlwZSwgdW5zaWduZWQgbGlua01hdGNoVHlw ZSkKIHsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwLCBjb3VudCA9IHByb3BlcnRpZXMucHJvcGVy dHlDb3VudCgpOyBpIDwgY291bnQ7ICsraSkgewogICAgICAgICBhdXRvIGN1cnJlbnQgPSBwcm9w ZXJ0aWVzLnByb3BlcnR5QXQoaSk7CkBAIC00MjQ3LDcgKzQyNDksOCBAQCB2b2lkIFN0eWxlUmVz b2x2ZXI6OkNhc2NhZGVkUHJvcGVydGllczo6YWRkU3R5bGVQcm9wZXJ0aWVzKGNvbnN0IFN0eWxl UHJvcGVydGllcwogICAgICAgICAgICAgLy8gSWYgdGhlIHByb3BlcnR5IHZhbHVlIGlzIGV4cGxp Y2l0bHkgaW5oZXJpdGVkLCB3ZSBuZWVkIHRvIGFwcGx5IGZ1cnRoZXIgbm9uLWluaGVyaXRlZCBw cm9wZXJ0aWVzCiAgICAgICAgICAgICAvLyBhcyB0aGV5IG1pZ2h0IG92ZXJyaWRlIHRoZSB2YWx1 ZSBpbmhlcml0ZWQgaGVyZS4gRm9yIHRoaXMgcmVhc29uIHdlIGRvbid0IGFsbG93IGRlY2xhcmF0 aW9ucyB3aXRoCiAgICAgICAgICAgICAvLyBleHBsaWNpdGx5IGluaGVyaXRlZCBwcm9wZXJ0aWVz IHRvIGJlIGNhY2hlZC4KLSAgICAgICAgICAgIEFTU0VSVCghY3VycmVudC52YWx1ZSgpLT5pc0lu aGVyaXRlZFZhbHVlKCkpOworICAgICAgICAgICAgaWYgKGN1cnJlbnQudmFsdWUoKS0+aXNJbmhl cml0ZWRWYWx1ZSgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCA9 IGN1cnJlbnQuaWQoKTsKQEAgLTQyNjQsMTcgKzQyNjcsMjAgQEAgdm9pZCBTdHlsZVJlc29sdmVy OjpDYXNjYWRlZFByb3BlcnRpZXM6OmFkZFN0eWxlUHJvcGVydGllcyhjb25zdCBTdHlsZVByb3Bl cnRpZXMKICAgICAgICAgZWxzZQogICAgICAgICAgICAgc2V0KHByb3BlcnR5SUQsICpjdXJyZW50 LnZhbHVlKCksIGxpbmtNYXRjaFR5cGUpOwogICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAot dm9pZCBTdHlsZVJlc29sdmVyOjpDYXNjYWRlZFByb3BlcnRpZXM6OmFkZE1hdGNoZXMoY29uc3Qg TWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0LCBib29sIGltcG9ydGFudCwgaW50IHN0YXJ0SW5kZXgs IGludCBlbmRJbmRleCwgYm9vbCBpbmhlcml0ZWRPbmx5KQorYm9vbCBTdHlsZVJlc29sdmVyOjpD YXNjYWRlZFByb3BlcnRpZXM6OmFkZE1hdGNoZXMoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVz dWx0LCBib29sIGltcG9ydGFudCwgaW50IHN0YXJ0SW5kZXgsIGludCBlbmRJbmRleCwgYm9vbCBp bmhlcml0ZWRPbmx5KQogewogICAgIGlmIChzdGFydEluZGV4ID09IC0xKQotICAgICAgICByZXR1 cm47CisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgZm9yIChpbnQgaSA9IHN0YXJ0SW5kZXg7 IGkgPD0gZW5kSW5kZXg7ICsraSkgewogICAgICAgICBjb25zdCBNYXRjaGVkUHJvcGVydGllcyYg bWF0Y2hlZFByb3BlcnRpZXMgPSBtYXRjaFJlc3VsdC5tYXRjaGVkUHJvcGVydGllc1tpXTsKLSAg ICAgICAgYWRkU3R5bGVQcm9wZXJ0aWVzKCptYXRjaGVkUHJvcGVydGllcy5wcm9wZXJ0aWVzLCAq bWF0Y2hSZXN1bHQubWF0Y2hlZFJ1bGVzW2ldLCBpbXBvcnRhbnQsIGluaGVyaXRlZE9ubHksIHN0 YXRpY19jYXN0PFByb3BlcnR5V2hpdGVsaXN0VHlwZT4obWF0Y2hlZFByb3BlcnRpZXMud2hpdGVs aXN0VHlwZSksIG1hdGNoZWRQcm9wZXJ0aWVzLmxpbmtNYXRjaFR5cGUpOworICAgICAgICBpZiAo IWFkZFN0eWxlUHJvcGVydGllcygqbWF0Y2hlZFByb3BlcnRpZXMucHJvcGVydGllcywgKm1hdGNo UmVzdWx0Lm1hdGNoZWRSdWxlc1tpXSwgaW1wb3J0YW50LCBpbmhlcml0ZWRPbmx5LCBzdGF0aWNf Y2FzdDxQcm9wZXJ0eVdoaXRlbGlzdFR5cGU+KG1hdGNoZWRQcm9wZXJ0aWVzLndoaXRlbGlzdFR5 cGUpLCBtYXRjaGVkUHJvcGVydGllcy5saW5rTWF0Y2hUeXBlKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgU3R5bGVSZXNvbHZl cjo6Q2FzY2FkZWRQcm9wZXJ0aWVzOjphcHBseURlZmVycmVkUHJvcGVydGllcyhTdHlsZVJlc29s dmVyJiByZXNvbHZlcikK