52498 2011-01-14 16:57:37 -0800 fix expanded lines in the code review tool 2011-01-14 17:15:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth oldest_to_newest 334741 0 ojan 2011-01-14 16:57:37 -0800 fix expanded lines in the code review tool 334743 1 79029 ojan 2011-01-14 16:58:42 -0800 Created attachment 79029 Patch 334758 2 79029 abarth 2011-01-14 17:08:23 -0800 Comment on attachment 79029 Patch Ok. "long-standing" 334763 3 ojan 2011-01-14 17:15:15 -0800 Committed r75847: <http://trac.webkit.org/changeset/75847> 79029 2011-01-14 16:58:42 -0800 2011-01-14 17:08:23 -0800 Patch bug-52498-20110114165841.patch text/plain 6476 ojan ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDcxZDI4NTMzMWQ5ODQ3Zjk1NDM3ZjIy YWMwYWE1NDFiOGQzYTE2YjcuLjk3NDFmNWQ4MjNlYzM0NTc4YmE1NzdhOGU4YzE2ZjExZGRhNjBi MzIgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEx LTAxLTE0ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZml4IGV4cGFuZGVkIGxpbmVzIGluIHRo ZSBjb2RlIHJldmlldyB0b29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01MjQ5OAorCisgICAgICAgIEZpeGVzIHRoZW0gdG8gd29yayBub3cgdGhhdCB3 ZSBoYXZlIHdyYXBwZXIgZGl2cy4KKyAgICAgICAgQWxzbyBmaXhlcyB0aGUgbG9uZy1zdGFuZGlu ZyBidWcgdGhhdCB0aGUgbGluZSBudW1iZXJzCisgICAgICAgIHdlcmUgaW5jb3JyZWN0IHNvbWV0 aW1lcy4KKworICAgICAgICAqIGNvZGUtcmV2aWV3LmpzOgorCisyMDExLTAxLTE0ICBPamFuIFZh ZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgRml4IGJhZCBtZXJnZSBpbiByNzU4 MTYuCiAKICAgICAgICAgKiBjb2RlLXJldmlldy5qczoKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1 Z3Mud2Via2l0Lm9yZy9jb2RlLXJldmlldy5qcyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9j b2RlLXJldmlldy5qcwppbmRleCBhOTAzYzE4OTQwMGUzMDllNzE5OTg5MGNiNGE2YWQyOGM5YmVm ZTdkLi4xZDI1YjBmYTU4Mzc0Y2YwMzBkYTQ2NGQzOTc4ZmRjYjg2MjdiYWExIDEwMDY0NAotLS0g YS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvY29kZS1yZXZpZXcuanMKKysrIGIvV2Vic2l0ZXMv YnVncy53ZWJraXQub3JnL2NvZGUtcmV2aWV3LmpzCkBAIC00NDIsNiArNDQyLDMwIEBACiAgIHZh ciBCRUxPVyA9ICdiZWxvdyc7CiAgIHZhciBBTEwgPSAnYWxsJzsKIAorICBmdW5jdGlvbiBsaW5l TnVtYmVyc0Zyb21TZXQoc2V0LCBpc19sYXN0KSB7CisgICAgdmFyIHRvID0gLTE7CisgICAgdmFy IGZyb20gPSAtMTsKKworICAgIHZhciBzaXplID0gc2V0LnNpemUoKTsKKyAgICB2YXIgc3RhcnQg PSBpc19sYXN0ID8gKHNpemUgLSAxKSA6IDA7CisgICAgdmFyIGVuZCA9IGlzX2xhc3QgPyAtMSA6 IHNpemU7CisgICAgdmFyIG9mZnNldCA9IGlzX2xhc3QgPyAtMSA6IDE7CisKKyAgICBmb3IgKHZh ciBpID0gc3RhcnQ7IGkgIT0gZW5kOyBpICs9IG9mZnNldCkgeworICAgICAgaWYgKHRvICE9IC0x ICYmIGZyb20gIT0gLTEpCisgICAgICAgIHJldHVybiB7dG86IHRvLCBmcm9tOiBmcm9tfTsKKwor ICAgICAgdmFyIGxpbmVfbnVtYmVyID0gc2V0W2ldOworICAgICAgaWYgKCQobGluZV9udW1iZXIp Lmhhc0NsYXNzKCd0bycpKSB7CisgICAgICAgIGlmICh0byA9PSAtMSkKKyAgICAgICAgICB0byA9 IE51bWJlcihsaW5lX251bWJlci50ZXh0Q29udGVudCk7CisgICAgICB9IGVsc2UgeworICAgICAg ICBpZiAoZnJvbSA9PSAtMSkKKyAgICAgICAgICBmcm9tID0gTnVtYmVyKGxpbmVfbnVtYmVyLnRl eHRDb250ZW50KTsKKyAgICAgIH0KKyAgICB9CisgIH0KKwogICBmdW5jdGlvbiBleHBhbmQoZXhw YW5kX2JhciwgZmlsZV9uYW1lLCBkaXJlY3Rpb24sIGFtb3VudCkgewogICAgIGlmIChmaWxlX25h bWUgaW4gb3JpZ2luYWxfZmlsZV9jb250ZW50cyAmJiAhcGF0Y2hlZF9maWxlX2NvbnRlbnRzW2Zp bGVfbmFtZV0pIHsKICAgICAgIC8vIEZJWE1FOiBJbiB0aGlzIGNhc2UsIHRyeSBmZXRjaGluZyB0 aGUgc291cmNlIGZpbGUgYXQgdGhlIHJldmlzaW9uIHRoZSBwYXRjaCB3YXMgY3JlYXRlZCBhdC4K QEAgLTQ1MywzMCArNDc3LDMyIEBACiAgICAgdmFyIGFib3ZlX2V4cGFuc2lvbiA9IGV4cGFuZF9i YXIucXVlcnlTZWxlY3RvcignLkV4cGFuZCcgKyBBQk9WRSkKICAgICB2YXIgYmVsb3dfZXhwYW5z aW9uID0gZXhwYW5kX2Jhci5xdWVyeVNlbGVjdG9yKCcuRXhwYW5kJyArIEJFTE9XKQogCi0gICAg dmFyIGFib3ZlX2xhc3RfbGluZSA9IGFib3ZlX2V4cGFuc2lvbi5xdWVyeVNlbGVjdG9yKCcuRXhw YW5zaW9uTGluZTpsYXN0LW9mLXR5cGUnKTsKLSAgICBpZiAoIWFib3ZlX2xhc3RfbGluZSkgewor ICAgIHZhciBhYm92ZV9saW5lX251bWJlcnMgPSAkKCcuZXhwYW5zaW9uTGluZU51bWJlcicsIGFi b3ZlX2V4cGFuc2lvbik7CisgICAgaWYgKCFhYm92ZV9saW5lX251bWJlcnNbMF0pIHsKICAgICAg IHZhciBkaWZmX3NlY3Rpb24gPSBleHBhbmRfYmFyLnByZXZpb3VzRWxlbWVudFNpYmxpbmc7Ci0g ICAgICBhYm92ZV9sYXN0X2xpbmUgPSBkaWZmX3NlY3Rpb24ucXVlcnlTZWxlY3RvcignLkxpbmVD b250YWluZXI6bGFzdC1vZi10eXBlJyk7CisgICAgICBhYm92ZV9saW5lX251bWJlcnMgPSAkKCcu bGluZU51bWJlcicsIGRpZmZfc2VjdGlvbik7CiAgICAgfQogCiAgICAgdmFyIGFib3ZlX2xhc3Rf bGluZV9udW0sIGFib3ZlX2xhc3RfZnJvbV9saW5lX251bTsKLSAgICBpZiAoYWJvdmVfbGFzdF9s aW5lKSB7Ci0gICAgICBhYm92ZV9sYXN0X2xpbmVfbnVtID0gdG9MaW5lTnVtYmVyKGFib3ZlX2xh c3RfbGluZSk7Ci0gICAgICBhYm92ZV9sYXN0X2Zyb21fbGluZV9udW0gPSBmcm9tTGluZU51bWJl cihhYm92ZV9sYXN0X2xpbmUpOworICAgIGlmIChhYm92ZV9saW5lX251bWJlcnNbMF0pIHsKKyAg ICAgIHZhciBhYm92ZV9udW1iZXJzID0gbGluZU51bWJlcnNGcm9tU2V0KGFib3ZlX2xpbmVfbnVt YmVycywgdHJ1ZSk7CisgICAgICBhYm92ZV9sYXN0X2xpbmVfbnVtID0gYWJvdmVfbnVtYmVycy50 bzsKKyAgICAgIGFib3ZlX2xhc3RfZnJvbV9saW5lX251bSA9IGFib3ZlX251bWJlcnMuZnJvbTsK ICAgICB9IGVsc2UKICAgICAgIGFib3ZlX2xhc3RfZnJvbV9saW5lX251bSA9IGFib3ZlX2xhc3Rf bGluZV9udW0gPSAwOwogCi0gICAgdmFyIGJlbG93X2ZpcnN0X2xpbmUgPSBiZWxvd19leHBhbnNp b24ucXVlcnlTZWxlY3RvcignLkV4cGFuc2lvbkxpbmUnKTsKLSAgICBpZiAoIWJlbG93X2ZpcnN0 X2xpbmUpIHsKKyAgICB2YXIgYmVsb3dfbGluZV9udW1iZXJzID0gJCgnLmV4cGFuc2lvbkxpbmVO dW1iZXInLCBiZWxvd19leHBhbnNpb24pOworICAgIGlmICghYmVsb3dfbGluZV9udW1iZXJzWzBd KSB7CiAgICAgICB2YXIgZGlmZl9zZWN0aW9uID0gZXhwYW5kX2Jhci5uZXh0RWxlbWVudFNpYmxp bmc7CiAgICAgICBpZiAoZGlmZl9zZWN0aW9uKQotICAgICAgICBiZWxvd19maXJzdF9saW5lID0g ZGlmZl9zZWN0aW9uLnF1ZXJ5U2VsZWN0b3IoJy5MaW5lQ29udGFpbmVyJyk7CisgICAgICAgIGJl bG93X2xpbmVfbnVtYmVycyA9ICQoJy5saW5lTnVtYmVyJywgZGlmZl9zZWN0aW9uKTsKICAgICB9 CiAKICAgICB2YXIgYmVsb3dfZmlyc3RfbGluZV9udW0sIGJlbG93X2ZpcnN0X2Zyb21fbGluZV9u dW07Ci0gICAgaWYgKGJlbG93X2ZpcnN0X2xpbmUpIHsKLSAgICAgIGJlbG93X2ZpcnN0X2xpbmVf bnVtID0gdG9MaW5lTnVtYmVyKGJlbG93X2ZpcnN0X2xpbmUpIC0gMTsKLSAgICAgIGJlbG93X2Zp cnN0X2Zyb21fbGluZV9udW0gPSBmcm9tTGluZU51bWJlcihiZWxvd19maXJzdF9saW5lKSAtIDE7 CisgICAgaWYgKGJlbG93X2xpbmVfbnVtYmVyc1swXSkgeworICAgICAgdmFyIGJlbG93X251bWJl cnMgPSBsaW5lTnVtYmVyc0Zyb21TZXQoYmVsb3dfbGluZV9udW1iZXJzLCBmYWxzZSk7CisgICAg ICBiZWxvd19maXJzdF9saW5lX251bSA9IGJlbG93X251bWJlcnMudG8gLSAxOworICAgICAgYmVs b3dfZmlyc3RfZnJvbV9saW5lX251bSA9IGJlbG93X251bWJlcnMuZnJvbSAtIDE7CiAgICAgfSBl bHNlCiAgICAgICBiZWxvd19maXJzdF9mcm9tX2xpbmVfbnVtID0gYmVsb3dfZmlyc3RfbGluZV9u dW0gPSBwYXRjaGVkX2ZpbGVfY29udGVudHNbZmlsZV9uYW1lXS5sZW5ndGggLSAxOwogCkBAIC01 MjYsMTUgKzU1MiwxNSBAQAogICAgIHJldHVybiBsaW5lOwogICB9CiAKLSAgZnVuY3Rpb24gdW5p ZmllZEV4cGFuc2lvbkxpbmUobGluZV9udW1iZXIsIGNvbnRlbnRzKSB7Ci0gICAgcmV0dXJuIHVu aWZpZWRMaW5lKGxpbmVfbnVtYmVyLCBsaW5lX251bWJlciwgY29udGVudHMsIHRydWUpOworICBm dW5jdGlvbiB1bmlmaWVkRXhwYW5zaW9uTGluZShmcm9tLCB0bywgY29udGVudHMpIHsKKyAgICBy ZXR1cm4gdW5pZmllZExpbmUoZnJvbSwgdG8sIGNvbnRlbnRzLCB0cnVlKTsKICAgfQogCi0gIGZ1 bmN0aW9uIHNpZGVCeVNpZGVFeHBhbnNpb25MaW5lKGxpbmVfbnVtYmVyLCBjb250ZW50cykgewor ICBmdW5jdGlvbiBzaWRlQnlTaWRlRXhwYW5zaW9uTGluZShmcm9tLCB0bywgY29udGVudHMpIHsK ICAgICB2YXIgbGluZSA9ICQoJzxkaXYgY2xhc3M9IkV4cGFuc2lvbkxpbmUiPjwvZGl2PicpOwog ICAgIC8vIENsb25lIHRoZSBjb250ZW50cyBzbyB3ZSBoYXZlIHR3byBjb3BpZXMgd2UgY2FuIHB1 dCBiYWNrIGluIHRoZSBET00uCi0gICAgbGluZS5hcHBlbmQobGluZVNpZGUoJ2Zyb20nLCBjb250 ZW50cy5jbG9uZSh0cnVlKSwgdHJ1ZSwgbGluZV9udW1iZXIpKTsKLSAgICBsaW5lLmFwcGVuZChs aW5lU2lkZSgndG8nLCBjb250ZW50cywgdHJ1ZSwgbGluZV9udW1iZXIpKTsKKyAgICBsaW5lLmFw cGVuZChsaW5lU2lkZSgnZnJvbScsIGNvbnRlbnRzLmNsb25lKHRydWUpLCB0cnVlLCBmcm9tKSk7 CisgICAgbGluZS5hcHBlbmQobGluZVNpZGUoJ3RvJywgY29udGVudHMsIHRydWUsIHRvKSk7CiAg ICAgcmV0dXJuIGxpbmU7CiAgIH0KIApAQCAtNTY3LDExICs1OTMsMTEgQEAKICAgICB2YXIgaXNf c2lkZV9ieV9zaWRlID0gaXNEaWZmU2lkZUJ5U2lkZShmaWxlc1tmaWxlX25hbWVdKTsKIAogICAg IGZvciAodmFyIGkgPSAwOyBpIDwgZW5kX2xpbmVfbnVtIC0gc3RhcnRfbGluZV9udW07IGkrKykg ewotICAgICAgLy8gRklYTUU6IGZyb20gbGluZSBudW1iZXJzIGFyZSB3cm9uZwotICAgICAgdmFy IGxpbmVfbnVtYmVyID0gc3RhcnRfZnJvbV9saW5lX251bSArIGkgKyAxOworICAgICAgdmFyIGZy b20gPSBzdGFydF9mcm9tX2xpbmVfbnVtICsgaSArIDE7CisgICAgICB2YXIgdG8gPSBzdGFydF9s aW5lX251bSArIGkgKyAxOwogICAgICAgdmFyIGNvbnRlbnRzID0gJCgnPHNwYW4gY2xhc3M9InRl eHQiPjwvc3Bhbj4nKTsKICAgICAgIGNvbnRlbnRzLnRleHQocGF0Y2hlZF9maWxlX2NvbnRlbnRz W2ZpbGVfbmFtZV1bc3RhcnRfbGluZV9udW0gKyBpXSk7Ci0gICAgICB2YXIgbGluZSA9IGlzX3Np ZGVfYnlfc2lkZSA/IHNpZGVCeVNpZGVFeHBhbnNpb25MaW5lKGxpbmVfbnVtYmVyLCBjb250ZW50 cykgOiB1bmlmaWVkRXhwYW5zaW9uTGluZShsaW5lX251bWJlciwgY29udGVudHMpOworICAgICAg dmFyIGxpbmUgPSBpc19zaWRlX2J5X3NpZGUgPyBzaWRlQnlTaWRlRXhwYW5zaW9uTGluZShmcm9t LCB0bywgY29udGVudHMpIDogdW5pZmllZEV4cGFuc2lvbkxpbmUoZnJvbSwgdG8sIGNvbnRlbnRz KTsKICAgICAgIGZyYWdtZW50LmFwcGVuZENoaWxkKGxpbmVbMF0pOwogICAgIH0KIApAQCAtODQy LDcgKzg2OCw2IEBACiAgICAgcmV0dXJuIGF0dHJpYnV0ZXNCdWZmZXIuam9pbignICcpOwogICB9 CiAKLSAgLy8gRklYTUU6IFB1dCByZW1vdmVkIGxpbmVzIHRvIHRoZSBsZWZ0IG9mIHRoZWlyIGNv cnJlc3BvbmRpbmcgYWRkZWQgbGluZXMuCiAgIGZ1bmN0aW9uIHNpZGVCeVNpZGVpZnlMaW5lKGxp bmUsIGZyb20sIHRvLCBjb250ZW50cywgY2xhc3NOYW1lcywgYXR0cmlidXRlcywgaWQpIHsKICAg ICB2YXIgZnJvbV9jbGFzcyA9ICcnOwogICAgIHZhciB0b19jbGFzcyA9ICcnOwpAQCAtODgxLDgg KzkwNiw5IEBACiAgIGZ1bmN0aW9uIGNvbnZlcnRFeHBhbnNpb25MaW5lKGRpZmZfdHlwZSwgbGlu ZSkgewogICAgIHZhciBjb252ZXJ0X2Z1bmN0aW9uID0gZGlmZl90eXBlID09ICdzaWRlYnlzaWRl JyA/IHNpZGVCeVNpZGVFeHBhbnNpb25MaW5lIDogdW5pZmllZEV4cGFuc2lvbkxpbmU7CiAgICAg dmFyIGNvbnRlbnRzID0gJCgnLnRleHQnLCBsaW5lKS5maXJzdCgpOwotICAgIHZhciBsaW5lX251 bWJlciA9IGZyb21MaW5lTnVtYmVyKGxpbmUpOwotICAgIHZhciBuZXdfbGluZSA9IGNvbnZlcnRf ZnVuY3Rpb24obGluZV9udW1iZXIsIGNvbnRlbnRzKTsKKyAgICB2YXIgZnJvbSA9IGZyb21MaW5l TnVtYmVyKGxpbmUpOworICAgIHZhciB0byA9IHRvTGluZU51bWJlcihsaW5lKTsKKyAgICB2YXIg bmV3X2xpbmUgPSBjb252ZXJ0X2Z1bmN0aW9uKGZyb20sIHRvLCBjb250ZW50cyk7CiAgICAgJChs aW5lKS5yZXBsYWNlV2l0aChuZXdfbGluZSk7CiAgIH0KIAo=