122630 2013-10-10 19:22:43 -0700 Add toSVGColor|Paint() to cleanup static_cast<>, and use it 2013-10-10 20:35:51 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim macpherson menard pdr schenney oldest_to_newest 938645 0 gyuyoung.kim 2013-10-10 19:22:43 -0700 SVGColor and SVGPaint can't use CSS_VALUE_TYPE_CASTS(), this cl adds toSVGColor() and toSVGPaint() manually. Those functions will help to detect bad type cast. 938648 1 213955 gyuyoung.kim 2013-10-10 19:26:13 -0700 Created attachment 213955 Patch 938664 2 213955 commit-queue 2013-10-10 20:35:48 -0700 Comment on attachment 213955 Patch Clearing flags on attachment: 213955 Committed r157286: <http://trac.webkit.org/changeset/157286> 938665 3 commit-queue 2013-10-10 20:35:51 -0700 All reviewed patches have been landed. Closing bug. 213955 2013-10-10 19:26:13 -0700 2013-10-10 20:35:48 -0700 Patch bug-122630-20131011112611.patch text/plain 7197 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmNiNTZiMTI2MGEzZmI4 YjlmNzdmNDE5MWNlZDM3YzBmMWMzZDczZi4uMmIzYjc1YzZiOWRmYjViMmFmNTVhYjBjMWI5NDBm NTU2MWU2MWZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTEwLTEwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgQWRkIHRvU1ZH Q29sb3J8UGFpbnQoKSB0byBjbGVhbnVwIHN0YXRpY19jYXN0PD4sIGFuZCB1c2UgaXQgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI2MzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTVkdDb2xvciBhbmQg U1ZHUGFpbnQgY2FuJ3QgdXNlIENTU19WQUxVRV9UWVBFX0NBU1RTKCksIHRoaXMgY2wgYWRkcwor ICAgICAgICB0b1NWR0NvbG9yKCkgYW5kIHRvU1ZHUGFpbnQoKSBtYW51YWxseS4gVGhvc2UgZnVu Y3Rpb25zIHdpbGwgaGVscCB0bworICAgICAgICBkZXRlY3QgYmFkIHR5cGUgY2FzdC4KKworICAg ICAgICAqIGNzcy9DU1NWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NWYWx1ZTo6Y3Nz VGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NWYWx1ZTo6ZGVzdHJveSk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NWYWx1ZTo6Y2xvbmVGb3JDU1NPTSk6CisgICAgICAgICogY3NzL1NWR0NTU1N0 eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6YXBwbHlT VkdQcm9wZXJ0eSk6CisgICAgICAgICogc3ZnL1NWR0NvbG9yLmg6CisgICAgICAgIChXZWJDb3Jl Ojp0b1NWR0NvbG9yKToKKyAgICAgICAgKiBzdmcvU1ZHUGFpbnQuaDoKKyAgICAgICAgKFdlYkNv cmU6OnRvU1ZHUGFpbnQpOgorCiAyMDEzLTEwLTEwICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdGhlIG9sZCBmcm9u dC1lbmQgZnJvbSBXZWJLaXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFs dWUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlLmNwcAppbmRleCBkYmM5NDNkYTM5 ODY3N2Y5ZWY3MTg5NTU3Yjk1MzA0ZmFjNTE2YjBkLi5kMzA0YWYxYTcyOWY3MTc1OTc1MTRmOTRh ZjI2Y2I3M2NmOGU1MDVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFsdWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZS5jcHAKQEAgLTM0OSw5ICszNDks OSBAQCBTdHJpbmcgQ1NTVmFsdWU6OmNzc1RleHQoKSBjb25zdAogI2VuZGlmCiAjaWYgRU5BQkxF KFNWRykKICAgICBjYXNlIFNWR0NvbG9yQ2xhc3M6Ci0gICAgICAgIHJldHVybiBzdGF0aWNfY2Fz dDxjb25zdCBTVkdDb2xvcio+KHRoaXMpLT5jdXN0b21DU1NUZXh0KCk7CisgICAgICAgIHJldHVy biB0b1NWR0NvbG9yKHRoaXMpLT5jdXN0b21DU1NUZXh0KCk7CiAgICAgY2FzZSBTVkdQYWludENs YXNzOgotICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Y29uc3QgU1ZHUGFpbnQqPih0aGlzKS0+ Y3VzdG9tQ1NTVGV4dCgpOworICAgICAgICByZXR1cm4gdG9TVkdQYWludCh0aGlzKS0+Y3VzdG9t Q1NTVGV4dCgpOwogICAgIGNhc2UgV2ViS2l0Q1NTU1ZHRG9jdW1lbnRDbGFzczoKICAgICAgICAg cmV0dXJuIHRvV2ViS2l0Q1NTU1ZHRG9jdW1lbnRWYWx1ZSh0aGlzKS0+Y3VzdG9tQ1NTVGV4dCgp OwogI2VuZGlmCkBAIC00OTcsMTAgKzQ5NywxMCBAQCB2b2lkIENTU1ZhbHVlOjpkZXN0cm95KCkK ICNlbmRpZgogI2lmIEVOQUJMRShTVkcpCiAgICAgY2FzZSBTVkdDb2xvckNsYXNzOgotICAgICAg ICBkZWxldGUgc3RhdGljX2Nhc3Q8U1ZHQ29sb3IqPih0aGlzKTsKKyAgICAgICAgZGVsZXRlIHRv U1ZHQ29sb3IodGhpcyk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIFNWR1BhaW50Q2xhc3M6 Ci0gICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxTVkdQYWludCo+KHRoaXMpOworICAgICAgICBk ZWxldGUgdG9TVkdQYWludCh0aGlzKTsKICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgV2ViS2l0 Q1NTU1ZHRG9jdW1lbnRDbGFzczoKICAgICAgICAgZGVsZXRlIHRvV2ViS2l0Q1NTU1ZHRG9jdW1l bnRWYWx1ZSh0aGlzKTsKQEAgLTU0MCw5ICs1NDAsOSBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBD U1NWYWx1ZTo6Y2xvbmVGb3JDU1NPTSgpIGNvbnN0CiAjZW5kaWYKICNpZiBFTkFCTEUoU1ZHKQog ICAgIGNhc2UgU1ZHQ29sb3JDbGFzczoKLSAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNvbnN0 IFNWR0NvbG9yKj4odGhpcyktPmNsb25lRm9yQ1NTT00oKTsKKyAgICAgICAgcmV0dXJuIHRvU1ZH Q29sb3IodGhpcyktPmNsb25lRm9yQ1NTT00oKTsKICAgICBjYXNlIFNWR1BhaW50Q2xhc3M6Ci0g ICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBTVkdQYWludCo+KHRoaXMpLT5jbG9uZUZv ckNTU09NKCk7CisgICAgICAgIHJldHVybiB0b1NWR1BhaW50KHRoaXMpLT5jbG9uZUZvckNTU09N KCk7CiAjZW5kaWYKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlQoIWlzU3VidHlwZUV4cG9z ZWRUb0NTU09NKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1NWR0NTU1N0eWxl U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1NWR0NTU1N0eWxlU2VsZWN0b3IuY3Bw CmluZGV4IDA3YmIyY2ExOGRmOTMwNzE0YzU3YjQwYTJiZWYwMWRiN2ZmNmE5NDcuLmJlNjZjZWY4 MzUyNjRiNTQ4MzhmODE2ODdlYzIwY2VhNjc5NWE3ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TVkdDU1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U1ZHQ1NTU3R5bGVTZWxlY3Rvci5jcHAKQEAgLTIzOSw3ICsyMzksNyBAQCB2b2lkIFN0eWxlUmVz b2x2ZXI6OmFwcGx5U1ZHUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVl KQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlm ICh2YWx1ZS0+aXNTVkdQYWludCgpKSB7Ci0gICAgICAgICAgICAgICAgU1ZHUGFpbnQqIHN2Z1Bh aW50ID0gc3RhdGljX2Nhc3Q8U1ZHUGFpbnQqPih2YWx1ZSk7CisgICAgICAgICAgICAgICAgU1ZH UGFpbnQqIHN2Z1BhaW50ID0gdG9TVkdQYWludCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgc3Zn c3R5bGUtPnNldEZpbGxQYWludChzdmdQYWludC0+cGFpbnRUeXBlKCksIGNvbG9yRnJvbVNWR0Nv bG9yQ1NTVmFsdWUoc3ZnUGFpbnQsIHN0YXRlLnN0eWxlKCktPmNvbG9yKCkpLCBzdmdQYWludC0+ dXJpKCksIGFwcGx5UHJvcGVydHlUb1JlZ3VsYXJTdHlsZSgpLCBhcHBseVByb3BlcnR5VG9WaXNp dGVkTGlua1N0eWxlKCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC0y NTYsNyArMjU2LDcgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVNWR1Byb3BlcnR5KENTU1By b3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAodmFsdWUtPmlzU1ZHUGFpbnQoKSkgewotICAg ICAgICAgICAgICAgIFNWR1BhaW50KiBzdmdQYWludCA9IHN0YXRpY19jYXN0PFNWR1BhaW50Kj4o dmFsdWUpOworICAgICAgICAgICAgICAgIFNWR1BhaW50KiBzdmdQYWludCA9IHRvU1ZHUGFpbnQo dmFsdWUpOwogICAgICAgICAgICAgICAgIHN2Z3N0eWxlLT5zZXRTdHJva2VQYWludChzdmdQYWlu dC0+cGFpbnRUeXBlKCksIGNvbG9yRnJvbVNWR0NvbG9yQ1NTVmFsdWUoc3ZnUGFpbnQsIHN0YXRl LnN0eWxlKCktPmNvbG9yKCkpLCBzdmdQYWludC0+dXJpKCksIGFwcGx5UHJvcGVydHlUb1JlZ3Vs YXJTdHlsZSgpLCBhcHBseVByb3BlcnR5VG9WaXNpdGVkTGlua1N0eWxlKCkpOwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC00NzgsMTQgKzQ3OCwxNCBAQCB2b2lkIFN0eWxl UmVzb2x2ZXI6OmFwcGx5U1ZHUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZh bHVlKQogICAgICAgICB7CiAgICAgICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTChz dG9wQ29sb3IsIFN0b3BDb2xvcik7CiAgICAgICAgICAgICBpZiAodmFsdWUtPmlzU1ZHQ29sb3Io KSkKLSAgICAgICAgICAgICAgICBzdmdzdHlsZS0+c2V0U3RvcENvbG9yKGNvbG9yRnJvbVNWR0Nv bG9yQ1NTVmFsdWUoc3RhdGljX2Nhc3Q8U1ZHQ29sb3IqPih2YWx1ZSksIHN0YXRlLnN0eWxlKCkt PmNvbG9yKCkpKTsKKyAgICAgICAgICAgICAgICBzdmdzdHlsZS0+c2V0U3RvcENvbG9yKGNvbG9y RnJvbVNWR0NvbG9yQ1NTVmFsdWUodG9TVkdDb2xvcih2YWx1ZSksIHN0YXRlLnN0eWxlKCktPmNv bG9yKCkpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eUxpZ2h0aW5nQ29sb3I6CiAgICAgICAgIHsKICAgICAgICAgICAgIEhBTkRMRV9JTkhF UklUX0FORF9JTklUSUFMKGxpZ2h0aW5nQ29sb3IsIExpZ2h0aW5nQ29sb3IpOwogICAgICAgICAg ICAgaWYgKHZhbHVlLT5pc1NWR0NvbG9yKCkpCi0gICAgICAgICAgICAgICAgc3Znc3R5bGUtPnNl dExpZ2h0aW5nQ29sb3IoY29sb3JGcm9tU1ZHQ29sb3JDU1NWYWx1ZShzdGF0aWNfY2FzdDxTVkdD b2xvcio+KHZhbHVlKSwgc3RhdGUuc3R5bGUoKS0+Y29sb3IoKSkpOworICAgICAgICAgICAgICAg IHN2Z3N0eWxlLT5zZXRMaWdodGluZ0NvbG9yKGNvbG9yRnJvbVNWR0NvbG9yQ1NTVmFsdWUodG9T VkdDb2xvcih2YWx1ZSksIHN0YXRlLnN0eWxlKCktPmNvbG9yKCkpKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlGbG9vZE9wYWNpdHk6CkBA IC01MTAsNyArNTEwLDcgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVNWR1Byb3BlcnR5KENT U1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICAgICAgewogICAgICAgICAgICAg SEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoZmxvb2RDb2xvciwgRmxvb2RDb2xvcik7CiAgICAg ICAgICAgICBpZiAodmFsdWUtPmlzU1ZHQ29sb3IoKSkKLSAgICAgICAgICAgICAgICBzdmdzdHls ZS0+c2V0Rmxvb2RDb2xvcihjb2xvckZyb21TVkdDb2xvckNTU1ZhbHVlKHN0YXRpY19jYXN0PFNW R0NvbG9yKj4odmFsdWUpLCBzdGF0ZS5zdHlsZSgpLT5jb2xvcigpKSk7CisgICAgICAgICAgICAg ICAgc3Znc3R5bGUtPnNldEZsb29kQ29sb3IoY29sb3JGcm9tU1ZHQ29sb3JDU1NWYWx1ZSh0b1NW R0NvbG9yKHZhbHVlKSwgc3RhdGUuc3R5bGUoKS0+Y29sb3IoKSkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUdseXBoT3JpZW50YXRpb25I b3Jpem9udGFsOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0NvbG9yLmggYi9T b3VyY2UvV2ViQ29yZS9zdmcvU1ZHQ29sb3IuaAppbmRleCA4MzI1YjE5ZTMwZmQ2Mzc3MjdmY2Y3 ZDQ2NGEyNTQ0ODEzYjAwMWNjLi4zZWU4ZTZlMmI0NTQzNGQzOWVmYjBiMDViNjFkM2VlZDc1Zjll YWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQ29sb3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHQ29sb3IuaApAQCAtOTMsNiArOTMsMjEgQEAgcHJpdmF0ZToKICAg ICBTVkdDb2xvclR5cGUgbV9jb2xvclR5cGU7CiB9OwogCisvLyBUaGlzIHdpbGwgY2F0Y2ggYW55 b25lIGRvaW5nIGFuIHVubmVjZXNzYXJ5IGNhc3QuCitTVkdDb2xvciogdG9TVkdDb2xvcihjb25z dCBTVkdDb2xvciopOworCitpbmxpbmUgU1ZHQ29sb3IqIHRvU1ZHQ29sb3IoQ1NTVmFsdWUqIHZh bHVlKQoreworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCF2YWx1ZSB8fCB2 YWx1ZS0+aXNTVkdDb2xvcigpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U1ZHQ29sb3IqPih2 YWx1ZSk7Cit9CisKK2lubGluZSBjb25zdCBTVkdDb2xvciogdG9TVkdDb2xvcihjb25zdCBDU1NW YWx1ZSogdmFsdWUpCit7CisgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIXZh bHVlIHx8IHZhbHVlLT5pc1NWR0NvbG9yKCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25z dCBTVkdDb2xvcio+KHZhbHVlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5k aWYgLy8gRU5BQkxFKFNWRykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYWlu dC5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhaW50LmgKaW5kZXggMGI4MDZjMmUwMTQ2Yzk2 NDQyMWU2OGMzYmM3M2ZlNWYzZGQ3NGRlYS4uYzM2NGU0ZjY5NWY5ZjNhMDE0MDRhNGE4NmM5MWU0 NThlNmRhNjdhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhaW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhaW50LmgKQEAgLTExNSw2ICsxMTUsMjEgQEAgcHJp dmF0ZToKICAgICBTdHJpbmcgbV91cmk7CiB9OwogCisvLyBUaGlzIHdpbGwgY2F0Y2ggYW55b25l IGRvaW5nIGFuIHVubmVjZXNzYXJ5IGNhc3QuCitTVkdQYWludCogdG9TVkdQYWludChjb25zdCBT VkdDb2xvciopOworCitpbmxpbmUgU1ZHUGFpbnQqIHRvU1ZHUGFpbnQoQ1NTVmFsdWUqIHZhbHVl KQoreworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCF2YWx1ZSB8fCB2YWx1 ZS0+aXNTVkdQYWludCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U1ZHUGFpbnQqPih2YWx1 ZSk7Cit9CisKK2lubGluZSBjb25zdCBTVkdQYWludCogdG9TVkdQYWludChjb25zdCBDU1NWYWx1 ZSogdmFsdWUpCit7CisgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIXZhbHVl IHx8IHZhbHVlLT5pc1NWR1BhaW50KCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBT VkdQYWludCo+KHZhbHVlKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYg Ly8gRU5BQkxFKFNWRykK