89348 2012-06-18 07:45:12 -0700 Make StylePropertySet::merge() always override on conflict 2012-06-19 02:10:31 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tmpsantos tmpsantos andersca cmarcelo enrica inferno kling koivisto macpherson menard rniwa tony webkit.review.bot oldest_to_newest 651384 0 tmpsantos 2012-06-18 07:45:12 -0700 Nowhere in the code the non overriding behavior is used, which just adds an extra check. 651400 1 148103 tmpsantos 2012-06-18 08:17:31 -0700 Created attachment 148103 Patch 652198 2 148103 rniwa 2012-06-19 01:21:15 -0700 Comment on attachment 148103 Patch Nice! 652241 3 148103 webkit.review.bot 2012-06-19 02:10:25 -0700 Comment on attachment 148103 Patch Clearing flags on attachment: 148103 Committed r120696: <http://trac.webkit.org/changeset/120696> 652242 4 webkit.review.bot 2012-06-19 02:10:31 -0700 All reviewed patches have been landed. Closing bug. 148103 2012-06-18 08:17:31 -0700 2012-06-19 02:10:25 -0700 Patch bug-89348-20120618181917.patch text/plain 5917 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI2NDM3ZDk5Zjk5NTEz MDhiZDdhYzIxZjBhMDI4MzQ1MGQwMTc4OS4uM2VjOTQ1NzIxZThhMGJmYzdhNTU0ODUyN2E1NjUy MjUyOWYzM2QxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA2LTE4ICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgorCisgICAgICAg IE1ha2UgU3R5bGVQcm9wZXJ0eVNldDo6bWVyZ2UoKSBhbHdheXMgb3ZlcnJpZGUgb24gY29uZmxp Y3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MzQ4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbWVyZ2Uo KSB3YXMgb25seSB1c2VkIHdpdGggYXJnT3ZlcnJpZGVzT25Db25mbGljdCA9IHRydWUsIHdoaWNo CisgICAgICAgIG1ha2VzIHRoZSBleHRyYSBwYXJhbWV0ZXIgdXNlbGVzcy4gSXQgd2lsbCBhbHNv IHNhdmUgYSBib29sZWFuIGNoZWNrLgorCisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVQcm9wZXJ0eVNldDo6bWVyZ2VBbmRPdmVycmlk ZU9uQ29uZmxpY3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnR5U2V0Lmg6CisgICAgICAg IChTdHlsZVByb3BlcnR5U2V0KToKKyAgICAgICAgKiBlZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5k LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0 eWxlVG9Ob2RlUmFuZ2UpOgorICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6b3ZlcnJpZGVXaXRoU3R5bGUpOgorICAgICAg ICAoV2ViQ29yZTo6c3R5bGVGcm9tTWF0Y2hlZFJ1bGVzRm9yRWxlbWVudCk6CisgICAgICAgIChX ZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1lcmdlU3R5bGVGcm9tUnVsZXMpOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdGluZ1N0eWxlOjptZXJnZVN0eWxlRnJvbVJ1bGVzRm9yU2VyaWFsaXphdGlvbik6 CisKIDIwMTItMDYtMTggIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+ CiAKICAgICAgICAgVGV4dHVyZU1hcHBlckxheWVyOiBpbnZpc2libGUgbGF5ZXJzIGRvIG5vdCBs ZXQgdGhlaXIgY2hpbGRyZW4gdG8gYmUgcGFpbnRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv cGVydHlTZXQuY3BwCmluZGV4IDQzYWMyYTU4ZDY1ZmU1M2U2MTdkOTQwZDk2MWQ4MTAxNzZlNzFm NGMuLjYwYWZkNWU3MDg2MDY3NzRhM2Y1ZjMzZDNmOTY1M2IwYjQ4NzY4ODAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAKQEAgLTg2MSwxOCArODYxLDE2IEBAIFN0cmlu ZyBTdHlsZVByb3BlcnR5U2V0Ojphc1RleHQoKSBjb25zdAogICAgIHJldHVybiByZXN1bHQudG9T dHJpbmcoKTsKIH0KIAotdm9pZCBTdHlsZVByb3BlcnR5U2V0OjptZXJnZShjb25zdCBTdHlsZVBy b3BlcnR5U2V0KiBvdGhlciwgYm9vbCBhcmdPdmVycmlkZXNPbkNvbmZsaWN0KQordm9pZCBTdHls ZVByb3BlcnR5U2V0OjptZXJnZUFuZE92ZXJyaWRlT25Db25mbGljdChjb25zdCBTdHlsZVByb3Bl cnR5U2V0KiBvdGhlcikKIHsKICAgICBBU1NFUlQoaXNNdXRhYmxlKCkpOwogICAgIHVuc2lnbmVk IHNpemUgPSBvdGhlci0+cHJvcGVydHlDb3VudCgpOwogICAgIGZvciAodW5zaWduZWQgbiA9IDA7 IG4gPCBzaXplOyArK24pIHsKICAgICAgICAgY29uc3QgQ1NTUHJvcGVydHkmIHRvTWVyZ2UgPSBv dGhlci0+cHJvcGVydHlBdChuKTsKICAgICAgICAgQ1NTUHJvcGVydHkqIG9sZCA9IGZpbmRQcm9w ZXJ0eVdpdGhJZCh0b01lcmdlLmlkKCkpOwotICAgICAgICBpZiAob2xkKSB7Ci0gICAgICAgICAg ICBpZiAoIWFyZ092ZXJyaWRlc09uQ29uZmxpY3QgJiYgb2xkLT52YWx1ZSgpKQotICAgICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAob2xkKQogICAgICAgICAgICAgc2V0UHJvcGVy dHkodG9NZXJnZSwgb2xkKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIGVsc2UKICAgICAgICAg ICAgIGFwcGVuZCh0b01lcmdlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVy dHlTZXQuaAppbmRleCBlNzk5MmVkMzU0ZTA2MjIwYWRkOWVmODY1MmQyMTg1OGVhMzcyZTU5Li43 NGNlMDc5YTQ3MzMxZjVlNDI3YjUxZmVlOWNmMGJjMzk0OTk3NTM4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVByb3BlcnR5U2V0LmgKQEAgLTgzLDcgKzgzLDcgQEAgcHVibGljOgogICAgIHZvaWQg cmVtb3ZlQmxvY2tQcm9wZXJ0aWVzKCk7CiAgICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQo Y29uc3QgQ1NTUHJvcGVydHlJRCogc2V0LCB1bnNpZ25lZCBsZW5ndGgpOwogCi0gICAgdm9pZCBt ZXJnZShjb25zdCBTdHlsZVByb3BlcnR5U2V0KiwgYm9vbCBhcmdPdmVycmlkZXNPbkNvbmZsaWN0 ID0gdHJ1ZSk7CisgICAgdm9pZCBtZXJnZUFuZE92ZXJyaWRlT25Db25mbGljdChjb25zdCBTdHls ZVByb3BlcnR5U2V0Kik7CiAKICAgICB2b2lkIHNldENTU1BhcnNlck1vZGUoQ1NTUGFyc2VyTW9k ZSk7CiAgICAgQ1NTUGFyc2VyTW9kZSBjc3NQYXJzZXJNb2RlKCkgY29uc3QgeyByZXR1cm4gc3Rh dGljX2Nhc3Q8Q1NTUGFyc2VyTW9kZT4obV9jc3NQYXJzZXJNb2RlKTsgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAppbmRleCA5NjhmNDRkODdkOTUwZDhm ODhiODI0MzNkYzM2YTdmZTU4YjI5MWNjLi42ZmY4YzQ0ZTExMTMyODFmM2VhMWJlODhlMGNiYjJl OWQwODM3YTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVD b21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5k LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5SW5s aW5lU3R5bGVUb05vZGVSYW5nZShFZGl0aW5nU3R5bGUqIHN0eWxlLCBQYXNzUmVmCiAgICAgICAg ICAgICAvLyBBZGQgdG8gdGhpcyBlbGVtZW50J3MgaW5saW5lIHN0eWxlIGFuZCBza2lwIG92ZXIg aXRzIGNvbnRlbnRzLgogICAgICAgICAgICAgSFRNTEVsZW1lbnQqIGVsZW1lbnQgPSB0b0hUTUxF bGVtZW50KG5vZGUuZ2V0KCkpOwogICAgICAgICAgICAgUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+ IGlubGluZVN0eWxlID0gZWxlbWVudC0+ZW5zdXJlSW5saW5lU3R5bGUoKS0+Y29weSgpOwotICAg ICAgICAgICAgaW5saW5lU3R5bGUtPm1lcmdlKHN0eWxlLT5zdHlsZSgpKTsKKyAgICAgICAgICAg IGlubGluZVN0eWxlLT5tZXJnZUFuZE92ZXJyaWRlT25Db25mbGljdChzdHlsZS0+c3R5bGUoKSk7 CiAgICAgICAgICAgICBzZXROb2RlQXR0cmlidXRlKGVsZW1lbnQsIHN0eWxlQXR0ciwgaW5saW5l U3R5bGUtPmFzVGV4dCgpKTsKICAgICAgICAgICAgIG5leHQgPSBub2RlLT50cmF2ZXJzZU5leHRT aWJsaW5nKCk7CiAgICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dGluZ1N0eWxlLmNwcAppbmRleCA2M2ZhODNlMDUyMTQ3YjI0OTU4YzkwYTdkNDE3ODMxNTRiOWEx OTVlLi4wZWEwYTI1NGZhMDgxMmE3NDg0NWUyZjJhZmI2OTEyNzc1M2M1ZGNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCkBAIC01MjksNyArNTI5LDcgQEAgdm9pZCBF ZGl0aW5nU3R5bGU6Om92ZXJyaWRlV2l0aFN0eWxlKGNvbnN0IFN0eWxlUHJvcGVydHlTZXQqIHN0 eWxlKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX211dGFibGVTdHlsZSkKICAgICAgICAg bV9tdXRhYmxlU3R5bGUgPSBTdHlsZVByb3BlcnR5U2V0OjpjcmVhdGUoKTsKLSAgICBtX211dGFi bGVTdHlsZS0+bWVyZ2Uoc3R5bGUpOworICAgIG1fbXV0YWJsZVN0eWxlLT5tZXJnZUFuZE92ZXJy aWRlT25Db25mbGljdChzdHlsZSk7CiAgICAgZXh0cmFjdEZvbnRTaXplRGVsdGEoKTsKIH0KIApA QCAtMTA2Niw3ICsxMDY2LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4g c3R5bGVGcm9tTWF0Y2hlZFJ1bGVzRm9yRWxlbWVudChFbGVtZW50KiBlbGUKICAgICBpZiAobWF0 Y2hlZFJ1bGVzKSB7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtYXRjaGVkUnVs ZXMtPmxlbmd0aCgpOyBpKyspIHsKICAgICAgICAgICAgIGlmIChtYXRjaGVkUnVsZXMtPml0ZW0o aSktPnR5cGUoKSA9PSBDU1NSdWxlOjpTVFlMRV9SVUxFKQotICAgICAgICAgICAgICAgIHN0eWxl LT5tZXJnZShzdGF0aWNfY2FzdDxDU1NTdHlsZVJ1bGUqPihtYXRjaGVkUnVsZXMtPml0ZW0oaSkp LT5zdHlsZVJ1bGUoKS0+cHJvcGVydGllcygpLCB0cnVlKTsKKyAgICAgICAgICAgICAgICBzdHls ZS0+bWVyZ2VBbmRPdmVycmlkZU9uQ29uZmxpY3Qoc3RhdGljX2Nhc3Q8Q1NTU3R5bGVSdWxlKj4o bWF0Y2hlZFJ1bGVzLT5pdGVtKGkpKS0+c3R5bGVSdWxlKCktPnByb3BlcnRpZXMoKSk7CiAgICAg ICAgIH0KICAgICB9CiAgICAgCkBAIC0xMDgwLDcgKzEwODAsNyBAQCB2b2lkIEVkaXRpbmdTdHls ZTo6bWVyZ2VTdHlsZUZyb21SdWxlcyhTdHlsZWRFbGVtZW50KiBlbGVtZW50KQogICAgIC8vIFN0 eWxlcyBmcm9tIHRoZSBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24sIGhlbGQgaW4gdGhlIHZhcmlh YmxlICJzdHlsZSIsIHRha2UgcHJlY2VkZW5jZSAKICAgICAvLyBvdmVyIHRob3NlIGZyb20gbWF0 Y2hlZCBydWxlcy4KICAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIHN0eWxlRnJvbU1h dGNoZWRSdWxlcy0+bWVyZ2UobV9tdXRhYmxlU3R5bGUuZ2V0KCkpOworICAgICAgICBzdHlsZUZy b21NYXRjaGVkUnVsZXMtPm1lcmdlQW5kT3ZlcnJpZGVPbkNvbmZsaWN0KG1fbXV0YWJsZVN0eWxl LmdldCgpKTsKIAogICAgIGNsZWFyKCk7CiAgICAgbV9tdXRhYmxlU3R5bGUgPSBzdHlsZUZyb21N YXRjaGVkUnVsZXM7CkBAIC0xMTA4LDcgKzExMDgsNyBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6bWVy Z2VTdHlsZUZyb21SdWxlc0ZvclNlcmlhbGl6YXRpb24oU3R5bGVkRWxlbWVudCogZWxlbWVudCkK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KLSAgICBtX211dGFibGVTdHlsZS0+bWVy Z2UoZnJvbUNvbXB1dGVkU3R5bGUuZ2V0KCkpOworICAgIG1fbXV0YWJsZVN0eWxlLT5tZXJnZUFu ZE92ZXJyaWRlT25Db25mbGljdChmcm9tQ29tcHV0ZWRTdHlsZS5nZXQoKSk7CiB9CiAKIHN0YXRp YyB2b2lkIHJlbW92ZVByb3BlcnRpZXNJblN0eWxlKFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlVG9S ZW1vdmVQcm9wZXJ0aWVzRnJvbSwgU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUpCg==