56271 2011-03-13 14:33:11 -0700 focus() call inside input event handler is ignored 2022-06-01 08:39:13 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED CONFIGURATION CHANGED HasReduction, InRadar P2 Minor --- 38696 1 rniwa aboxhall aboxhall ahmad.saleem792 akeerthi ap darin enrica gregsimon leviw ntim rniwa tony webkit-bug-importer oldest_to_newest 366730 0 rniwa 2011-03-13 14:33:11 -0700 When an input element is created and focus() is called on that element inside an input event handler of another input element, the focus stays on the input element from which the input event was fired and focus() call is effectively ignored. http://crbug.com/75863 366731 1 85623 rniwa 2011-03-13 14:34:46 -0700 Created attachment 85623 demo Here's a reduction attached on the Chromium bug. To reproduce the bug, type in any character into the input element. The focus be moved to the new input element when new one appears but it doesn't on ToT WebKit. 367039 2 tony 2011-03-14 10:11:15 -0700 Isn't this because of http://trac.webkit.org/changeset/58829 ? There was some additional discussion on bug 39791. 367045 3 rniwa 2011-03-14 10:30:31 -0700 (In reply to comment #2) > Isn't this because of http://trac.webkit.org/changeset/58829 ? There was some additional discussion on bug 39791. As far as I read the change, it only affects the case where the event handler sets the focus on a different frame. 367054 4 leviw 2011-03-14 10:42:43 -0700 Here is the backtrace for the call that blows away the javascript focus() call back to the original input. #0 0x10192f249 in WebCore::FocusController::setFocusedNode at FocusController.cpp:353 #1 0x1021521ca in WebCore::SelectionController::setFocusedNodeIfNeeded at SelectionController.cpp:1686 #2 0x102156e28 in WebCore::SelectionController::setSelection at SelectionController.cpp:182 #3 0x1018cd70d in WebCore::Editor::changeSelectionAfterCommand at Editor.cpp:3077 #4 0x1018d7f72 in WebCore::Editor::appliedEditing at Editor.cpp:1071 #5 0x1022adc07 in WebCore::TypingCommand::typingAddedToOpenCommand at TypingCommand.cpp:349 #6 0x1022af405 in WebCore::TypingCommand::insertTextRunWithoutNewlines at TypingCommand.cpp:401 #7 0x1022af4ba in WebCore::TypingCommand::insertText at TypingCommand.cpp:375 #8 0x1022af668 in WebCore::TypingCommand::doApply at TypingCommand.cpp:299 #9 0x1018c4aa7 in WebCore::EditCommand::apply at EditCommand.cpp:92 #10 0x1018c4b44 in WebCore::applyCommand at EditCommand.cpp:224 #11 0x1022b039e in WebCore::TypingCommand::insertText at TypingCommand.cpp:200 #12 0x1018d6bb8 in WebCore::Editor::insertTextWithoutSendingTextEvent at Editor.cpp:1198 #13 0x1018d6d8c in WebCore::Editor::handleTextEvent at Editor.cpp:208 #14 0x1018ef3fc in WebCore::EventHandler::defaultTextInputEventHandler at EventHandler.cpp:2762 #15 0x101ee4597 in WebCore::Node::defaultEventHandler at Node.cpp:3033 #16 0x101a56370 in WebCore::HTMLFormControlElementWithState::defaultEventHandler at HTMLFormControlElement.cpp:538 #17 0x101a6b8b9 in WebCore::HTMLInputElement::defaultEventHandler at HTMLInputElement.cpp:1074 #18 0x101ee4e94 in WebCore::Node::dispatchGenericEvent at Node.cpp:2727 #19 0x101ee5139 in WebCore::Node::dispatchEvent at Node.cpp:2625 #20 0x1019069f6 in WebCore::EventTarget::dispatchEvent at EventTarget.cpp:297 #21 0x1018f4ed8 in WebCore::EventHandler::handleTextInputEvent at EventHandler.cpp:2727 #22 0x1018d1739 in WebCore::Editor::insertText at Editor.cpp:1149 367060 5 leviw 2011-03-14 10:48:10 -0700 It seems to me that Editor::appliedEditing or Editor::changeSelectionAfterCommand shouldn't change the focused node, so it should perhaps ensure it's trying to update the selection on the currently focused node and bail if it's not? I'll see if that behavior matches FFX before assuming that doesn't break anything else. 367295 6 leviw 2011-03-14 15:38:22 -0700 (In reply to comment #5) > It seems to me that Editor::appliedEditing or Editor::changeSelectionAfterCommand shouldn't change the focused node, so it should perhaps ensure it's trying to update the selection on the currently focused node and bail if it's not? I'll see if that behavior matches FFX before assuming that doesn't break anything else. I tried a basic fix in Editor::changeSelectionAfterCommand, where I only change selection if the new selection occurs in the same context as the currently focused node. This does cause some changes to selection behavior in our already present layout tests. Aside from EditingDelegate changes, selections when dragging content changes: the content dragged in isn't selected. This is like FFX (though notably FFX doesn't support dragging from one editable context to another... the original contents are lost and not pasted in!). IE9 highlights the dragged text in the destination, but doesn't support the onInput event listener. Trying to use "addEventListener" as they describe in their documentation (http://msdn.microsoft.com/en-us/library/gg592978(v=vs.85).aspx) results in a javascript exception stating that the input tag doesn't support "addEventListener". I'm inclined towards changing our behavior, but understand that these changes may make it less than desirable. Opinions? 367304 7 leviw 2011-03-14 15:49:09 -0700 (In reply to comment #6) > IE9 highlights the dragged text in the destination, but doesn't support the onInput event listener. Trying to use "addEventListener" as they describe in their documentation (http://msdn.microsoft.com/en-us/library/gg592978(v=vs.85).aspx) results in a javascript exception stating that the input tag doesn't support "addEventListener". Ryosuke pointed out that I ran into this because I was in Quirks mode (oops!). IE9 then passes the attached test case. 367378 8 leviw 2011-03-14 17:39:09 -0700 After some more testing, I've identified that IE9 and Firefox do not set the focus when setting the selection, which SelectionController::setFocus does indiscriminately. Fixing this behavior should also fix this bug. The fix should be easy, but call sites that expect the focus to be set along with selection will need to be updated to respect the new contract, and lots of layout tests will have to be rebaselined with the changed editing delegates. I'm happy to rename the bug and take it, but I'll defer to Alice if she still wants to fix it. 367385 9 aboxhall 2011-03-14 17:45:25 -0700 (In reply to comment #8) > After some more testing, I've identified that IE9 and Firefox do not set the focus when setting the selection, which SelectionController::setFocus does indiscriminately. Fixing this behavior should also fix this bug. The fix should be easy, but call sites that expect the focus to be set along with selection will need to be updated to respect the new contract, and lots of layout tests will have to be rebaselined with the changed editing delegates. > > I'm happy to rename the bug and take it, but I'll defer to Alice if she still wants to fix it. I had a look at this bug with Ojan yesterday and we found the same thing. I'm unwell today so I wouldn't get to it till tomorrow at the earliest, so I'm just as happy for you to take it if you'd like. 368682 10 86008 leviw 2011-03-16 17:35:28 -0700 Created attachment 86008 Work in progress This affects the editing delegates for tons of tests, so it'll be a large rebaselining effort. I'll also add a test case. This has the possibility of breaking compatibility with sites that rely on WebKit's current behavior. I'd love to get confirmation that we think this change is the right way to go. Darin? AP? 1873287 11 ahmad.saleem792 2022-06-01 06:08:33 -0700 I am unable to reproduce this in Safari 15.5 on macOS 12.4 using attached "demo". As soon as I type anything after first letter, the focus shift to next one and the text keep on appearing in second input element. It is consistent with other browsers Firefox Nightly 103 and Chrome Canary 104. Thanks! 1873314 12 ap 2022-06-01 08:38:14 -0700 Thank you for checking! CC'ed a few folks to also verify the behavior in case they have concerns. 1873315 13 webkit-bug-importer 2022-06-01 08:39:13 -0700 <rdar://problem/94223857> 85623 2011-03-13 14:34:46 -0700 2011-03-13 14:34:46 -0700 demo test.html text/html 377 rniwa PHNjcmlwdD4KICBmdW5jdGlvbiBjcmVhdGVBbm90aGVySW5wdXQoZSkgewogICAgLy9kb2N1bWVu dC5ib2R5LnJlbW92ZUNoaWxkKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpJykpOwogICAgZS5w cmV2ZW50RGVmYXVsdCgpOyBlLnN0b3BQcm9wYWdhdGlvbigpOyAgIC8vIG9taXR0aW5nIHRoZXNl IGRvZXNuJ3QgaGVscAoKICAgIHZhciBpbnB1dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lu cHV0Jyk7CiAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGlucHV0KTsKICAgIGlucHV0LmZv Y3VzKCk7CiAgfQo8L3NjcmlwdD4KCjxib2R5PgogIDxpbnB1dCBpZD0iaSIgb25pbnB1dD0iY3Jl YXRlQW5vdGhlcklucHV0KGV2ZW50KTsiPgo8L2JvZHk+Cgo= 86008 2011-03-16 17:35:28 -0700 2011-03-16 17:35:28 -0700 Work in progress selection.patch text/plain 10908 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5oCShy ZXZpc2lvbiA4MTI4MSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJv bGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw2ICs1OSw3IEBACiAgICAgICAgIENsZWFyVHlw aW5nU3R5bGUgPSAxIDw8IDEsCiAgICAgICAgIFVzZXJUcmlnZ2VyZWQgPSAxIDw8IDIsCiAgICAg ICAgIFNwZWxsQ29ycmVjdGlvblRyaWdnZXJlZCA9IDEgPDwgMywKKyAgICAgICAgVXBkYXRlRm9j dXNlZE5vZGUgPSAxIDw8IDQsCiAgICAgfTsKICAgICB0eXBlZGVmIHVuc2lnbmVkIFNldFNlbGVj dGlvbk9wdGlvbnM7CiAKQEAgLTc3LDcgKzc4LDggQEAKIAogICAgIGNvbnN0IFZpc2libGVTZWxl Y3Rpb24mIHNlbGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2VsZWN0aW9uOyB9CiAgICAgdm9p ZCBzZXRTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYsIFNldFNlbGVjdGlvbk9wdGlv bnMgPSBDbG9zZVR5cGluZyB8IENsZWFyVHlwaW5nU3R5bGUsIEN1cnNvckFsaWduT25TY3JvbGwg PSBBbGlnbkN1cnNvck9uU2Nyb2xsSWZOZWVkZWQsIFRleHRHcmFudWxhcml0eSA9IENoYXJhY3Rl ckdyYW51bGFyaXR5LCBEaXJlY3Rpb25hbGl0eVBvbGljeSA9IE1ha2VEaXJlY3Rpb25hbFNlbGVj dGlvbik7Ci0gICAgdm9pZCBzZXRTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgc2Vs ZWN0aW9uLCBUZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHksIERpcmVjdGlvbmFsaXR5UG9saWN5 IGRpcmVjdGlvbmFsaXR5ID0gTWFrZURpcmVjdGlvbmFsU2VsZWN0aW9uKSB7IHNldFNlbGVjdGlv bihzZWxlY3Rpb24sIENsb3NlVHlwaW5nIHwgQ2xlYXJUeXBpbmdTdHlsZSwgQWxpZ25DdXJzb3JP blNjcm9sbElmTmVlZGVkLCBncmFudWxhcml0eSwgZGlyZWN0aW9uYWxpdHkpOyB9CisgICAgdm9p ZCBzZXRTZWxlY3Rpb25BbmRGb2N1cyhjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24s IFRleHRHcmFudWxhcml0eSBncmFudWxhcml0eSwgRGlyZWN0aW9uYWxpdHlQb2xpY3kgZGlyZWN0 aW9uYWxpdHkgPSBNYWtlRGlyZWN0aW9uYWxTZWxlY3Rpb24pIHsgc2V0U2VsZWN0aW9uKHNlbGVj dGlvbiwgQ2xvc2VUeXBpbmcgfCBDbGVhclR5cGluZ1N0eWxlIHwgVXBkYXRlRm9jdXNlZE5vZGUs IEFsaWduQ3Vyc29yT25TY3JvbGxJZk5lZWRlZCwgZ3JhbnVsYXJpdHksIGRpcmVjdGlvbmFsaXR5 KTsgfQorICAgIHZvaWQgc2V0U2VsZWN0aW9uQW5kRm9jdXMoY29uc3QgVmlzaWJsZVNlbGVjdGlv biYgc2VsZWN0aW9uKSB7IHNldFNlbGVjdGlvbihzZWxlY3Rpb24sIENsb3NlVHlwaW5nIHwgQ2xl YXJUeXBpbmdTdHlsZSB8IFVwZGF0ZUZvY3VzZWROb2RlKTsgfQogICAgIGJvb2wgc2V0U2VsZWN0 ZWRSYW5nZShSYW5nZSosIEVBZmZpbml0eSwgYm9vbCBjbG9zZVR5cGluZyk7CiAgICAgdm9pZCBz ZWxlY3RBbGwoKTsKICAgICB2b2lkIGNsZWFyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3IuY3BwCShyZXZpc2lvbiA4MTI4MSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkxMCw3ICsxOTEwLDcgQEAKICAgICAgICAgCiAgICAg ICAgIC8vIEZJWE1FIDQ4NTkxOTA6IFRoaXMgZ2V0cyBjb25mdXNlZCB3aXRoIGRvdWJsZWQgcHVu Y3R1YXRpb24gYXQgdGhlIGVuZCBvZiBhIHBhcmFncmFwaAogICAgICAgICBSZWZQdHI8UmFuZ2U+ IGJhZEdyYW1tYXJSYW5nZSA9IFRleHRJdGVyYXRvcjo6c3VicmFuZ2UoZ3JhbW1hclNlYXJjaFJh bmdlLmdldCgpLCBncmFtbWFyUGhyYXNlT2Zmc2V0ICsgZ3JhbW1hckRldGFpbC5sb2NhdGlvbiwg Z3JhbW1hckRldGFpbC5sZW5ndGgpOwotICAgICAgICBmcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0 U2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24oYmFkR3JhbW1hclJhbmdlLmdldCgpLCBTRUxfREVG QVVMVF9BRkZJTklUWSkpOworICAgICAgICBmcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0 aW9uQW5kRm9jdXMoVmlzaWJsZVNlbGVjdGlvbihiYWRHcmFtbWFyUmFuZ2UuZ2V0KCksIFNFTF9E RUZBVUxUX0FGRklOSVRZKSk7CiAgICAgICAgIGZyYW1lKCktPnNlbGVjdGlvbigpLT5yZXZlYWxT ZWxlY3Rpb24oKTsKICAgICAgICAgCiAgICAgICAgIGNsaWVudCgpLT51cGRhdGVTcGVsbGluZ1VJ V2l0aEdyYW1tYXJTdHJpbmcoYmFkR3JhbW1hclBocmFzZSwgZ3JhbW1hckRldGFpbCk7CkBAIC0x OTIxLDcgKzE5MjEsNyBAQAogICAgICAgICAvLyBhIG1hcmtlciBzbyB3ZSBkcmF3IHRoZSByZWQg c3F1aWdnbGUgbGF0ZXIuCiAgICAgICAgIAogICAgICAgICBSZWZQdHI8UmFuZ2U+IG1pc3NwZWxs aW5nUmFuZ2UgPSBUZXh0SXRlcmF0b3I6OnN1YnJhbmdlKHNwZWxsaW5nU2VhcmNoUmFuZ2UuZ2V0 KCksIG1pc3NwZWxsaW5nT2Zmc2V0LCBtaXNzcGVsbGVkV29yZC5sZW5ndGgoKSk7Ci0gICAgICAg IGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihtaXNz cGVsbGluZ1JhbmdlLmdldCgpLCBET1dOU1RSRUFNKSk7CisgICAgICAgIGZyYW1lKCktPnNlbGVj dGlvbigpLT5zZXRTZWxlY3Rpb25BbmRGb2N1cyhWaXNpYmxlU2VsZWN0aW9uKG1pc3NwZWxsaW5n UmFuZ2UuZ2V0KCksIERPV05TVFJFQU0pKTsKICAgICAgICAgZnJhbWUoKS0+c2VsZWN0aW9uKCkt PnJldmVhbFNlbGVjdGlvbigpOwogICAgICAgICAKICAgICAgICAgY2xpZW50KCktPnVwZGF0ZVNw ZWxsaW5nVUlXaXRoTWlzc3BlbGxlZFdvcmQobWlzc3BlbGxlZFdvcmQpOwpAQCAtMjEyNiw3ICsy MTI2LDcgQEAKICAgICAgICAgaWYgKG5ld1NlbGVjdGlvbiAhPSBmcmFtZSgpLT5zZWxlY3Rpb24o KS0+c2VsZWN0aW9uKCkpIHsKICAgICAgICAgICAgIGlmICghZnJhbWUoKS0+c2VsZWN0aW9uKCkt PnNob3VsZENoYW5nZVNlbGVjdGlvbihuZXdTZWxlY3Rpb24pKQogICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24obmV3 U2VsZWN0aW9uKTsKKyAgICAgICAgICAgIGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rp b25BbmRGb2N1cyhuZXdTZWxlY3Rpb24pOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFmcmFt ZSgpLT5lZGl0b3IoKS0+c2hvdWxkSW5zZXJ0VGV4dChhdXRvY29ycmVjdGVkU3RyaW5nLCBtaXNz cGVsbGluZ1JhbmdlLmdldCgpLCBFZGl0b3JJbnNlcnRBY3Rpb25UeXBlZCkpCkBAIC0yNDAxLDcg KzI0MDEsNyBAQAogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAocmVzdWx0LT50eXBl ID09IFRleHRDaGVja2luZ1R5cGVMaW5rKSB7Ci0gICAgICAgICAgICAgICAgbV9mcmFtZS0+c2Vs ZWN0aW9uKCktPnNldFNlbGVjdGlvbihzZWxlY3Rpb25Ub1JlcGxhY2UpOworICAgICAgICAgICAg ICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb25BbmRGb2N1cyhzZWxlY3Rpb25U b1JlcGxhY2UpOwogICAgICAgICAgICAgICAgIHNlbGVjdGlvbkNoYW5nZWQgPSB0cnVlOwogICAg ICAgICAgICAgICAgIHJlc3RvcmVTZWxlY3Rpb25BZnRlckNoYW5nZSA9IGZhbHNlOwogICAgICAg ICAgICAgICAgIGlmIChjYW5FZGl0UmljaGx5KCkpCkBAIC0yNDE5LDcgKzI0MTksNyBAQAogICAg ICAgICAgICAgICAgIGlmICh1c2VTcGVsbGluZ0NvcnJlY3Rpb25Db21tYW5kKQogICAgICAgICAg ICAgICAgICAgICBhcHBseUNvbW1hbmQoU3BlbGxpbmdDb3JyZWN0aW9uQ29tbWFuZDo6Y3JlYXRl KHJhbmdlVG9SZXBsYWNlLCByZXN1bHQtPnJlcGxhY2VtZW50KSk7CiAgICAgICAgICAgICAgICAg ZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxl Y3Rpb24oc2VsZWN0aW9uVG9SZXBsYWNlKTsKKyAgICAgICAgICAgICAgICAgICAgbV9mcmFtZS0+ c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbkFuZEZvY3VzKHNlbGVjdGlvblRvUmVwbGFjZSk7CiAg ICAgICAgICAgICAgICAgICAgIHJlcGxhY2VTZWxlY3Rpb25XaXRoVGV4dChyZXN1bHQtPnJlcGxh Y2VtZW50LCBmYWxzZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIH0KIApAQCAtMjc4Myw3ICsy NzgzLDcgQEAKICNpZiBTVVBQT1JUX0FVVE9DT1JSRUNUSU9OX1BBTkVMCiAgICAgY2xpZW50KCkt PnJlY29yZEF1dG9jb3JyZWN0aW9uUmVzcG9uc2UoRWRpdG9yQ2xpZW50OjpBdXRvY29ycmVjdGlv blJldmVydGVkLCBjb3JyZWN0ZWQsIGNvcnJlY3Rpb24pOwogICAgIG1fZnJhbWUtPmRvY3VtZW50 KCktPnVwZGF0ZUxheW91dCgpOwotICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rp b24oc2VsZWN0aW9uT2ZDb3JyZWN0ZWQsIFNlbGVjdGlvbkNvbnRyb2xsZXI6OkNsb3NlVHlwaW5n IHwgU2VsZWN0aW9uQ29udHJvbGxlcjo6Q2xlYXJUeXBpbmdTdHlsZSB8IFNlbGVjdGlvbkNvbnRy b2xsZXI6OlNwZWxsQ29ycmVjdGlvblRyaWdnZXJlZCk7CisgICAgbV9mcmFtZS0+c2VsZWN0aW9u KCktPnNldFNlbGVjdGlvbihzZWxlY3Rpb25PZkNvcnJlY3RlZCwgU2VsZWN0aW9uQ29udHJvbGxl cjo6Q2xvc2VUeXBpbmcgfCBTZWxlY3Rpb25Db250cm9sbGVyOjpDbGVhclR5cGluZ1N0eWxlIHwg U2VsZWN0aW9uQ29udHJvbGxlcjo6U3BlbGxDb3JyZWN0aW9uVHJpZ2dlcmVkIHwgU2VsZWN0aW9u Q29udHJvbGxlcjo6VXBkYXRlRm9jdXNlZE5vZGUpOwogICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2Ug PSBSYW5nZTo6Y3JlYXRlKG1fZnJhbWUtPmRvY3VtZW50KCksIG1fZnJhbWUtPnNlbGVjdGlvbigp LT5zZWxlY3Rpb24oKS5zdGFydCgpLCBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCku ZW5kKCkpOwogCiAgICAgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyKiBtYXJrZXJzID0gbV9mcmFt ZS0+ZG9jdW1lbnQoKS0+bWFya2VycygpOwpAQCAtMjg5Nyw3ICsyODk3LDcgQEAKICAgICBpZiAo bmV3U2VsZWN0aW9uICE9IG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKSkgewogICAg ICAgICBpZiAoIW1fZnJhbWUtPnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rpb24obmV3 U2VsZWN0aW9uKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbV9mcmFtZS0+c2VsZWN0 aW9uKCktPnNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24pOworICAgICAgICBtX2ZyYW1lLT5zZWxl Y3Rpb24oKS0+c2V0U2VsZWN0aW9uQW5kRm9jdXMobmV3U2VsZWN0aW9uKTsKICAgICB9CiAKICAg ICAvLyBJbnNlcnQgdGhlIHRyYW5zcG9zZWQgY2hhcmFjdGVycy4KQEAgLTMwNjksNyArMzA2OSw3 IEBACiAgICAgLy8gU2VlIDxyZGFyOi8vcHJvYmxlbS81NzI5MzE1PiBTb21lIHNob3VsZENoYW5n ZVNlbGVjdGVkRE9NUmFuZ2UgY29udGFpbiBSYW5nZXMgZm9yIHNlbGVjdGlvbnMgdGhhdCBhcmUg bm8gbG9uZ2VyIHZhbGlkCiAgICAgYm9vbCBzZWxlY3Rpb25EaWROb3RDaGFuZ2VET01Qb3NpdGlv biA9IG5ld1NlbGVjdGlvbiA9PSBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCk7CiAg ICAgaWYgKHNlbGVjdGlvbkRpZE5vdENoYW5nZURPTVBvc2l0aW9uIHx8IG1fZnJhbWUtPnNlbGVj dGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rpb24obmV3U2VsZWN0aW9uKSkgewotICAgICAgICBT ZWxlY3Rpb25Db250cm9sbGVyOjpTZXRTZWxlY3Rpb25PcHRpb25zIG9wdGlvbnMgPSAwOworICAg ICAgICBTZWxlY3Rpb25Db250cm9sbGVyOjpTZXRTZWxlY3Rpb25PcHRpb25zIG9wdGlvbnMgPSBT ZWxlY3Rpb25Db250cm9sbGVyOjpVcGRhdGVGb2N1c2VkTm9kZTsKICAgICAgICAgaWYgKGNsb3Nl VHlwaW5nKQogICAgICAgICAgICAgb3B0aW9ucyB8PSBTZWxlY3Rpb25Db250cm9sbGVyOjpDbG9z ZVR5cGluZzsKICAgICAgICAgaWYgKGNsZWFyVHlwaW5nU3R5bGUpCkBAIC0zMzg0LDcgKzMzODQs NyBAQAogICAgIGlmIChyZXN1bHRSYW5nZS0+Y29sbGFwc2VkKGV4Y2VwdGlvbikpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24o VmlzaWJsZVNlbGVjdGlvbihyZXN1bHRSYW5nZS5nZXQoKSwgRE9XTlNUUkVBTSkpOworICAgIG1f ZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb25BbmRGb2N1cyhWaXNpYmxlU2VsZWN0aW9u KHJlc3VsdFJhbmdlLmdldCgpLCBET1dOU1RSRUFNKSk7CiAgICAgbV9mcmFtZS0+c2VsZWN0aW9u KCktPnJldmVhbFNlbGVjdGlvbigpOwogICAgIHJldHVybiB0cnVlOwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA4 MTI4MSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE3NywxMCArMTc3LDcgQEAKICAgICBtX3NlbGVjdGlvbiA9IHM7 CiAgICAgCiAgICAgbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSA9IHRydWU7Ci0gICAgCi0gICAgaWYg KCFzLmlzTm9uZSgpKQotICAgICAgICBzZXRGb2N1c2VkTm9kZUlmTmVlZGVkKCk7Ci0gICAgCisK ICAgICB1cGRhdGVBcHBlYXJhbmNlKCk7CiAKICAgICAvLyBBbHdheXMgY2xlYXIgdGhlIHggcG9z aXRpb24gdXNlZCBmb3IgdmVydGljYWwgYXJyb3cgbmF2aWdhdGlvbi4KQEAgLTEzNzQsNyArMTM3 MSw3IEBACiAgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb24oYmVmb3JlT3duZXJFbGVt ZW50LCBhZnRlck93bmVyRWxlbWVudCk7CiAgICAgaWYgKHBhcmVudC0+c2VsZWN0aW9uKCktPnNo b3VsZENoYW5nZVNlbGVjdGlvbihuZXdTZWxlY3Rpb24pKSB7CiAgICAgICAgIHBhZ2UtPmZvY3Vz Q29udHJvbGxlcigpLT5zZXRGb2N1c2VkRnJhbWUocGFyZW50KTsKLSAgICAgICAgcGFyZW50LT5z ZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbik7CisgICAgICAgIHBhcmVudC0+ c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbkFuZEZvY3VzKG5ld1NlbGVjdGlvbik7CiAgICAgfQog fQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MTMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDExLTAzLTE2ICBMZXZp IFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmb2N1cygpIGNhbGwgaW5zaWRlIGlucHV0IGV2ZW50 IGhhbmRsZXIgaXMgaWdub3JlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTYyNzEKKworICAgICAgICBObyBsb25nZXIgc2V0IHRoZSBmb2N1c2VkIG5v ZGUgd2hlbiBzZXR0aW5nIHRoZSBzZWxlY3Rpb24gYnkgZGVmYXVsdC4gQWRkZWQKKyAgICAgICAg Y29udmVuaWVuY2UgbWV0aG9kcyBmb3Igc2V0dGluZyB0aGUgb2xkIGJlaGF2aW9yIGZvciB0aGUg cGxhY2VzIHRoYXQgc3RpbGwKKyAgICAgICAgd2FudCB0aGlzIGJlaGF2aW9yLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjphZHZhbmNlVG9OZXh0TWlzc3BlbGxpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6RWRpdG9yOjptYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmdUb1dvcmQp OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjptYXJrQWxsTWlzc3BlbGxpbmdzQW5kQmFkR3Jh bW1hckluUmFuZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6dW5hcHBsaWVkU3BlbGxD b3JyZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6dHJhbnNwb3NlKToKKyAgICAg ICAgKFdlYkNvcmU6OkVkaXRvcjo6Y2hhbmdlU2VsZWN0aW9uQWZ0ZXJDb21tYW5kKToKKyAgICAg ICAgKFdlYkNvcmU6OkVkaXRvcjo6ZmluZFN0cmluZyk6CisgICAgICAgICogZWRpdGluZy9TZWxl Y3Rpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvbkNvbnRyb2xs ZXI6OnNldFNlbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25Db250cm9sbGVy OjpzZWxlY3RGcmFtZUVsZW1lbnRJblBhcmVudElmRnVsbHlTZWxlY3RlZCk6CisgICAgICAgICog ZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rp b25Db250cm9sbGVyOjpzZXRTZWxlY3Rpb25BbmRGb2N1cyk6CisgICAgICAgICogcGFnZS9FdmVu dEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0U2VsZWN0aW9uSWZOZWVkZWQpOgor ICAgICAgICAoV2ViQ29yZTo6c2V0Tm9uRGlyZWN0aW9uYWxTZWxlY3Rpb25JZk5lZWRlZCk6Cisg ICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9j dXNDb250cm9sbGVyOjphZHZhbmNlRm9jdXNJbkRvY3VtZW50T3JkZXIpOgorCiAyMDExLTAzLTE2 ICBKYXJra28gU2Fra2luZW4gIDxqYXJra28uai5zYWtraW5lbkBnbWFpbC5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA4MTI4MSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkw LDggKzI5MCw5IEBACiAgICAgaWYgKGNhcmV0QnJvd3NpbmcpIHsKICAgICAgICAgUG9zaXRpb24g cG9zaXRpb24gPSBmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUobm9kZSk7CiAgICAgICAgIFZp c2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uKHBvc2l0aW9uLCBwb3NpdGlvbiwgRE9XTlNUUkVB TSk7Ci0gICAgICAgIGlmIChmcmFtZS0+c2VsZWN0aW9uKCktPnNob3VsZENoYW5nZVNlbGVjdGlv bihuZXdTZWxlY3Rpb24pKQotICAgICAgICAgICAgZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxl Y3Rpb24obmV3U2VsZWN0aW9uKTsKKyAgICAgICAgaWYgKGZyYW1lLT5zZWxlY3Rpb24oKS0+c2hv dWxkQ2hhbmdlU2VsZWN0aW9uKG5ld1NlbGVjdGlvbikpIHsKKyAgICAgICAgICAgIGZyYW1lLT5z ZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uQW5kRm9jdXMobmV3U2VsZWN0aW9uKTsKKyAgICAgICAg fQogICAgIH0KIAogICAgIHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKS0+Zm9jdXMoZmFsc2Up OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkocmV2aXNpb24gODEyODEp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI1NCwxNCArMjU0LDE0IEBACiB7CiAgICAgQVNTRVJUKHNlbGVjdGlvbik7CiAgICAgaWYg KHNlbGVjdGlvbi0+c2VsZWN0aW9uKCkgIT0gbmV3U2VsZWN0aW9uICYmIHNlbGVjdGlvbi0+c2hv dWxkQ2hhbmdlU2VsZWN0aW9uKG5ld1NlbGVjdGlvbikpCi0gICAgICAgIHNlbGVjdGlvbi0+c2V0 U2VsZWN0aW9uKG5ld1NlbGVjdGlvbik7CisgICAgICAgIHNlbGVjdGlvbi0+c2V0U2VsZWN0aW9u QW5kRm9jdXMobmV3U2VsZWN0aW9uKTsKIH0KIAogc3RhdGljIHZvaWQgc2V0Tm9uRGlyZWN0aW9u YWxTZWxlY3Rpb25JZk5lZWRlZChTZWxlY3Rpb25Db250cm9sbGVyKiBzZWxlY3Rpb24sIGNvbnN0 IFZpc2libGVTZWxlY3Rpb24mIG5ld1NlbGVjdGlvbiwgVGV4dEdyYW51bGFyaXR5IGdyYW51bGFy aXR5KQogewogICAgIEFTU0VSVChzZWxlY3Rpb24pOwogICAgIGlmIChzZWxlY3Rpb24tPnNlbGVj dGlvbigpICE9IG5ld1NlbGVjdGlvbiAmJiBzZWxlY3Rpb24tPnNob3VsZENoYW5nZVNlbGVjdGlv bihuZXdTZWxlY3Rpb24pKQotICAgICAgICBzZWxlY3Rpb24tPnNldFNlbGVjdGlvbihuZXdTZWxl Y3Rpb24sIGdyYW51bGFyaXR5LCBNYWtlTm9uRGlyZWN0aW9uYWxTZWxlY3Rpb24pOworICAgICAg ICBzZWxlY3Rpb24tPnNldFNlbGVjdGlvbkFuZEZvY3VzKG5ld1NlbGVjdGlvbiwgZ3JhbnVsYXJp dHksIE1ha2VOb25EaXJlY3Rpb25hbFNlbGVjdGlvbik7CiB9CiAKIHZvaWQgRXZlbnRIYW5kbGVy OjpzZWxlY3RDbG9zZXN0V29yZEZyb21Nb3VzZUV2ZW50KGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0 VGVzdFJlc3VsdHMmIHJlc3VsdCkK