163662 2016-10-19 08:54:20 -0700 [CSS Parser] Fix named color parsing 2016-10-19 10:34:20 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue oldest_to_newest 1241921 0 hyatt 2016-10-19 08:54:20 -0700 Named color parsing in the old parser for extended colors relied on constructing a Color with the name and doing a lookup that way. This was bad in that serialization on the back end loses the extended color name. The new parser allows the back end to hold a primitive identifier value for extended colors (making serialization correct). StyleColor contains a helper function for looking up the correct color. This patch switches both the old and the new parsers over to the new StyleColor function. 1241922 1 292067 hyatt 2016-10-19 08:57:19 -0700 Created attachment 292067 Patch 1241923 2 commit-queue 2016-10-19 08:59:49 -0700 Attachment 292067 did not pass style-queue: ERROR: Source/WebCore/css/StyleResolver.cpp:123: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1241947 3 hyatt 2016-10-19 09:41:34 -0700 Landed in r207539. 1241974 4 292067 darin 2016-10-19 10:34:20 -0700 Comment on attachment 292067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=292067&action=review > Source/WebCore/css/StyleResolver.cpp:1817 > + default: { > + return StyleColor::colorFromKeyword(ident); > + } No need for these braces. 292067 2016-10-19 08:57:19 -0700 2016-10-19 08:59:33 -0700 Patch patch.txt text/plain 5157 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzUzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEwLTE5ICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBGaXggbmFtZWQg Y29sb3IgcGFyc2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTYzNjYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTmFtZWQgY29sb3IgcGFyc2luZyBpbiB0aGUgb2xkIHBhcnNlciBmb3IgZXh0ZW5kZWQg Y29sb3JzIHJlbGllZCBvbiBjb25zdHJ1Y3RpbmcgYSBDb2xvciB3aXRoIHRoZQorICAgICAgICBu YW1lIGFuZCBkb2luZyBhIGxvb2t1cCB0aGF0IHdheS4gVGhpcyB3YXMgYmFkIGluIHRoYXQgc2Vy aWFsaXphdGlvbiBvbiB0aGUgYmFjayBlbmQgbG9zZXMgdGhlCisgICAgICAgIGV4dGVuZGVkIGNv bG9yIG5hbWUuCisKKyAgICAgICAgVGhlIG5ldyBwYXJzZXIgYWxsb3dzIHRoZSBiYWNrIGVuZCB0 byBob2xkIGEgcHJpbWl0aXZlIGlkZW50aWZpZXIgdmFsdWUgZm9yIGV4dGVuZGVkIGNvbG9ycwor ICAgICAgICAobWFraW5nIHNlcmlhbGl6YXRpb24gY29ycmVjdCkuIFN0eWxlQ29sb3IgY29udGFp bnMgYSBoZWxwZXIgZnVuY3Rpb24gZm9yIGxvb2tpbmcgdXAgdGhlIGNvcnJlY3QgY29sb3IuCisK KyAgICAgICAgVGhpcyBwYXRjaCBzd2l0Y2hlcyBib3RoIHRoZSBvbGQgYW5kIHRoZSBuZXcgcGFy c2VycyBvdmVyIHRvIHRoZSBuZXcgU3R5bGVDb2xvciBmdW5jdGlvbi4KKworICAgICAgICAqIGNz cy9DU1NTZWxlY3Rvckxpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0b3JMaXN0 OjpDU1NTZWxlY3Rvckxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0b3JMaXN0Ojpv cGVyYXRvcj0pOgorICAgICAgICAqIGNzcy9TdHlsZUNvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlN0eWxlQ29sb3I6OmlzQ29sb3JLZXl3b3JkKToKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNv bHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjb2xvckZyb21Qcmlt aXRpdmVWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpjb2xvckZvckNTU1ZhbHVlKTogRGVsZXRl ZC4KKwogMjAxNi0xMC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIFNlY3VyaXR5T3JpZ2luOjp0YWludHNDYW52YXMKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvckxpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NTZWxlY3Rvckxpc3QuY3BwCShyZXZpc2lvbiAyMDc1MzYpCisrKyBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3JMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyAr NDUsNiBAQCBDU1NTZWxlY3Rvckxpc3Q6OkNTU1NlbGVjdG9yTGlzdChjb25zdCBDCiBDU1NTZWxl Y3Rvckxpc3Q6OkNTU1NlbGVjdG9yTGlzdChDU1NTZWxlY3Rvckxpc3QmJiBvdGhlcikKICAgICA6 IG1fc2VsZWN0b3JBcnJheShvdGhlci5tX3NlbGVjdG9yQXJyYXkpCiB7Ci0gICAgQVNTRVJUX1dJ VEhfU0VDVVJJVFlfSU1QTElDQVRJT04oY29tcG9uZW50Q291bnQoKSk7CiAgICAgb3RoZXIubV9z ZWxlY3RvckFycmF5ID0gbnVsbHB0cjsKIH0KIApAQCAtMTAyLDcgKzEwMSw2IEBAIENTU1NlbGVj dG9yTGlzdCYgQ1NTU2VsZWN0b3JMaXN0OjpvcGVyYXQKICAgICBtX3NlbGVjdG9yQXJyYXkgPSBv dGhlci5tX3NlbGVjdG9yQXJyYXk7CiAgICAgb3RoZXIubV9zZWxlY3RvckFycmF5ID0gbnVsbHB0 cjsKIAotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGNvbXBvbmVudENvdW50 KCkpOwogICAgIHJldHVybiAqdGhpczsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQ29sb3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUNvbG9y LmNwcAkocmV2aXNpb24gMjA3NDc5KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQ29sb3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw5IEBAIENvbG9yIFN0eWxlQ29sb3I6OmNv bG9yRnJvbUtleXdvcmQoQ1NTVmEKIAogYm9vbCBTdHlsZUNvbG9yOjppc0NvbG9yS2V5d29yZChD U1NWYWx1ZUlEIGlkKQogewotICAgIHJldHVybiAoaWQgPj0gQ1NTVmFsdWVBbHBoYSAmJiBpZCA8 PSBDU1NWYWx1ZVdlYmtpdFRleHQpIHx8IGlkID09IENTU1ZhbHVlTWVudTsKKyAgICByZXR1cm4g KGlkID49IENTU1ZhbHVlQWxwaGEgJiYgaWQgPD0gQ1NTVmFsdWVXZWJraXRUZXh0KQorICAgICAg ICB8fCAoaWQgPj0gQ1NTVmFsdWVBbGljZWJsdWUgJiYgaWQgPD0gQ1NTVmFsdWVZZWxsb3dncmVl bikKKyAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVNZW51OwogfQogCiBib29sIFN0eWxlQ29sb3I6 OmlzU3lzdGVtQ29sb3IoQ1NTVmFsdWVJRCBpZCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVJlc29sdmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVS ZXNvbHZlci5jcHAJKHJldmlzaW9uIDIwNzQ3OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVJlc29sdmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIwLDYgKzEyMCw3IEBACiAjaW5jbHVk ZSAiU2hhZG93RGF0YS5oIgogI2luY2x1ZGUgIlNoYWRvd1Jvb3QuaCIKICNpbmNsdWRlICJTdHls ZUJ1aWxkZXIuaCIKKyNpbmNsdWRlICJTdHlsZUNvbG9yLmgiCiAjaW5jbHVkZSAiU3R5bGVDYWNo ZWRJbWFnZS5oIgogI2luY2x1ZGUgIlN0eWxlRm9udFNpemVGdW5jdGlvbnMuaCIKICNpbmNsdWRl ICJTdHlsZUdlbmVyYXRlZEltYWdlLmgiCkBAIC0xNzc3LDQzICsxNzc4LDYgQEAgdm9pZCBTdHls ZVJlc29sdmVyOjpzZXRGb250U2l6ZShGb250Q2FzYwogICAgIGZvbnREZXNjcmlwdGlvbi5zZXRD b21wdXRlZFNpemUoU3R5bGU6OmNvbXB1dGVkRm9udFNpemVGcm9tU3BlY2lmaWVkU2l6ZShzaXpl LCBmb250RGVzY3JpcHRpb24uaXNBYnNvbHV0ZVNpemUoKSwgdXNlU1ZHWm9vbVJ1bGVzKCksIG1f c3RhdGUuc3R5bGUoKSwgZG9jdW1lbnQoKSkpOwogfQogCi1zdGF0aWMgQ29sb3IgY29sb3JGb3JD U1NWYWx1ZShDU1NWYWx1ZUlEIGNzc1ZhbHVlSWQpCi17Ci0gICAgc3RydWN0IENvbG9yVmFsdWUg ewotICAgICAgICBDU1NWYWx1ZUlEIGNzc1ZhbHVlSWQ7Ci0gICAgICAgIFJHQkEzMiBjb2xvcjsK LSAgICB9OwotCi0gICAgc3RhdGljIGNvbnN0IENvbG9yVmFsdWUgY29sb3JWYWx1ZXNbXSA9IHsK LSAgICAgICAgeyBDU1NWYWx1ZUFxdWEsIDB4RkYwMEZGRkYgfSwKLSAgICAgICAgeyBDU1NWYWx1 ZUJsYWNrLCAweEZGMDAwMDAwIH0sCi0gICAgICAgIHsgQ1NTVmFsdWVCbHVlLCAweEZGMDAwMEZG IH0sCi0gICAgICAgIHsgQ1NTVmFsdWVGdWNoc2lhLCAweEZGRkYwMEZGIH0sCi0gICAgICAgIHsg Q1NTVmFsdWVHcmF5LCAweEZGODA4MDgwIH0sCi0gICAgICAgIHsgQ1NTVmFsdWVHcmVlbiwgMHhG RjAwODAwMCAgfSwKLSAgICAgICAgeyBDU1NWYWx1ZUdyZXksIDB4RkY4MDgwODAgfSwKLSAgICAg ICAgeyBDU1NWYWx1ZUxpbWUsIDB4RkYwMEZGMDAgfSwKLSAgICAgICAgeyBDU1NWYWx1ZU1hcm9v biwgMHhGRjgwMDAwMCB9LAotICAgICAgICB7IENTU1ZhbHVlTmF2eSwgMHhGRjAwMDA4MCB9LAot ICAgICAgICB7IENTU1ZhbHVlT2xpdmUsIDB4RkY4MDgwMDAgIH0sCi0gICAgICAgIHsgQ1NTVmFs dWVPcmFuZ2UsIDB4RkZGRkE1MDAgfSwKLSAgICAgICAgeyBDU1NWYWx1ZVB1cnBsZSwgMHhGRjgw MDA4MCB9LAotICAgICAgICB7IENTU1ZhbHVlUmVkLCAweEZGRkYwMDAwIH0sCi0gICAgICAgIHsg Q1NTVmFsdWVTaWx2ZXIsIDB4RkZDMEMwQzAgfSwKLSAgICAgICAgeyBDU1NWYWx1ZVRlYWwsIDB4 RkYwMDgwODAgIH0sCi0gICAgICAgIHsgQ1NTVmFsdWVUcmFuc3BhcmVudCwgMHgwMDAwMDAwMCB9 LAotICAgICAgICB7IENTU1ZhbHVlV2hpdGUsIDB4RkZGRkZGRkYgfSwKLSAgICAgICAgeyBDU1NW YWx1ZVllbGxvdywgMHhGRkZGRkYwMCB9LAotICAgICAgICB7IENTU1ZhbHVlSW52YWxpZCwgQ1NT VmFsdWVJbnZhbGlkIH0KLSAgICB9OwotCi0gICAgZm9yIChjb25zdCBDb2xvclZhbHVlKiBjb2wg PSBjb2xvclZhbHVlczsgY29sLT5jc3NWYWx1ZUlkOyArK2NvbCkgewotICAgICAgICBpZiAoY29s LT5jc3NWYWx1ZUlkID09IGNzc1ZhbHVlSWQpCi0gICAgICAgICAgICByZXR1cm4gY29sLT5jb2xv cjsKLSAgICB9Ci0gICAgcmV0dXJuIFJlbmRlclRoZW1lOjpkZWZhdWx0VGhlbWUoKS0+c3lzdGVt Q29sb3IoY3NzVmFsdWVJZCk7Ci19Ci0KIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y29sb3JGcm9tUHJp bWl0aXZlVmFsdWVJc0Rlcml2ZWRGcm9tRWxlbWVudChjb25zdCBDU1NQcmltaXRpdmVWYWx1ZSYg dmFsdWUpCiB7CiAgICAgaW50IGlkZW50ID0gdmFsdWUudmFsdWVJRCgpOwpAQCAtMTg0OCw4ICsx ODEyLDkgQEAgQ29sb3IgU3R5bGVSZXNvbHZlcjo6Y29sb3JGcm9tUHJpbWl0aXZlVgogICAgICAg ICByZXR1cm4gUmVuZGVyVGhlbWU6OmZvY3VzUmluZ0NvbG9yKCk7CiAgICAgY2FzZSBDU1NWYWx1 ZUN1cnJlbnRjb2xvcjoKICAgICAgICAgcmV0dXJuIHN0YXRlLnN0eWxlKCktPmNvbG9yKCk7Ci0g ICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGNvbG9yRm9yQ1NTVmFsdWUoaWRlbnQpOworICAg IGRlZmF1bHQ6IHsKKyAgICAgICAgcmV0dXJuIFN0eWxlQ29sb3I6OmNvbG9yRnJvbUtleXdvcmQo aWRlbnQpOworICAgIH0KICAgICB9CiB9CiAK