113413 2013-03-27 08:54:18 -0700 Inserting a blank (" ") at the end of a line does not insert anything in Overtype mode 2013-03-27 11:25:50 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 svillar svillar ap enrica koivisto mifenton rniwa shezbaig.wk svillar tkent webkit.review.bot oldest_to_newest 864587 0 svillar 2013-03-27 08:54:18 -0700 That's because we're still calling replaceTextInNode() in that case which is wrong because the replace code makes some assumptions that are not valid for this case. 864613 1 195341 svillar 2013-03-27 09:23:32 -0700 Created attachment 195341 Patch 864617 2 195341 rniwa 2013-03-27 09:27:40 -0700 Comment on attachment 195341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195341&action=review > Source/WebCore/editing/InsertTextCommand.cpp:106 > + if (!selectInsertedText) > + setEndingSelection(VisibleSelection(endingSelection().visibleEnd(), endingSelection().isDirectional())); Do we have a test for this? > LayoutTests/editing/execCommand/overtype.html:33 > - document.execCommand("InsertText", false, 'FO'); > - Markup.dump(element, 'After overwritting the first two characters'); > + document.execCommand("InsertText", false, 'F'); > + Markup.dump(element, 'After overwritting the first character'); Why are we modifying this test case? 864687 3 svillar 2013-03-27 10:53:21 -0700 (In reply to comment #2) > (From update of attachment 195341 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195341&action=review > > > Source/WebCore/editing/InsertTextCommand.cpp:106 > > + if (!selectInsertedText) > > + setEndingSelection(VisibleSelection(endingSelection().visibleEnd(), endingSelection().isDirectional())); > > Do we have a test for this? What do you mean? For the case selectInsertedText == true ? Note that I am not adding any code in that case, it's just a refactoring to allow us to use setEndingSelectionWithoutValidation(). Not really required by the patch, but I just found it convenient. > > LayoutTests/editing/execCommand/overtype.html:33 > > - document.execCommand("InsertText", false, 'FO'); > > - Markup.dump(element, 'After overwritting the first two characters'); > > + document.execCommand("InsertText", false, 'F'); > > + Markup.dump(element, 'After overwritting the first character'); > > Why are we modifying this test case? Just because the original work was "foo" and as I wanted to overwrite with withespace in the middle and in the end. 864690 4 195341 rniwa 2013-03-27 10:56:07 -0700 Comment on attachment 195341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195341&action=review >>> Source/WebCore/editing/InsertTextCommand.cpp:106 >>> + setEndingSelection(VisibleSelection(endingSelection().visibleEnd(), endingSelection().isDirectional())); >> >> Do we have a test for this? > > What do you mean? For the case selectInsertedText == true ? Note that I am not adding any code in that case, it's just a refactoring to allow us to use setEndingSelectionWithoutValidation(). Not really required by the patch, but I just found it convenient. Oh, I see. Sorry, I misread your patch. 864722 5 svillar 2013-03-27 11:24:35 -0700 Committed r146999: <http://trac.webkit.org/changeset/146999> 195341 2013-03-27 09:23:32 -0700 2013-03-27 10:56:07 -0700 Patch bug-113413-20130327172331.patch text/plain 9213 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYzYTNiOTM0YzE5MGZi ZmZlZGJhZjdlNzI0MmIwMjY1ZDAwNTc2OS4uNDhiY2RiNjZlMmVjZTIwMWVmNTJlNGExMDNlOTBk NDc3NjM3Yjg2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTI3ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIEluc2VydGlu ZyBhIGJsYW5rICgiICIpIGF0IHRoZSBlbmQgb2YgYSBsaW5lIGRvZXMgbm90IGluc2VydCBhbnl0 aGluZyBpbiBPdmVydHlwZSBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTM0MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBQZXJmb3JtIGEgIm5vcm1hbCIgaW5zZXJ0IGluc3RlYWQgb2YgYSByZXBs YWNlIHdoZW4gdGhlcmUgaXMKKyAgICAgICAgbm90aGluZyB0byByZXBsYWNlIChsaWtlIGF0IHRo ZSBlbmQgb2YgYSBsaW5lKSBhcyB0aGlzIGNhc2UgaXMgbm90CisgICAgICAgIHN1cHBvcnRlZCBi eSB0aGUgcmVwbGFjaW5nIGNvZGUgcGF0aC4gVGhpcyB3aWxsIGFsbG93IHVzIHRvCisgICAgICAg IHByb3Blcmx5IHJlYmFsYW5jZSB3aGl0ZXNwYWNlcyBpbiB0aG9zZSBjYXNlcy4KKworICAgICAg ICBVcGRhdGVkIHRoZSBlZGl0aW5nL2V4ZWNDb21tYW5kL292ZXJ0eXBlLmh0bWwgdGVzdCB0byBj aGVjayBhbHNvCisgICAgICAgIHRoaXMgdXNlIGNhc2UuCisKKyAgICAgICAgKiBlZGl0aW5nL0lu c2VydFRleHRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydFRleHRDb21tYW5k OjpzZXRFbmRpbmdTZWxlY3Rpb25XaXRob3V0VmFsaWRhdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNlcnRUZXh0Q29tbWFuZDo6cGVyZm9ybVRyaXZpYWxSZXBsYWNlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc2VydFRleHRDb21tYW5kOjpwZXJmb3JtT3ZlcndyaXRlKToKKyAgICAgICAgKFdl YkNvcmU6Okluc2VydFRleHRDb21tYW5kOjpkb0FwcGx5KTogdXNlIHRoZSByZWNlbnRseSBhZGRl ZAorICAgICAgICBzZXRFbmRpbmdTZWxlY3Rpb25XaXRob3V0VmFsaWRhdGlvbigpIHRvIGF2b2lk IGNvZGUgZHVwbGljYXRpb24uCisgICAgICAgICogZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5o OgorICAgICAgICAoSW5zZXJ0VGV4dENvbW1hbmQpOgorCiAyMDEzLTAzLTI2ICBTZXJnaW8gVmls bGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBvdmVy dHlwZSBtb2RlIGZvciBlZGl0YWJsZSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv SW5zZXJ0VGV4dENvbW1hbmQuY3BwCmluZGV4IDM4ZGVjNGJmNzNkMWU1MjQ3YTczNDkzMzk4MGZj ZGFjZmJmNDJmMzAuLjllOTY3NmQ3MmUyOTQyNTZiMGM2MzJiMmVhOGNlNDZiZmQ0MzQ5Y2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCkBAIC03NSw3 ICs3NSw3IEBAIFBvc2l0aW9uIEluc2VydFRleHRDb21tYW5kOjpwb3NpdGlvbkluc2lkZVRleHRO b2RlKGNvbnN0IFBvc2l0aW9uJiBwKQogICAgIHJldHVybiBwb3M7CiB9CiAKLXZvaWQgSW5zZXJ0 VGV4dENvbW1hbmQ6OnNldEVuZGluZ1NlbGVjdGlvbldpdGhvdXRWYWxpZGF0aW9uKGNvbnN0IFBv c2l0aW9uJiBzdGFydFBvc2l0aW9uLCBjb25zdCBQb3NpdGlvbiYgZW5kUG9zaXRpb24sIGJvb2wg c2VsZWN0SW5zZXJ0ZWRUZXh0KQordm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6c2V0RW5kaW5nU2Vs ZWN0aW9uV2l0aG91dFZhbGlkYXRpb24oY29uc3QgUG9zaXRpb24mIHN0YXJ0UG9zaXRpb24sIGNv bnN0IFBvc2l0aW9uJiBlbmRQb3NpdGlvbikKIHsKICAgICAvLyBXZSBjb3VsZCBoYXZlIGluc2Vy dGVkIGEgcGFydCBvZiBjb21wb3NlZCBjaGFyYWN0ZXIgc2VxdWVuY2UsCiAgICAgLy8gc28gd2Ug YXJlIGJhc2ljYWxseSB0cmVhdGluZyBlbmRpbmcgc2VsZWN0aW9uIGFzIGEgcmFuZ2UgdG8gYXZv aWQgdmFsaWRhdGlvbi4KQEAgLTg0LDkgKzg0LDYgQEAgdm9pZCBJbnNlcnRUZXh0Q29tbWFuZDo6 c2V0RW5kaW5nU2VsZWN0aW9uV2l0aG91dFZhbGlkYXRpb24oY29uc3QgUG9zaXRpb24mIHN0YXIK ICAgICBmb3JjZWRFbmRpbmdTZWxlY3Rpb24uc2V0V2l0aG91dFZhbGlkYXRpb24oc3RhcnRQb3Np dGlvbiwgZW5kUG9zaXRpb24pOwogICAgIGZvcmNlZEVuZGluZ1NlbGVjdGlvbi5zZXRJc0RpcmVj dGlvbmFsKGVuZGluZ1NlbGVjdGlvbigpLmlzRGlyZWN0aW9uYWwoKSk7CiAgICAgc2V0RW5kaW5n U2VsZWN0aW9uKGZvcmNlZEVuZGluZ1NlbGVjdGlvbik7Ci0KLSAgICBpZiAoIXNlbGVjdEluc2Vy dGVkVGV4dCkKLSAgICAgICAgc2V0RW5kaW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24oZW5k aW5nU2VsZWN0aW9uKCkudmlzaWJsZUVuZCgpLCBlbmRpbmdTZWxlY3Rpb24oKS5pc0RpcmVjdGlv bmFsKCkpKTsKIH0KIAogLy8gVGhpcyBhdm9pZHMgdGhlIGV4cGVuc2Ugb2YgYSBmdWxsIGZsZWRn ZWQgZGVsZXRlIG9wZXJhdGlvbiwgYW5kIGF2b2lkcyBhIGxheW91dCB0aGF0IHR5cGljYWxseSBy ZXN1bHRzCkBAIC0xMDQsNyArMTAxLDkgQEAgYm9vbCBJbnNlcnRUZXh0Q29tbWFuZDo6cGVyZm9y bVRyaXZpYWxSZXBsYWNlKGNvbnN0IFN0cmluZyYgdGV4dCwgYm9vbCBzZWxlY3RJbnMKICAgICBp ZiAoZW5kUG9zaXRpb24uaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHNl dEVuZGluZ1NlbGVjdGlvbldpdGhvdXRWYWxpZGF0aW9uKHN0YXJ0LCBlbmRQb3NpdGlvbiwgc2Vs ZWN0SW5zZXJ0ZWRUZXh0KTsKKyAgICBzZXRFbmRpbmdTZWxlY3Rpb25XaXRob3V0VmFsaWRhdGlv bihzdGFydCwgZW5kUG9zaXRpb24pOworICAgIGlmICghc2VsZWN0SW5zZXJ0ZWRUZXh0KQorICAg ICAgICBzZXRFbmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihlbmRpbmdTZWxlY3Rpb24o KS52aXNpYmxlRW5kKCksIGVuZGluZ1NlbGVjdGlvbigpLmlzRGlyZWN0aW9uYWwoKSkpOwogCiAg ICAgcmV0dXJuIHRydWU7CiB9CkBAIC0xMTcsMTAgKzExNiwxNSBAQCBib29sIEluc2VydFRleHRD b21tYW5kOjpwZXJmb3JtT3ZlcndyaXRlKGNvbnN0IFN0cmluZyYgdGV4dCwgYm9vbCBzZWxlY3RJ bnNlcnRlZAogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICB1bnNpZ25lZCBjb3VudCA9IHN0 ZDo6bWluKHRleHQubGVuZ3RoKCksIHRleHROb2RlLT5sZW5ndGgoKSAtIHN0YXJ0Lm9mZnNldElu Q29udGFpbmVyTm9kZSgpKTsKKyAgICBpZiAoIWNvdW50KQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKICAgICByZXBsYWNlVGV4dEluTm9kZSh0ZXh0Tm9kZSwgc3RhcnQub2Zmc2V0SW5Db250YWlu ZXJOb2RlKCksIGNvdW50LCB0ZXh0KTsKIAogICAgIFBvc2l0aW9uIGVuZFBvc2l0aW9uID0gUG9z aXRpb24odGV4dE5vZGUucmVsZWFzZSgpLCBzdGFydC5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSAr IHRleHQubGVuZ3RoKCkpOwotICAgIHNldEVuZGluZ1NlbGVjdGlvbldpdGhvdXRWYWxpZGF0aW9u KHN0YXJ0LCBlbmRQb3NpdGlvbiwgc2VsZWN0SW5zZXJ0ZWRUZXh0KTsKKyAgICBzZXRFbmRpbmdT ZWxlY3Rpb25XaXRob3V0VmFsaWRhdGlvbihzdGFydCwgZW5kUG9zaXRpb24pOworICAgIGlmICgh c2VsZWN0SW5zZXJ0ZWRUZXh0KQorICAgICAgICBzZXRFbmRpbmdTZWxlY3Rpb24oVmlzaWJsZVNl bGVjdGlvbihlbmRpbmdTZWxlY3Rpb24oKS52aXNpYmxlRW5kKCksIGVuZGluZ1NlbGVjdGlvbigp LmlzRGlyZWN0aW9uYWwoKSkpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0yMTYsMTMgKzIy MCw3IEBAIHZvaWQgSW5zZXJ0VGV4dENvbW1hbmQ6OmRvQXBwbHkoKQogICAgICAgICB9CiAgICAg fQogCi0gICAgLy8gV2UgY291bGQgaGF2ZSBpbnNlcnRlZCBhIHBhcnQgb2YgY29tcG9zZWQgY2hh cmFjdGVyIHNlcXVlbmNlLAotICAgIC8vIHNvIHdlIGFyZSBiYXNpY2FsbHkgdHJlYXRpbmcgZW5k aW5nIHNlbGVjdGlvbiBhcyBhIHJhbmdlIHRvIGF2b2lkIHZhbGlkYXRpb24uCi0gICAgLy8gPGh0 dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzgxPgotICAgIFZpc2libGVT ZWxlY3Rpb24gZm9yY2VkRW5kaW5nU2VsZWN0aW9uOwotICAgIGZvcmNlZEVuZGluZ1NlbGVjdGlv bi5zZXRXaXRob3V0VmFsaWRhdGlvbihzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbik7Ci0gICAg Zm9yY2VkRW5kaW5nU2VsZWN0aW9uLnNldElzRGlyZWN0aW9uYWwoZW5kaW5nU2VsZWN0aW9uKCku aXNEaXJlY3Rpb25hbCgpKTsKLSAgICBzZXRFbmRpbmdTZWxlY3Rpb24oZm9yY2VkRW5kaW5nU2Vs ZWN0aW9uKTsKKyAgICBzZXRFbmRpbmdTZWxlY3Rpb25XaXRob3V0VmFsaWRhdGlvbihzdGFydFBv c2l0aW9uLCBlbmRQb3NpdGlvbik7CiAKICAgICAvLyBIYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhl cmUgaXMgYSB0eXBpbmcgc3R5bGUuCiAgICAgaWYgKFJlZlB0cjxFZGl0aW5nU3R5bGU+IHR5cGlu Z1N0eWxlID0gZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPnR5cGluZ1N0eWxlKCkp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQu aCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuaAppbmRleCAzMzIy YWFjZjcwOWQ3NmM2ZDYyMDJhNjBkZWNmNmM3NGYxYWFlMTBhLi5lM2NmMGIwMWFjOTUyNzA3M2Q2 NmJmYTQwNGQ4ZTRjZTNmMDA4MzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0luc2VydFRleHRDb21tYW5kLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRU ZXh0Q29tbWFuZC5oCkBAIC03Myw3ICs3Myw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAgYm9vbCBw ZXJmb3JtVHJpdmlhbFJlcGxhY2UoY29uc3QgU3RyaW5nJiwgYm9vbCBzZWxlY3RJbnNlcnRlZFRl eHQpOwogICAgIGJvb2wgcGVyZm9ybU92ZXJ3cml0ZShjb25zdCBTdHJpbmcmLCBib29sIHNlbGVj dEluc2VydGVkVGV4dCk7Ci0gICAgdm9pZCBzZXRFbmRpbmdTZWxlY3Rpb25XaXRob3V0VmFsaWRh dGlvbihjb25zdCBQb3NpdGlvbiYgc3RhcnRQb3NpdGlvbiwgY29uc3QgUG9zaXRpb24mIGVuZFBv c2l0aW9uLCBib29sIHNlbGVjdEluc2VydGVkVGV4dCk7CisgICAgdm9pZCBzZXRFbmRpbmdTZWxl Y3Rpb25XaXRob3V0VmFsaWRhdGlvbihjb25zdCBQb3NpdGlvbiYgc3RhcnRQb3NpdGlvbiwgY29u c3QgUG9zaXRpb24mIGVuZFBvc2l0aW9uKTsKIAogICAgIGZyaWVuZCBjbGFzcyBUeXBpbmdDb21t YW5kOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggOWExMDFlODA4ZjU2OTc4MjA5OThlZjQ4Yzc4Zjc5YjU3ODljMTc4Ni4u OGQxN2VlMjJjMWFlMDIxNmI4ZjQ5MDVhZjQ3YTI3MTBiMTc2NDlmMCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDEzLTAzLTI3ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEu Y29tPgorCisgICAgICAgIEluc2VydGluZyBhIGJsYW5rICgiICIpIGF0IHRoZSBlbmQgb2YgYSBs aW5lIGRvZXMgbm90IGluc2VydCBhbnl0aGluZyBpbiBPdmVydHlwZSBtb2RlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM0MTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIHRoZSB0ZXN0IHRv IGluY2x1ZGUgdGhlIGNhc2Ugb2YgaW5zZXJ0aW5nIGEgd2hpdGVzcGFjZQorICAgICAgICBib3Ro IGluIHRoZSBtaWRkbGUgb3IgYXQgdGhlIGVuZCBvZiBhIGxpbmUuCisKKyAgICAgICAgKiBlZGl0 aW5nL2V4ZWNDb21tYW5kL292ZXJ0eXBlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBlZGl0aW5n L2V4ZWNDb21tYW5kL292ZXJ0eXBlLmh0bWw6CisKIDIwMTMtMDMtMjYgIFNlcmdpbyBWaWxsYXIg U2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IG92ZXJ0eXBl IG1vZGUgZm9yIGVkaXRhYmxlIGNvbnRlbnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRp bmcvZXhlY0NvbW1hbmQvb3ZlcnR5cGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9leGVjQ29tbWFuZC9vdmVydHlwZS1leHBlY3RlZC50eHQKaW5kZXggYWQzYzIyOTVhYjc4N2Fi MjhjYmYzZTAzOTJlN2FhMzkwZmQ5NmU1Ni4uZmYzZTcxY2M5MWEyNjFhNDQ1ZDQzMmQxZTU3NGJm OTFhZmQ0NjFiYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9v dmVydHlwZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9vdmVydHlwZS1leHBlY3RlZC50eHQKQEAgLTEzLDExICsxMywxMSBAQCBUaGVzZSBhcmUgdGhl IG9yaWdpbmFsIGNvbnRlbnRzOgogfCAiCiAiCiAKLUFmdGVyIG92ZXJ3cml0dGluZyB0aGUgZmly c3QgdHdvIGNoYXJhY3RlcnM6CitBZnRlciBvdmVyd3JpdHRpbmcgdGhlIGZpcnN0IGNoYXJhY3Rl cjoKIHwgIgogIgogfCA8Yj4KLXwgICAiRk88I3NlbGVjdGlvbi1jYXJldD5vIgorfCAgICJGPCNz ZWxlY3Rpb24tY2FyZXQ+b28iCiB8IDxhPgogfCAgIGhyZWY9Imh0dHA6Ly93d3cuZ29vZ2xlLmNv bS8iCiB8ICAgPGRpdj4KQEAgLTMwLDcgKzMwLDIwIEBAIEFmdGVyIGluc2VydGluZyBhIGJsYW5r OgogfCAiCiAiCiB8IDxiPgotfCAgICJGTzwjc2VsZWN0aW9uLWNhcmV0PiAiCit8ICAgIkYgPCNz ZWxlY3Rpb24tY2FyZXQ+byIKK3wgPGE+Cit8ICAgaHJlZj0iaHR0cDovL3d3dy5nb29nbGUuY29t LyIKK3wgICA8ZGl2PgorfCAgICAgaWQ9ImxpbmtUZXh0IgorfCAgICAgImJhciIKK3wgIgorIgor CitBZnRlciBpbnNlcnRpbmcgYSBibGFuayBhdCB0aGUgbGluZSBlbmQ6Cit8ICIKKyIKK3wgPGI+ Cit8ICAgIkYgb8KgPCNzZWxlY3Rpb24tY2FyZXQ+IgogfCA8YT4KIHwgICBocmVmPSJodHRwOi8v d3d3Lmdvb2dsZS5jb20vIgogfCAgIDxkaXY+CkBAIC00Myw3ICs1Niw3IEBAIE92ZXJ3cml0ZSBh dCB0aGUgZW5kIG9mIGEgbGluZSBwZXJmb3JtcyBhcyBhIG5vcm1hbCBJbnNlcnQ6CiB8ICIKICIK IHwgPGI+Ci18ICAgIkZPTyBTT01FIE1PUkU8I3NlbGVjdGlvbi1jYXJldD4iCit8ICAgIkYgbyBT T01FIE1PUkU8I3NlbGVjdGlvbi1jYXJldD4iCiB8IDxhPgogfCAgIGhyZWY9Imh0dHA6Ly93d3cu Z29vZ2xlLmNvbS8iCiB8ICAgPGRpdj4KQEAgLTU2LDcgKzY5LDcgQEAgT3ZlcndyaXR0aW5nIHdv cmtzIGV2ZW4gaWYgdGhlIGluc2VydGVkIHRleHQgaXMgbG9uZ2VyIHRoYW4gdGhlIHJlcGxhY2Vk IHRleHQ6CiB8ICIKICIKIHwgPGI+Ci18ICAgIkZPTyBTT01FIE1PUkUiCit8ICAgIkYgbyBTT01F IE1PUkUiCiB8IDxhPgogfCAgIGhyZWY9Imh0dHA6Ly93d3cuZ29vZ2xlLmNvbS8iCiB8ICAgPGRp dj4KQEAgLTY5LDcgKzgyLDcgQEAgT3ZlcndyaXRlIHNob3VsZCBjcmVhdGUgbmV3IHRleHQgbm9k ZXMgb24gZGVtYW5kOgogfCAiCiAiCiB8IDxiPgotfCAgICJGT08gU09NRSBNT1JFIgorfCAgICJG IG8gU09NRSBNT1JFIgogfCA8ZGl2PgogfCAgIGlkPSJsaW5rVGV4dCIKIHwgICA8YT4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvb3ZlcnR5cGUuaHRtbCBiL0xh eW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvb3ZlcnR5cGUuaHRtbAppbmRleCA0NjMwYjcw NDdkMTA2MTEwMDNkZjQ1MDIyYzY0YjdlZDIzNTFiMGU1Li41MDQzMTQwOGFmYzYxZWE5MmQ4ZTNk NzQyODJjNDljMDIwM2YyNWM0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL292ZXJ0eXBlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9vdmVydHlwZS5odG1sCkBAIC0yOSwxMyArMjksMTcgQEAgZWxzZSB7CiAgICAgc2VsZWN0aW9u LmNvbGxhcHNlKGVsZW1lbnQsIDApOwogICAgIGludGVybmFscy50b2dnbGVPdmVyd3JpdGVNb2Rl RW5hYmxlZChkb2N1bWVudCk7CiAKLSAgICBkb2N1bWVudC5leGVjQ29tbWFuZCgiSW5zZXJ0VGV4 dCIsIGZhbHNlLCAnRk8nKTsKLSAgICBNYXJrdXAuZHVtcChlbGVtZW50LCAnQWZ0ZXIgb3Zlcndy aXR0aW5nIHRoZSBmaXJzdCB0d28gY2hhcmFjdGVycycpOworICAgIGRvY3VtZW50LmV4ZWNDb21t YW5kKCJJbnNlcnRUZXh0IiwgZmFsc2UsICdGJyk7CisgICAgTWFya3VwLmR1bXAoZWxlbWVudCwg J0FmdGVyIG92ZXJ3cml0dGluZyB0aGUgZmlyc3QgY2hhcmFjdGVyJyk7CiAKICAgICBkb2N1bWVu dC5leGVjQ29tbWFuZCgiSW5zZXJ0VGV4dCIsIGZhbHNlLCAnICcpOwogICAgIE1hcmt1cC5kdW1w KGVsZW1lbnQsICdBZnRlciBpbnNlcnRpbmcgYSBibGFuaycpOwogCi0gICAgZG9jdW1lbnQuZXhl Y0NvbW1hbmQoIkluc2VydFRleHQiLCBmYWxzZSwgJ08gU09NRSBNT1JFJyk7CisgICAgbW92ZVNl bGVjdGlvbkZvcndhcmRCeUNoYXJhY3RlckNvbW1hbmQoKTsKKyAgICBkb2N1bWVudC5leGVjQ29t bWFuZCgiSW5zZXJ0VGV4dCIsIGZhbHNlLCAnICcpOworICAgIE1hcmt1cC5kdW1wKGVsZW1lbnQs ICdBZnRlciBpbnNlcnRpbmcgYSBibGFuayBhdCB0aGUgbGluZSBlbmQnKTsKKworICAgIGRvY3Vt ZW50LmV4ZWNDb21tYW5kKCJJbnNlcnRUZXh0IiwgZmFsc2UsICdTT01FIE1PUkUnKTsKICAgICBN YXJrdXAuZHVtcChlbGVtZW50LCAnT3ZlcndyaXRlIGF0IHRoZSBlbmQgb2YgYSBsaW5lIHBlcmZv cm1zIGFzIGEgbm9ybWFsIEluc2VydCcpOwogCiAgICAgc2VsZWN0aW9uLmNvbGxhcHNlKGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJsaW5rVGV4dCIpLCAwKTsK