161941 2016-09-13 19:14:41 -0700 Rename parseColorParameters and clean up conditional 2016-09-14 13:15:09 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino dbates hyatt webkit-bug-importer oldest_to_newest 1229415 0 dino 2016-09-13 19:14:41 -0700 Rename parseColorParameters and clean up conditional 1229417 1 webkit-bug-importer 2016-09-13 19:17:59 -0700 <rdar://problem/28292750> 1229418 2 288761 dino 2016-09-13 19:21:40 -0700 Created attachment 288761 Patch 1229687 3 dino 2016-09-14 13:15:09 -0700 Committed r205924: <http://trac.webkit.org/changeset/205924> 288761 2016-09-13 19:21:40 -0700 2016-09-14 10:20:22 -0700 Patch bug-161941-20160914121902.patch text/plain 5979 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTE4YmE3ZWVlYjgzMmFm ZWI5OWY4NjU1OTA2ZmJjN2EyNmY1ZDIzYi4uNWUyZDFhOTg4ZTNlYTAyZGM1Y2I3ZjY5OTI0YWZm NzcxMmZlNWEzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA5LTEzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgcGFyc2VDb2xvclBh cmFtZXRlcnMgYW5kIGNsZWFuIHVwIGNvbmRpdGlvbmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjE5NDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI4MjkyNzUwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgY29sb3IoKSBzdXBwb3J0LCByZW5hbWUgdGhl IGV4aXN0aW5nCisgICAgICAgIHBhcnNlQ29sb3JQYXJhbWV0ZXJzIHRvIHBhcnNlUkdCUGFyYW1l dGVycy4KKworICAgICAgICBBbHNvIGNsZWFuIHVwIHRoZSBsb2dpYyBpbiB0aGUgcGFyc2VDb2xv ckZyb21WYWx1ZSBmdW5jdGlvbi4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VSR0JQYXJhbWV0ZXJzKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VDb2xvckZyb21WYWx1ZSk6CisgICAgICAg IChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQ29sb3JQYXJhbWV0ZXJzKTogRGVsZXRlZC4KKyAg ICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlci5oOgorCiAyMDE2LTA5LTEyICBEZWFuIEphY2tz b24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIFJHQkEzMiB3aXRoIENvbG9y IGluIG1lbWJlciB2YXJpYWJsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmNw cAppbmRleCBlYzM0NDk2OTJhNzI1NzgzMDM5YTVhNDY1Y2M3OTNmN2RhMTRhOTA1Li40ZDc4NzA1 MWZlM2NiOTg0YWIzNGMxZjc2NDRhZTJkN2EwNzJjNmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXIuY3BwCkBAIC03NjUzLDcgKzc2NTMsNyBAQCBpbmxpbmUgaW50IENTU1Bh cnNlcjo6Y29sb3JJbnRGcm9tVmFsdWUoVmFsdWVXaXRoQ2FsY3VsYXRpb24mIHZhbHVlV2l0aENh bGN1bGF0aQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxpbnQ+KGRvdWJsZVZhbHVlKTsKIH0KIAot Ym9vbCBDU1NQYXJzZXI6OnBhcnNlQ29sb3JQYXJhbWV0ZXJzKENTU1BhcnNlclZhbHVlJiB2YWx1 ZSwgaW50KiBjb2xvckFycmF5LCBib29sIHBhcnNlQWxwaGEpCitib29sIENTU1BhcnNlcjo6cGFy c2VSR0JQYXJhbWV0ZXJzKENTU1BhcnNlclZhbHVlJiB2YWx1ZSwgaW50KiBjb2xvckFycmF5LCBi b29sIHBhcnNlQWxwaGEpCiB7CiAgICAgQ1NTUGFyc2VyVmFsdWVMaXN0KiBhcmdzID0gdmFsdWUu ZnVuY3Rpb24tPmFyZ3MuZ2V0KCk7CiAgICAgVmFsdWVXaXRoQ2FsY3VsYXRpb24gZmlyc3RBcmd1 bWVudFdpdGhDYWxjdWxhdGlvbigqYXJncy0+Y3VycmVudCgpKTsKQEAgLTc3NTIsMzcgKzc3NTIs MzUgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQ29sb3JGcm9tVmFsdWUoQ1NTUGFyc2VyVmFsdWUm IHZhbHVlLCBSR0JBMzImIGMpCiAgICAgICAgICYmIHZhbHVlLmZ1bmN0aW9uLT5hcmdzLT5zaXpl KCkgPT0gNSAvKiByZ2IgKyB0d28gY29tbWFzICovCiAgICAgICAgICYmIGVxdWFsTGV0dGVyc0ln bm9yaW5nQVNDSUlDYXNlKHZhbHVlLmZ1bmN0aW9uLT5uYW1lLCAicmdiKCIpKSB7CiAgICAgICAg IGludCBjb2xvclZhbHVlc1szXTsKLSAgICAgICAgaWYgKCFwYXJzZUNvbG9yUGFyYW1ldGVycyh2 YWx1ZSwgY29sb3JWYWx1ZXMsIGZhbHNlKSkKKyAgICAgICAgaWYgKCFwYXJzZVJHQlBhcmFtZXRl cnModmFsdWUsIGNvbG9yVmFsdWVzLCBmYWxzZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIGMgPSBtYWtlUkdCKGNvbG9yVmFsdWVzWzBdLCBjb2xvclZhbHVlc1sxXSwgY29s b3JWYWx1ZXNbMl0pOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmICh2YWx1ZS51bml0ID09IENT U1BhcnNlclZhbHVlOjpGdW5jdGlvbgotICAgICAgICAgICAgJiYgdmFsdWUuZnVuY3Rpb24tPmFy Z3MKLSAgICAgICAgICAgICYmIHZhbHVlLmZ1bmN0aW9uLT5hcmdzLT5zaXplKCkgPT0gNyAvKiBy Z2JhICsgdGhyZWUgY29tbWFzICovCi0gICAgICAgICAgICAmJiBlcXVhbExldHRlcnNJZ25vcmlu Z0FTQ0lJQ2FzZSh2YWx1ZS5mdW5jdGlvbi0+bmFtZSwgInJnYmEoIikpIHsKLSAgICAgICAgICAg IGludCBjb2xvclZhbHVlc1s0XTsKLSAgICAgICAgICAgIGlmICghcGFyc2VDb2xvclBhcmFtZXRl cnModmFsdWUsIGNvbG9yVmFsdWVzLCB0cnVlKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgICAgICAgICBjID0gbWFrZVJHQkEoY29sb3JWYWx1ZXNbMF0sIGNvbG9yVmFsdWVz WzFdLCBjb2xvclZhbHVlc1syXSwgY29sb3JWYWx1ZXNbM10pOwotICAgICAgICB9IGVsc2UgaWYg KHZhbHVlLnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9uCi0gICAgICAgICAgICAmJiB2 YWx1ZS5mdW5jdGlvbi0+YXJncwotICAgICAgICAgICAgJiYgdmFsdWUuZnVuY3Rpb24tPmFyZ3Mt PnNpemUoKSA9PSA1IC8qIGhzbCArIHR3byBjb21tYXMgKi8KLSAgICAgICAgICAgICYmIGVxdWFs TGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKHZhbHVlLmZ1bmN0aW9uLT5uYW1lLCAiaHNsKCIpKSB7 Ci0gICAgICAgICAgICBkb3VibGUgY29sb3JWYWx1ZXNbM107Ci0gICAgICAgICAgICBpZiAoIXBh cnNlSFNMUGFyYW1ldGVycyh2YWx1ZSwgY29sb3JWYWx1ZXMsIGZhbHNlKSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBjID0gbWFrZVJHQkFGcm9tSFNMQShjb2xv clZhbHVlc1swXSwgY29sb3JWYWx1ZXNbMV0sIGNvbG9yVmFsdWVzWzJdLCAxLjApOwotICAgICAg ICB9IGVsc2UgaWYgKHZhbHVlLnVuaXQgPT0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9uCi0gICAg ICAgICAgICAmJiB2YWx1ZS5mdW5jdGlvbi0+YXJncwotICAgICAgICAgICAgJiYgdmFsdWUuZnVu Y3Rpb24tPmFyZ3MtPnNpemUoKSA9PSA3IC8qIGhzbGEgKyB0aHJlZSBjb21tYXMgKi8KLSAgICAg ICAgICAgICYmIGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKHZhbHVlLmZ1bmN0aW9uLT5u YW1lLCAiaHNsYSgiKSkgewotICAgICAgICAgICAgZG91YmxlIGNvbG9yVmFsdWVzWzRdOwotICAg ICAgICAgICAgaWYgKCFwYXJzZUhTTFBhcmFtZXRlcnModmFsdWUsIGNvbG9yVmFsdWVzLCB0cnVl KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBjID0gbWFrZVJH QkFGcm9tSFNMQShjb2xvclZhbHVlc1swXSwgY29sb3JWYWx1ZXNbMV0sIGNvbG9yVmFsdWVzWzJd LCBjb2xvclZhbHVlc1szXSk7Ci0gICAgICAgIH0gZWxzZQorICAgIH0gZWxzZSBpZiAodmFsdWUu dW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb24KKyAgICAgICAgJiYgdmFsdWUuZnVuY3Rp b24tPmFyZ3MKKyAgICAgICAgJiYgdmFsdWUuZnVuY3Rpb24tPmFyZ3MtPnNpemUoKSA9PSA3IC8q IHJnYmEgKyB0aHJlZSBjb21tYXMgKi8KKyAgICAgICAgJiYgZXF1YWxMZXR0ZXJzSWdub3JpbmdB U0NJSUNhc2UodmFsdWUuZnVuY3Rpb24tPm5hbWUsICJyZ2JhKCIpKSB7CisgICAgICAgIGludCBj b2xvclZhbHVlc1s0XTsKKyAgICAgICAgaWYgKCFwYXJzZVJHQlBhcmFtZXRlcnModmFsdWUsIGNv bG9yVmFsdWVzLCB0cnVlKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CisgICAg ICAgIGMgPSBtYWtlUkdCQShjb2xvclZhbHVlc1swXSwgY29sb3JWYWx1ZXNbMV0sIGNvbG9yVmFs dWVzWzJdLCBjb2xvclZhbHVlc1szXSk7CisgICAgfSBlbHNlIGlmICh2YWx1ZS51bml0ID09IENT U1BhcnNlclZhbHVlOjpGdW5jdGlvbgorICAgICAgICAmJiB2YWx1ZS5mdW5jdGlvbi0+YXJncwor ICAgICAgICAmJiB2YWx1ZS5mdW5jdGlvbi0+YXJncy0+c2l6ZSgpID09IDUgLyogaHNsICsgdHdv IGNvbW1hcyAqLworICAgICAgICAmJiBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZSh2YWx1 ZS5mdW5jdGlvbi0+bmFtZSwgImhzbCgiKSkgeworICAgICAgICBkb3VibGUgY29sb3JWYWx1ZXNb M107CisgICAgICAgIGlmICghcGFyc2VIU0xQYXJhbWV0ZXJzKHZhbHVlLCBjb2xvclZhbHVlcywg ZmFsc2UpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBjID0gbWFrZVJHQkFG cm9tSFNMQShjb2xvclZhbHVlc1swXSwgY29sb3JWYWx1ZXNbMV0sIGNvbG9yVmFsdWVzWzJdLCAx LjApOworICAgIH0gZWxzZSBpZiAodmFsdWUudW5pdCA9PSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rp b24KKyAgICAgICAgJiYgdmFsdWUuZnVuY3Rpb24tPmFyZ3MKKyAgICAgICAgJiYgdmFsdWUuZnVu Y3Rpb24tPmFyZ3MtPnNpemUoKSA9PSA3IC8qIGhzbGEgKyB0aHJlZSBjb21tYXMgKi8KKyAgICAg ICAgJiYgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UodmFsdWUuZnVuY3Rpb24tPm5hbWUs ICJoc2xhKCIpKSB7CisgICAgICAgIGRvdWJsZSBjb2xvclZhbHVlc1s0XTsKKyAgICAgICAgaWYg KCFwYXJzZUhTTFBhcmFtZXRlcnModmFsdWUsIGNvbG9yVmFsdWVzLCB0cnVlKSkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgYyA9IG1ha2VSR0JBRnJvbUhTTEEoY29sb3JWYWx1 ZXNbMF0sIGNvbG9yVmFsdWVzWzFdLCBjb2xvclZhbHVlc1syXSwgY29sb3JWYWx1ZXNbM10pOwor ICAgIH0gZWxzZQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlci5oCmluZGV4IDBlYzk2MjliNTkxYTdmMzUw Y2QzOWM0NzkyOTc0OTE1OGRlMTNhMmEuLjIxOTlhMGI4ODliM2Y1ZjFhYzY2MWZiMGJlNTk1MjJl MTY0OWU5MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2Vy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXIuaApAQCAtMjc2LDcg KzI3Niw3IEBAIHB1YmxpYzoKICAgICBib29sIHBhcnNlQ291bnRlcihDU1NQcm9wZXJ0eUlELCBp bnQgZGVmYXVsdFZhbHVlLCBib29sIGltcG9ydGFudCk7CiAgICAgUmVmUHRyPENTU1ByaW1pdGl2 ZVZhbHVlPiBwYXJzZUNvdW50ZXJDb250ZW50KENTU1BhcnNlclZhbHVlTGlzdCYgYXJncywgYm9v bCBjb3VudGVycyk7CiAKLSAgICBib29sIHBhcnNlQ29sb3JQYXJhbWV0ZXJzKENTU1BhcnNlclZh bHVlJiwgaW50KiBjb2xvclZhbHVlcywgYm9vbCBwYXJzZUFscGhhKTsKKyAgICBib29sIHBhcnNl UkdCUGFyYW1ldGVycyhDU1NQYXJzZXJWYWx1ZSYsIGludCogY29sb3JWYWx1ZXMsIGJvb2wgcGFy c2VBbHBoYSk7CiAgICAgYm9vbCBwYXJzZUhTTFBhcmFtZXRlcnMoQ1NTUGFyc2VyVmFsdWUmLCBk b3VibGUqIGNvbG9yVmFsdWVzLCBib29sIHBhcnNlQWxwaGEpOwogICAgIFJlZlB0cjxDU1NQcmlt aXRpdmVWYWx1ZT4gcGFyc2VDb2xvcihDU1NQYXJzZXJWYWx1ZSogPSBudWxscHRyKTsKICAgICBi b29sIHBhcnNlQ29sb3JGcm9tVmFsdWUoQ1NTUGFyc2VyVmFsdWUmLCBSR0JBMzImKTsK