52180 2011-01-10 16:55:27 -0800 convert back to unified from sidebyside diff 2011-01-11 12:07:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth eric mihaip webkit.review.bot oldest_to_newest 332054 0 ojan 2011-01-10 16:55:27 -0800 convert back to unified from sidebyside diff 332060 1 78473 ojan 2011-01-10 16:58:00 -0800 Created attachment 78473 Patch 332071 2 78473 abarth 2011-01-10 17:31:08 -0800 Comment on attachment 78473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78473&action=review > Websites/bugs.webkit.org/code-review.js:885 > + $('.unify-link').live('click', handleUnifyLinkClick); > $('.ExpandLink').live('click', handleExpandLinkClick); These classes seem unnecessarily different. 332072 3 abarth 2011-01-10 17:31:29 -0800 It's difficult to review this patch for correctness, but it seems fine. 332115 4 ojan 2011-01-10 18:48:12 -0800 (In reply to comment #2) > (From update of attachment 78473 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=78473&action=review > > > Websites/bugs.webkit.org/code-review.js:885 > > + $('.unify-link').live('click', handleUnifyLinkClick); > > $('.ExpandLink').live('click', handleExpandLinkClick); > > These classes seem unnecessarily different. Yeah. I never know which style to follow in this file. The existing style in this file is some mashup of webkit/chromium/bugzilla style. At some point we should make it have a consistent style. Until then, I'm not sure what style to follow, so I end up doing some mix. :( 332121 5 78473 abarth 2011-01-10 18:56:28 -0800 Comment on attachment 78473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78473&action=review >>> Websites/bugs.webkit.org/code-review.js:885 >>> $('.side-by-side-link').live('click', handleSideBySideLinkClick); >>> + $('.unify-link').live('click', handleUnifyLinkClick); >>> $('.ExpandLink').live('click', handleExpandLinkClick); >> >> These classes seem unnecessarily different. > > Yeah. I never know which style to follow in this file. The existing style in this file is some mashup of webkit/chromium/bugzilla style. At some point we should make it have a consistent style. Until then, I'm not sure what style to follow, so I end up doing some mix. :( Fair enough. :) 332439 6 ojan 2011-01-11 10:39:32 -0800 Committed r75514: <http://trac.webkit.org/changeset/75514> 332522 7 webkit.review.bot 2011-01-11 12:07:12 -0800 http://trac.webkit.org/changeset/75514 might have broken GTK Linux 64-bit Debug 78473 2011-01-10 16:58:00 -0800 2011-01-10 18:56:28 -0800 Patch bug-52180-20110110165759.patch text/plain 11843 ojan ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDllMDQwMTk1YzMwNWQyZGY5NWFhMTRh ZjM5YWM4NWJhNGRkZjcxM2YuLjVlYmIxNGRkZjJkOTZkZWFkNjdiMGU3ZDc3ZDUwMzZiNWE5ZGFi OTEgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEx LTAxLTEwICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY29udmVydCBiYWNrIHRvIHVuaWZpZWQg ZnJvbSBzaWRlYnlzaWRlIGRpZmYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUyMTgwCisKKyAgICAgICAgUmVtb3ZlIHVybCBmcmFnbWVudCBzdHVmZi4g SGF2aW5nIGl0IGJlIHBlci1maWxlZGlmZiBpcyB0b28gY29tcGxpY2F0ZWQuCisKKyAgICAgICAg KiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKKyAgICAgICAgKiBjb2RlLXJldmlldy5qczoK KwogMjAxMS0wMS0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJ1YmJlci1zdGFtcGVkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVn cy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiIGIvV2Vic2l0ZXMvYnVncy53 ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCmluZGV4IGFjMTA3NTc3MGE0N2U1 MWQwMTgwNTE4NDFmMWJjMjljMDQ5ZTI5MDMuLjg0NjExZDY4OGE3MDJjMTM5ZTQzNTZiMTBmOTMw MGJhZTFjZDk4YzIgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQ YXRjaC9QcmV0dHlQYXRjaC5yYgorKysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5 UGF0Y2gvUHJldHR5UGF0Y2gucmIKQEAgLTMwMiwxNiArMzAyLDE3IEBAIGJvZHkgewogICBtYXJn aW4tbGVmdDogMC42N2VtOwogfQogCi0uRXhwYW5kTGlua0NvbnRhaW5lciBhIHsKKy5MaW5rQ29u dGFpbmVyIGEgewogICBib3JkZXI6IDA7CisgIGZvbnQtc3R5bGU6IG5vcm1hbDsKIH0KIAotLkV4 cGFuZExpbmtDb250YWluZXIgYTphZnRlciB7CisuTGlua0NvbnRhaW5lciBhOmFmdGVyIHsKICAg Y29udGVudDogIiB8ICI7CiAgIGNvbG9yOiBibGFjazsKIH0KIAotLkV4cGFuZExpbmtDb250YWlu ZXIgYTpsYXN0LW9mLXR5cGU6YWZ0ZXIgeworLkxpbmtDb250YWluZXIgYTpsYXN0LW9mLXR5cGU6 YWZ0ZXIgewogICBjb250ZW50OiAiIjsKIH0KIApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53 ZWJraXQub3JnL2NvZGUtcmV2aWV3LmpzIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUt cmV2aWV3LmpzCmluZGV4IDA5MTY2YzY1ZjYyZDNhNzM3ZWM4Y2Q2NGUyY2RmOTVkNzBmZDBhMDEu LjBkYTFhMTRhODJjNDUzNmY5NTAyZDJhZWUxZDc1NmRjNDRkNDRhMjIgMTAwNjQ0Ci0tLSBhL1dl YnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9jb2RlLXJldmlldy5qcworKysgYi9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvY29kZS1yZXZpZXcuanMKQEAgLTY0LDkgKzY0LDYgQEAKICAgdmFyIG9yaWdp bmFsX2ZpbGVfY29udGVudHMgPSB7fTsKICAgdmFyIHBhdGNoZWRfZmlsZV9jb250ZW50cyA9IHt9 OwogICB2YXIgV0VCS0lUX0JBU0VfRElSID0gImh0dHA6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0 b3J5L3dlYmtpdC90cnVuay8iOwotICAvLyBGSVhNRTogU2VyaWFsaXplIHRoaXMgdG8gdGhlIFVS TCBmcmFnbWVudCBmb3IgcGVybWFsaW5raW5nIGdvb2RuZXNzLCBlLmcuLAotICAvLyBzbyB0aGUg YnVnIHBhZ2UgY2FuIGxpbmsgZGlyZWN0bHkgdG8gdGhlIHNpZGUtYnktc2lkZSBkaWZmLgotICB2 YXIgdXJsX2ZyYWdtZW50ID0ge307CiAgIHZhciBTSURFX0JZX1NJREVfRElGRlNfS0VZID0gJ3Np ZGVieXNpZGVkaWZmcyc7CiAKICAgZnVuY3Rpb24gaWRGb3JMaW5lKG51bWJlcikgewpAQCAtMzUy LDcgKzM0OSw3IEBACiAgIGZ1bmN0aW9uIGV4cGFuZEJhckh0bWwoZmlsZV9uYW1lLCBvcHRfZGly ZWN0aW9uKSB7CiAgICAgdmFyIGh0bWwgPSAnPGRpdiBjbGFzcz0iRXhwYW5kQmFyIj4nICsKICAg ICAgICAgJzxwcmUgY2xhc3M9IkV4cGFuZEFyZWEgRXhwYW5kJyArIEFCT1ZFICsgJyI+PC9wcmU+ JyArCi0gICAgICAgICc8ZGl2IGNsYXNzPSJFeHBhbmRMaW5rQ29udGFpbmVyIj48c3BhbiBjbGFz cz0iRXhwYW5kVGV4dCI+ZXhwYW5kOiA8L3NwYW4+JzsKKyAgICAgICAgJzxkaXYgY2xhc3M9IkV4 cGFuZExpbmtDb250YWluZXIgTGlua0NvbnRhaW5lciI+PHNwYW4gY2xhc3M9IkV4cGFuZFRleHQi PmV4cGFuZDogPC9zcGFuPic7CiAKICAgICAvLyBGSVhNRTogSWYgdGhlcmUgYXJlIDwxMDAgbGlu ZSB0byBleHBhbmQsIGRvbid0IHNob3cgdGhlIGV4cGFuZC0xMDAgbGluay4KICAgICAvLyBJZiB0 aGVyZSBhcmUgPDIwIGxpbmVzIHRvIGV4cGFuZCwgZG9uJ3Qgc2hvdyB0aGUgZXhwYW5kLTIwIGxp bmsuCkBAIC0zODgsNyArMzg1LDE1IEBACiAgIH0KIAogICBmdW5jdGlvbiBoYW5kbGVTaWRlQnlT aWRlTGlua0NsaWNrKCkgewotICAgICQoJy5GaWxlRGlmZicpLmVhY2goc2lkZUJ5U2lkZWlmeSk7 CisgICAgJCgnLkZpbGVEaWZmJykuZWFjaChmdW5jdGlvbigpIHsKKyAgICAgIGNvbnZlcnRGaWxl RGlmZignc2lkZWJ5c2lkZScsIHRoaXMpOworICAgIH0pOworICB9CisKKyAgZnVuY3Rpb24gaGFu ZGxlVW5pZnlMaW5rQ2xpY2soKSB7CisgICAgJCgnLkZpbGVEaWZmJykuZWFjaChmdW5jdGlvbigp IHsKKyAgICAgIGNvbnZlcnRGaWxlRGlmZigndW5pZmllZCcsIHRoaXMpOworICAgIH0pOwogICB9 CiAKICAgZnVuY3Rpb24gZ2V0V2ViS2l0U291cmNlRmlsZShmaWxlX25hbWUsIG9uTG9hZCwgZXhw YW5kX2JhcikgewpAQCAtNDkyLDEwICs0OTcsMTYgQEAKICAgICBpbnNlcnRMaW5lcyhmaWxlX25h bWUsIGV4cGFuc2lvbl9hcmVhLCBkaXJlY3Rpb24sIHN0YXJ0X2xpbmVfbnVtLCBlbmRfbGluZV9u dW0sIHN0YXJ0X2Zyb21fbGluZV9udW0pOwogICB9CiAKLSAgZnVuY3Rpb24gdW5pZmllZERpZmZF eHBhbnNpb25MaW5lKGxpbmVfbnVtYmVyLCBjb250ZW50cykgewotICAgIHZhciBsaW5lID0gJCgn PGRpdiBjbGFzcz0iRXhwYW5zaW9uTGluZSI+JyArCi0gICAgICAgICc8c3BhbiBjbGFzcz0iZnJv bSBleHBhbnNpb25saW5lTnVtYmVyIj4nICsgbGluZV9udW1iZXIgKwotICAgICAgICAnPC9zcGFu PjxzcGFuIGNsYXNzPSJ0byBleHBhbnNpb25saW5lTnVtYmVyIj4nICsgbGluZV9udW1iZXIgKwor ICBmdW5jdGlvbiB1bmlmaWVkTGluZShmcm9tLCB0bywgY29udGVudHMsIGlzX2V4cGFuc2lvbl9s aW5lLCBvcHRfY2xhc3NOYW1lLCBvcHRfYXR0cmlidXRlcykgeworICAgIHZhciBjbGFzc05hbWUg PSBpc19leHBhbnNpb25fbGluZSA/ICdFeHBhbnNpb25MaW5lJyA6ICdMaW5lQ29udGFpbmVyIExp bmUnOworICAgIGlmIChvcHRfY2xhc3NOYW1lKQorICAgICAgY2xhc3NOYW1lICs9ICcgJyArIG9w dF9jbGFzc05hbWU7CisKKyAgICB2YXIgbGluZU51bWJlckNsYXNzTmFtZSA9IGlzX2V4cGFuc2lv bl9saW5lID8gJ2V4cGFuc2lvbkxpbmVOdW1iZXInIDogJ2xpbmVOdW1iZXInOworCisgICAgdmFy IGxpbmUgPSAkKCc8ZGl2IGNsYXNzPSInICsgY2xhc3NOYW1lICsgJyIgJyArIChvcHRfYXR0cmli dXRlcyB8fCAnJykgKyAnPicgKworICAgICAgICAnPHNwYW4gY2xhc3M9ImZyb20gJyArIGxpbmVO dW1iZXJDbGFzc05hbWUgKyAnIj4nICsgKGZyb20gfHwgJyZuYnNwOycpICsKKyAgICAgICAgJzwv c3Bhbj48c3BhbiBjbGFzcz0idG8gJyArIGxpbmVOdW1iZXJDbGFzc05hbWUgKyAnIj4nICsgKHRv IHx8ICcmbmJzcDsnKSArCiAgICAgICAgICc8L3NwYW4+IDxzcGFuIGNsYXNzPSJ0ZXh0Ij48L3Nw YW4+JyArCiAgICAgICAgICc8L2Rpdj4nKTsKICAgICAvLyBVc2UgdGV4dCBpbnN0ZWFkIG9mIGlu bmVySFRNTCB0byBhdm9pZCBldmFsdXRpbmcgSFRNTC4KQEAgLTUwMyw3ICs1MTQsMTEgQEAKICAg ICByZXR1cm4gbGluZTsKICAgfQogCi0gIGZ1bmN0aW9uIHNpZGVCeVNpZGVEaWZmRXhwYW5zaW9u TGluZShsaW5lX251bWJlciwgY29udGVudHMpIHsKKyAgZnVuY3Rpb24gdW5pZmllZEV4cGFuc2lv bkxpbmUobGluZV9udW1iZXIsIGNvbnRlbnRzKSB7CisgICAgcmV0dXJuIHVuaWZpZWRMaW5lKGxp bmVfbnVtYmVyLCBsaW5lX251bWJlciwgY29udGVudHMsIHRydWUpOworICB9CisKKyAgZnVuY3Rp b24gc2lkZUJ5U2lkZUV4cGFuc2lvbkxpbmUobGluZV9udW1iZXIsIGNvbnRlbnRzKSB7CiAgICAg dmFyIGxpbmUgPSAkKCc8ZGl2IGNsYXNzPSJFeHBhbnNpb25MaW5lIj48L2Rpdj4nKTsKICAgICBs aW5lLmFwcGVuZChsaW5lU2lkZSgnZnJvbScsIGNvbnRlbnRzLCB0cnVlLCBsaW5lX251bWJlcikp OwogICAgIGxpbmUuYXBwZW5kKGxpbmVTaWRlKCd0bycsIGNvbnRlbnRzLCB0cnVlLCBsaW5lX251 bWJlcikpOwpAQCAtNTM3LDE0ICs1NTIsMTMgQEAKIAogICBmdW5jdGlvbiBpbnNlcnRMaW5lcyhm aWxlX25hbWUsIGV4cGFuc2lvbl9hcmVhLCBkaXJlY3Rpb24sIHN0YXJ0X2xpbmVfbnVtLCBlbmRf bGluZV9udW0sIHN0YXJ0X2Zyb21fbGluZV9udW0pIHsKICAgICB2YXIgZnJhZ21lbnQgPSBkb2N1 bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7Ci0gICAgdmFyIGZpbGVfZGlmZl9pbmRleCA9 ICQoJy5GaWxlRGlmZicpLmluZGV4KGZpbGVzW2ZpbGVfbmFtZV0pOwotICAgIHZhciBpc19zaWRl X2J5X3NpZGUgPSBpc0RpZmZTaWRlQnlTaWRlKGZpbGVfZGlmZl9pbmRleCk7CisgICAgdmFyIGlz X3NpZGVfYnlfc2lkZSA9IGlzRGlmZlNpZGVCeVNpZGUoZmlsZXNbZmlsZV9uYW1lXSk7CiAKICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IGVuZF9saW5lX251bSAtIHN0YXJ0X2xpbmVfbnVtOyBpKysp IHsKICAgICAgIC8vIEZJWE1FOiBmcm9tIGxpbmUgbnVtYmVycyBhcmUgd3JvbmcKICAgICAgIHZh ciBsaW5lX251bWJlciA9IHN0YXJ0X2Zyb21fbGluZV9udW0gKyBpICsgMTsKICAgICAgIHZhciBj b250ZW50cyA9IHBhdGNoZWRfZmlsZV9jb250ZW50c1tmaWxlX25hbWVdW3N0YXJ0X2xpbmVfbnVt ICsgaV07Ci0gICAgICB2YXIgbGluZSA9IGlzX3NpZGVfYnlfc2lkZSA/IHNpZGVCeVNpZGVEaWZm RXhwYW5zaW9uTGluZShsaW5lX251bWJlciwgY29udGVudHMpIDogdW5pZmllZERpZmZFeHBhbnNp b25MaW5lKGxpbmVfbnVtYmVyLCBjb250ZW50cyk7CisgICAgICB2YXIgbGluZSA9IGlzX3NpZGVf Ynlfc2lkZSA/IHNpZGVCeVNpZGVFeHBhbnNpb25MaW5lKGxpbmVfbnVtYmVyLCBjb250ZW50cykg OiB1bmlmaWVkRXhwYW5zaW9uTGluZShsaW5lX251bWJlciwgY29udGVudHMpOwogICAgICAgZnJh Z21lbnQuYXBwZW5kQ2hpbGQobGluZVswXSk7CiAgICAgfQogCkBAIC01ODQsMTEgKzU5OCwxMyBA QAogICB9CiAKICAgZnVuY3Rpb24gZnJvbUxpbmVOdW1iZXIobGluZSkgewotICAgIHJldHVybiBO dW1iZXIobGluZS5xdWVyeVNlbGVjdG9yKCcuZnJvbScpLnRleHRDb250ZW50KTsKKyAgICB2YXIg bm9kZSA9IGxpbmUucXVlcnlTZWxlY3RvcignLmZyb20nKTsKKyAgICByZXR1cm4gbm9kZSA/IE51 bWJlcihub2RlLnRleHRDb250ZW50KSA6IDA7CiAgIH0KIAogICBmdW5jdGlvbiB0b0xpbmVOdW1i ZXIobGluZSkgewotICAgIHJldHVybiBOdW1iZXIobGluZS5xdWVyeVNlbGVjdG9yKCcudG8nKS50 ZXh0Q29udGVudCk7CisgICAgdmFyIG5vZGUgPSBsaW5lLnF1ZXJ5U2VsZWN0b3IoJy50bycpOwor ICAgIHJldHVybiBub2RlID8gTnVtYmVyKG5vZGUudGV4dENvbnRlbnQpIDogMDsKICAgfQogCiAg IGZ1bmN0aW9uIHRleHRDb250ZW50c0ZvcihsaW5lKSB7CkBAIC02ODAsNyArNjk2LDggQEAKICAg ICBmZXRjaEhpc3RvcnkoKTsKICAgICAkKGRvY3VtZW50LmJvZHkpLnByZXBlbmQoJzxkaXYgaWQ9 Im1lc3NhZ2UiPicgKwogICAgICAgICAnPGRpdiBjbGFzcz0iaGVscCI+U2VsZWN0IGxpbmUgbnVt YmVycyB0byBhZGQgYSBjb21tZW50LicgKwotICAgICAgICAgICc8ZGl2IGNsYXNzPSJEaWZmTGlu a3MiPicgKworICAgICAgICAgICc8ZGl2IGNsYXNzPSJEaWZmTGlua3MgTGlua0NvbnRhaW5lciI+ JyArCisgICAgICAgICAgICAnPGEgaHJlZj0iamF2YXNjcmlwdDoiIGNsYXNzPSJ1bmlmeS1saW5r Ij51bmlmaWVkPC9hPicgKwogICAgICAgICAgICAgJzxhIGhyZWY9ImphdmFzY3JpcHQ6IiBjbGFz cz0ic2lkZS1ieS1zaWRlLWxpbmsiPnNpZGUtYnktc2lkZTwvYT4nICsKICAgICAgICAgICAnPC9k aXY+JyArCiAgICAgICAgICc8L2Rpdj4nICsKQEAgLTcxNCw0OCArNzMxLDc2IEBACiAgICAgdXBk YXRlVG9vbGJhckFuY2hvclN0YXRlKCk7CiAgIH0pOwogCi0gIGZ1bmN0aW9uIGlzRGlmZlNpZGVC eVNpZGUoZmlsZV9kaWZmX2luZGV4KSB7Ci0gICAgaWYgKCF1cmxfZnJhZ21lbnRbU0lERV9CWV9T SURFX0RJRkZTX0tFWV0pCi0gICAgICB1cmxfZnJhZ21lbnRbU0lERV9CWV9TSURFX0RJRkZTX0tF WV0gPSBbXTsKLSAgICByZXR1cm4gdXJsX2ZyYWdtZW50W1NJREVfQllfU0lERV9ESUZGU19LRVld LmluZGV4T2YoZmlsZV9kaWZmX2luZGV4KSAhPSAtMTsKKyAgZnVuY3Rpb24gaXNEaWZmU2lkZUJ5 U2lkZShmaWxlX2RpZmYpIHsKKyAgICByZXR1cm4gZGlmZlN0YXRlKGZpbGVfZGlmZikgPT0gJ3Np ZGVieXNpZGUnOworICB9CisKKyAgZnVuY3Rpb24gZGlmZlN0YXRlKGZpbGVfZGlmZikgeworICAg IHZhciBkaWZmX3N0YXRlID0gJChmaWxlX2RpZmYpLmF0dHIoJ2RhdGEtZGlmZnN0YXRlJyk7Cisg ICAgcmV0dXJuIGRpZmZfc3RhdGUgfHwgJ3VuaWZpZWQnOworICB9CisKKyAgZnVuY3Rpb24gdW5p ZnlMaW5lKGxpbmUsIGZyb20sIHRvLCBjb250ZW50cywgY2xhc3NOYW1lcywgYXR0cmlidXRlcywg aWQpIHsKKyAgICB2YXIgbmV3X2xpbmUgPSB1bmlmaWVkTGluZShmcm9tLCB0bywgY29udGVudHMs IGZhbHNlLCBjbGFzc05hbWVzLCBhdHRyaWJ1dGVzKTsKKyAgICB2YXIgb2xkX2xpbmUgPSAkKGxp bmUpOworICAgIGlmICghb2xkX2xpbmUuaGFzQ2xhc3MoJ0xpbmVDb250YWluZXInKSkKKyAgICAg IG9sZF9saW5lID0gb2xkX2xpbmUucGFyZW50cygnLkxpbmVDb250YWluZXInKTsKKworICAgIHZh ciBjb21tZW50cyA9IGNvbW1lbnRzVG9UcmFuc2ZlckZvcigkKGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKGlkKSkpOworICAgIG9sZF9saW5lLmFmdGVyKGNvbW1lbnRzKTsKKyAgICBvbGRfbGluZS5y ZXBsYWNlV2l0aChuZXdfbGluZSk7CiAgIH0KIAotICBmdW5jdGlvbiBzaWRlQnlTaWRlaWZ5KGZp bGVfZGlmZl9pbmRleCkgewotICAgIGlmIChpc0RpZmZTaWRlQnlTaWRlKGZpbGVfZGlmZl9pbmRl eCkpCisgIGZ1bmN0aW9uIGNvbnZlcnRGaWxlRGlmZihkaWZmX3R5cGUsIGZpbGVfZGlmZikgewor ICAgIGlmIChkaWZmU3RhdGUoZmlsZV9kaWZmKSA9PSBkaWZmX3R5cGUpCiAgICAgICByZXR1cm47 CiAKLSAgICB1cmxfZnJhZ21lbnRbU0lERV9CWV9TSURFX0RJRkZTX0tFWV0ucHVzaChmaWxlX2Rp ZmZfaW5kZXgpOworICAgICQoZmlsZV9kaWZmKS5hdHRyKCdkYXRhLWRpZmZzdGF0ZScsIGRpZmZf dHlwZSk7CisKKyAgICAkKCcuTGluZScsIGZpbGVfZGlmZikuZWFjaChmdW5jdGlvbigpIHsKKyAg ICAgIGNvbnZlcnRMaW5lKGRpZmZfdHlwZSwgdGhpcyk7CisgICAgfSk7CiAKLSAgICAkKCcuTGlu ZScsIHRoaXMpLmVhY2goc2lkZUJ5U2lkZWlmeUxpbmUpOwotICAgICQoJy5FeHBhbnNpb25MaW5l JywgdGhpcykuZWFjaChzaWRlQnlTaWRlaWZ5RXhwYW5zaW9uTGluZSk7CisgICAgJCgnLkV4cGFu c2lvbkxpbmUnLCBmaWxlX2RpZmYpLmVhY2goZnVuY3Rpb24oKSB7CisgICAgICBjb252ZXJ0RXhw YW5zaW9uTGluZShkaWZmX3R5cGUsIHRoaXMpOworICAgIH0pOwogICB9CiAKLSAgLy8gRklYTUU6 IFB1dCByZW1vdmVkIGxpbmVzIHRvIHRoZSBsZWZ0IG9mIHRoZWlyIGNvcnJlc3BvbmRpbmcgYWRk ZWQgbGluZXMuCi0gIC8vIEZJWE1FOiBQcm92aWRlIGEgd2F5IHRvIGdvIGJhY2sgdG8gdGhlIHVu aWZpZWQgZGlmZi4KLSAgLy8gRklYTUU6IEFsbG93IGZvciBjb252ZXJ0aW5nIGFuIGluZGl2aWR1 YWwgZmlsZSB0byBzaWRlLWJ5LXNpZGUuCi0gIGZ1bmN0aW9uIHNpZGVCeVNpZGVpZnlMaW5lKCkg ewotICAgIHZhciBmcm9tID0gZnJvbUxpbmVOdW1iZXIodGhpcyk7Ci0gICAgdmFyIHRvID0gdG9M aW5lTnVtYmVyKHRoaXMpOwotICAgIHZhciBjb250ZW50cyA9IHRleHRDb250ZW50c0Zvcih0aGlz KTsKKyAgZnVuY3Rpb24gY29udmVydExpbmUoZGlmZl90eXBlLCBsaW5lKSB7CisgICAgdmFyIGNv bnZlcnRfZnVuY3Rpb24gPSBkaWZmX3R5cGUgPT0gJ3NpZGVieXNpZGUnID8gc2lkZUJ5U2lkZWlm eUxpbmUgOiB1bmlmeUxpbmU7CisgICAgdmFyIGZyb20gPSBmcm9tTGluZU51bWJlcihsaW5lKTsK KyAgICB2YXIgdG8gPSB0b0xpbmVOdW1iZXIobGluZSk7CisgICAgdmFyIGNvbnRlbnRzID0gdGV4 dENvbnRlbnRzRm9yKGxpbmUpOworICAgIHZhciBjbGFzc05hbWVzID0gY2xhc3NOYW1lc0Zvck1v dmluZ0xpbmUobGluZSk7CisgICAgdmFyIGF0dHJpYnV0ZXMgPSBhdHRyaWJ1dGVzRm9yTW92aW5n TGluZShsaW5lKTsKKyAgICB2YXIgaWQgPSBsaW5lLmlkOworICAgIGNvbnZlcnRfZnVuY3Rpb24o bGluZSwgZnJvbSwgdG8sIGNvbnRlbnRzLCBjbGFzc05hbWVzLCBhdHRyaWJ1dGVzLCBpZCkKKyAg fQogCi0gICAgdmFyIGNsYXNzUGFydHMgPSB0aGlzLmNsYXNzTmFtZS5zcGxpdCgnICcpOworICBm dW5jdGlvbiBjbGFzc05hbWVzRm9yTW92aW5nTGluZShsaW5lKSB7CisgICAgdmFyIGNsYXNzUGFy dHMgPSBsaW5lLmNsYXNzTmFtZS5zcGxpdCgnICcpOwogICAgIHZhciBjbGFzc0J1ZmZlciA9IFtd OwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2xhc3NQYXJ0cy5sZW5ndGg7IGkrKykgewogICAg ICAgdmFyIHBhcnQgPSBjbGFzc1BhcnRzW2ldOwogICAgICAgaWYgKHBhcnQgIT0gJ0xpbmVDb250 YWluZXInICYmIHBhcnQgIT0gJ0xpbmUnKQogICAgICAgICBjbGFzc0J1ZmZlci5wdXNoKHBhcnQp OwogICAgIH0KLSAgICB2YXIgY2xhc3NOYW1lcyA9IGNsYXNzQnVmZmVyLmpvaW4oJyAnKTsKKyAg ICByZXR1cm4gY2xhc3NCdWZmZXIuam9pbignICcpOworICB9CiAKLSAgICB2YXIgaWQgPSB0aGlz LmlkOwotICAgIHZhciBhdHRyaWJ1dGVzQnVmZmVyID0gWydpZD0nICsgaWRdOworICBmdW5jdGlv biBhdHRyaWJ1dGVzRm9yTW92aW5nTGluZShsaW5lKSB7CisgICAgdmFyIGF0dHJpYnV0ZXNCdWZm ZXIgPSBbJ2lkPScgKyBsaW5lLmlkXTsKICAgICAvLyBNYWtlIHN1cmUgdG8ga2VlcCBhbGwgZGF0 YS0gYXR0cmlidXRlcy4KLSAgICAkKHRoaXMuYXR0cmlidXRlcykuZWFjaChmdW5jdGlvbigpIHsK KyAgICAkKGxpbmUuYXR0cmlidXRlcykuZWFjaChmdW5jdGlvbigpIHsKICAgICAgIGlmICh0aGlz Lm5hbWUuaW5kZXhPZignZGF0YS0nKSA9PSAwKQogICAgICAgICBhdHRyaWJ1dGVzQnVmZmVyLnB1 c2godGhpcy5uYW1lICsgJz0nICsgdGhpcy52YWx1ZSk7CiAgICAgfSk7Ci0gICAgdmFyIGF0dHJp YnV0ZXMgPSBhdHRyaWJ1dGVzQnVmZmVyLmpvaW4oJyAnKTsKKyAgICByZXR1cm4gYXR0cmlidXRl c0J1ZmZlci5qb2luKCcgJyk7CisgIH0KIAorICAvLyBGSVhNRTogUHV0IHJlbW92ZWQgbGluZXMg dG8gdGhlIGxlZnQgb2YgdGhlaXIgY29ycmVzcG9uZGluZyBhZGRlZCBsaW5lcy4KKyAgLy8gRklY TUU6IEFsbG93IGZvciBjb252ZXJ0aW5nIGFuIGluZGl2aWR1YWwgZmlsZSB0byBzaWRlLWJ5LXNp ZGUuCisgIGZ1bmN0aW9uIHNpZGVCeVNpZGVpZnlMaW5lKGxpbmUsIGZyb20sIHRvLCBjb250ZW50 cywgY2xhc3NOYW1lcywgYXR0cmlidXRlcywgaWQpIHsKICAgICB2YXIgZnJvbV9jbGFzcyA9ICcn OwogICAgIHZhciB0b19jbGFzcyA9ICcnOwogICAgIHZhciBmcm9tX2F0dHJpYnV0ZXMgPSAnJzsK QEAgLTc4NCwxOCArODI5LDIxIEBACiAgICAgbmV3X2xpbmUuYXBwZW5kKGxpbmVTaWRlKCdmcm9t JywgZnJvbV9jb250ZW50cywgZmFsc2UsIGZyb20sIGZyb21fYXR0cmlidXRlcywgZnJvbV9jbGFz cykpOwogICAgIG5ld19saW5lLmFwcGVuZChsaW5lU2lkZSgndG8nLCB0b19jb250ZW50cywgZmFs c2UsIHRvLCB0b19hdHRyaWJ1dGVzLCB0b19jbGFzcykpOwogCi0gICAgJCh0aGlzKS5yZXBsYWNl V2l0aChuZXdfbGluZSk7Ci0gICAgdHJhbmZlckNvbW1lbnRzRm9yKCQoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoaWQpKSk7CisgICAgJChsaW5lKS5yZXBsYWNlV2l0aChuZXdfbGluZSk7CisKKyAg ICB2YXIgbGluZSA9ICQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpKTsKKyAgICBsaW5lLmFm dGVyKGNvbW1lbnRzVG9UcmFuc2ZlckZvcihsaW5lKSk7CiAgIH0KIAotICBmdW5jdGlvbiBzaWRl QnlTaWRlaWZ5RXhwYW5zaW9uTGluZSgpIHsKLSAgICB2YXIgY29udGVudHMgPSB0ZXh0Q29udGVu dHNGb3IodGhpcyk7Ci0gICAgdmFyIGxpbmVfbnVtYmVyID0gZnJvbUxpbmVOdW1iZXIodGhpcyk7 Ci0gICAgdmFyIG5ld19saW5lID0gc2lkZUJ5U2lkZURpZmZFeHBhbnNpb25MaW5lKGxpbmVfbnVt YmVyLCBjb250ZW50cyk7Ci0gICAgJCh0aGlzKS5yZXBsYWNlV2l0aChuZXdfbGluZSk7CisgIGZ1 bmN0aW9uIGNvbnZlcnRFeHBhbnNpb25MaW5lKGRpZmZfdHlwZSwgbGluZSkgeworICAgIHZhciBj b252ZXJ0X2Z1bmN0aW9uID0gZGlmZl90eXBlID09ICdzaWRlYnlzaWRlJyA/IHNpZGVCeVNpZGVF eHBhbnNpb25MaW5lIDogdW5pZmllZEV4cGFuc2lvbkxpbmU7CisgICAgdmFyIGNvbnRlbnRzID0g dGV4dENvbnRlbnRzRm9yKGxpbmUpOworICAgIHZhciBsaW5lX251bWJlciA9IGZyb21MaW5lTnVt YmVyKGxpbmUpOworICAgIHZhciBuZXdfbGluZSA9IGNvbnZlcnRfZnVuY3Rpb24obGluZV9udW1i ZXIsIGNvbnRlbnRzKTsKKyAgICAkKGxpbmUpLnJlcGxhY2VXaXRoKG5ld19saW5lKTsKICAgfQog Ci0gIGZ1bmN0aW9uIHRyYW5mZXJDb21tZW50c0ZvcihsaW5lKSB7CisgIGZ1bmN0aW9uIGNvbW1l bnRzVG9UcmFuc2ZlckZvcihsaW5lKSB7CiAgICAgdmFyIGZyYWdtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRG9jdW1lbnRGcmFnbWVudCgpOwogCiAgICAgcHJldmlvdXNDb21tZW50c0ZvcihsaW5lKS5l YWNoKGZ1bmN0aW9uKCkgewpAQCAtODE0LDcgKzg2Miw3IEBACiAgICAgICBmcmFnbWVudC5hcHBl bmRDaGlsZChmcm96ZW5Db21tZW50KTsKICAgICB9CiAKLSAgICBsaW5lLmFmdGVyKGZyYWdtZW50 KTsKKyAgICByZXR1cm4gZnJhZ21lbnQ7CiAgIH0KIAogICBmdW5jdGlvbiBkaXNjYXJkQ29tbWVu dCgpIHsKQEAgLTgzMyw2ICs4ODEsNyBAQAogICB9CiAKICAgJCgnLnNpZGUtYnktc2lkZS1saW5r JykubGl2ZSgnY2xpY2snLCBoYW5kbGVTaWRlQnlTaWRlTGlua0NsaWNrKTsKKyAgJCgnLnVuaWZ5 LWxpbmsnKS5saXZlKCdjbGljaycsIGhhbmRsZVVuaWZ5TGlua0NsaWNrKTsKICAgJCgnLkV4cGFu ZExpbmsnKS5saXZlKCdjbGljaycsIGhhbmRsZUV4cGFuZExpbmtDbGljayk7CiAgICQoJy5jb21t ZW50IC5kaXNjYXJkJykubGl2ZSgnY2xpY2snLCBkaXNjYXJkQ29tbWVudCk7CiAgICQoJy5mcm96 ZW5Db21tZW50JykubGl2ZSgnY2xpY2snLCB1bmZyZWV6ZUNvbW1lbnQpOwo=