44977 2010-08-31 13:17:23 -0700 [reviewtool] Show previous comments inline in diff 2010-08-31 14:25:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth eric oldest_to_newest 272309 0 abarth 2010-08-31 13:17:23 -0700 [reviewtool] Show previous comments inline in diff 272311 1 66091 abarth 2010-08-31 13:20:08 -0700 Created attachment 66091 Patch 272371 2 66091 eric 2010-08-31 14:23:33 -0700 Comment on attachment 66091 Patch We need unit testing for this code. 272372 3 abarth 2010-08-31 14:24:21 -0700 Yes, we do. 272374 4 abarth 2010-08-31 14:25:23 -0700 Committed r66532: <http://trac.webkit.org/changeset/66532> 66091 2010-08-31 13:20:08 -0700 2010-08-31 14:23:33 -0700 Patch bug-44977-20100831132007.patch text/plain 6668 abarth SW5kZXg6IEJ1Z3NTaXRlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBCdWdzU2l0ZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDY2NTI1KQorKysgQnVnc1NpdGUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDgtMzEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb cmV2aWV3dG9vbF0gU2hvdyBwcmV2aW91cyBjb21tZW50cyBpbmxpbmUgaW4gZGlmZgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5NzcKKworICAgICAg ICBUaGlzIHBhdGNoIGFkZHMgYmFzaWMgc3VwcG9ydCBmb3Igc2hvd2luZyBwcmV2aW91cyBjb21t ZW50cyBpbmxpbmUgaW4KKyAgICAgICAgdGhlIGRpZmYuICBXZSBjcmF3bCB0aGUgYnVncy53ZWJr aXQub3JnIGNvbW1lbnRzIGFib3V0IHRoaXMgYXR0YWNobWVudAorICAgICAgICBhbmQgZXh0cmFj dCBjb21tZW50cyByZWxhdGVkIHRvIHNwZWNpZmljIGxpbmVzLiAgV2UgdGhlbiBzaG93IHRoZQor ICAgICAgICBjb21tZW50cyBpbmxpbmUgaW4gdGhlIGRpZmYuCisKKyAgICAgICAgVGhpcyBwYXJ0 IG9mIHRoZSB0b29sIG5lZWRzIGEgYnVuY2ggb2YgcG9saXNoLCBidXQgdGhpcyBhdCBsZWFzdCBp cyBhCisgICAgICAgIHN0YXJ0aW5nIHBvaW50IGZvciBmdXJ0aGVyIHdvcmsuCisKKyAgICAgICAg KiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKKyAgICAgICAgKiBjb2RlLXJldmlldy5qczoK KwogMjAxMC0wOC0zMSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogQnVnc1NpdGUvY29kZS1yZXZpZXcuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gQnVnc1NpdGUvY29kZS1yZXZpZXcuanMJKHJldmlzaW9uIDY2NTI1KQor KysgQnVnc1NpdGUvY29kZS1yZXZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTE0LDcgKzE0LDYg QEAKICAgaWYgKCFhdHRhY2htZW50X2lkKQogICAgIHJldHVybjsKIAotICB2YXIgcHJldmlvdXNf Y29tbWVudHMgPSBbXTsKICAgdmFyIGN1cnJlbnRfY29tbWVudCA9IHt9CiAgIHZhciBuZXh0X2xp bmVfaWQgPSAwOwogCkBAIC04MSwyMyArODAsOTggQEAKICAgICBhZGRDb21tZW50Rm9yKCQoJyMn ICsgaWQpKTsKICAgfQogCi0gIGZ1bmN0aW9uIGRpc3BsYXlQcmV2aW91c0NvbW1lbnRzKCkgewot ICAgIGNvbW1lbnRfY29sbGVjdGlvbiA9IHRoaXM7Ci0gICAgZm9yRWFjaExpbmUoZnVuY3Rpb24o bGluZSkgewotICAgICAgdmFyIGxpbmVfaWQgPSBsaW5lLmF0dHIoJ2lkJyk7Ci0gICAgICB2YXIg Y29tbWVudCA9IGNvbW1lbnRfY29sbGVjdGlvbltsaW5lX2lkXTsKLSAgICAgIGlmIChjb21tZW50 KSB7Ci0gICAgICAgIHZhciBjb21tZW50X2Jsb2NrID0gJCgnPGRpdiBkYXRhLWNvbW1lbnQtZm9y PSInICsgbGluZV9pZCArICciIGNsYXNzPSJwcmV2aW91c19jb21tZW50Ij48L2Rpdj4nKTsKLSAg ICAgICAgY29tbWVudF9ibG9jay50ZXh0KGNvbW1lbnQpLnByZXBlbmQoJzxkaXYgY2xhc3M9InJl cGx5Ij5DbGljayB0byByZXBseTwvZGl2PicpOwotICAgICAgICBjb21tZW50X2Jsb2NrLmVhY2go aG92ZXJpZnkpLmNsaWNrKGFkZENvbW1lbnRGaWVsZCk7Ci0gICAgICAgIGluc2VydENvbW1lbnRG b3IobGluZSwgY29tbWVudF9ibG9jayk7CisgIHZhciBmaWxlcyA9IHt9CisKKyAgZnVuY3Rpb24g YWRkUHJldmlvdXNDb21tZW50KGxpbmUsIGNvbW1lbnRfdGV4dCkgeworICAgIHZhciBjb21tZW50 X2Jsb2NrID0gJCgnPGRpdiBkYXRhLWNvbW1lbnQtZm9yPSInICsgbGluZS5hdHRyKCdpZCcpICsg JyIgY2xhc3M9InByZXZpb3VzX2NvbW1lbnQiPjwvZGl2PicpOworICAgIGNvbW1lbnRfYmxvY2su dGV4dChjb21tZW50X3RleHQpLnByZXBlbmQoJzxkaXYgY2xhc3M9InJlcGx5Ij5DbGljayB0byBy ZXBseTwvZGl2PicpOworICAgIGNvbW1lbnRfYmxvY2suZWFjaChob3ZlcmlmeSkuY2xpY2soYWRk Q29tbWVudEZpZWxkKTsKKyAgICBpbnNlcnRDb21tZW50Rm9yKGxpbmUsIGNvbW1lbnRfYmxvY2sp OworICB9CisKKyAgZnVuY3Rpb24gZGlzcGxheVByZXZpb3VzQ29tbWVudHMoY29tbWVudHMpIHsK KyAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNvbW1lbnRzLmxlbmd0aDsgKytpKSB7CisgICAgICB2 YXIgZmlsZV9uYW1lID0gY29tbWVudHNbaV0uZmlsZV9uYW1lOworICAgICAgdmFyIGxpbmVfbnVt YmVyID0gY29tbWVudHNbaV0ubGluZV9udW1iZXI7CisgICAgICB2YXIgY29tbWVudF90ZXh0ID0g Y29tbWVudHNbaV0uY29tbWVudF90ZXh0OworCisgICAgICB2YXIgZmlsZSA9IGZpbGVzW2ZpbGVf bmFtZV07CisKKyAgICAgIHZhciBxdWVyeSA9ICcuTGluZSAudG8nOworICAgICAgaWYgKGxpbmVf bnVtYmVyWzBdID09ICctJykgeworICAgICAgICAvLyBUaGUgbGluZV9udW1iZXIgcmVwcmVzZW50 IGEgcmVtb3ZhbC4gIFdlIG5lZWQgdG8gYWRqdXN0IHRoZSBxdWVyeSB0bworICAgICAgICAvLyBs b29rIGF0IHRoZSAiZnJvbSIgbGluZXMuCisgICAgICAgIHF1ZXJ5ID0gJy5MaW5lIC5mcm9tJzsK KyAgICAgICAgLy8gVHJpbSBvZmYgdGhlICctJyBjb250cm9sIGNoYXJhY3Rlci4KKyAgICAgICAg bGluZV9udW1iZXIgPSBsaW5lX251bWJlci5zdWJzdHIoMSk7CisgICAgICB9CisKKyAgICAgICQo ZmlsZSkuZmluZChxdWVyeSkuZWFjaChmdW5jdGlvbigpIHsKKyAgICAgICAgaWYgKCQodGhpcyku dGV4dCgpICE9IGxpbmVfbnVtYmVyKQorICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFyIGxp bmUgPSAkKHRoaXMpLnBhcmVudCgpOworICAgICAgICBhZGRQcmV2aW91c0NvbW1lbnQobGluZSwg Y29tbWVudF90ZXh0KTsKKyAgICAgIH0pOworICAgIH0KKyAgfQorCisgIGZ1bmN0aW9uIHNjYW5G b3JDb21tZW50cyh0ZXh0KSB7CisgICAgdmFyIGNvbW1lbnRzID0gW10KKyAgICB2YXIgbGluZXMg PSB0ZXh0LnNwbGl0KCdcbicpOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGluZXMubGVuZ3Ro OyArK2kpIHsKKyAgICAgIHZhciBwYXJ0cyA9IGxpbmVzW2ldLm1hdGNoKC9eKFs+IF0rKShbXjpd Kyk6KC0/XGQrKSQvKTsKKyAgICAgIGlmICghcGFydHMpCisgICAgICAgIGNvbnRpbnVlOworICAg ICAgdmFyIHF1b3RlX21hcmtlcnMgPSBwYXJ0c1sxXTsKKyAgICAgIHZhciBmaWxlX25hbWUgPSBw YXJ0c1syXTsKKyAgICAgIHZhciBsaW5lX251bWJlciA9IHBhcnRzWzNdOworICAgICAgaWYgKCFm aWxlX25hbWUgaW4gZmlsZXMpCisgICAgICAgIGNvbnRpbnVlOworICAgICAgd2hpbGUgKGkgPCBs aW5lcy5sZW5ndGggJiYgbGluZXNbaV0ubGVuZ3RoID4gMCAmJiBsaW5lc1tpXVswXSA9PSAnPicp CisgICAgICAgICsraTsKKyAgICAgIHZhciBjb21tZW50X2xpbmVzID0gW107CisgICAgICB3aGls ZSAoaSA8IGxpbmVzLmxlbmd0aCAmJiAobGluZXNbaV0ubGVuZ3RoID09IDAgfHwgbGluZXNbaV1b MF0gIT0gJz4nKSkgeworICAgICAgICBjb21tZW50X2xpbmVzLnB1c2gobGluZXNbaV0pOworICAg ICAgICArK2k7CiAgICAgICB9CisgICAgICB2YXIgY29tbWVudF90ZXh0ID0gY29tbWVudF9saW5l cy5qb2luKCdcbicpOworICAgICAgY29tbWVudHMucHVzaCh7CisgICAgICAgICdmaWxlX25hbWUn OiBmaWxlX25hbWUsCisgICAgICAgICdsaW5lX251bWJlcic6IGxpbmVfbnVtYmVyLAorICAgICAg ICAnY29tbWVudF90ZXh0JzogY29tbWVudF90ZXh0CisgICAgICB9KTsKKyAgICB9CisgICAgcmV0 dXJuIGNvbW1lbnRzOworICB9CisKKyAgZnVuY3Rpb24gZmV0Y2hIaXN0b3J5KCkgeworICAgICQu Z2V0KCdhdHRhY2htZW50LmNnaT9pZD0nICsgYXR0YWNobWVudF9pZCArICcmYWN0aW9uPWVkaXQn LCBmdW5jdGlvbihkYXRhKSB7CisgICAgICB2YXIgYnVnX2lkID0gL0F0dGFjaG1lbnQgXGQrIERl dGFpbHMgZm9yIEJ1ZyAoXGQrKS8uZXhlYyhkYXRhKVsxXTsKKyAgICAgICQuZ2V0KCdzaG93X2J1 Zy5jZ2k/aWQ9JyArIGJ1Z19pZCwgZnVuY3Rpb24oZGF0YSkgeworICAgICAgICB2YXIgY29tbWVu dHMgPSBbXTsKKyAgICAgICAgJChkYXRhKS5maW5kKCcuYnpfY29tbWVudCcpLmVhY2goZnVuY3Rp b24oKSB7CisgICAgICAgICAgdmFyIGF1dGhvciA9ICQodGhpcykuZmluZCgnLmVtYWlsJykudGV4 dCgpOworICAgICAgICAgIHZhciB0ZXh0ID0gJCh0aGlzKS5maW5kKCcuYnpfY29tbWVudF90ZXh0 JykudGV4dCgpOworICAgICAgICAgIHZhciBjb21tZW50X21hcmtlciA9ICcoRnJvbSB1cGRhdGUg b2YgYXR0YWNobWVudCAnICsgYXR0YWNobWVudF9pZCArICcgLmRldGFpbHMuKSc7CisgICAgICAg ICAgaWYgKHRleHQubWF0Y2goY29tbWVudF9tYXJrZXIpKQorICAgICAgICAgICAgJC5tZXJnZShj b21tZW50cywgc2NhbkZvckNvbW1lbnRzKHRleHQpKTsKKyAgICAgICAgfSk7CisgICAgICAgIGRp c3BsYXlQcmV2aW91c0NvbW1lbnRzKGNvbW1lbnRzKTsKKyAgICAgIH0pOwogICAgIH0pOwogICB9 CiAKLSAgJChkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKSB7CisgIGZ1bmN0aW9uIGNyYXdsRGlm ZigpIHsKICAgICAkKCcuTGluZScpLmVhY2goaWRpZnkpLmVhY2goaG92ZXJpZnkpLmRibGNsaWNr KGFkZENvbW1lbnRGaWVsZCk7Ci0gICAgJChwcmV2aW91c19jb21tZW50cykuZWFjaChkaXNwbGF5 UHJldmlvdXNDb21tZW50cyk7CisgICAgJCgnLkZpbGVEaWZmJykuZWFjaChmdW5jdGlvbigpIHsK KyAgICAgIHZhciBmaWxlX25hbWUgPSAkKHRoaXMpLmNoaWxkcmVuKCdoMScpLnRleHQoKTsKKyAg ICAgIGZpbGVzW2ZpbGVfbmFtZV0gPSB0aGlzOworICAgIH0pOworICB9CisKKyAgJChkb2N1bWVu dCkucmVhZHkoZnVuY3Rpb24oKSB7CisgICAgY3Jhd2xEaWZmKCk7CisgICAgZmV0Y2hIaXN0b3J5 KCk7CiAgICAgJChkb2N1bWVudC5ib2R5KS5wcmVwZW5kKCc8ZGl2IGlkPSJ0b29sYmFyIj48ZGl2 IGNsYXNzPSJhY3Rpb25zIj48YnV0dG9uIGlkPSJwb3N0X2NvbW1lbnRzIj5QcmVwYXJlIGNvbW1l bnRzPC9idXR0b24+PC9kaXY+PGRpdiBjbGFzcz0iaGVscCI+RG91YmxlLWNsaWNrIGEgbGluZSB0 byBhZGQgYSBjb21tZW50LjwvZGl2PjwvZGl2PicpOwogICAgICQoZG9jdW1lbnQuYm9keSkucHJl cGVuZCgnPGRpdiBpZD0iY29tbWVudF9mb3JtIiBjbGFzcz0iaW5hY3RpdmUiPjxkaXYgY2xhc3M9 IndpbnRlciI+PC9kaXY+PGRpdiBjbGFzcz0ibGlnaHRib3giPjxpZnJhbWUgc3JjPSJhdHRhY2ht ZW50LmNnaT9pZD0nICsgYXR0YWNobWVudF9pZCArICcmYWN0aW9uPXJldmlld2Zvcm0iPjwvaWZy YW1lPjwvZGl2PjwvZGl2PicpOwogICB9KTsKQEAgLTE5NCw3ICsyNjgsNyBAQAogCiAgIGZ1bmN0 aW9uIHNuaXBwZXRGb3IobGluZSkgewogICAgIHZhciBmaWxlX25hbWUgPSBmaWxlTmFtZUZvcihs aW5lKTsKLSAgICB2YXIgbGluZV9udW1iZXIgPSBsaW5lLmhhc0NsYXNzKCdyZW1vdmUnKSA/IGxp bmUuY2hpbGRyZW4oJy5mcm9tJykudGV4dCgpIDogbGluZS5jaGlsZHJlbignLnRvJykudGV4dCgp OworICAgIHZhciBsaW5lX251bWJlciA9IGxpbmUuaGFzQ2xhc3MoJ3JlbW92ZScpID8gJy0nICsg bGluZS5jaGlsZHJlbignLmZyb20nKS50ZXh0KCkgOiBsaW5lLmNoaWxkcmVuKCcudG8nKS50ZXh0 KCk7CiAgICAgcmV0dXJuICc+ICcgKyBmaWxlX25hbWUgKyAnOicgKyBsaW5lX251bWJlciArICdc bicgKyBjb250ZXh0U25pcHBldEZvcihsaW5lKTsKICAgfQogCkBAIC0yMTUsNyArMjg5LDYgQEAK ICAgICB9KTsKICAgICAkKCcjY29tbWVudF9mb3JtJykucmVtb3ZlQ2xhc3MoJ2luYWN0aXZlJyk7 CiAgICAgdmFyIGNvbW1lbnQgPSBjb21tZW50c19pbl9jb250ZXh0LmpvaW4oJ1xuXG4nKTsKLSAg ICBjb25zb2xlLmxvZyhjb21tZW50KTsKICAgICAkKCcjY29tbWVudF9mb3JtJykuZmluZCgnaWZy YW1lJykuY29udGVudHMoKS5maW5kKCcjY29tbWVudCcpLnZhbChjb21tZW50KTsKICAgfSk7CiB9 KSgpOwpJbmRleDogQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIJKHJldmlzaW9uIDY2NTI1 KQorKysgQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIJKHdvcmtpbmcgY29weSkK QEAgLTI3Nyw3ICsyNzcsNyBAQCBib2R5IHsKIH0KIDwvc3R5bGU+CiA8c2NyaXB0IHNyYz0iaHR0 cHM6Ly9hamF4Lmdvb2dsZWFwaXMuY29tL2FqYXgvbGlicy9qcXVlcnkvMS40LjIvanF1ZXJ5Lm1p bi5qcyI+PC9zY3JpcHQ+IAotPHNjcmlwdCBzcmM9ImNvZGUtcmV2aWV3LmpzP3ZlcnNpb249MyI+ PC9zY3JpcHQ+IAorPHNjcmlwdCBzcmM9ImNvZGUtcmV2aWV3LmpzP3ZlcnNpb249NCI+PC9zY3Jp cHQ+IAogRU9GCiAKICAgICBkZWYgc2VsZi5yZXZpc2lvbk9yRGVzY3JpcHRpb24oc3RyaW5nKQo=