53974 2011-02-07 21:14:16 -0800 bring back diff context lines into the review tool 2011-02-07 22:39:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth aroben oldest_to_newest 347059 0 ojan 2011-02-07 21:14:16 -0800 bring back diff context lines into the review tool 347061 1 81579 ojan 2011-02-07 21:14:55 -0800 Created attachment 81579 Patch 347083 2 81579 abarth 2011-02-07 21:56:24 -0800 Comment on attachment 81579 Patch I can't verify all the details, but looks reasonable. 347119 3 ojan 2011-02-07 22:39:57 -0800 Committed r77903: <http://trac.webkit.org/changeset/77903> 81579 2011-02-07 21:14:55 -0800 2011-02-07 21:56:24 -0800 Patch bug-53974-20110208161452.patch text/plain 3681 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogNzc4OTAKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Vi a2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmlu ZGV4IDNlZWYzYzFhZGM3MWVhOTNkMGVmYTZiMmYzZTFiZDFkN2U1ZDc4NmQuLmI1Y2M4Zjc0Mjlh MzM0NjY2NGM1ZmE2YjMwZDNiMzZkNjZmNmI2NDQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mu d2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTAyLTA3ICBPamFuIFZhZmFpICA8b2phbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgYnJpbmcgYmFjayBkaWZmIGNvbnRleHQgbGluZXMgaW50byB0aGUgcmV2aWV3IHRvb2wKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzOTc0CisKKyAg ICAgICAgKiBjb2RlLXJldmlldy5qczoKKwogMjAxMS0wMi0wMSAgT2phbiBWYWZhaSAgPG9qYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1n aXQgYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvY29kZS1yZXZpZXcuanMgYi9XZWJzaXRlcy9i dWdzLndlYmtpdC5vcmcvY29kZS1yZXZpZXcuanMKaW5kZXggYWNiY2M0ODY4ZTcyYTZjMTFhYWVk NWQ2NTQxZDMzNTU4YWZjOGM2ZS4uZWQ2Y2IwOWE3ZWI5OWEwZjY5NWRmM2FkMjliZTJjZDFhOTcz ODJkMiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2aWV3Lmpz CisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9jb2RlLXJldmlldy5qcwpAQCAtNTgyLDE0 ICs1ODIsMTIgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogCiAgICAgLy8gRG9uJ3Qgc2hv dyB0aGUgbGlua3MgdG8gZXhwYW5kIHVwd2FyZHMvZG93bndhcmRzIGlmIHRoZSBwYXRjaCBzdGFy dHMvZW5kcyB3aXRob3V0IGNvbnRleHQKICAgICAvLyBsaW5lcywgaS5lLiBzdGFydHMvZW5kcyB3 aXRoIGFkZC9yZW1vdmUgbGluZXMuCi0gICAgdmFyIGZpcnN0X2xpbmUgPSBmaWxlX2RpZmYucXVl cnlTZWxlY3RvcignLkxpbmVDb250YWluZXInKTsKKyAgICB2YXIgZmlyc3RfbGluZSA9IGZpbGVf ZGlmZi5xdWVyeVNlbGVjdG9yKCcuTGluZUNvbnRhaW5lcjpub3QoLmNvbnRleHQpJyk7CiAKICAg ICAvLyBJZiB0aGVyZSBpcyBubyBlbGVtZW50IHdpdGggYSAiTGluZSIgY2xhc3MsIHRoZW4gdGhp cyBpcyBhbiBpbWFnZSBkaWZmLgogICAgIGlmICghZmlyc3RfbGluZSkKICAgICAgIHJldHVybjsK IAotICAgICQoJy5jb250ZXh0JywgZmlsZV9kaWZmKS5kZXRhY2goKTsKLQogICAgIHZhciBleHBh bmRfYmFyX2luZGV4ID0gMDsKICAgICBpZiAoISQoZmlyc3RfbGluZSkuaGFzQ2xhc3MoJ2FkZCcp ICYmICEkKGZpcnN0X2xpbmUpLmhhc0NsYXNzKCdyZW1vdmUnKSkKICAgICAgICQoJ2gxJywgZmls ZV9kaWZmKS5hZnRlcihleHBhbmRCYXJIdG1sKEJFTE9XKSkKQEAgLTczNiw3ICs3MzQsNyBAQCB2 YXIgQ09ERV9SRVZJRVdfVU5JVFRFU1Q7CiAgICAgdmFyIGFib3ZlX2xpbmVfbnVtYmVycyA9ICQo Jy5leHBhbnNpb25MaW5lTnVtYmVyJywgYWJvdmVfZXhwYW5zaW9uKTsKICAgICBpZiAoIWFib3Zl X2xpbmVfbnVtYmVyc1swXSkgewogICAgICAgdmFyIGRpZmZfc2VjdGlvbiA9IGV4cGFuZF9iYXIu cHJldmlvdXNFbGVtZW50U2libGluZzsKLSAgICAgIGFib3ZlX2xpbmVfbnVtYmVycyA9ICQoJy5s aW5lTnVtYmVyJywgZGlmZl9zZWN0aW9uKTsKKyAgICAgIGFib3ZlX2xpbmVfbnVtYmVycyA9ICQo Jy5MaW5lOm5vdCguY29udGV4dCkgLmxpbmVOdW1iZXInLCBkaWZmX3NlY3Rpb24pOwogICAgIH0K IAogICAgIHZhciBhYm92ZV9sYXN0X2xpbmVfbnVtLCBhYm92ZV9sYXN0X2Zyb21fbGluZV9udW07 CkBAIC03NTEsNyArNzQ5LDcgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogICAgIGlmICgh YmVsb3dfbGluZV9udW1iZXJzWzBdKSB7CiAgICAgICB2YXIgZGlmZl9zZWN0aW9uID0gZXhwYW5k X2Jhci5uZXh0RWxlbWVudFNpYmxpbmc7CiAgICAgICBpZiAoZGlmZl9zZWN0aW9uKQotICAgICAg ICBiZWxvd19saW5lX251bWJlcnMgPSAkKCcubGluZU51bWJlcicsIGRpZmZfc2VjdGlvbik7Cisg ICAgICAgIGJlbG93X2xpbmVfbnVtYmVycyA9ICQoJy5MaW5lOm5vdCguY29udGV4dCkgLmxpbmVO dW1iZXInLCBkaWZmX3NlY3Rpb24pOwogICAgIH0KIAogICAgIHZhciBiZWxvd19maXJzdF9saW5l X251bSwgYmVsb3dfZmlyc3RfZnJvbV9saW5lX251bTsKQEAgLTc4Niw2ICs3ODQsOCBAQCB2YXIg Q09ERV9SRVZJRVdfVU5JVFRFU1Q7CiAgICAgaWYgKHN0YXJ0X2xpbmVfbnVtID09IGFib3ZlX2xh c3RfbGluZV9udW0gJiYgZW5kX2xpbmVfbnVtID09IGJlbG93X2ZpcnN0X2xpbmVfbnVtKSB7CiAg ICAgICAkKCcuRXhwYW5kTGlua0NvbnRhaW5lcicsIGV4cGFuZF9iYXIpLmRldGFjaCgpOwogICAg ICAgYmVsb3dfZXhwYW5zaW9uLmluc2VydEJlZm9yZShsaW5lcywgYmVsb3dfZXhwYW5zaW9uLmZp cnN0Q2hpbGQpOworICAgICAgLy8gTm93IHRoYXQgd2UncmUgZmlsbGluZyBpbiBhbGwgdGhlIGxp bmVzLCB0aGUgY29udGV4dCBsaW5lIGZvbGxvd2luZyB0aGlzIGV4cGFuZCBiYXIgaXMgbm8gbG9u Z2VyIG5lZWRlZC4KKyAgICAgICQoJy5jb250ZXh0JywgZXhwYW5kX2Jhci5uZXh0RWxlbWVudFNp YmxpbmcpLmRldGFjaCgpOwogICAgIH0gZWxzZSBpZiAoZGlyZWN0aW9uID09IEFCT1ZFKSB7CiAg ICAgICBhYm92ZV9leHBhbnNpb24uYXBwZW5kQ2hpbGQobGluZXMpOwogICAgIH0gZWxzZSB7CkBA IC05MjcsNyArOTI3LDcgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogICAgIC8vIEFwcGx5 IGRpZmZzIGluIHJldmVyc2Ugb3JkZXIgdG8gYXZvaWQgbmVlZGluZyB0byBrZWVwIHRyYWNrIG9m IGNoYW5naW5nIGxpbmUgbnVtYmVycy4KICAgICBmb3IgKHZhciBpID0gZGlmZl9zZWN0aW9ucy5s ZW5ndGggLSAxOyBpID49IDA7IGktLSkgewogICAgICAgdmFyIHNlY3Rpb24gPSBkaWZmX3NlY3Rp b25zW2ldOwotICAgICAgdmFyIGxpbmVzID0gc2VjdGlvbi5nZXRFbGVtZW50c0J5Q2xhc3NOYW1l KCdMaW5lJyk7CisgICAgICB2YXIgbGluZXMgPSAkKCcuTGluZTpub3QoLmNvbnRleHQpJywgc2Vj dGlvbik7CiAgICAgICB2YXIgY3VycmVudF9saW5lID0gLTE7CiAgICAgICB2YXIgY29udGV4dCA9 IFtdOwogICAgICAgdmFyIGh1bmtfbnVtID0gaSArIDE7CkBAIC0xMDkyLDYgKzEwOTIsMTAgQEAg dmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogICAgICQoZmlsZV9kaWZmKS5hdHRyKCdkYXRhLWRp ZmZzdGF0ZScsIGRpZmZfdHlwZSk7CiAgICAgdXBkYXRlRGlmZkxpbmtWaXNpYmlsaXR5KGZpbGVf ZGlmZik7CiAKKyAgICAkKCcuY29udGV4dCcsIGZpbGVfZGlmZikuZWFjaChmdW5jdGlvbigpIHsK KyAgICAgIGNvbnZlcnRMaW5lKGRpZmZfdHlwZSwgdGhpcyk7CisgICAgfSk7CisKICAgICAkKCcu c2hhcmVkIC5MaW5lJywgZmlsZV9kaWZmKS5lYWNoKGZ1bmN0aW9uKCkgewogICAgICAgY29udmVy dExpbmUoZGlmZl90eXBlLCB0aGlzKTsKICAgICB9KTsK