71754 2011-11-07 17:30:49 -0800 Indent command can insert block quote in non editable content 2011-11-08 10:40:01 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 enrica rniwa adele darin rniwa tony oldest_to_newest 497628 0 enrica 2011-11-07 17:30:49 -0800 run the attached test case. EXPECTED The markup should be <body contenteditable> <blockquote …> <img><img> </blockquote> </body> ACTUAL <blockquote …> <img><img> </blockquote> <body contenteditable></body> The blockquote is inserted outside the editable content and the original content of the body is moved in non editable area. 497630 1 113967 enrica 2011-11-07 17:31:10 -0800 Created attachment 113967 Test case 497647 2 113969 rniwa 2011-11-07 18:10:55 -0800 Created attachment 113969 work in progress Still doesn't work due to a bunch of bugs in CompositeEditCommand::cloneParagraphUnderNewElement. It needs be updated using modern syntax instead of deprecatedNode. 497683 3 113979 rniwa 2011-11-07 19:21:05 -0800 Created attachment 113979 fixes the bug 498175 4 113979 enrica 2011-11-08 10:00:02 -0800 Comment on attachment 113979 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=113979&action=review The patch doesnt cover every case. It would be nice to add more cases to the test. Definitely the one I mentioned above and probably the case were the root editable element is an inline. > Source/WebCore/editing/CompositeEditCommand.cpp:796 > + } This code will not work in every case. If you have <body><div contenteditable><img><img></div></body> the blockquote will still be inserted outside the div. I believe the correct test should be to check if outer node is the root editable element. 498220 5 114110 rniwa 2011-11-08 10:25:38 -0800 Created attachment 114110 Updated per comment 498226 6 114110 enrica 2011-11-08 10:30:39 -0800 Comment on attachment 114110 Updated per comment Looks good now. Thanks for the quick followup! 498242 7 rniwa 2011-11-08 10:40:01 -0800 Committed r99594: <http://trac.webkit.org/changeset/99594> 113967 2011-11-07 17:31:10 -0800 2011-11-07 17:31:10 -0800 Test case test.html text/html 271 enrica PGhlYWQ+CjxzY3JpcHQ+CmZ1bmN0aW9uIHRlc3QoKSB7CiAgICBkb2N1bWVudC5leGVjQ29tbWFu ZCgiU2VsZWN0QWxsIik7CiAgICBkb2N1bWVudC5leGVjQ29tbWFuZCgiSW5zZXJ0SW1hZ2UiLGZh bHNlKTsKICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJJbnNlcnRJbWFnZSIsZmFsc2UpOwogICAg ZG9jdW1lbnQuZXhlY0NvbW1hbmQoIkluZGVudCIpOwp9CiA8L3NjcmlwdD4KPC9oZWFkPgo8Ym9k eSBjb250ZW50ZWRpdGFibGUgb25sb2FkPSd0ZXN0KCk7Jz4KPC9ib2R5Pg== 113969 2011-11-07 18:10:55 -0800 2011-11-07 19:20:59 -0800 work in progress wip71754 text/plain 2432 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQu Y3BwCShyZXZpc2lvbiA5OTQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRl RWRpdENvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzIsOCArMTcyLDggQEAKICAgICAv LyBGb3IgZWRpdGluZyBwb3NpdGlvbnMgbGlrZSBbdGFibGUsIDBdLCBpbnNlcnQgYmVmb3JlIHRo ZSB0YWJsZSwKICAgICAvLyBsaWtld2lzZSBmb3IgcmVwbGFjZWQgZWxlbWVudHMsIGJycywgZXRj LgogICAgIFBvc2l0aW9uIHAgPSBlZGl0aW5nUG9zaXRpb24ucGFyZW50QW5jaG9yZWRFcXVpdmFs ZW50KCk7Ci0gICAgTm9kZSogcmVmQ2hpbGQgPSBwLmRlcHJlY2F0ZWROb2RlKCk7Ci0gICAgaW50 IG9mZnNldCA9IHAuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKTsKKyAgICBOb2RlKiByZWZDaGls ZCA9IHAuY29udGFpbmVyTm9kZSgpOworICAgIGludCBvZmZzZXQgPSBwLm9mZnNldEluQ29udGFp bmVyTm9kZSgpOwogICAgIAogICAgIGlmIChjYW5IYXZlQ2hpbGRyZW5Gb3JFZGl0aW5nKHJlZkNo aWxkKSkgewogICAgICAgICBOb2RlKiBjaGlsZCA9IHJlZkNoaWxkLT5maXJzdENoaWxkKCk7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luZGVudE91dGRlbnRDb21tYW5kLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luZGVudE91dGRlbnRDb21tYW5kLmNw cAkocmV2aXNpb24gOTk0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luZGVudE91dGRl bnRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTQsMjEgKzk0LDI1IEBACiAgICAgTm9k ZSogbm9kZVRvU3BsaXRUbzsKICAgICBpZiAoZW5jbG9zaW5nQ2VsbCkKICAgICAgICAgbm9kZVRv U3BsaXRUbyA9IGVuY2xvc2luZ0NlbGw7Ci0gICAgZWxzZSBpZiAoZW5jbG9zaW5nTGlzdChzdGFy dC5kZXByZWNhdGVkTm9kZSgpKSkKLSAgICAgICAgbm9kZVRvU3BsaXRUbyA9IGVuY2xvc2luZ0Js b2NrKHN0YXJ0LmRlcHJlY2F0ZWROb2RlKCkpOworICAgIGVsc2UgaWYgKGVuY2xvc2luZ0xpc3Qo c3RhcnQuY29udGFpbmVyTm9kZSgpKSkKKyAgICAgICAgbm9kZVRvU3BsaXRUbyA9IGVuY2xvc2lu Z0Jsb2NrKHN0YXJ0LmNvbnRhaW5lck5vZGUoKSk7CiAgICAgZWxzZQogICAgICAgICBub2RlVG9T cGxpdFRvID0gZWRpdGFibGVSb290Rm9yUG9zaXRpb24oc3RhcnQpOwogCiAgICAgaWYgKCFub2Rl VG9TcGxpdFRvKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9j ayA9IChzdGFydC5kZXByZWNhdGVkTm9kZSgpID09IG5vZGVUb1NwbGl0VG8pID8gc3RhcnQuZGVw cmVjYXRlZE5vZGUoKSA6IHNwbGl0VHJlZVRvTm9kZShzdGFydC5kZXByZWNhdGVkTm9kZSgpLCBu b2RlVG9TcGxpdFRvKTsKKyAgICBSZWZQdHI8Tm9kZT4gbm9kZUFmdGVyU3RhcnQgPSBzdGFydC5j b21wdXRlTm9kZUFmdGVyUG9zaXRpb24oKTsKKyAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9jayA9 IChzdGFydC5jb250YWluZXJOb2RlKCkgPT0gbm9kZVRvU3BsaXRUbykgPyBzdGFydC5jb250YWlu ZXJOb2RlKCkgOiBzcGxpdFRyZWVUb05vZGUoc3RhcnQuY29udGFpbmVyTm9kZSgpLCBub2RlVG9T cGxpdFRvKTsKIAogICAgIGlmICghdGFyZ2V0QmxvY2txdW90ZSkgewogICAgICAgICAvLyBDcmVh dGUgYSBuZXcgYmxvY2txdW90ZSBhbmQgaW5zZXJ0IGl0IGFzIGEgY2hpbGQgb2YgdGhlIHJvb3Qg ZWRpdGFibGUgZWxlbWVudC4gV2UgYWNjb21wbGlzaAogICAgICAgICAvLyB0aGlzIGJ5IHNwbGl0 dGluZyBhbGwgcGFyZW50cyBvZiB0aGUgY3VycmVudCBwYXJhZ3JhcGggdXAgdG8gdGhhdCBwb2lu dC4KICAgICAgICAgdGFyZ2V0QmxvY2txdW90ZSA9IGNyZWF0ZUJsb2NrRWxlbWVudCgpOwotICAg ICAgICBpbnNlcnROb2RlQmVmb3JlKHRhcmdldEJsb2NrcXVvdGUsIG91dGVyQmxvY2spOworICAg ICAgICBpZiAob3V0ZXJCbG9jayA9PSBzdGFydC5jb250YWluZXJOb2RlKCkpCisgICAgICAgICAg ICBpbnNlcnROb2RlQXQodGFyZ2V0QmxvY2txdW90ZSwgc3RhcnQpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBpbnNlcnROb2RlQmVmb3JlKHRhcmdldEJsb2NrcXVvdGUsIG91dGVyQmxvY2sp OwogICAgIH0KIAogICAgIG1vdmVQYXJhZ3JhcGhXaXRoQ2xvbmVzKHN0YXJ0LCBlbmQsIHRhcmdl dEJsb2NrcXVvdGUuZ2V0KCksIG91dGVyQmxvY2suZ2V0KCkpOwo= 113979 2011-11-07 19:21:05 -0800 2011-11-08 10:25:34 -0800 fixes the bug bug-71754-20111107192104.patch text/plain 7418 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NTE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMTEtMDcgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW5kZW50IGNvbW1hbmQgY2FuIGlu c2VydCBibG9jayBxdW90ZSBpbiBub24gZWRpdGFibGUgY29udGVudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE3NTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYnVnIHdhcyBjYXVzZWQgYnkgSW5k ZW50T3V0ZGVudENvbW1hbmQncyBpbmNvcnJlY3RseSB1c2luZyBkZXByZWNhdGVkTm9kZSB0byBk ZXRlcm1pbmUgdGhlIG91dGVyIGJsb2NrLAorICAgICAgICBub3QgdXBkYXRpbmcgdGhlIHN0YXJ0 IGFmdGVyIGluc2VydGluZyB0aGUgdGFyZ2V0QmxvY2txdW90ZSwgYW5kIGNsb25lUGFyYWdyYXBo VW5kZXJOZXdFbGVtZW50J3MgY2xvbmluZworICAgICAgICBvdXRlck5vZGUgZXZlbiBpZiBpdCB3 YXMgYm9keS4gRml4ZWQgdGhvc2UgYnVncy4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL2V4ZWND b21tYW5kL2luZGVudC1pbWFnZXMuaHRtbAorCisgICAgICAgICogZWRpdGluZy9Db21wb3NpdGVF ZGl0Q29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6 Y2xvbmVQYXJhZ3JhcGhVbmRlck5ld0VsZW1lbnQpOgorICAgICAgICAqIGVkaXRpbmcvSW5kZW50 T3V0ZGVudENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5kZW50T3V0ZGVudENvbW1h bmQ6OmluZGVudEludG9CbG9ja3F1b3RlKToKKwogMjAxMS0xMS0wNyAgS2VudGFybyBIYXJhICA8 aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIFtDdXN0b21HZXR0ZXJdIElE TCBmb3Igd2luZG93LkltYWdlIG9mIFY4CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Nv bXBvc2l0ZUVkaXRDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkocmV2aXNpb24gOTk0NTEpCisrKyBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzc5LDEzICs3NzksMjEgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6cHVzaEFuY2hv ckVsZQogLy8gQ2xvbmUgdGhlIHBhcmFncmFwaCBiZXR3ZWVuIHN0YXJ0IGFuZCBlbmQgdW5kZXIg YmxvY2tFbGVtZW50LAogLy8gcHJlc2VydmluZyB0aGUgaGllcmFyY2h5IHVwIHRvIG91dGVyTm9k ZS4gCiAKLXZvaWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmNsb25lUGFyYWdyYXBoVW5kZXJOZXdF bGVtZW50KFBvc2l0aW9uJiBzdGFydCwgUG9zaXRpb24mIGVuZCwgTm9kZSogb3V0ZXJOb2RlLCBF bGVtZW50KiBibG9ja0VsZW1lbnQpCit2b2lkIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpjbG9uZVBh cmFncmFwaFVuZGVyTmV3RWxlbWVudChQb3NpdGlvbiYgc3RhcnQsIFBvc2l0aW9uJiBlbmQsIE5v ZGUqIHBhc3NlZE91dGVyTm9kZSwgRWxlbWVudCogYmxvY2tFbGVtZW50KQogewogICAgIC8vIEZp cnN0IHdlIGNsb25lIHRoZSBvdXRlck5vZGUKLSAgICAKLSAgICBSZWZQdHI8Tm9kZT4gdG9wTm9k ZSA9IG91dGVyTm9kZS0+Y2xvbmVOb2RlKGlzVGFibGVFbGVtZW50KG91dGVyTm9kZSkpOwotICAg IGFwcGVuZE5vZGUodG9wTm9kZSwgYmxvY2tFbGVtZW50KTsKLSAgICBSZWZQdHI8Tm9kZT4gbGFz dE5vZGUgPSB0b3BOb2RlOworICAgIFJlZlB0cjxOb2RlPiB0b3BOb2RlOworICAgIFJlZlB0cjxO b2RlPiBsYXN0Tm9kZTsKKyAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJOb2RlID0gcGFzc2VkT3V0ZXJO b2RlOworCisgICAgaWYgKG91dGVyTm9kZS0+aGFzVGFnTmFtZShib2R5VGFnKSkgeworICAgICAg ICB0b3BOb2RlID0gYmxvY2tFbGVtZW50OworICAgICAgICBsYXN0Tm9kZSA9IGJsb2NrRWxlbWVu dDsKKyAgICB9IGVsc2UgeworICAgICAgICB0b3BOb2RlID0gb3V0ZXJOb2RlLT5jbG9uZU5vZGUo aXNUYWJsZUVsZW1lbnQob3V0ZXJOb2RlLmdldCgpKSk7CisgICAgICAgIGFwcGVuZE5vZGUodG9w Tm9kZSwgYmxvY2tFbGVtZW50KTsKKyAgICAgICAgbGFzdE5vZGUgPSB0b3BOb2RlOworICAgIH0K IAogICAgIGlmIChzdGFydC5kZXByZWNhdGVkTm9kZSgpICE9IG91dGVyTm9kZSAmJiBsYXN0Tm9k ZS0+aXNFbGVtZW50Tm9kZSgpKSB7CiAgICAgICAgIFZlY3RvcjxSZWZQdHI8Tm9kZT4gPiBhbmNl c3RvcnM7CkBAIC04MTEsMTIgKzgxOSwxMiBAQCB2b2lkIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpj bG9uZVBhcmFncmFwCiAgICAgICAgIC8vIElmIGVuZCBpcyBub3QgYSBkZXNjZW5kYW50IG9mIG91 dGVyTm9kZSB3ZSBuZWVkIHRvCiAgICAgICAgIC8vIGZpbmQgdGhlIGZpcnN0IGNvbW1vbiBhbmNl c3RvciBhbmQgYWRqdXN0IHRoZSBpbnNlcnRpb24KICAgICAgICAgLy8gcG9pbnQgYWNjb3JkaW5n bHkuCi0gICAgICAgIHdoaWxlICghZW5kLmRlcHJlY2F0ZWROb2RlKCktPmlzRGVzY2VuZGFudE9m KG91dGVyTm9kZSkpIHsKKyAgICAgICAgd2hpbGUgKCFlbmQuZGVwcmVjYXRlZE5vZGUoKS0+aXNE ZXNjZW5kYW50T2Yob3V0ZXJOb2RlLmdldCgpKSkgewogICAgICAgICAgICAgb3V0ZXJOb2RlID0g b3V0ZXJOb2RlLT5wYXJlbnROb2RlKCk7CiAgICAgICAgICAgICB0b3BOb2RlID0gdG9wTm9kZS0+ cGFyZW50Tm9kZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgZm9yIChOb2RlKiBuID0gc3RhcnQu ZGVwcmVjYXRlZE5vZGUoKS0+dHJhdmVyc2VOZXh0U2libGluZyhvdXRlck5vZGUpOyBuOyBuID0g bi0+dHJhdmVyc2VOZXh0U2libGluZyhvdXRlck5vZGUpKSB7CisgICAgICAgIGZvciAoTm9kZSog biA9IHN0YXJ0LmRlcHJlY2F0ZWROb2RlKCktPnRyYXZlcnNlTmV4dFNpYmxpbmcob3V0ZXJOb2Rl LmdldCgpKTsgbjsgbiA9IG4tPnRyYXZlcnNlTmV4dFNpYmxpbmcob3V0ZXJOb2RlLmdldCgpKSkg ewogICAgICAgICAgICAgaWYgKG4tPnBhcmVudE5vZGUoKSAhPSBzdGFydC5kZXByZWNhdGVkTm9k ZSgpLT5wYXJlbnROb2RlKCkpCiAgICAgICAgICAgICAgICAgbGFzdE5vZGUgPSB0b3BOb2RlLT5s YXN0Q2hpbGQoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbmRlbnRPdXRkZW50 Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbmRlbnRP dXRkZW50Q29tbWFuZC5jcHAJKHJldmlzaW9uIDk5NDUxKQorKysgU291cmNlL1dlYkNvcmUvZWRp dGluZy9JbmRlbnRPdXRkZW50Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0LDI0ICs5 NCwzMCBAQCB2b2lkIEluZGVudE91dGRlbnRDb21tYW5kOjppbmRlbnRJbnRvQmxvCiAgICAgTm9k ZSogbm9kZVRvU3BsaXRUbzsKICAgICBpZiAoZW5jbG9zaW5nQ2VsbCkKICAgICAgICAgbm9kZVRv U3BsaXRUbyA9IGVuY2xvc2luZ0NlbGw7Ci0gICAgZWxzZSBpZiAoZW5jbG9zaW5nTGlzdChzdGFy dC5kZXByZWNhdGVkTm9kZSgpKSkKLSAgICAgICAgbm9kZVRvU3BsaXRUbyA9IGVuY2xvc2luZ0Js b2NrKHN0YXJ0LmRlcHJlY2F0ZWROb2RlKCkpOworICAgIGVsc2UgaWYgKGVuY2xvc2luZ0xpc3Qo c3RhcnQuY29udGFpbmVyTm9kZSgpKSkKKyAgICAgICAgbm9kZVRvU3BsaXRUbyA9IGVuY2xvc2lu Z0Jsb2NrKHN0YXJ0LmNvbnRhaW5lck5vZGUoKSk7CiAgICAgZWxzZQogICAgICAgICBub2RlVG9T cGxpdFRvID0gZWRpdGFibGVSb290Rm9yUG9zaXRpb24oc3RhcnQpOwogCiAgICAgaWYgKCFub2Rl VG9TcGxpdFRvKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9j ayA9IChzdGFydC5kZXByZWNhdGVkTm9kZSgpID09IG5vZGVUb1NwbGl0VG8pID8gc3RhcnQuZGVw cmVjYXRlZE5vZGUoKSA6IHNwbGl0VHJlZVRvTm9kZShzdGFydC5kZXByZWNhdGVkTm9kZSgpLCBu b2RlVG9TcGxpdFRvKTsKKyAgICBSZWZQdHI8Tm9kZT4gbm9kZUFmdGVyU3RhcnQgPSBzdGFydC5j b21wdXRlTm9kZUFmdGVyUG9zaXRpb24oKTsKKyAgICBSZWZQdHI8Tm9kZT4gb3V0ZXJCbG9jayA9 IChzdGFydC5jb250YWluZXJOb2RlKCkgPT0gbm9kZVRvU3BsaXRUbykgPyBzdGFydC5jb250YWlu ZXJOb2RlKCkgOiBzcGxpdFRyZWVUb05vZGUoc3RhcnQuY29udGFpbmVyTm9kZSgpLCBub2RlVG9T cGxpdFRvKTsKIAorICAgIFZpc2libGVQb3NpdGlvbiBzdGFydE9mQ29udGVudHMgPSBzdGFydDsK ICAgICBpZiAoIXRhcmdldEJsb2NrcXVvdGUpIHsKICAgICAgICAgLy8gQ3JlYXRlIGEgbmV3IGJs b2NrcXVvdGUgYW5kIGluc2VydCBpdCBhcyBhIGNoaWxkIG9mIHRoZSByb290IGVkaXRhYmxlIGVs ZW1lbnQuIFdlIGFjY29tcGxpc2gKICAgICAgICAgLy8gdGhpcyBieSBzcGxpdHRpbmcgYWxsIHBh cmVudHMgb2YgdGhlIGN1cnJlbnQgcGFyYWdyYXBoIHVwIHRvIHRoYXQgcG9pbnQuCiAgICAgICAg IHRhcmdldEJsb2NrcXVvdGUgPSBjcmVhdGVCbG9ja0VsZW1lbnQoKTsKLSAgICAgICAgaW5zZXJ0 Tm9kZUJlZm9yZSh0YXJnZXRCbG9ja3F1b3RlLCBvdXRlckJsb2NrKTsKKyAgICAgICAgaWYgKG91 dGVyQmxvY2sgPT0gc3RhcnQuY29udGFpbmVyTm9kZSgpKQorICAgICAgICAgICAgaW5zZXJ0Tm9k ZUF0KHRhcmdldEJsb2NrcXVvdGUsIHN0YXJ0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg aW5zZXJ0Tm9kZUJlZm9yZSh0YXJnZXRCbG9ja3F1b3RlLCBvdXRlckJsb2NrKTsKKyAgICAgICAg c3RhcnRPZkNvbnRlbnRzID0gcG9zaXRpb25BZnRlck5vZGUodGFyZ2V0QmxvY2txdW90ZS5nZXQo KSk7CiAgICAgfQogCi0gICAgbW92ZVBhcmFncmFwaFdpdGhDbG9uZXMoc3RhcnQsIGVuZCwgdGFy Z2V0QmxvY2txdW90ZS5nZXQoKSwgb3V0ZXJCbG9jay5nZXQoKSk7CisgICAgbW92ZVBhcmFncmFw aFdpdGhDbG9uZXMoc3RhcnRPZkNvbnRlbnRzLCBlbmQsIHRhcmdldEJsb2NrcXVvdGUuZ2V0KCks IG91dGVyQmxvY2suZ2V0KCkpOwogfQogCiB2b2lkIEluZGVudE91dGRlbnRDb21tYW5kOjpvdXRk ZW50UGFyYWdyYXBoKCkKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NTE2KQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTEtMDcgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW5kZW50IGNvbW1hbmQg Y2FuIGluc2VydCBibG9jayBxdW90ZSBpbiBub24gZWRpdGFibGUgY29udGVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE3NTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSB0ZXN0IHRvIGluZGVu dCB0d28gaW1hZ2VzIGluIGEgZG9jdW1lbnQuCisKKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21t YW5kL2luZGVudC1pbWFnZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5n L2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMuaHRtbDogQWRkZWQuCisKIDIwMTEtMTEtMDcgIENo cmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHI5OTAyNS1yOTkwMzcpOiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtZWxlbWVu dC1zZWxlY3Rpb24td2l0aC1vcHRncm91cHMuaHRtbCBpcyBhc3NlcnRpbmcKSW5kZXg6IExheW91 dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWltYWdlcy1leHBlY3RlZC50eHQKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2Vz LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0Nv bW1hbmQvaW5kZW50LWltYWdlcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEs NiBAQAorVGhpcyB0ZXN0IGluZGVudHMgaW5zaWRlcyBhIGRvY3VtZW50IHdpdGggZXhhY3RseSB0 d28gaW1hZ2UgZWxlbWVudHMuCit8IDxibG9ja3F1b3RlPgorfCAgIHN0eWxlPSJtYXJnaW46IDAg MCAwIDQwcHg7IGJvcmRlcjogbm9uZTsgcGFkZGluZzogMHB4OyIKK3wgICA8aW1nPgorfCAgIDxp bWc+Cit8ICAgPCNzZWxlY3Rpb24tY2FyZXQ+CkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4 ZWNDb21tYW5kL2luZGVudC1pbWFnZXMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMuaHRtbAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWltYWdlcy5odG1sCShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDE1IEBACis8Ym9keSBjb250ZW50ZWRpdGFibGU+PGltZz48aW1nPjxz Y3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMiPjwvc2NyaXB0Pjxz Y3JpcHQ+CisKK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVz dENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCit3aGlsZSAoc2NyaXB0ID0gZG9jdW1lbnQucXVl cnlTZWxlY3Rvcignc2NyaXB0JykpCisgICAgc2NyaXB0LnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQo c2NyaXB0KTsKKworZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24oZG9jdW1lbnQuYm9keSwgMik7 Citkb2N1bWVudC5leGVjQ29tbWFuZCgnaW5kZW50Jyk7CisKK01hcmt1cC5kZXNjcmlwdGlvbign VGhpcyB0ZXN0IGluZGVudHMgaW5zaWRlcyBhIGRvY3VtZW50IHdpdGggZXhhY3RseSB0d28gaW1h Z2UgZWxlbWVudHMuJyk7CitNYXJrdXAuZHVtcChkb2N1bWVudC5ib2R5KTsKKworPC9zY3JpcHQ+ PC9ib2R5Pgo= 114110 2011-11-08 10:25:38 -0800 2011-11-08 10:30:39 -0800 Updated per comment bug-71754-20111108102537.patch text/plain 10684 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NTE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMTEtMDcgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW5kZW50IGNvbW1hbmQgY2FuIGlu c2VydCBibG9jayBxdW90ZSBpbiBub24gZWRpdGFibGUgY29udGVudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE3NTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYnVnIHdhcyBjYXVzZWQgYnkgSW5k ZW50T3V0ZGVudENvbW1hbmQncyBpbmNvcnJlY3RseSB1c2luZyBkZXByZWNhdGVkTm9kZSB0byBk ZXRlcm1pbmUgdGhlIG91dGVyIGJsb2NrLAorICAgICAgICBub3QgdXBkYXRpbmcgdGhlIHN0YXJ0 IGFmdGVyIGluc2VydGluZyB0aGUgdGFyZ2V0QmxvY2txdW90ZSwgYW5kIGNsb25lUGFyYWdyYXBo VW5kZXJOZXdFbGVtZW50J3MgY2xvbmluZworICAgICAgICBvdXRlck5vZGUgZXZlbiBpZiBpdCB3 YXMgYm9keS4gRml4ZWQgdGhvc2UgYnVncy4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL2V4ZWND b21tYW5kL2luZGVudC1pbWFnZXMuaHRtbAorICAgICAgICAgICAgICBlZGl0aW5nL2V4ZWNDb21t YW5kL2luZGVudC1pbWFnZXMtMi5odG1sCisgICAgICAgICAgICAgIGVkaXRpbmcvZXhlY0NvbW1h bmQvaW5kZW50LWltYWdlcy0zLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvQ29tcG9zaXRlRWRp dENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlRWRpdENvbW1hbmQ6OmNs b25lUGFyYWdyYXBoVW5kZXJOZXdFbGVtZW50KToKKyAgICAgICAgKiBlZGl0aW5nL0luZGVudE91 dGRlbnRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluZGVudE91dGRlbnRDb21tYW5k OjppbmRlbnRJbnRvQmxvY2txdW90ZSk6CisKIDIwMTEtMTEtMDcgIEtlbnRhcm8gSGFyYSAgPGhh cmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbW92ZSBbQ3VzdG9tR2V0dGVyXSBJREwg Zm9yIHdpbmRvdy5JbWFnZSBvZiBWOApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21w b3NpdGVFZGl0Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDk5NTE2KQorKysgU291cmNlL1dl YkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTc3OSwxMyArNzc5LDIxIEBAIHZvaWQgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OnB1c2hBbmNob3JF bGUKIC8vIENsb25lIHRoZSBwYXJhZ3JhcGggYmV0d2VlbiBzdGFydCBhbmQgZW5kIHVuZGVyIGJs b2NrRWxlbWVudCwKIC8vIHByZXNlcnZpbmcgdGhlIGhpZXJhcmNoeSB1cCB0byBvdXRlck5vZGUu IAogCi12b2lkIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpjbG9uZVBhcmFncmFwaFVuZGVyTmV3RWxl bWVudChQb3NpdGlvbiYgc3RhcnQsIFBvc2l0aW9uJiBlbmQsIE5vZGUqIG91dGVyTm9kZSwgRWxl bWVudCogYmxvY2tFbGVtZW50KQordm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6Y2xvbmVQYXJh Z3JhcGhVbmRlck5ld0VsZW1lbnQoUG9zaXRpb24mIHN0YXJ0LCBQb3NpdGlvbiYgZW5kLCBOb2Rl KiBwYXNzZWRPdXRlck5vZGUsIEVsZW1lbnQqIGJsb2NrRWxlbWVudCkKIHsKICAgICAvLyBGaXJz dCB3ZSBjbG9uZSB0aGUgb3V0ZXJOb2RlCi0gICAgCi0gICAgUmVmUHRyPE5vZGU+IHRvcE5vZGUg PSBvdXRlck5vZGUtPmNsb25lTm9kZShpc1RhYmxlRWxlbWVudChvdXRlck5vZGUpKTsKLSAgICBh cHBlbmROb2RlKHRvcE5vZGUsIGJsb2NrRWxlbWVudCk7Ci0gICAgUmVmUHRyPE5vZGU+IGxhc3RO b2RlID0gdG9wTm9kZTsKKyAgICBSZWZQdHI8Tm9kZT4gdG9wTm9kZTsKKyAgICBSZWZQdHI8Tm9k ZT4gbGFzdE5vZGU7CisgICAgUmVmUHRyPE5vZGU+IG91dGVyTm9kZSA9IHBhc3NlZE91dGVyTm9k ZTsKKworICAgIGlmIChvdXRlck5vZGUgPT0gb3V0ZXJOb2RlLT5yb290RWRpdGFibGVFbGVtZW50 KCkpIHsKKyAgICAgICAgdG9wTm9kZSA9IGJsb2NrRWxlbWVudDsKKyAgICAgICAgbGFzdE5vZGUg PSBibG9ja0VsZW1lbnQ7CisgICAgfSBlbHNlIHsKKyAgICAgICAgdG9wTm9kZSA9IG91dGVyTm9k ZS0+Y2xvbmVOb2RlKGlzVGFibGVFbGVtZW50KG91dGVyTm9kZS5nZXQoKSkpOworICAgICAgICBh cHBlbmROb2RlKHRvcE5vZGUsIGJsb2NrRWxlbWVudCk7CisgICAgICAgIGxhc3ROb2RlID0gdG9w Tm9kZTsKKyAgICB9CiAKICAgICBpZiAoc3RhcnQuZGVwcmVjYXRlZE5vZGUoKSAhPSBvdXRlck5v ZGUgJiYgbGFzdE5vZGUtPmlzRWxlbWVudE5vZGUoKSkgewogICAgICAgICBWZWN0b3I8UmVmUHRy PE5vZGU+ID4gYW5jZXN0b3JzOwpAQCAtODExLDEyICs4MTksMTIgQEAgdm9pZCBDb21wb3NpdGVF ZGl0Q29tbWFuZDo6Y2xvbmVQYXJhZ3JhcAogICAgICAgICAvLyBJZiBlbmQgaXMgbm90IGEgZGVz Y2VuZGFudCBvZiBvdXRlck5vZGUgd2UgbmVlZCB0bwogICAgICAgICAvLyBmaW5kIHRoZSBmaXJz dCBjb21tb24gYW5jZXN0b3IgYW5kIGFkanVzdCB0aGUgaW5zZXJ0aW9uCiAgICAgICAgIC8vIHBv aW50IGFjY29yZGluZ2x5LgotICAgICAgICB3aGlsZSAoIWVuZC5kZXByZWNhdGVkTm9kZSgpLT5p c0Rlc2NlbmRhbnRPZihvdXRlck5vZGUpKSB7CisgICAgICAgIHdoaWxlICghZW5kLmRlcHJlY2F0 ZWROb2RlKCktPmlzRGVzY2VuZGFudE9mKG91dGVyTm9kZS5nZXQoKSkpIHsKICAgICAgICAgICAg IG91dGVyTm9kZSA9IG91dGVyTm9kZS0+cGFyZW50Tm9kZSgpOwogICAgICAgICAgICAgdG9wTm9k ZSA9IHRvcE5vZGUtPnBhcmVudE5vZGUoKTsKICAgICAgICAgfQogCi0gICAgICAgIGZvciAoTm9k ZSogbiA9IHN0YXJ0LmRlcHJlY2F0ZWROb2RlKCktPnRyYXZlcnNlTmV4dFNpYmxpbmcob3V0ZXJO b2RlKTsgbjsgbiA9IG4tPnRyYXZlcnNlTmV4dFNpYmxpbmcob3V0ZXJOb2RlKSkgeworICAgICAg ICBmb3IgKE5vZGUqIG4gPSBzdGFydC5kZXByZWNhdGVkTm9kZSgpLT50cmF2ZXJzZU5leHRTaWJs aW5nKG91dGVyTm9kZS5nZXQoKSk7IG47IG4gPSBuLT50cmF2ZXJzZU5leHRTaWJsaW5nKG91dGVy Tm9kZS5nZXQoKSkpIHsKICAgICAgICAgICAgIGlmIChuLT5wYXJlbnROb2RlKCkgIT0gc3RhcnQu ZGVwcmVjYXRlZE5vZGUoKS0+cGFyZW50Tm9kZSgpKQogICAgICAgICAgICAgICAgIGxhc3ROb2Rl ID0gdG9wTm9kZS0+bGFzdENoaWxkKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv SW5kZW50T3V0ZGVudENvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvSW5kZW50T3V0ZGVudENvbW1hbmQuY3BwCShyZXZpc2lvbiA5OTUxNikKKysrIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvSW5kZW50T3V0ZGVudENvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05NCwyNCArOTQsMzAgQEAgdm9pZCBJbmRlbnRPdXRkZW50Q29tbWFuZDo6aW5kZW50SW50 b0JsbwogICAgIE5vZGUqIG5vZGVUb1NwbGl0VG87CiAgICAgaWYgKGVuY2xvc2luZ0NlbGwpCiAg ICAgICAgIG5vZGVUb1NwbGl0VG8gPSBlbmNsb3NpbmdDZWxsOwotICAgIGVsc2UgaWYgKGVuY2xv c2luZ0xpc3Qoc3RhcnQuZGVwcmVjYXRlZE5vZGUoKSkpCi0gICAgICAgIG5vZGVUb1NwbGl0VG8g PSBlbmNsb3NpbmdCbG9jayhzdGFydC5kZXByZWNhdGVkTm9kZSgpKTsKKyAgICBlbHNlIGlmIChl bmNsb3NpbmdMaXN0KHN0YXJ0LmNvbnRhaW5lck5vZGUoKSkpCisgICAgICAgIG5vZGVUb1NwbGl0 VG8gPSBlbmNsb3NpbmdCbG9jayhzdGFydC5jb250YWluZXJOb2RlKCkpOwogICAgIGVsc2UKICAg ICAgICAgbm9kZVRvU3BsaXRUbyA9IGVkaXRhYmxlUm9vdEZvclBvc2l0aW9uKHN0YXJ0KTsKIAog ICAgIGlmICghbm9kZVRvU3BsaXRUbykKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVmUHRyPE5v ZGU+IG91dGVyQmxvY2sgPSAoc3RhcnQuZGVwcmVjYXRlZE5vZGUoKSA9PSBub2RlVG9TcGxpdFRv KSA/IHN0YXJ0LmRlcHJlY2F0ZWROb2RlKCkgOiBzcGxpdFRyZWVUb05vZGUoc3RhcnQuZGVwcmVj YXRlZE5vZGUoKSwgbm9kZVRvU3BsaXRUbyk7CisgICAgUmVmUHRyPE5vZGU+IG5vZGVBZnRlclN0 YXJ0ID0gc3RhcnQuY29tcHV0ZU5vZGVBZnRlclBvc2l0aW9uKCk7CisgICAgUmVmUHRyPE5vZGU+ IG91dGVyQmxvY2sgPSAoc3RhcnQuY29udGFpbmVyTm9kZSgpID09IG5vZGVUb1NwbGl0VG8pID8g c3RhcnQuY29udGFpbmVyTm9kZSgpIDogc3BsaXRUcmVlVG9Ob2RlKHN0YXJ0LmNvbnRhaW5lck5v ZGUoKSwgbm9kZVRvU3BsaXRUbyk7CiAKKyAgICBWaXNpYmxlUG9zaXRpb24gc3RhcnRPZkNvbnRl bnRzID0gc3RhcnQ7CiAgICAgaWYgKCF0YXJnZXRCbG9ja3F1b3RlKSB7CiAgICAgICAgIC8vIENy ZWF0ZSBhIG5ldyBibG9ja3F1b3RlIGFuZCBpbnNlcnQgaXQgYXMgYSBjaGlsZCBvZiB0aGUgcm9v dCBlZGl0YWJsZSBlbGVtZW50LiBXZSBhY2NvbXBsaXNoCiAgICAgICAgIC8vIHRoaXMgYnkgc3Bs aXR0aW5nIGFsbCBwYXJlbnRzIG9mIHRoZSBjdXJyZW50IHBhcmFncmFwaCB1cCB0byB0aGF0IHBv aW50LgogICAgICAgICB0YXJnZXRCbG9ja3F1b3RlID0gY3JlYXRlQmxvY2tFbGVtZW50KCk7Ci0g ICAgICAgIGluc2VydE5vZGVCZWZvcmUodGFyZ2V0QmxvY2txdW90ZSwgb3V0ZXJCbG9jayk7Cisg ICAgICAgIGlmIChvdXRlckJsb2NrID09IHN0YXJ0LmNvbnRhaW5lck5vZGUoKSkKKyAgICAgICAg ICAgIGluc2VydE5vZGVBdCh0YXJnZXRCbG9ja3F1b3RlLCBzdGFydCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGluc2VydE5vZGVCZWZvcmUodGFyZ2V0QmxvY2txdW90ZSwgb3V0ZXJCbG9j ayk7CisgICAgICAgIHN0YXJ0T2ZDb250ZW50cyA9IHBvc2l0aW9uQWZ0ZXJOb2RlKHRhcmdldEJs b2NrcXVvdGUuZ2V0KCkpOwogICAgIH0KIAotICAgIG1vdmVQYXJhZ3JhcGhXaXRoQ2xvbmVzKHN0 YXJ0LCBlbmQsIHRhcmdldEJsb2NrcXVvdGUuZ2V0KCksIG91dGVyQmxvY2suZ2V0KCkpOworICAg IG1vdmVQYXJhZ3JhcGhXaXRoQ2xvbmVzKHN0YXJ0T2ZDb250ZW50cywgZW5kLCB0YXJnZXRCbG9j a3F1b3RlLmdldCgpLCBvdXRlckJsb2NrLmdldCgpKTsKIH0KIAogdm9pZCBJbmRlbnRPdXRkZW50 Q29tbWFuZDo6b3V0ZGVudFBhcmFncmFwaCgpCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA5OTUxNikKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisy MDExLTExLTA3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIElu ZGVudCBjb21tYW5kIGNhbiBpbnNlcnQgYmxvY2sgcXVvdGUgaW4gbm9uIGVkaXRhYmxlIGNvbnRl bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNzU0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRl c3RzIHRvIGluZGVudCB0d28gaW1hZ2VzIGluIGEgZG9jdW1lbnQuCisKKyAgICAgICAgKiBlZGl0 aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMuaHRtbDogQWRkZWQuCisgICAg ICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLTItZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtMi5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtMy1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50 LWltYWdlcy0zLmh0bWw6IEFkZGVkLgorCiAyMDExLTExLTA3ICBDaHJpcyBGbGVpemFjaCAgPGNm bGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyOTkwMjUtcjk5MDM3KTog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0LWVsZW1lbnQtc2VsZWN0aW9uLXdpdGgt b3B0Z3JvdXBzLmh0bWwgaXMgYXNzZXJ0aW5nCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4 ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtMi1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLTItZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQt aW1hZ2VzLTItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEyIEBACitUaGlz IHRlc3QgaW5kZW50cyBpbnNpZGVzIGEgZG9jdW1lbnQgd2l0aCBleGFjdGx5IHR3byBpbWFnZSBl bGVtZW50cy4KK3wgPGRpdj4KK3wgICBjb250ZW50ZWRpdGFibGU9IiIKK3wgICA8YmxvY2txdW90 ZT4KK3wgICAgIHN0eWxlPSJtYXJnaW46IDAgMCAwIDQwcHg7IGJvcmRlcjogbm9uZTsgcGFkZGlu ZzogMHB4OyIKK3wgICAgIDxpbWc+Cit8ICAgICA8aW1nPgorfCAgICAgPCNzZWxlY3Rpb24tY2Fy ZXQ+Cit8ICIKKyIKK3wgIgorIgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9pbmRlbnQtaW1hZ2VzLTIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtMi5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLTIuaHRtbAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PjxkaXYg Y29udGVudGVkaXRhYmxlPjxpbWc+PGltZz48L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvZHVtcC1hcy1tYXJrdXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworaWYgKHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNU ZXh0KCk7CisKK3doaWxlIChzY3JpcHQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdzY3JpcHQn KSkKKyAgICBzY3JpcHQucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChzY3JpcHQpOworCitnZXRTZWxl Y3Rpb24oKS5zZXRQb3NpdGlvbihkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnZGl2Jylb MF0sIDIpOworZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ2luZGVudCcpOworCitNYXJrdXAuZGVzY3Jp cHRpb24oJ1RoaXMgdGVzdCBpbmRlbnRzIGluc2lkZXMgYSBkb2N1bWVudCB3aXRoIGV4YWN0bHkg dHdvIGltYWdlIGVsZW1lbnRzLicpOworTWFya3VwLmR1bXAoZG9jdW1lbnQuYm9keSk7CisKKzwv c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVj Q29tbWFuZC9pbmRlbnQtaW1hZ2VzLTMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWltYWdlcy0zLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWlt YWdlcy0zLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMCBAQAorVGhpcyB0 ZXN0IGluZGVudHMgaW5zaWRlcyBhIGRvY3VtZW50IHdpdGggZXhhY3RseSB0d28gaW1hZ2UgZWxl bWVudHMuCitJbmRlbnRhdGlvbiBzaG91bGQgZmFpbCBiZWNhdXNlIHRoZSByb290IGVkaXRhYmxl IGVsZW1lbnQgaXMgaW5saW5lLgorfCA8c3Bhbj4KK3wgICBjb250ZW50ZWRpdGFibGU9IiIKK3wg ICA8aW1nPgorfCAgIDxpbWc+Cit8ICIKKyIKK3wgIgorIgpJbmRleDogTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLTMuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1pbWFnZXMtMy5odG1sCShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLTMu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxib2R5PjxzcGFuIGNvbnRlbnRlZGl0YWJsZT48aW1nPjxpbWc+PC9zcGFuPgorPHNjcmlw dCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0PgorCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxheW91dFRlc3RD b250cm9sbGVyLmR1bXBBc1RleHQoKTsKKword2hpbGUgKHNjcmlwdCA9IGRvY3VtZW50LnF1ZXJ5 U2VsZWN0b3IoJ3NjcmlwdCcpKQorICAgIHNjcmlwdC5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHNj cmlwdCk7CisKK2dldFNlbGVjdGlvbigpLnNldFBvc2l0aW9uKGRvY3VtZW50LmdldEVsZW1lbnRz QnlUYWdOYW1lKCdkaXYnKVswXSwgMik7Citkb2N1bWVudC5leGVjQ29tbWFuZCgnaW5kZW50Jyk7 CisKK01hcmt1cC5kZXNjcmlwdGlvbignVGhpcyB0ZXN0IGluZGVudHMgaW5zaWRlcyBhIGRvY3Vt ZW50IHdpdGggZXhhY3RseSB0d28gaW1hZ2UgZWxlbWVudHMuXG4nCisrICdJbmRlbnRhdGlvbiBz aG91bGQgZmFpbCBiZWNhdXNlIHRoZSByb290IGVkaXRhYmxlIGVsZW1lbnQgaXMgaW5saW5lLicp OworTWFya3VwLmR1bXAoZG9jdW1lbnQuYm9keSk7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2Vz LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21t YW5kL2luZGVudC1pbWFnZXMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1hZ2VzLWV4cGVjdGVkLnR4dAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSw2IEBACitUaGlzIHRlc3QgaW5kZW50cyBpbnNpZGVzIGEgZG9jdW1l bnQgd2l0aCBleGFjdGx5IHR3byBpbWFnZSBlbGVtZW50cy4KK3wgPGJsb2NrcXVvdGU+Cit8ICAg c3R5bGU9Im1hcmdpbjogMCAwIDAgNDBweDsgYm9yZGVyOiBub25lOyBwYWRkaW5nOiAwcHg7Igor fCAgIDxpbWc+Cit8ICAgPGltZz4KK3wgICA8I3NlbGVjdGlvbi1jYXJldD4KSW5kZXg6IExheW91 dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWltYWdlcy5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LWltYWdlcy5odG1sCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtaW1h Z2VzLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTUgQEAKKzxib2R5IGNvbnRlbnRlZGl0 YWJsZT48aW1nPjxpbWc+PHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1 cC5qcyI+PC9zY3JpcHQ+PHNjcmlwdD4KKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKK3doaWxlIChzY3Jp cHQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdzY3JpcHQnKSkKKyAgICBzY3JpcHQucGFyZW50 Tm9kZS5yZW1vdmVDaGlsZChzY3JpcHQpOworCitnZXRTZWxlY3Rpb24oKS5zZXRQb3NpdGlvbihk b2N1bWVudC5ib2R5LCAyKTsKK2RvY3VtZW50LmV4ZWNDb21tYW5kKCdpbmRlbnQnKTsKKworTWFy a3VwLmRlc2NyaXB0aW9uKCdUaGlzIHRlc3QgaW5kZW50cyBpbnNpZGVzIGEgZG9jdW1lbnQgd2l0 aCBleGFjdGx5IHR3byBpbWFnZSBlbGVtZW50cy4nKTsKK01hcmt1cC5kdW1wKGRvY3VtZW50LmJv ZHkpOworCis8L3NjcmlwdD48L2JvZHk+Cg==