95800 2012-09-04 17:28:20 -0700 Remove WTF_DEPRECATED_STRING_OPERATORS from StylePropertySet.cpp 2012-09-04 22:33:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth benjamin cmarcelo eric macpherson menard webkit.review.bot oldest_to_newest 711592 0 abarth 2012-09-04 17:28:20 -0700 Remove WTF_DEPRECATED_STRING_OPERATORS from StylePropertySet.cpp 711594 1 162138 abarth 2012-09-04 17:29:15 -0700 Created attachment 162138 Patch 711628 2 162138 benjamin 2012-09-04 18:17:14 -0700 Comment on attachment 162138 Patch The patch looks good. I remember we had issues before with StylePropertySet::getLayeredShorthandValue(). Would it be possible some code is actually expecting an empty value? 711723 3 162138 abarth 2012-09-04 22:28:13 -0700 Comment on attachment 162138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162138&action=review > Source/WebCore/css/StylePropertySet.cpp:428 > + if (result.isEmpty()) > + return String(); As far I as can tell, the problem was fixed by adding these two lines. 711725 4 benjamin 2012-09-04 22:30:04 -0700 I'll land manually if you don't mind, that will make my life easier on the Mac port. 711727 5 162138 benjamin 2012-09-04 22:33:25 -0700 Comment on attachment 162138 Patch Clearing flags on attachment: 162138 Committed r127555: <http://trac.webkit.org/changeset/127555> 711728 6 benjamin 2012-09-04 22:33:28 -0700 All reviewed patches have been landed. Closing bug. 162138 2012-09-04 17:29:15 -0700 2012-09-04 22:33:25 -0700 Patch bug-95800-20120904172858.patch text/plain 5179 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRlYmQxMmYxMjc1YTBh NTZjOTA1NzFlY2NiYjU0N2U0ZTY5YTdlNS4uZDU1NmNkYjUzNmE0Njk5N2RmY2FmMDlkYTMyYTZj ZDE4ZDIwNTc1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA5LTA0ICBBZGFt IEJhcnRoICA8YWJhcnRoQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZW1vdmUgV1RGX0RFUFJF Q0FURURfU1RSSU5HX09QRVJBVE9SUyBmcm9tIFN0eWxlUHJvcGVydHlTZXQuY3BwCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTgwMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYSBy ZS1zcGluIG9mIHBhcnQgb2YgdGhlIHBhdGNoIGZyb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTAyLCBidXQgd2l0aCB0aGUgdGVzdHMKKyAgICAg ICAgZml4ZWQuICA6KQorCisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVQcm9wZXJ0eVNldDo6Z2V0NFZhbHVlcyk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZVByb3BlcnR5U2V0OjpnZXRMYXllcmVkU2hvcnRoYW5kVmFsdWUpOgorCisy MDEyLTA5LTA0ICBBZGFtIEJhcnRoICA8YWJhcnRoQGNocm9taXVtLm9yZz4KKwogICAgICAgICBN YWtlIGNocm9taXVtLWxpbnV4IGJ1aWxkIHdpdGhvdXQgV1RGX0RFUFJFQ0FURURfU1RSSU5HX09Q RVJBVE9SUwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTU3OTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwCmluZGV4IGIwNjNh ZGFmZjM3YzdhOWExZGRjY2IxNzA0ODdkZDM1ZTM3MWM0MzQuLmI5NDk1MGRkODRkOGIxN2Q5YjAz YjZlMzJjZmNhOWM1YzFlZWNjMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVByb3BlcnR5U2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNl dC5jcHAKQEAgLTMwMCwyMCArMzAwLDI2IEBAIFN0cmluZyBTdHlsZVByb3BlcnR5U2V0OjpnZXQ0 VmFsdWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmIHNob3J0aGFuZCkgY29uCiAgICAg Ym9vbCBzaG93Qm90dG9tID0gKHRvcC0+dmFsdWUoKS0+Y3NzVGV4dCgpICE9IGJvdHRvbS0+dmFs dWUoKS0+Y3NzVGV4dCgpKSB8fCBzaG93TGVmdDsKICAgICBib29sIHNob3dSaWdodCA9ICh0b3At PnZhbHVlKCktPmNzc1RleHQoKSAhPSByaWdodC0+dmFsdWUoKS0+Y3NzVGV4dCgpKSB8fCBzaG93 Qm90dG9tOwogCi0gICAgU3RyaW5nIHJlcyA9IHRvcC0+dmFsdWUoKS0+Y3NzVGV4dCgpOwotICAg IGlmIChzaG93UmlnaHQpCi0gICAgICAgIHJlcyArPSAiICIgKyByaWdodC0+dmFsdWUoKS0+Y3Nz VGV4dCgpOwotICAgIGlmIChzaG93Qm90dG9tKQotICAgICAgICByZXMgKz0gIiAiICsgYm90dG9t LT52YWx1ZSgpLT5jc3NUZXh0KCk7Ci0gICAgaWYgKHNob3dMZWZ0KQotICAgICAgICByZXMgKz0g IiAiICsgbGVmdC0+dmFsdWUoKS0+Y3NzVGV4dCgpOwotCi0gICAgcmV0dXJuIHJlczsKKyAgICBT dHJpbmdCdWlsZGVyIHJlc3VsdDsKKyAgICByZXN1bHQuYXBwZW5kKHRvcC0+dmFsdWUoKS0+Y3Nz VGV4dCgpKTsKKyAgICBpZiAoc2hvd1JpZ2h0KSB7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAn KTsKKyAgICAgICAgcmVzdWx0LmFwcGVuZChyaWdodC0+dmFsdWUoKS0+Y3NzVGV4dCgpKTsKKyAg ICB9CisgICAgaWYgKHNob3dCb3R0b20pIHsKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgnICcpOwor ICAgICAgICByZXN1bHQuYXBwZW5kKGJvdHRvbS0+dmFsdWUoKS0+Y3NzVGV4dCgpKTsKKyAgICB9 CisgICAgaWYgKHNob3dMZWZ0KSB7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAnKTsKKyAgICAg ICAgcmVzdWx0LmFwcGVuZChsZWZ0LT52YWx1ZSgpLT5jc3NUZXh0KCkpOworICAgIH0KKyAgICBy ZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CiB9CiAKIFN0cmluZyBTdHlsZVByb3BlcnR5U2V0Ojpn ZXRMYXllcmVkU2hvcnRoYW5kVmFsdWUoY29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCYgc2hv cnRoYW5kKSBjb25zdAogewotICAgIFN0cmluZyByZXM7CisgICAgU3RyaW5nQnVpbGRlciByZXN1 bHQ7CiAKICAgICBjb25zdCB1bnNpZ25lZCBzaXplID0gc2hvcnRoYW5kLmxlbmd0aCgpOwogICAg IC8vIEJlZ2luIGJ5IGNvbGxlY3RpbmcgdGhlIHByb3BlcnRpZXMgaW50byBhbiBhcnJheS4KQEAg LTMzNCw3ICszNDAsNyBAQCBTdHJpbmcgU3R5bGVQcm9wZXJ0eVNldDo6Z2V0TGF5ZXJlZFNob3J0 aGFuZFZhbHVlKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmCiAgICAgLy8gTm93IHN0aXRj aCB0aGUgcHJvcGVydGllcyB0b2dldGhlci4gIEltcGxpY2l0IGluaXRpYWwgdmFsdWVzIGFyZSBm bGFnZ2VkIGFzIHN1Y2ggYW5kCiAgICAgLy8gY2FuIHNhZmVseSBiZSBvbWl0dGVkLgogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtTGF5ZXJzOyBpKyspIHsKLSAgICAgICAgU3RyaW5nIGxh eWVyUmVzOworICAgICAgICBTdHJpbmdCdWlsZGVyIGxheWVyUmVzdWx0OwogICAgICAgICBib29s IHVzZVJlcGVhdFhTaG9ydGhhbmQgPSBmYWxzZTsKICAgICAgICAgYm9vbCB1c2VSZXBlYXRZU2hv cnRoYW5kID0gZmFsc2U7CiAgICAgICAgIGJvb2wgdXNlU2luZ2xlV29yZFNob3J0aGFuZCA9IGZh bHNlOwpAQCAtMzg4LDM3ICszOTQsMzkgQEAgU3RyaW5nIFN0eWxlUHJvcGVydHlTZXQ6OmdldExh eWVyZWRTaG9ydGhhbmRWYWx1ZShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJgogICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICBpZiAodmFsdWUgJiYgIXZhbHVlLT5pc0ltcGxpY2l0SW5p dGlhbFZhbHVlKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWxheWVyUmVzLmlzTnVsbCgpKQot ICAgICAgICAgICAgICAgICAgICBsYXllclJlcyArPSAiICI7CisgICAgICAgICAgICAgICAgaWYg KCFsYXllclJlc3VsdC5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgICAgIGxheWVyUmVzdWx0 LmFwcGVuZCgnICcpOwogICAgICAgICAgICAgICAgIGlmIChmb3VuZEJhY2tncm91bmRQb3NpdGlv bllDU1NQcm9wZXJ0eSAmJiBzaG9ydGhhbmQucHJvcGVydGllcygpW2pdID09IENTU1Byb3BlcnR5 QmFja2dyb3VuZFNpemUpIAotICAgICAgICAgICAgICAgICAgICBsYXllclJlcyArPSAiLyAiOwor ICAgICAgICAgICAgICAgICAgICBsYXllclJlc3VsdC5hcHBlbmRMaXRlcmFsKCIvICIpOwogICAg ICAgICAgICAgICAgIGlmICghZm91bmRCYWNrZ3JvdW5kUG9zaXRpb25ZQ1NTUHJvcGVydHkgJiYg c2hvcnRoYW5kLnByb3BlcnRpZXMoKVtqXSA9PSBDU1NQcm9wZXJ0eUJhY2tncm91bmRTaXplKSAK ICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgICAgICBpZiAodXNl UmVwZWF0WFNob3J0aGFuZCkgewogICAgICAgICAgICAgICAgICAgICB1c2VSZXBlYXRYU2hvcnRo YW5kID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgICAgIGxheWVyUmVzICs9IGdldFZhbHVlTmFt ZShDU1NWYWx1ZVJlcGVhdFgpOworICAgICAgICAgICAgICAgICAgICBsYXllclJlc3VsdC5hcHBl bmQoZ2V0VmFsdWVOYW1lKENTU1ZhbHVlUmVwZWF0WCkpOwogICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAodXNlUmVwZWF0WVNob3J0aGFuZCkgewogICAgICAgICAgICAgICAgICAgICB1c2VSZXBl YXRZU2hvcnRoYW5kID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgICAgIGxheWVyUmVzICs9IGdl dFZhbHVlTmFtZShDU1NWYWx1ZVJlcGVhdFkpOworICAgICAgICAgICAgICAgICAgICBsYXllclJl c3VsdC5hcHBlbmQoZ2V0VmFsdWVOYW1lKENTU1ZhbHVlUmVwZWF0WSkpOwogICAgICAgICAgICAg ICAgIH0gZWxzZSBpZiAodXNlU2luZ2xlV29yZFNob3J0aGFuZCkgewogICAgICAgICAgICAgICAg ICAgICB1c2VTaW5nbGVXb3JkU2hvcnRoYW5kID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgICAg IGxheWVyUmVzICs9IHZhbHVlLT5jc3NUZXh0KCk7CisgICAgICAgICAgICAgICAgICAgIGxheWVy UmVzdWx0LmFwcGVuZCh2YWx1ZS0+Y3NzVGV4dCgpKTsKICAgICAgICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICAgICAgbGF5ZXJSZXMgKz0gdmFsdWUtPmNzc1RleHQoKTsKKyAgICAg ICAgICAgICAgICAgICAgbGF5ZXJSZXN1bHQuYXBwZW5kKHZhbHVlLT5jc3NUZXh0KCkpOwogCiAg ICAgICAgICAgICAgICAgaWYgKHNob3J0aGFuZC5wcm9wZXJ0aWVzKClbal0gPT0gQ1NTUHJvcGVy dHlCYWNrZ3JvdW5kUG9zaXRpb25ZKQogICAgICAgICAgICAgICAgICAgICBmb3VuZEJhY2tncm91 bmRQb3NpdGlvbllDU1NQcm9wZXJ0eSA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K IAotICAgICAgICBpZiAoIWxheWVyUmVzLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBpZiAoIXJl cy5pc051bGwoKSkKLSAgICAgICAgICAgICAgICByZXMgKz0gIiwgIjsKLSAgICAgICAgICAgIHJl cyArPSBsYXllclJlczsKKyAgICAgICAgaWYgKCFsYXllclJlc3VsdC5pc0VtcHR5KCkpIHsKKyAg ICAgICAgICAgIGlmICghcmVzdWx0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICByZXN1bHQu YXBwZW5kTGl0ZXJhbCgiLCAiKTsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQobGF5ZXJSZXN1 bHQpOwogICAgICAgICB9CiAgICAgfQotICAgIHJldHVybiByZXM7CisgICAgaWYgKHJlc3VsdC5p c0VtcHR5KCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gcmVzdWx0LnRv U3RyaW5nKCk7CiB9CiAKIFN0cmluZyBTdHlsZVByb3BlcnR5U2V0OjpnZXRTaG9ydGhhbmRWYWx1 ZShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJiBzaG9ydGhhbmQpIGNvbnN0Cg==