117500 2013-06-11 01:18:38 -0700 Add CSS parsing recovery to functions 2013-06-12 02:30:37 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 116071 1 svillar svillar commit-queue darin esprehn+autocc glenn gyuyoung.kim kling macpherson menard pfeldman rniwa svillar tkent oldest_to_newest 899089 0 svillar 2013-06-11 01:18:38 -0700 We should consider merging: CSS parsing recovery in function. prop: expt(}); color: red; } and prop: expt(10px }); color: red; } are parsed differently. This change fixes that. Not completely though: difference occures if wrong part contains parentheses. Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=150205 899134 1 204319 svillar 2013-06-11 01:44:11 -0700 Created attachment 204319 Patch 899458 2 204319 svillar 2013-06-12 00:20:43 -0700 Comment on attachment 204319 Patch Clearing flags on attachment: 204319 Committed r151488: <http://trac.webkit.org/changeset/151488> 899459 3 svillar 2013-06-12 00:20:52 -0700 All reviewed patches have been landed. Closing bug. 899480 4 gyuyoung.kim 2013-06-12 02:30:37 -0700 *** Bug 117068 has been marked as a duplicate of this bug. *** 204319 2013-06-11 01:44:11 -0700 2013-06-12 00:20:43 -0700 Patch bug-117500-20130611104233.patch text/plain 6640 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM3YTFmZDY4NDQzZTMy MGQzYmUxMWI4YzExNTY4OGM2OGMxOTgwNC4uMzkyNGIzNGFiZTJlNjY5ZTBjNjYzNWY1YTdhZTQz ZjY0NDQyODNkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEzLTA2LTExICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCisgICAgICAgIEFkZCBDU1Mg cGFyc2luZyByZWNvdmVyeSB0byBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzUwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZyb20gQmxpbmsgcjE1MDIwNSBieSA8c2VyeWFAY2hyb21p dW0ub3JnPgorCisgICAgICAgIEFkZCBwYXJzaW5nIHJlY292ZXJ5IGNhcGFiaWxpdGllcyB0byBm dW5jdGlvbnMuIEVycm9ycyB3ZXJlCisgICAgICAgIGNvcnJlY3RseSBkZXRlY3RlZCB3aXRob3V0 IHRoaXMgY2hhbmdlIGJ1dCB0aGVuIHRoZSB3aG9sZQorICAgICAgICBkZWNsYXJhdGlvbiB3YXMg aW52YWxpZGF0ZWQuIEJ5IHVzaW5nIGV4cHJfcmVjb3ZlcnkgdG8gaGFuZGxlIHRoZW0KKyAgICAg ICAgd2UgY2FuIHJlY292ZXIgZnJvbSB0aG9zZSBlcnJvcnMgYW5kIGdvIG9uIHdpdGggdGhlIHBh cnNpbmcuCisKKyAgICAgICAgKiBjc3MvQ1NTR3JhbW1hci55LmluOgorCisyMDEzLTA2LTExICBT ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCiAgICAgICAgIEF1dG9j bG9zZSBicmFjZXMgYW5kIHBhcmVudGhlc2VzIGF0IHRoZSBlbmQgb2Ygc3R5bGUgc2hlZXQKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzQxNAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU0dyYW1tYXIueS5pbgppbmRleCA1MDhjMzkwZDVmNzYwMDIzYWNhZjc5NmJk NDg3Yjk2OGU3ZTAwMzBiLi40Njg2NTkyYWUzOWI0ZmI1NGJjNDUwMjQ4MmQ3ZjY0OTRlOTNmNDY5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkuaW4KQEAgLTg4LDkgKzg4LDkgQEAgc3RhdGlj IGlubGluZSBib29sIGlzQ1NTVG9rZW5BU3RyaW5nKGludCB5eXR5cGUpCiAlfQogCiAjaWYgRU5B QkxFX1NIQURPV19ET00KLSVleHBlY3QgMzMKLSNlbHNlCiAlZXhwZWN0IDMyCisjZWxzZQorJWV4 cGVjdCAzMQogI2VuZGlmCiAKICVub25hc3NvYyBMT1dFU1RfUFJFQwpAQCAtMTcwMCwxMyArMTcw MCwxMyBAQCB0ZXJtOgogI2VuZGlmCiAgIH0KICAgLyogRklYTUU6IGFjY29yZGluZyB0byB0aGUg c3BlY3MgYSBmdW5jdGlvbiBjYW4gaGF2ZSBhIHVuYXJ5X29wZXJhdG9yIGluIGZyb250LiBJIGtu b3cgbm8gY2FzZSB3aGVyZSB0aGlzIG1ha2VzIHNlbnNlICovCi0gIHwgZnVuY3Rpb24geworICB8 IGZ1bmN0aW9uIG1heWJlX3NwYWNlIHsKICAgICAgICQkID0gJDE7CiAgIH0KLSAgfCBjYWxjX2Z1 bmN0aW9uIHsKKyAgfCBjYWxjX2Z1bmN0aW9uIG1heWJlX3NwYWNlIHsKICAgICAgICQkID0gJDE7 CiAgIH0KLSAgfCBtaW5fb3JfbWF4X2Z1bmN0aW9uIHsKKyAgfCBtaW5fb3JfbWF4X2Z1bmN0aW9u IG1heWJlX3NwYWNlIHsKICAgICAgICQkID0gJDE7CiAgIH0KICAgfCAnJScgbWF5YmVfc3BhY2Ug eyAvKiBIYW5kbGUgd2lkdGg6ICU7ICovCkBAIC0xNzUzLDcgKzE3NTMsNyBAQCB1bmFyeV90ZXJt OgogICA7CiAKIGZ1bmN0aW9uOgotICAgIEZVTkNUSU9OIG1heWJlX3NwYWNlIGV4cHIgY2xvc2lu Z19wYXJlbnRoZXNpcyBtYXliZV9zcGFjZSB7CisgICAgRlVOQ1RJT04gbWF5YmVfc3BhY2UgZXhw ciBjbG9zaW5nX3BhcmVudGhlc2lzIHsKICAgICAgICAgQ1NTUGFyc2VyRnVuY3Rpb24qIGYgPSBw YXJzZXItPmNyZWF0ZUZsb2F0aW5nRnVuY3Rpb24oKTsKICAgICAgICAgZi0+bmFtZSA9ICQxOwog ICAgICAgICBmLT5hcmdzID0gcGFyc2VyLT5zaW5rRmxvYXRpbmdWYWx1ZUxpc3QoJDMpOwpAQCAt MTc2MSw3ICsxNzYxLDcgQEAgZnVuY3Rpb246CiAgICAgICAgICQkLnVuaXQgPSBDU1NQYXJzZXJW YWx1ZTo6RnVuY3Rpb247CiAgICAgICAgICQkLmZ1bmN0aW9uID0gZjsKICAgICB9IHwKLSAgICBG VU5DVElPTiBtYXliZV9zcGFjZSBjbG9zaW5nX3BhcmVudGhlc2lzIG1heWJlX3NwYWNlIHsKKyAg ICBGVU5DVElPTiBtYXliZV9zcGFjZSBjbG9zaW5nX3BhcmVudGhlc2lzIHsKICAgICAgICAgQ1NT UGFyc2VyRnVuY3Rpb24qIGYgPSBwYXJzZXItPmNyZWF0ZUZsb2F0aW5nRnVuY3Rpb24oKTsKICAg ICAgICAgZi0+bmFtZSA9ICQxOwogICAgICAgICBDU1NQYXJzZXJWYWx1ZUxpc3QqIHZhbHVlTGlz dCA9IHBhcnNlci0+Y3JlYXRlRmxvYXRpbmdWYWx1ZUxpc3QoKTsKQEAgLTE3NzAsNyArMTc3MCw3 IEBAIGZ1bmN0aW9uOgogICAgICAgICAkJC51bml0ID0gQ1NTUGFyc2VyVmFsdWU6OkZ1bmN0aW9u OwogICAgICAgICAkJC5mdW5jdGlvbiA9IGY7CiAgICAgfSB8Ci0gICAgRlVOQ1RJT04gbWF5YmVf c3BhY2UgZXJyb3IgeworICAgIEZVTkNUSU9OIG1heWJlX3NwYWNlIGV4cHJfcmVjb3ZlcnkgY2xv c2luZ19wYXJlbnRoZXNpcyB7CiAgICAgICAgIENTU1BhcnNlckZ1bmN0aW9uKiBmID0gcGFyc2Vy LT5jcmVhdGVGbG9hdGluZ0Z1bmN0aW9uKCk7CiAgICAgICAgIGYtPm5hbWUgPSAkMTsKICAgICAg ICAgZi0+YXJncyA9IG51bGxwdHI7CkBAIC0xODgzLDcgKzE4ODMsNyBAQCBjYWxjX2Z1bmNfZXhw cl9saXN0OgogICA7CiAKIGNhbGNfZnVuY3Rpb246Ci0gICAgQ0FMQ0ZVTkNUSU9OIG1heWJlX3Nw YWNlIGNhbGNfZnVuY19leHByIGNhbGNfbWF5YmVfc3BhY2UgY2xvc2luZ19wYXJlbnRoZXNpcyBt YXliZV9zcGFjZSB7CisgICAgQ0FMQ0ZVTkNUSU9OIG1heWJlX3NwYWNlIGNhbGNfZnVuY19leHBy IGNhbGNfbWF5YmVfc3BhY2UgY2xvc2luZ19wYXJlbnRoZXNpcyB7CiAgICAgICAgIENTU1BhcnNl ckZ1bmN0aW9uKiBmID0gcGFyc2VyLT5jcmVhdGVGbG9hdGluZ0Z1bmN0aW9uKCk7CiAgICAgICAg IGYtPm5hbWUgPSAkMTsKICAgICAgICAgZi0+YXJncyA9IHBhcnNlci0+c2lua0Zsb2F0aW5nVmFs dWVMaXN0KCQzKTsKQEAgLTE4OTEsNyArMTg5MSw3IEBAIGNhbGNfZnVuY3Rpb246CiAgICAgICAg ICQkLnVuaXQgPSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb247CiAgICAgICAgICQkLmZ1bmN0aW9u ID0gZjsKICAgICB9Ci0gICAgfCBDQUxDRlVOQ1RJT04gbWF5YmVfc3BhY2UgZXJyb3IgeworICAg IHwgQ0FMQ0ZVTkNUSU9OIG1heWJlX3NwYWNlIGV4cHJfcmVjb3ZlcnkgY2xvc2luZ19wYXJlbnRo ZXNpcyB7CiAgICAgICAgIFlZRVJST1I7CiAgICAgfQogICAgIDsKQEAgLTE5MDcsNyArMTkwNyw3 IEBAIG1pbl9vcl9tYXg6CiAgICAgOwogCiBtaW5fb3JfbWF4X2Z1bmN0aW9uOgotICAgIG1pbl9v cl9tYXggbWF5YmVfc3BhY2UgY2FsY19mdW5jX2V4cHJfbGlzdCBjbG9zaW5nX3BhcmVudGhlc2lz IG1heWJlX3NwYWNlIHsKKyAgICBtaW5fb3JfbWF4IG1heWJlX3NwYWNlIGNhbGNfZnVuY19leHBy X2xpc3QgY2xvc2luZ19wYXJlbnRoZXNpcyB7CiAgICAgICAgIENTU1BhcnNlckZ1bmN0aW9uKiBm ID0gcGFyc2VyLT5jcmVhdGVGbG9hdGluZ0Z1bmN0aW9uKCk7CiAgICAgICAgIGYtPm5hbWUgPSAk MTsKICAgICAgICAgZi0+YXJncyA9IHBhcnNlci0+c2lua0Zsb2F0aW5nVmFsdWVMaXN0KCQzKTsK QEAgLTE5MTUsNyArMTkxNSw3IEBAIG1pbl9vcl9tYXhfZnVuY3Rpb246CiAgICAgICAgICQkLnVu aXQgPSBDU1NQYXJzZXJWYWx1ZTo6RnVuY3Rpb247CiAgICAgICAgICQkLmZ1bmN0aW9uID0gZjsK ICAgICB9IAotICAgIHwgbWluX29yX21heCBtYXliZV9zcGFjZSBlcnJvciB7CisgICAgfCBtaW5f b3JfbWF4IG1heWJlX3NwYWNlIGV4cHJfcmVjb3ZlcnkgY2xvc2luZ19wYXJlbnRoZXNpcyB7CiAg ICAgICAgIFlZRVJST1I7CiAgICAgfQogICAgIDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MjFiZWEzMGFjM2MzNWEwZGMz YmMyMGUzNDgxZmE0OTc3N2UzNTkyLi4xMmE5NGNmMDhlMjA4NTQ3MDE0NDdmNWMyZDVmYTVlYWRk MTRiMDBmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTMtMDYtMTEgIFNlcmdpbyBWaWxsYXIg U2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKKyAgICAgICAgQWRkIENTUyBwYXJzaW5nIHJl Y292ZXJ5IHRvIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3NTAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRnJvbSBCbGluayByMTUwMjA1IGJ5IDxzZXJ5YUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgKiBmYXN0L2Nzcy9wYXJzaW5nLWVycm9yLXJlY292ZXJ5Lmh0bWw6IGFkZGVkIHNv bWUgdGVzdCBjYXNlcyBmb3IKKyAgICAgICAgcGFyc2luZyByZWNvdmVyeSBpbnNpZGUgZnVuY3Rp b25zLgorCisyMDEzLTA2LTExICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEu Y29tPgorCiAgICAgICAgIEF1dG9jbG9zZSBicmFjZXMgYW5kIHBhcmVudGhlc2VzIGF0IHRoZSBl bmQgb2Ygc3R5bGUgc2hlZXQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExNzQxNAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9wYXJz aW5nLWVycm9yLXJlY292ZXJ5Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9wYXJzaW5nLWVy cm9yLXJlY292ZXJ5Lmh0bWwKaW5kZXggOWFiZjkyY2RjMmM3NTI0NGJiMGMwZjBiMDk5OTA2NDEx Y2EyYmU5NC4uYzUxODAxODk0NmE1MWE1NDNhZDRkNTNmYThkNTA4ZGM0NDk0NmE4MyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvcGFyc2luZy1lcnJvci1yZWNvdmVyeS5odG1sCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3BhcnNpbmctZXJyb3ItcmVjb3ZlcnkuaHRtbApAQCAt NjAsNiArNjAsMzYgQEAKICAgICAgICAgICAgIGRpc3BsYXk6IGJsb2NrICFpbXBvcnRhbnQge2lu dmFsaWRfYmxvY2t9CiAgICAgICAgIH0KIAorICAgICAgICAjdGVzdDggeworICAgICAgICAgICAg Y29sb3I6IHJnYigxLH0pOworICAgICAgICAgICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgfQor CisgICAgICAgICN0ZXN0OSB7CisgICAgICAgICAgICBjb2xvcjogcmdiKH0pOworICAgICAgICAg ICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgfQorCisgICAgICAgICN0ZXN0MTAgeworICAgICAg ICAgICAgd2lkdGg6IGNhbGMoMSx9KTsKKyAgICAgICAgICAgIGRpc3BsYXk6IG5vbmU7CisgICAg ICAgIH0KKworICAgICAgICAjdGVzdDExIHsKKyAgICAgICAgICAgIHdpZHRoOiBjYWxjKH0pOwor ICAgICAgICAgICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgfQorCisgICAgICAgICN0ZXN0MTIg eworICAgICAgICAgICAgd2lkdGg6IC13ZWJraXQtbWluKDEsfSk7CisgICAgICAgICAgICBkaXNw bGF5OiBub25lOworICAgICAgICB9CisKKyAgICAgICAgI3Rlc3QxMyB7CisgICAgICAgICAgICB3 aWR0aDogLXdlYmtpdC1taW4ofSk7CisgICAgICAgICAgICBkaXNwbGF5OiBub25lOworICAgICAg ICB9CisKICAgICAgICAgLyogU3VjY2Vzc2Z1bGx5IHBhcnNlZCAqLwogICAgICAgICAjbGFzdCB7 CiAgICAgICAgICAgICBkaXNwbGF5OmJsb2NrOwpAQCAtNzQsNiArMTA0LDEyIEBACiAgIDxkaXYg Y2xhc3M9InRvX2JlX2hpZGRlbiIgaWQ9InRlc3Q1Ij5GQUlMOiBUZXN0IDU8L2Rpdj4KICAgPGRp diBjbGFzcz0idG9fYmVfaGlkZGVuIiBpZD0idGVzdDYiPkZBSUw6IFRlc3QgNjwvZGl2PgogICA8 ZGl2IGNsYXNzPSJ0b19iZV9oaWRkZW4iIGlkPSJ0ZXN0NyI+RkFJTDogVGVzdCA3PC9kaXY+Cisg IDxkaXYgY2xhc3M9InRvX2JlX2hpZGRlbiIgaWQ9InRlc3Q4Ij5GQUlMOiBUZXN0IDg8L2Rpdj4K KyAgPGRpdiBjbGFzcz0idG9fYmVfaGlkZGVuIiBpZD0idGVzdDkiPkZBSUw6IFRlc3QgOTwvZGl2 PgorICA8ZGl2IGNsYXNzPSJ0b19iZV9oaWRkZW4iIGlkPSJ0ZXN0MTAiPkZBSUw6IFRlc3QgMTA8 L2Rpdj4KKyAgPGRpdiBjbGFzcz0idG9fYmVfaGlkZGVuIiBpZD0idGVzdDExIj5GQUlMOiBUZXN0 IDExPC9kaXY+CisgIDxkaXYgY2xhc3M9InRvX2JlX2hpZGRlbiIgaWQ9InRlc3QxMiI+RkFJTDog VGVzdCAxMjwvZGl2PgorICA8ZGl2IGNsYXNzPSJ0b19iZV9oaWRkZW4iIGlkPSJ0ZXN0MTMiPkZB SUw6IFRlc3QgMTM8L2Rpdj4KICAgPGRpdiBjbGFzcz0idG9fYmVfc2hvd24iIGlkPSJsYXN0Ij5Q QVNTPC9kaXY+CiA8L2JvZHk+CiA8L2h0bWw+Cg==