52686 2011-01-18 17:00:15 -0800 Setting outerHTML should merge text nodes 2021-06-13 10:52:42 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226808 P3 Normal --- 0 eae webkit-unassigned abarth ap ayg commit-queue eric tony oldest_to_newest 336221 0 eae 2011-01-18 17:00:15 -0800 When setting outerHTML adjacent text nodes should be merged. Setting outerText already has this behavior as does the IE implementation of setting outerHTML. 336227 1 79359 eae 2011-01-18 17:14:40 -0800 Created attachment 79359 Patch 336371 2 ap 2011-01-19 00:43:10 -0800 > This matches the behavior of outerText and the IE implementation of outerHTML. Does HTML5 specify such behavior? 336712 3 eae 2011-01-19 12:33:01 -0800 > Does HTML5 specify such behavior? No, HTML5 doesn't specify how text nodes should be handled when setting outerHTML and doesn't cover outerText at all. 337041 4 79359 abarth 2011-01-19 18:59:43 -0800 Comment on attachment 79359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79359&action=review > Source/WebCore/html/HTMLElement.cpp:386 > HTMLElement* parent = static_cast<HTMLElement*>(p); We don't need to hold a reference to parent here? It's strange that we re-check parentNode for null below but don't hold a ref here. 337061 5 79359 eae 2011-01-19 19:25:33 -0800 Comment on attachment 79359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79359&action=review >> Source/WebCore/html/HTMLElement.cpp:386 > > We don't need to hold a reference to parent here? It's strange that we re-check parentNode for null below but don't hold a ref here. Good point, I'll change it to hold a reference to the parent node instead. 337071 6 79543 eae 2011-01-19 19:57:33 -0800 Created attachment 79543 Patch 340347 7 eae 2011-01-26 10:49:27 -0800 Ping? 392816 8 79543 tony 2011-04-26 15:26:19 -0700 Comment on attachment 79543 Patch Seems fine. 392819 9 tony 2011-04-26 15:27:12 -0700 Oh, are we worried that we don't collapse chains of text nodes or should we not get into that state because we collapse at every change? What does IE do in this case? 392866 10 eae 2011-04-26 15:46:07 -0700 We shouldn't be able to get into that state. If you can think of any case where we could I'd love to hear about it! IE always collapses adjacent text nodes. 395615 11 91765 eae 2011-04-29 16:37:24 -0700 Created attachment 91765 Patch for landing 395638 12 91765 commit-queue 2011-04-29 17:23:12 -0700 Comment on attachment 91765 Patch for landing Clearing flags on attachment: 91765 Committed r85374: <http://trac.webkit.org/changeset/85374> 395639 13 commit-queue 2011-04-29 17:23:18 -0700 All reviewed patches have been landed. Closing bug. 396733 14 ayg 2011-05-02 15:42:58 -0700 Could you please file bugs against HTML5 when you find problems with it, instead of just changing behavior and letting the spec remain incorrect? You don't have to make an account or anything. Just go to http://whatwg.org/html5/, find the right part of the spec, and file a comment in the little box at the bottom. I just filed a bug: http://www.w3.org/Bugs/Public/show_bug.cgi?id=12584 397345 15 eae 2011-05-03 13:47:37 -0700 Certainly. Thanks for the pointer. 79359 2011-01-18 17:14:40 -0800 2011-01-19 19:57:33 -0800 Patch outerhtml.patch text/plain 7040 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2MDY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDEtMTggIEVtaWwgRWts dW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTZXR0aW5nIG91dGVySFRNTCBzaG91bGQgbWVyZ2UgdGV4dCBub2Rl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI2ODYK KworICAgICAgICBXaGVuIHNldHRpbmcgb3V0ZXJIVE1MIGFkamFjZW50IHRleHQgbm9kZXMgc2hv dWxkIGJlIG1lcmdlZC4gVGhpcyBtYXRjaGVzCisgICAgICAgIHRoZSBiZWhhdmlvciBvZiBvdXRl clRleHQgYW5kIHRoZSBJRSBpbXBsZW1lbnRhdGlvbiBvZiBvdXRlckhUTUwuICAgICAgIAorCisg ICAgICAgIFRlc3Q6IGZhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWwKKworICAgICAgICAqIGh0 bWwvSFRNTEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVyZ2VXaXRoTmV4dFRleHRO b2RlKTogTW92ZSBmdW5jdGlvbiB0byBiZWZvcmUgc2V0T3V0ZXJIVE1MLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTEVsZW1lbnQ6OnNldE91dGVySFRNTCk6IE1lcmdlIGFkamFjZW50IHRleHQgbm9k ZXMgYWZ0ZXIgcmVwbGFjaW5nIHRoZSBlbGVtZW50LgorCiAyMDExLTAxLTE4ICBLZW5uZXRoIFJ1 c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZp bi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCShyZXZpc2lvbiA3NjA0MSkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNjAsNiArMzYwLDIyIEBAIHZvaWQgSFRNTEVsZW1lbnQ6OnNldElubmVySFRNTChjb25zdCBT dHIKICAgICAgICAgcmVwbGFjZUNoaWxkcmVuV2l0aEZyYWdtZW50KHRoaXMsIGZyYWdtZW50LnJl bGVhc2UoKSwgZWMpOwogfQogCitzdGF0aWMgdm9pZCBtZXJnZVdpdGhOZXh0VGV4dE5vZGUoUGFz c1JlZlB0cjxOb2RlPiBub2RlLCBFeGNlcHRpb25Db2RlJiBlYykKK3sKKyAgICBBU1NFUlQobm9k ZSAmJiBub2RlLT5pc1RleHROb2RlKCkpOworICAgIE5vZGUqIG5leHQgPSBub2RlLT5uZXh0U2li bGluZygpOworICAgIGlmICghbmV4dCB8fCAhbmV4dC0+aXNUZXh0Tm9kZSgpKQorICAgICAgICBy ZXR1cm47CisgICAgCisgICAgUmVmUHRyPFRleHQ+IHRleHROb2RlID0gc3RhdGljX2Nhc3Q8VGV4 dCo+KG5vZGUuZ2V0KCkpOworICAgIFJlZlB0cjxUZXh0PiB0ZXh0TmV4dCA9IHN0YXRpY19jYXN0 PFRleHQqPihuZXh0KTsKKyAgICB0ZXh0Tm9kZS0+YXBwZW5kRGF0YSh0ZXh0TmV4dC0+ZGF0YSgp LCBlYyk7CisgICAgaWYgKGVjKQorICAgICAgICByZXR1cm47CisgICAgaWYgKHRleHROZXh0LT5w YXJlbnROb2RlKCkpIC8vIE1pZ2h0IGhhdmUgYmVlbiByZW1vdmVkIGJ5IG11dGF0aW9uIGV2ZW50 LgorICAgICAgICB0ZXh0TmV4dC0+cmVtb3ZlKGVjKTsKK30KKwogdm9pZCBIVE1MRWxlbWVudDo6 c2V0T3V0ZXJIVE1MKGNvbnN0IFN0cmluZyYgaHRtbCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAg ICAgTm9kZSogcCA9IHBhcmVudE5vZGUoKTsKQEAgLTM2OCwxMiArMzg0LDIyIEBAIHZvaWQgSFRN TEVsZW1lbnQ6OnNldE91dGVySFRNTChjb25zdCBTdHIKICAgICAgICAgcmV0dXJuOwogICAgIH0K ICAgICBIVE1MRWxlbWVudCogcGFyZW50ID0gc3RhdGljX2Nhc3Q8SFRNTEVsZW1lbnQqPihwKTsK KyAgICBSZWZQdHI8Tm9kZT4gcHJldiA9IHByZXZpb3VzU2libGluZygpOworICAgIFJlZlB0cjxO b2RlPiBuZXh0ID0gbmV4dFNpYmxpbmcoKTsKIAogICAgIFJlZlB0cjxEb2N1bWVudEZyYWdtZW50 PiBmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbVNvdXJjZShodG1sLCBwYXJlbnQsIGVjKTsK LSAgICBpZiAoZnJhZ21lbnQpIHsKLSAgICAgICAgLy8gRklYTUU6IFdoeSBkb2Vzbid0IHRoaXMg aGF2ZSBjb2RlIHRvIG1lcmdlIG5laWdoYm9yaW5nIHRleHQgbm9kZXMgdGhlIHdheSBzZXRPdXRl clRleHQgZG9lcz8KLSAgICAgICAgcGFyZW50LT5yZXBsYWNlQ2hpbGQoZnJhZ21lbnQucmVsZWFz ZSgpLCB0aGlzLCBlYyk7Ci0gICAgfQorICAgIGlmICghcGFyZW50Tm9kZSgpKQorICAgICAgICBl YyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VSUjsKKyAgICBpZiAoZWMpCisgICAgICAgIHJldHVybjsK KyAgICAgIAorICAgIHBhcmVudC0+cmVwbGFjZUNoaWxkKGZyYWdtZW50LnJlbGVhc2UoKSwgdGhp cywgZWMpOworICAgIFJlZlB0cjxOb2RlPiBub2RlID0gbmV4dCA/IG5leHQtPnByZXZpb3VzU2li bGluZygpIDogMDsKKyAgICBpZiAoIWVjICYmIG5vZGUgJiYgbm9kZS0+aXNUZXh0Tm9kZSgpKQor ICAgICAgICBtZXJnZVdpdGhOZXh0VGV4dE5vZGUobm9kZS5yZWxlYXNlKCksIGVjKTsKKworICAg IGlmICghZWMgJiYgcHJldiAmJiBwcmV2LT5pc1RleHROb2RlKCkpCisgICAgICAgIG1lcmdlV2l0 aE5leHRUZXh0Tm9kZShwcmV2LnJlbGVhc2UoKSwgZWMpOwogfQogCiBQYXNzUmVmUHRyPERvY3Vt ZW50RnJhZ21lbnQ+IEhUTUxFbGVtZW50Ojp0ZXh0VG9GcmFnbWVudChjb25zdCBTdHJpbmcmIHRl eHQsIEV4Y2VwdGlvbkNvZGUmIGVjKQpAQCAtNDU3LDIyICs0ODMsNiBAQCB2b2lkIEhUTUxFbGVt ZW50OjpzZXRJbm5lclRleHQoY29uc3QgU3RyCiAgICAgICAgIHJlcGxhY2VDaGlsZHJlbldpdGhG cmFnbWVudCh0aGlzLCBmcmFnbWVudC5yZWxlYXNlKCksIGVjKTsKIH0KIAotc3RhdGljIHZvaWQg bWVyZ2VXaXRoTmV4dFRleHROb2RlKFBhc3NSZWZQdHI8Tm9kZT4gbm9kZSwgRXhjZXB0aW9uQ29k ZSYgZWMpCi17Ci0gICAgQVNTRVJUKG5vZGUgJiYgbm9kZS0+aXNUZXh0Tm9kZSgpKTsKLSAgICBO b2RlKiBuZXh0ID0gbm9kZS0+bmV4dFNpYmxpbmcoKTsKLSAgICBpZiAoIW5leHQgfHwgIW5leHQt PmlzVGV4dE5vZGUoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIFJlZlB0cjxUZXh0PiB0 ZXh0Tm9kZSA9IHN0YXRpY19jYXN0PFRleHQqPihub2RlLmdldCgpKTsKLSAgICBSZWZQdHI8VGV4 dD4gdGV4dE5leHQgPSBzdGF0aWNfY2FzdDxUZXh0Kj4obmV4dCk7Ci0gICAgdGV4dE5vZGUtPmFw cGVuZERhdGEodGV4dE5leHQtPmRhdGEoKSwgZWMpOwotICAgIGlmIChlYykKLSAgICAgICAgcmV0 dXJuOwotICAgIGlmICh0ZXh0TmV4dC0+cGFyZW50Tm9kZSgpKSAvLyBNaWdodCBoYXZlIGJlZW4g cmVtb3ZlZCBieSBtdXRhdGlvbiBldmVudC4KLSAgICAgICAgdGV4dE5leHQtPnJlbW92ZShlYyk7 Ci19Ci0KIHZvaWQgSFRNTEVsZW1lbnQ6OnNldE91dGVyVGV4dChjb25zdCBTdHJpbmcgJnRleHQs IEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlmIChpZUZvcmJpZHNJbnNlcnRIVE1MKCkpIHsK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDc2MDY1KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDEtMTggIEVtaWwgRWtsdW5kICA8ZWFl QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTZXR0aW5nIG91dGVySFRNTCBzaG91bGQgbWVyZ2UgdGV4dCBub2RlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI2ODYKKyAgICAgICAg CisgICAgICAgIEFkZCB0ZXN0IGZvciBzZXR0aW5nIEVsZW1lbnQub3V0ZXJIVE1MLgorCisgICAg ICAgICogZmFzdC9kb20vc2V0LW91dGVyLWh0bWwtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC5odG1sOiBBZGRlZC4KKwogMjAxMS0wMS0xOCAg S2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2aWQgTGV2aW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vc2V0LW91dGVy LWh0bWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20v c2V0LW91dGVyLWh0bWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDkgQEAK K1JlcGxhY2VkIG5vZGUgdXNpbmcgb3V0ZXJIVE1MLgorcmVtb3Zpbmcgbm9kZSB1c2luZyBvdXRl ckhUTUwuCitUZXN0aW5nIG1lcmdpbmcgdGV4dCBub2Rlcy4KK1Rlc3RpbmcgYWRkaW5nIAordXNp bmcgb3V0ZXJIVE1MLgorUEFTUzogcmVwbGFjZQorUEFTUzogcmVtb3ZlCitQQVNTOiBtZXJnZSB0 ZXh0IG5vZGVzCitQQVNTOiBsaW5lIGJyZWFrCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9z ZXQtb3V0ZXItaHRtbC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL3Nl dC1vdXRlci1odG1sLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9z ZXQtb3V0ZXItaHRtbC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDU2IEBACis8aHRtbD4K KzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgcHJlIHsgbWFyZ2luOiAwOyB9CisgICAgPC9z dHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpz Ij48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgIE1hcmt1cC5ub0F1dG9EdW1wKCk7CisgICAg CisgICAgZnVuY3Rpb24gYXNzZXJ0TWFya3VwKG5hbWUsIGVsZW1lbnQsIGV4cGVjdGVkKQorICAg IHsKKyAgICAgICAgdmFyIG1hcmt1cCA9IE1hcmt1cC5nZXQoZWxlbWVudCk7CisgICAgICAgIGlm IChtYXJrdXAgPT0gZXhwZWN0ZWQpCisgICAgICAgICAgICBsb2coJ1BBU1M6ICcgKyBuYW1lKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgbG9nKCdGQUlMOiAnICsgbmFtZSAgKyAnXG5XYXM6 XG4nICsgbWFya3VwICsgJ1xuRXhwZWN0ZWQ6XG4nICsgZXhwZWN0ZWQpOworICAgIH0KKworICAg IGZ1bmN0aW9uIGxvZyh0ZXh0KQorICAgIHsKKyAgICAgICAgdmFyIGVsID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgncHJlJyk7CisgICAgICAgIGVsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKHRleHQpKTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3Vs dCcpLmFwcGVuZENoaWxkKGVsKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBydW5UZXN0KCkKKyAg ICB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCkKKworICAgICAgICB2YXIgaXRlbXMg PSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnbGknKTsKKyAgICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3Rlc3RSZXBsYWNlJykub3V0ZXJIVE1MID0gJzxzcGFuPlJlcGxhY2Vk PC9zcGFuPiBub2RlJzsKKyAgICAgICAgYXNzZXJ0TWFya3VwKCdyZXBsYWNlJywgaXRlbXNbMF0s ICd8IDxzcGFuPlxufCAgICJSZXBsYWNlZCJcbnwgIiBub2RlIHVzaW5nIG91dGVySFRNTC4iJyk7 CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RSZW1vdmUnKS5vdXRlckhU TUwgPSAnJzsKKyAgICAgICAgYXNzZXJ0TWFya3VwKCdyZW1vdmUnLCBpdGVtc1sxXSwgJ3wgIiBy ZW1vdmluZyBub2RlIHVzaW5nIG91dGVySFRNTC4iJyk7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Rlc3RNZXJnZScpLm91dGVySFRNTCA9ICdtZXJnaW5nJzsKKyAgICAgICAg YXNzZXJ0TWFya3VwKCdtZXJnZSB0ZXh0IG5vZGVzJywgaXRlbXNbMl0sICd8ICJUZXN0aW5nIG1l cmdpbmcgdGV4dCBub2Rlcy4iJyk7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J3Rlc3RBZGRCcicpLm91dGVySFRNTCA9ICc8YnI+JzsKKyAgICAgICAgYXNzZXJ0TWFya3VwKCds aW5lIGJyZWFrJywgaXRlbXNbM10sICd8ICJUZXN0aW5nIGFkZGluZyAiXG58IDxicj5cbnwgIiB1 c2luZyBvdXRlckhUTUwuIicpOworICAgIH0KKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8dWw+CisgICAgICAgIDxsaT48c3BhbiBpZD0idGVz dFJlcGxhY2UiPlRlc3RpbmcgcmVwbGFjaW5nIG5vZGU8L3NwYW4+IHVzaW5nIG91dGVySFRNTC48 L2xpPgorICAgICAgICA8bGk+PHNwYW4gaWQ9InRlc3RSZW1vdmUiPlRlc3Rpbmc8L3NwYW4+IHJl bW92aW5nIG5vZGUgdXNpbmcgb3V0ZXJIVE1MLjwvbGk+CisgICAgICAgIDxsaT5UZXN0aW5nIDxz cGFuIGlkPSJ0ZXN0TWVyZ2UiPm1lcmdpbmc8L3NwYW4+IHRleHQgbm9kZXMuPC9saT4KKyAgICAg ICAgPGxpPlRlc3RpbmcgYWRkaW5nIDxzcGFuIGlkPSJ0ZXN0QWRkQnIiPmxpbmUgYnJlYWs8L3Nw YW4+IHVzaW5nIG91dGVySFRNTC48L2xpPgorICAgIDwvdWw+CisgICAgPGRpdiBpZD0icmVzdWx0 Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KKwo= 79543 2011-01-19 19:57:33 -0800 2011-04-29 16:37:20 -0700 Patch outerhtml.patch text/plain 7177 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2MDY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDEtMTggIEVtaWwgRWts dW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTZXR0aW5nIG91dGVySFRNTCBzaG91bGQgbWVyZ2UgdGV4dCBub2Rl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI2ODYK KworICAgICAgICBXaGVuIHNldHRpbmcgb3V0ZXJIVE1MIGFkamFjZW50IHRleHQgbm9kZXMgc2hv dWxkIGJlIG1lcmdlZC4gVGhpcyBtYXRjaGVzCisgICAgICAgIHRoZSBiZWhhdmlvciBvZiBvdXRl clRleHQgYW5kIHRoZSBJRSBpbXBsZW1lbnRhdGlvbiBvZiBvdXRlckhUTUwuICAgICAgIAorCisg ICAgICAgIFRlc3Q6IGZhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWwKKworICAgICAgICAqIGh0 bWwvSFRNTEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVyZ2VXaXRoTmV4dFRleHRO b2RlKTogTW92ZSBmdW5jdGlvbiB0byBiZWZvcmUgc2V0T3V0ZXJIVE1MLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTEVsZW1lbnQ6OnNldE91dGVySFRNTCk6IE1lcmdlIGFkamFjZW50IHRleHQgbm9k ZXMgYWZ0ZXIgcmVwbGFjaW5nIHRoZSBlbGVtZW50LgorCiAyMDExLTAxLTE4ICBLZW5uZXRoIFJ1 c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZp bi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCShyZXZpc2lvbiA3NjA0MSkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNjAsNiArMzYwLDIyIEBAIHZvaWQgSFRNTEVsZW1lbnQ6OnNldElubmVySFRNTChjb25zdCBT dHIKICAgICAgICAgcmVwbGFjZUNoaWxkcmVuV2l0aEZyYWdtZW50KHRoaXMsIGZyYWdtZW50LnJl bGVhc2UoKSwgZWMpOwogfQogCitzdGF0aWMgdm9pZCBtZXJnZVdpdGhOZXh0VGV4dE5vZGUoUGFz c1JlZlB0cjxOb2RlPiBub2RlLCBFeGNlcHRpb25Db2RlJiBlYykKK3sKKyAgICBBU1NFUlQobm9k ZSAmJiBub2RlLT5pc1RleHROb2RlKCkpOworICAgIE5vZGUqIG5leHQgPSBub2RlLT5uZXh0U2li bGluZygpOworICAgIGlmICghbmV4dCB8fCAhbmV4dC0+aXNUZXh0Tm9kZSgpKQorICAgICAgICBy ZXR1cm47CisgICAgCisgICAgUmVmUHRyPFRleHQ+IHRleHROb2RlID0gc3RhdGljX2Nhc3Q8VGV4 dCo+KG5vZGUuZ2V0KCkpOworICAgIFJlZlB0cjxUZXh0PiB0ZXh0TmV4dCA9IHN0YXRpY19jYXN0 PFRleHQqPihuZXh0KTsKKyAgICB0ZXh0Tm9kZS0+YXBwZW5kRGF0YSh0ZXh0TmV4dC0+ZGF0YSgp LCBlYyk7CisgICAgaWYgKGVjKQorICAgICAgICByZXR1cm47CisgICAgaWYgKHRleHROZXh0LT5w YXJlbnROb2RlKCkpIC8vIE1pZ2h0IGhhdmUgYmVlbiByZW1vdmVkIGJ5IG11dGF0aW9uIGV2ZW50 LgorICAgICAgICB0ZXh0TmV4dC0+cmVtb3ZlKGVjKTsKK30KKwogdm9pZCBIVE1MRWxlbWVudDo6 c2V0T3V0ZXJIVE1MKGNvbnN0IFN0cmluZyYgaHRtbCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAg ICAgTm9kZSogcCA9IHBhcmVudE5vZGUoKTsKQEAgLTM2NywxMyArMzgzLDIxIEBAIHZvaWQgSFRN TEVsZW1lbnQ6OnNldE91dGVySFRNTChjb25zdCBTdHIKICAgICAgICAgZWMgPSBOT19NT0RJRklD QVRJT05fQUxMT1dFRF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgSFRNTEVsZW1l bnQqIHBhcmVudCA9IHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4ocCk7CisgICAgUmVmUHRyPEhU TUxFbGVtZW50PiBwYXJlbnQgPSBzdGF0aWNfY2FzdDxIVE1MRWxlbWVudCo+KHApOworICAgIFJl ZlB0cjxOb2RlPiBwcmV2ID0gcHJldmlvdXNTaWJsaW5nKCk7CisgICAgUmVmUHRyPE5vZGU+IG5l eHQgPSBuZXh0U2libGluZygpOwogCi0gICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdt ZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tU291cmNlKGh0bWwsIHBhcmVudCwgZWMpOwotICAgIGlm IChmcmFnbWVudCkgewotICAgICAgICAvLyBGSVhNRTogV2h5IGRvZXNuJ3QgdGhpcyBoYXZlIGNv ZGUgdG8gbWVyZ2UgbmVpZ2hib3JpbmcgdGV4dCBub2RlcyB0aGUgd2F5IHNldE91dGVyVGV4dCBk b2VzPwotICAgICAgICBwYXJlbnQtPnJlcGxhY2VDaGlsZChmcmFnbWVudC5yZWxlYXNlKCksIHRo aXMsIGVjKTsKLSAgICB9CisgICAgUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGZyYWdtZW50ID0g Y3JlYXRlRnJhZ21lbnRGcm9tU291cmNlKGh0bWwsIHBhcmVudC5nZXQoKSwgZWMpOworICAgIGlm IChlYykKKyAgICAgICAgcmV0dXJuOworICAgICAgCisgICAgcGFyZW50LT5yZXBsYWNlQ2hpbGQo ZnJhZ21lbnQucmVsZWFzZSgpLCB0aGlzLCBlYyk7CisgICAgUmVmUHRyPE5vZGU+IG5vZGUgPSBu ZXh0ID8gbmV4dC0+cHJldmlvdXNTaWJsaW5nKCkgOiAwOworICAgIGlmICghZWMgJiYgbm9kZSAm JiBub2RlLT5pc1RleHROb2RlKCkpCisgICAgICAgIG1lcmdlV2l0aE5leHRUZXh0Tm9kZShub2Rl LnJlbGVhc2UoKSwgZWMpOworCisgICAgaWYgKCFlYyAmJiBwcmV2ICYmIHByZXYtPmlzVGV4dE5v ZGUoKSkKKyAgICAgICAgbWVyZ2VXaXRoTmV4dFRleHROb2RlKHByZXYucmVsZWFzZSgpLCBlYyk7 CiB9CiAKIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gSFRNTEVsZW1lbnQ6OnRleHRUb0Zy YWdtZW50KGNvbnN0IFN0cmluZyYgdGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMpCkBAIC00NTcsMjIg KzQ4MSw2IEBAIHZvaWQgSFRNTEVsZW1lbnQ6OnNldElubmVyVGV4dChjb25zdCBTdHIKICAgICAg ICAgcmVwbGFjZUNoaWxkcmVuV2l0aEZyYWdtZW50KHRoaXMsIGZyYWdtZW50LnJlbGVhc2UoKSwg ZWMpOwogfQogCi1zdGF0aWMgdm9pZCBtZXJnZVdpdGhOZXh0VGV4dE5vZGUoUGFzc1JlZlB0cjxO b2RlPiBub2RlLCBFeGNlcHRpb25Db2RlJiBlYykKLXsKLSAgICBBU1NFUlQobm9kZSAmJiBub2Rl LT5pc1RleHROb2RlKCkpOwotICAgIE5vZGUqIG5leHQgPSBub2RlLT5uZXh0U2libGluZygpOwot ICAgIGlmICghbmV4dCB8fCAhbmV4dC0+aXNUZXh0Tm9kZSgpKQotICAgICAgICByZXR1cm47Ci0g ICAgCi0gICAgUmVmUHRyPFRleHQ+IHRleHROb2RlID0gc3RhdGljX2Nhc3Q8VGV4dCo+KG5vZGUu Z2V0KCkpOwotICAgIFJlZlB0cjxUZXh0PiB0ZXh0TmV4dCA9IHN0YXRpY19jYXN0PFRleHQqPihu ZXh0KTsKLSAgICB0ZXh0Tm9kZS0+YXBwZW5kRGF0YSh0ZXh0TmV4dC0+ZGF0YSgpLCBlYyk7Ci0g ICAgaWYgKGVjKQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKHRleHROZXh0LT5wYXJlbnROb2Rl KCkpIC8vIE1pZ2h0IGhhdmUgYmVlbiByZW1vdmVkIGJ5IG11dGF0aW9uIGV2ZW50LgotICAgICAg ICB0ZXh0TmV4dC0+cmVtb3ZlKGVjKTsKLX0KLQogdm9pZCBIVE1MRWxlbWVudDo6c2V0T3V0ZXJU ZXh0KGNvbnN0IFN0cmluZyAmdGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgaWYgKGll Rm9yYmlkc0luc2VydEhUTUwoKSkgewpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNzYwNjUpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0w MS0xOCAgRW1pbCBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldHRpbmcgb3V0ZXJIVE1MIHNob3VsZCBt ZXJnZSB0ZXh0IG5vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MjY4NgorICAgICAgICAKKyAgICAgICAgQWRkIHRlc3QgZm9yIHNldHRpbmcgRWxl bWVudC5vdXRlckhUTUwuCisKKyAgICAgICAgKiBmYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWw6 IEFkZGVkLgorCiAyMDExLTAxLTE4ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvZG9tL3NldC1vdXRlci1odG1sLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9mYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsOSBAQAorUmVwbGFjZWQgbm9kZSB1c2luZyBvdXRlckhUTUwuCity ZW1vdmluZyBub2RlIHVzaW5nIG91dGVySFRNTC4KK1Rlc3RpbmcgbWVyZ2luZyB0ZXh0IG5vZGVz LgorVGVzdGluZyBhZGRpbmcgCit1c2luZyBvdXRlckhUTUwuCitQQVNTOiByZXBsYWNlCitQQVNT OiByZW1vdmUKK1BBU1M6IG1lcmdlIHRleHQgbm9kZXMKK1BBU1M6IGxpbmUgYnJlYWsKSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZmFzdC9kb20vc2V0LW91dGVyLWh0bWwuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsNTYgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICBwcmUg eyBtYXJnaW46IDA7IH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvZHVtcC1hcy1tYXJrdXAuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgTWFy a3VwLm5vQXV0b0R1bXAoKTsKKyAgICAKKyAgICBmdW5jdGlvbiBhc3NlcnRNYXJrdXAobmFtZSwg ZWxlbWVudCwgZXhwZWN0ZWQpCisgICAgeworICAgICAgICB2YXIgbWFya3VwID0gTWFya3VwLmdl dChlbGVtZW50KTsKKyAgICAgICAgaWYgKG1hcmt1cCA9PSBleHBlY3RlZCkKKyAgICAgICAgICAg IGxvZygnUEFTUzogJyArIG5hbWUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBsb2coJ0ZB SUw6ICcgKyBuYW1lICArICdcbldhczpcbicgKyBtYXJrdXAgKyAnXG5FeHBlY3RlZDpcbicgKyBl eHBlY3RlZCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gbG9nKHRleHQpCisgICAgeworICAgICAg ICB2YXIgZWwgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdwcmUnKTsKKyAgICAgICAgZWwuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGV4dCkpOworICAgICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgncmVzdWx0JykuYXBwZW5kQ2hpbGQoZWwpOworICAgIH0KKworICAg IGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgIHsKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQo KQorCisgICAgICAgIHZhciBpdGVtcyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCds aScpOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdFJlcGxhY2UnKS5vdXRl ckhUTUwgPSAnPHNwYW4+UmVwbGFjZWQ8L3NwYW4+IG5vZGUnOworICAgICAgICBhc3NlcnRNYXJr dXAoJ3JlcGxhY2UnLCBpdGVtc1swXSwgJ3wgPHNwYW4+XG58ICAgIlJlcGxhY2VkIlxufCAiIG5v ZGUgdXNpbmcgb3V0ZXJIVE1MLiInKTsKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgndGVzdFJlbW92ZScpLm91dGVySFRNTCA9ICcnOworICAgICAgICBhc3NlcnRNYXJrdXAoJ3Jl bW92ZScsIGl0ZW1zWzFdLCAnfCAiIHJlbW92aW5nIG5vZGUgdXNpbmcgb3V0ZXJIVE1MLiInKTsK KworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdE1lcmdlJykub3V0ZXJIVE1M ID0gJ21lcmdpbmcnOworICAgICAgICBhc3NlcnRNYXJrdXAoJ21lcmdlIHRleHQgbm9kZXMnLCBp dGVtc1syXSwgJ3wgIlRlc3RpbmcgbWVyZ2luZyB0ZXh0IG5vZGVzLiInKTsKKworICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEFkZEJyJykub3V0ZXJIVE1MID0gJzxicj4nOwor ICAgICAgICBhc3NlcnRNYXJrdXAoJ2xpbmUgYnJlYWsnLCBpdGVtc1szXSwgJ3wgIlRlc3Rpbmcg YWRkaW5nICJcbnwgPGJyPlxufCAiIHVzaW5nIG91dGVySFRNTC4iJyk7CisgICAgfQorICAgIDwv c2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorICAgIDx1bD4KKyAg ICAgICAgPGxpPjxzcGFuIGlkPSJ0ZXN0UmVwbGFjZSI+VGVzdGluZyByZXBsYWNpbmcgbm9kZTwv c3Bhbj4gdXNpbmcgb3V0ZXJIVE1MLjwvbGk+CisgICAgICAgIDxsaT48c3BhbiBpZD0idGVzdFJl bW92ZSI+VGVzdGluZzwvc3Bhbj4gcmVtb3Zpbmcgbm9kZSB1c2luZyBvdXRlckhUTUwuPC9saT4K KyAgICAgICAgPGxpPlRlc3RpbmcgPHNwYW4gaWQ9InRlc3RNZXJnZSI+bWVyZ2luZzwvc3Bhbj4g dGV4dCBub2Rlcy48L2xpPgorICAgICAgICA8bGk+VGVzdGluZyBhZGRpbmcgPHNwYW4gaWQ9InRl c3RBZGRCciI+bGluZSBicmVhazwvc3Bhbj4gdXNpbmcgb3V0ZXJIVE1MLjwvbGk+CisgICAgPC91 bD4KKyAgICA8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgorCg== 91765 2011-04-29 16:37:24 -0700 2011-04-29 17:23:12 -0700 Patch for landing bug-52686-20110429163723.patch text/plain 7178 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MzU3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMjkgIEVtaWwgRWts dW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5n LgorCisgICAgICAgIFNldHRpbmcgb3V0ZXJIVE1MIHNob3VsZCBtZXJnZSB0ZXh0IG5vZGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjY4NgorCisg ICAgICAgIFdoZW4gc2V0dGluZyBvdXRlckhUTUwgYWRqYWNlbnQgdGV4dCBub2RlcyBzaG91bGQg YmUgbWVyZ2VkLiBUaGlzIG1hdGNoZXMKKyAgICAgICAgdGhlIGJlaGF2aW9yIG9mIG91dGVyVGV4 dCBhbmQgdGhlIElFIGltcGxlbWVudGF0aW9uIG9mIG91dGVySFRNTC4gICAgICAgCisKKyAgICAg ICAgVGVzdDogZmFzdC9kb20vc2V0LW91dGVyLWh0bWwuaHRtbAorCisgICAgICAgICogaHRtbC9I VE1MRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptZXJnZVdpdGhOZXh0VGV4dE5vZGUp OiBNb3ZlIGZ1bmN0aW9uIHRvIGJlZm9yZSBzZXRPdXRlckhUTUwuCisgICAgICAgIChXZWJDb3Jl OjpIVE1MRWxlbWVudDo6c2V0T3V0ZXJIVE1MKTogTWVyZ2UgYWRqYWNlbnQgdGV4dCBub2RlcyBh ZnRlciByZXBsYWNpbmcgdGhlIGVsZW1lbnQuCisKIDIwMTEtMDQtMjkgIENzYWJhIE9zenRyb2dv bsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgYnVpbGRm aXggYWZ0ZXIgcjg1MzQzLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAJKHJl dmlzaW9uIDg1MzU3KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM2MCw2ICszNjAsMjIgQEAgdm9pZCBIVE1MRWxlbWVudDo6c2V0SW5u ZXJIVE1MKGNvbnN0IFN0cgogICAgICAgICByZXBsYWNlQ2hpbGRyZW5XaXRoRnJhZ21lbnQodGhp cywgZnJhZ21lbnQucmVsZWFzZSgpLCBlYyk7CiB9CiAKK3N0YXRpYyB2b2lkIG1lcmdlV2l0aE5l eHRUZXh0Tm9kZShQYXNzUmVmUHRyPE5vZGU+IG5vZGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQorewor ICAgIEFTU0VSVChub2RlICYmIG5vZGUtPmlzVGV4dE5vZGUoKSk7CisgICAgTm9kZSogbmV4dCA9 IG5vZGUtPm5leHRTaWJsaW5nKCk7CisgICAgaWYgKCFuZXh0IHx8ICFuZXh0LT5pc1RleHROb2Rl KCkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBSZWZQdHI8VGV4dD4gdGV4dE5vZGUgPSBz dGF0aWNfY2FzdDxUZXh0Kj4obm9kZS5nZXQoKSk7CisgICAgUmVmUHRyPFRleHQ+IHRleHROZXh0 ID0gc3RhdGljX2Nhc3Q8VGV4dCo+KG5leHQpOworICAgIHRleHROb2RlLT5hcHBlbmREYXRhKHRl eHROZXh0LT5kYXRhKCksIGVjKTsKKyAgICBpZiAoZWMpCisgICAgICAgIHJldHVybjsKKyAgICBp ZiAodGV4dE5leHQtPnBhcmVudE5vZGUoKSkgLy8gTWlnaHQgaGF2ZSBiZWVuIHJlbW92ZWQgYnkg bXV0YXRpb24gZXZlbnQuCisgICAgICAgIHRleHROZXh0LT5yZW1vdmUoZWMpOworfQorCiB2b2lk IEhUTUxFbGVtZW50OjpzZXRPdXRlckhUTUwoY29uc3QgU3RyaW5nJiBodG1sLCBFeGNlcHRpb25D b2RlJiBlYykKIHsKICAgICBOb2RlKiBwID0gcGFyZW50Tm9kZSgpOwpAQCAtMzY3LDEzICszODMs MjEgQEAgdm9pZCBIVE1MRWxlbWVudDo6c2V0T3V0ZXJIVE1MKGNvbnN0IFN0cgogICAgICAgICBl YyA9IE5PX01PRElGSUNBVElPTl9BTExPV0VEX0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0K LSAgICBIVE1MRWxlbWVudCogcGFyZW50ID0gdG9IVE1MRWxlbWVudChwKTsKKyAgICBSZWZQdHI8 SFRNTEVsZW1lbnQ+IHBhcmVudCA9IHN0YXRpY19jYXN0PEhUTUxFbGVtZW50Kj4ocCk7CisgICAg UmVmUHRyPE5vZGU+IHByZXYgPSBwcmV2aW91c1NpYmxpbmcoKTsKKyAgICBSZWZQdHI8Tm9kZT4g bmV4dCA9IG5leHRTaWJsaW5nKCk7CiAKLSAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gZnJh Z21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21Tb3VyY2UoaHRtbCwgcGFyZW50LCBlYyk7Ci0gICAg aWYgKGZyYWdtZW50KSB7Ci0gICAgICAgIC8vIEZJWE1FOiBXaHkgZG9lc24ndCB0aGlzIGhhdmUg Y29kZSB0byBtZXJnZSBuZWlnaGJvcmluZyB0ZXh0IG5vZGVzIHRoZSB3YXkgc2V0T3V0ZXJUZXh0 IGRvZXM/Ci0gICAgICAgIHBhcmVudC0+cmVwbGFjZUNoaWxkKGZyYWdtZW50LnJlbGVhc2UoKSwg dGhpcywgZWMpOwotICAgIH0KKyAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gZnJhZ21lbnQg PSBjcmVhdGVGcmFnbWVudEZyb21Tb3VyY2UoaHRtbCwgcGFyZW50LmdldCgpLCBlYyk7CisgICAg aWYgKGVjKQorICAgICAgICByZXR1cm47CisgICAgICAKKyAgICBwYXJlbnQtPnJlcGxhY2VDaGls ZChmcmFnbWVudC5yZWxlYXNlKCksIHRoaXMsIGVjKTsKKyAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9 IG5leHQgPyBuZXh0LT5wcmV2aW91c1NpYmxpbmcoKSA6IDA7CisgICAgaWYgKCFlYyAmJiBub2Rl ICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkKKyAgICAgICAgbWVyZ2VXaXRoTmV4dFRleHROb2RlKG5v ZGUucmVsZWFzZSgpLCBlYyk7CisKKyAgICBpZiAoIWVjICYmIHByZXYgJiYgcHJldi0+aXNUZXh0 Tm9kZSgpKQorICAgICAgICBtZXJnZVdpdGhOZXh0VGV4dE5vZGUocHJldi5yZWxlYXNlKCksIGVj KTsKIH0KIAogUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBIVE1MRWxlbWVudDo6dGV4dFRv RnJhZ21lbnQoY29uc3QgU3RyaW5nJiB0ZXh0LCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTQ1Nywy MiArNDgxLDYgQEAgdm9pZCBIVE1MRWxlbWVudDo6c2V0SW5uZXJUZXh0KGNvbnN0IFN0cgogICAg ICAgICByZXBsYWNlQ2hpbGRyZW5XaXRoRnJhZ21lbnQodGhpcywgZnJhZ21lbnQucmVsZWFzZSgp LCBlYyk7CiB9CiAKLXN0YXRpYyB2b2lkIG1lcmdlV2l0aE5leHRUZXh0Tm9kZShQYXNzUmVmUHRy PE5vZGU+IG5vZGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQotewotICAgIEFTU0VSVChub2RlICYmIG5v ZGUtPmlzVGV4dE5vZGUoKSk7Ci0gICAgTm9kZSogbmV4dCA9IG5vZGUtPm5leHRTaWJsaW5nKCk7 Ci0gICAgaWYgKCFuZXh0IHx8ICFuZXh0LT5pc1RleHROb2RlKCkpCi0gICAgICAgIHJldHVybjsK LSAgICAKLSAgICBSZWZQdHI8VGV4dD4gdGV4dE5vZGUgPSBzdGF0aWNfY2FzdDxUZXh0Kj4obm9k ZS5nZXQoKSk7Ci0gICAgUmVmUHRyPFRleHQ+IHRleHROZXh0ID0gc3RhdGljX2Nhc3Q8VGV4dCo+ KG5leHQpOwotICAgIHRleHROb2RlLT5hcHBlbmREYXRhKHRleHROZXh0LT5kYXRhKCksIGVjKTsK LSAgICBpZiAoZWMpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAodGV4dE5leHQtPnBhcmVudE5v ZGUoKSkgLy8gTWlnaHQgaGF2ZSBiZWVuIHJlbW92ZWQgYnkgbXV0YXRpb24gZXZlbnQuCi0gICAg ICAgIHRleHROZXh0LT5yZW1vdmUoZWMpOwotfQotCiB2b2lkIEhUTUxFbGVtZW50OjpzZXRPdXRl clRleHQoY29uc3QgU3RyaW5nICZ0ZXh0LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAo aWVGb3JiaWRzSW5zZXJ0SFRNTCgpKSB7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NTM1NykKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEx LTA0LTI5ICBFbWlsIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVG9ueSBDaGFuZy4KKworICAgICAgICBTZXR0aW5nIG91dGVySFRNTCBzaG91bGQgbWVy Z2UgdGV4dCBub2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTI2ODYKKyAgICAgICAgCisgICAgICAgIEFkZCB0ZXN0IGZvciBzZXR0aW5nIEVsZW1l bnQub3V0ZXJIVE1MLgorCisgICAgICAgICogZmFzdC9kb20vc2V0LW91dGVyLWh0bWwtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC5odG1sOiBB ZGRlZC4KKwogMjAxMS0wNC0yMSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L2RvbS9zZXQtb3V0ZXItaHRtbC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9kb20vc2V0LW91dGVyLWh0bWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvZmFzdC9kb20vc2V0LW91dGVyLWh0bWwtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDkgQEAKK1JlcGxhY2VkIG5vZGUgdXNpbmcgb3V0ZXJIVE1MLgor cmVtb3Zpbmcgbm9kZSB1c2luZyBvdXRlckhUTUwuCitUZXN0aW5nIG1lcmdpbmcgdGV4dCBub2Rl cy4KK1Rlc3RpbmcgYWRkaW5nIAordXNpbmcgb3V0ZXJIVE1MLgorUEFTUzogcmVwbGFjZQorUEFT UzogcmVtb3ZlCitQQVNTOiBtZXJnZSB0ZXh0IG5vZGVzCitQQVNTOiBsaW5lIGJyZWFrCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC5odG1sCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvZG9tL3NldC1vdXRlci1odG1sLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9zZXQtb3V0ZXItaHRtbC5odG1sCShyZXZpc2lvbiAwKQpA QCAtMCwwICsxLDU2IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgcHJl IHsgbWFyZ2luOiAwOyB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgIE1h cmt1cC5ub0F1dG9EdW1wKCk7CisgICAgCisgICAgZnVuY3Rpb24gYXNzZXJ0TWFya3VwKG5hbWUs IGVsZW1lbnQsIGV4cGVjdGVkKQorICAgIHsKKyAgICAgICAgdmFyIG1hcmt1cCA9IE1hcmt1cC5n ZXQoZWxlbWVudCk7CisgICAgICAgIGlmIChtYXJrdXAgPT0gZXhwZWN0ZWQpCisgICAgICAgICAg ICBsb2coJ1BBU1M6ICcgKyBuYW1lKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbG9nKCdG QUlMOiAnICsgbmFtZSAgKyAnXG5XYXM6XG4nICsgbWFya3VwICsgJ1xuRXhwZWN0ZWQ6XG4nICsg ZXhwZWN0ZWQpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGxvZyh0ZXh0KQorICAgIHsKKyAgICAg ICAgdmFyIGVsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgncHJlJyk7CisgICAgICAgIGVsLmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRleHQpKTsKKyAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmFwcGVuZENoaWxkKGVsKTsKKyAgICB9CisKKyAg ICBmdW5jdGlvbiBydW5UZXN0KCkKKyAgICB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0 KCkKKworICAgICAgICB2YXIgaXRlbXMgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgn bGknKTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RSZXBsYWNlJykub3V0 ZXJIVE1MID0gJzxzcGFuPlJlcGxhY2VkPC9zcGFuPiBub2RlJzsKKyAgICAgICAgYXNzZXJ0TWFy a3VwKCdyZXBsYWNlJywgaXRlbXNbMF0sICd8IDxzcGFuPlxufCAgICJSZXBsYWNlZCJcbnwgIiBu b2RlIHVzaW5nIG91dGVySFRNTC4iJyk7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoJ3Rlc3RSZW1vdmUnKS5vdXRlckhUTUwgPSAnJzsKKyAgICAgICAgYXNzZXJ0TWFya3VwKCdy ZW1vdmUnLCBpdGVtc1sxXSwgJ3wgIiByZW1vdmluZyBub2RlIHVzaW5nIG91dGVySFRNTC4iJyk7 CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RNZXJnZScpLm91dGVySFRN TCA9ICdtZXJnaW5nJzsKKyAgICAgICAgYXNzZXJ0TWFya3VwKCdtZXJnZSB0ZXh0IG5vZGVzJywg aXRlbXNbMl0sICd8ICJUZXN0aW5nIG1lcmdpbmcgdGV4dCBub2Rlcy4iJyk7CisKKyAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RBZGRCcicpLm91dGVySFRNTCA9ICc8YnI+JzsK KyAgICAgICAgYXNzZXJ0TWFya3VwKCdsaW5lIGJyZWFrJywgaXRlbXNbM10sICd8ICJUZXN0aW5n IGFkZGluZyAiXG58IDxicj5cbnwgIiB1c2luZyBvdXRlckhUTUwuIicpOworICAgIH0KKyAgICA8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8dWw+Cisg ICAgICAgIDxsaT48c3BhbiBpZD0idGVzdFJlcGxhY2UiPlRlc3RpbmcgcmVwbGFjaW5nIG5vZGU8 L3NwYW4+IHVzaW5nIG91dGVySFRNTC48L2xpPgorICAgICAgICA8bGk+PHNwYW4gaWQ9InRlc3RS ZW1vdmUiPlRlc3Rpbmc8L3NwYW4+IHJlbW92aW5nIG5vZGUgdXNpbmcgb3V0ZXJIVE1MLjwvbGk+ CisgICAgICAgIDxsaT5UZXN0aW5nIDxzcGFuIGlkPSJ0ZXN0TWVyZ2UiPm1lcmdpbmc8L3NwYW4+ IHRleHQgbm9kZXMuPC9saT4KKyAgICAgICAgPGxpPlRlc3RpbmcgYWRkaW5nIDxzcGFuIGlkPSJ0 ZXN0QWRkQnIiPmxpbmUgYnJlYWs8L3NwYW4+IHVzaW5nIG91dGVySFRNTC48L2xpPgorICAgIDwv dWw+CisgICAgPGRpdiBpZD0icmVzdWx0Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KKwo=