179990 2017-11-23 19:30:18 -0800 Phantom focus/blur events fire on clicking between text input fields when listening with addEventListener 2020-03-10 23:23:51 -0700 1 1 1 Unclassified WebKit UI Events Safari 11 Mac macOS 10.13 RESOLVED FIXED InRadar P2 Normal --- 1 rez rniwa bdakin bolusmjak cdumez dbates d.kislenko fellaslimspam rniwa thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1374508 0 rez 2017-11-23 19:30:18 -0800 With two or more text inputs on a form, switching focus by click from one to another sometimes causes an extra focus/blur to fire. Steps to reproduce Start with a form with two or more text inputs and watch focus/blur events. Demo: https://codepen.io/cliener/pen/ooGpwW 1. Click on one of the text inputs (#1) 2. Click on another text input (#2) 3. Repeat the above until extra focus/blur events show. The phantom events only seem to fire on the second and subsequent text inputs. Expected behaviour Each clicked focus shift should fire single blur/focus events. Element #1 blur Element #2 focus Element #2 click Actual behaviour Some clicked focus shifts fire secondary blur/focus events with the net effect of: Element #1 blur Element #2 focus Element #1 blur Element #2 focus Element #2 click Additional notes Monitoring the events in the console with monitorEvents() does not show the phantom events. The extra events only appear to be visible when listening to the DOM focus/blur events with addEventListener. Disabling "Look up & data detectors" (System Preferences: Trackpad: Point & Click: Look up & data detectors) fixes the bug. Tested and recreated in: - Safari Version 11.0.1 (13604.3.5) on MacOS 10.13.1 (17B48) - Safari Technology Preview Release 44 (Safari 11.1, WebKit 13605.1.13.2) Impact of this bug Custom form elements which depend on focus/blur can get stuck in a loop as demonstrated in React Datepicker https://github.com/Hacker0x01/react-datepicker/issues/1077 This bug has also been noted in React where we're trying to find a workaround https://github.com/facebook/react/issues/10871 1374678 1 webkit-bug-importer 2017-11-24 22:53:58 -0800 <rdar://problem/35685975> 1480634 2 rniwa 2018-11-20 17:11:54 -0800 Hm... I can't reproduce this on 12.0.1 or STP70. 1480639 3 rniwa 2018-11-20 17:29:34 -0800 Can't reproduce on Safari 11.1 (13605.1.33.1.4) either. 1480641 4 rniwa 2018-11-20 17:46:14 -0800 Oh, that's because I always disable force click. I can reproduce reliably now. 1480657 5 rniwa 2018-11-20 19:41:13 -0800 The issue here is that TemporarySelectionChange which is created by TextIndicator::createWithRange is setting & restoring the selection, which also sets & restores the focus. I'd have to talk with Beth / Tim to figure out what we ought to do instead. 1480679 6 thorton 2018-11-20 23:06:05 -0800 (In reply to Ryosuke Niwa from comment #5) > The issue here is that TemporarySelectionChange which is created by > TextIndicator::createWithRange is setting & restoring the selection, which > also sets & restores the focus. I'd have to talk with Beth / Tim to figure > out what we ought to do instead. To get rid of that selection change, we'd need all of the paint-selection-only painting code to take an arbitrary range instead of always looking at the selection. I think that would be pretty nontrivial. Instead ideally we'd just stop the events from propagating, I think? 1480680 7 rniwa 2018-11-20 23:12:22 -0800 (In reply to Tim Horton from comment #6) > (In reply to Ryosuke Niwa from comment #5) > > The issue here is that TemporarySelectionChange which is created by > > TextIndicator::createWithRange is setting & restoring the selection, which > > also sets & restores the focus. I'd have to talk with Beth / Tim to figure > > out what we ought to do instead. > > To get rid of that selection change, we'd need all of the > paint-selection-only painting code to take an arbitrary range instead of > always looking at the selection. I think that would be pretty nontrivial. > > Instead ideally we'd just stop the events from propagating, I think? We can just avoid firing of selection related events & avoid changing that focus. Would moving the focus important here? If not, FrameSelection::setSelection takes an option to not set focus. 1480681 8 thorton 2018-11-20 23:18:40 -0800 (In reply to Ryosuke Niwa from comment #7) > (In reply to Tim Horton from comment #6) > > (In reply to Ryosuke Niwa from comment #5) > > > The issue here is that TemporarySelectionChange which is created by > > > TextIndicator::createWithRange is setting & restoring the selection, which > > > also sets & restores the focus. I'd have to talk with Beth / Tim to figure > > > out what we ought to do instead. > > > > To get rid of that selection change, we'd need all of the > > paint-selection-only painting code to take an arbitrary range instead of > > always looking at the selection. I think that would be pretty nontrivial. > > > > Instead ideally we'd just stop the events from propagating, I think? > > We can just avoid firing of selection related events & avoid changing that > focus. Would moving the focus important here? If not, > FrameSelection::setSelection takes an option to not set focus. No, I don't think moving the focus is important. 1480872 9 355449 rniwa 2018-11-21 18:37:23 -0800 Created attachment 355449 Fixes the bug 1480886 10 355449 thorton 2018-11-21 19:14:42 -0800 Comment on attachment 355449 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=355449&action=review > Source/WebCore/editing/Editor.h:107 > + DoNotSetFcous = 1 << 1, Typo "Fcous". 1480887 11 355449 thorton 2018-11-21 19:16:02 -0800 Comment on attachment 355449 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=355449&action=review > Source/WebCore/ChangeLog:15 > + Unfortunately, no new tests since force click testing is broken :( See <rdar://problem/31301721>. There are other ways to generate textindicators, though (find-in-page, lookup, some kinds of drags; see TextIndicator::createWithSelection...). You might be able to get one of them to work. 1480909 12 rniwa 2018-11-21 22:26:10 -0800 (In reply to Tim Horton from comment #11) > Comment on attachment 355449 [details] > Fixes the bug > > View in context: > https://bugs.webkit.org/attachment.cgi?id=355449&action=review > > > Source/WebCore/ChangeLog:15 > > + Unfortunately, no new tests since force click testing is broken :( See <rdar://problem/31301721>. > > There are other ways to generate textindicators, though (find-in-page, > lookup, some kinds of drags; see TextIndicator::createWithSelection...). You > might be able to get one of them to work. But those either move the focus first or don't move the focus. 1480910 13 rniwa 2018-11-21 22:38:14 -0800 (In reply to Tim Horton from comment #10) > Comment on attachment 355449 [details] > Fixes the bug > > View in context: > https://bugs.webkit.org/attachment.cgi?id=355449&action=review > > > Source/WebCore/editing/Editor.h:107 > > + DoNotSetFcous = 1 << 1, > > Typo "Fcous". Fixed. Thanks for the review! 1480911 14 rniwa 2018-11-21 22:39:17 -0800 Committed r238440: <https://trac.webkit.org/changeset/238440> 1480915 15 355449 dbates 2018-11-21 23:11:51 -0800 Comment on attachment 355449 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=355449&action=review > Source/WebCore/editing/Editor.cpp:209 > + if (options & TemporarySelectionOption::EnableAppearanceUpdates) We should make option an OptionSet. > Source/WebCore/editing/Editor.cpp:227 > + if (m_options & TemporarySelectionOption::IgnoreSelectionChanges) { We should make m_option an OptionSet. 1480918 16 355449 rniwa 2018-11-21 23:42:27 -0800 Comment on attachment 355449 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=355449&action=review >> Source/WebCore/editing/Editor.cpp:209 >> + if (options & TemporarySelectionOption::EnableAppearanceUpdates) > > We should make option an OptionSet. options is totally an OptionSet. >> Source/WebCore/editing/Editor.cpp:227 >> + if (m_options & TemporarySelectionOption::IgnoreSelectionChanges) { > > We should make m_option an OptionSet. It IS an OptionSet. 1480920 17 dbates 2018-11-21 23:49:20 -0800 (In reply to Ryosuke Niwa from comment #16) > Comment on attachment 355449 [details] > Fixes the bug > > View in context: > https://bugs.webkit.org/attachment.cgi?id=355449&action=review > > >> Source/WebCore/editing/Editor.cpp:209 > >> + if (options & TemporarySelectionOption::EnableAppearanceUpdates) > > > > We should make option an OptionSet. > > options is totally an OptionSet. > > >> Source/WebCore/editing/Editor.cpp:227 > >> + if (m_options & TemporarySelectionOption::IgnoreSelectionChanges) { > > > > We should make m_option an OptionSet. > > It IS an OptionSet. Cool. I guess I was looking for .contains() over & :/ 1511291 18 fellaslimspam 2019-02-28 22:14:06 -0800 This bug is still present in Safari Version 12.0.3 (14606.4.5). Tested on macOS Mojave Version 10.14.3 (18D109) MacBook Pro (Retina, 13-inch, Early 2015) Test case: Two inputs with a value (entered by user or directly set). 1) Click on the first input field. Results in 1 focus event on the first input. 2) Click on the text within the second input field. Results in 3 focus events (second input, first input, second input) 3) Click beside the text in the first input. Results in 1 focus event on the first input. The bug is persistent. Disabling "Look up & data detectors" in "System Preferences -> Trackpad" fixes the issue. 1511468 19 rniwa 2019-03-01 11:06:20 -0800 (In reply to fellaslimspam from comment #18) > This bug is still present in Safari Version 12.0.3 (14606.4.5). > Tested on macOS Mojave Version 10.14.3 (18D109) MacBook Pro (Retina, > 13-inch, Early 2015) That's expected because the fix didn't go into 18D109. Please test it on macOS 10.14.4 and iOS 12.2 betas instead. In general, Apple tends to (at least it has been happening for the last couple of years) include the latest version of WebKit in a major OS update and each OS's respective E-releases. Software updates between major "A" releases and "E" releases such as B, C, and D updates tend not to get all the bug fixes in WebKit. 1525395 20 bolusmjak 2019-04-08 14:51:32 -0700 I'm experiencing the double focus bug. I have updated to OS X 10.14.4 (18E226) and Safari Version 12.1 (14607.1.40.1.4) The bug is also in Safari Technology Preview Release 79 (Safari 12.2, WebKit 14608.1.14 1526338 21 rniwa 2019-04-11 01:24:51 -0700 (In reply to Mark from comment #20) > I'm experiencing the double focus bug. > I have updated to > OS X 10.14.4 (18E226) > and Safari Version 12.1 (14607.1.40.1.4) > > The bug is also in > Safari Technology Preview > Release 79 (Safari 12.2, WebKit 14608.1.14 Oh, interesting. Can you reproduce it using the example in comment #0? If so, would you mind what your settings are in System Preferences > Trackpad? Do you have force click & look up enabled? If not, could you give us reproduction steps? 1552844 22 d.kislenko 2019-07-15 09:01:40 -0700 OSX 10.14.5 (18F132) Safari 12.1.1 (14607.2.6.1.1) I have the same issue, when i switch to tab it's fire event 'focus' twice, instead of once. You can run following html to test: <html> <div>Times focus called: </div> <div id="focustimes">0</div> </html> <script> var i = 0; window.addEventListener('focus', function(e){ i = i +1; document.getElementById("focustimes").innerHTML = i; }) </script> 1552845 23 d.kislenko 2019-07-15 09:07:19 -0700 (In reply to David from comment #22) > OSX 10.14.5 (18F132) > Safari 12.1.1 (14607.2.6.1.1) > I have the same issue, when i switch to tab it's fire event 'focus' twice, > instead of once. > You can run following html to test: > > <html> > <div>Times focus called: </div> > <div id="focustimes">0</div> > </html> > <script> > var i = 0; > window.addEventListener('focus', function(e){ > i = i +1; > document.getElementById("focustimes").innerHTML = i; > }) > > </script> I just tried in Safari beta 13.0 (14608.1.32), it has same bug. 1628549 24 rniwa 2020-03-10 23:23:51 -0700 (In reply to David from comment #23) > (In reply to David from comment #22) > > OSX 10.14.5 (18F132) > > Safari 12.1.1 (14607.2.6.1.1) > > I have the same issue, when i switch to tab it's fire event 'focus' twice, > > instead of once. > > You can run following html to test: > > > > <html> > > <div>Times focus called: </div> > > <div id="focustimes">0</div> > > </html> > > <script> > > var i = 0; > > window.addEventListener('focus', function(e){ > > i = i +1; > > document.getElementById("focustimes").innerHTML = i; > > }) > > > > </script> > > I just tried in Safari beta 13.0 (14608.1.32), it has same bug. Is this still happening in the latest betas of Safari 13.1? If so, could you file a new bug? 355449 2018-11-21 18:37:23 -0800 2018-11-21 19:14:42 -0800 Fixes the bug bug-179990-20181121183722.patch text/plain 7342 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzODQzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE4LTExLTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBoYW50b20gZm9jdXMvYmx1ciBl dmVudHMgZmlyZSBvbiBjbGlja2luZyBiZXR3ZWVuIHRleHQgaW5wdXQgZmllbGRzIHdoZW4gbGlz dGVuaW5nIHdpdGggYWRkRXZlbnRMaXN0ZW5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5OTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1c2VkIGJ5IFRlbXBvcmFyeVNlbGVj dGlvbkNoYW5nZSB3aGljaCBpcyB1c2VkIGJ5IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5n ZQorICAgICAgICB0byBzZXQgYW5kIHJlc3RvcmUgdGhlIHNlbGVjdGlvbiBwdXR0aW5nIHRoZSBm b2N1cyBvbiB0aGUgbmV3bHkgbW91c2UtZG93bidlZCBpbnB1dCBlbGVtZW50CisgICAgICAgIGFu ZCByZXN0b3JpbmcgdGhlIGZvY3VzIGJhY2sgdG8gdGhlIGlucHV0IGVsZW1lbnQgd2hpY2ggb3Jp Z2luYWxseSBoYWQgdGhlIGZvY3VzIGltbWVkaWF0ZWx5LgorCisgICAgICAgIEZpeGVkIHRoZSBi dWcgYnkgYXZvaWRpbmcgdG8gc2V0IHRoZSBmb2N1cyBzaW5jZSBvbmx5IHNlbGVjdGlvbiBoaWdo bGlnaHRzIG5lZWQgdG8gYmUgdXBkYXRlZCBoZXJlLgorICAgICAgICBBbHNvIG1hZGUgVGVtcG9y YXJ5U2VsZWN0aW9uT3B0aW9uIGFuIGVudW0gY2xhc3MuCisKKyAgICAgICAgVW5mb3J0dW5hdGVs eSwgbm8gbmV3IHRlc3RzIHNpbmNlIGZvcmNlIGNsaWNrIHRlc3RpbmcgaXMgYnJva2VuIDooIFNl ZSA8cmRhcjovL3Byb2JsZW0vMzEzMDE3MjE+LgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdlOjpUZW1wb3Jh cnlTZWxlY3Rpb25DaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGVtcG9yYXJ5U2VsZWN0aW9u Q2hhbmdlOjp+VGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlRl bXBvcmFyeVNlbGVjdGlvbkNoYW5nZTo6c2V0U2VsZWN0aW9uKTogRXh0cmFjdGVkLiBGaXhlZCB0 aGUgYnVnIGJ5IGFkZGluZworICAgICAgICBGcmFtZVNlbGVjdGlvbjo6RG9Ob3RTZXRGb2N1cyB0 byB0aGUgb3B0aW9uIHdoZW4gVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uOjpEb05vdFNldEZjb3Vz IGlzIHNldC4KKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5oOgorICAgICAgICAqIHBhZ2UvRHJh Z0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OnBlcmZv cm1EcmFnT3BlcmF0aW9uKToKKyAgICAgICAgKiBwYWdlL1RleHRJbmRpY2F0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKTogU2V0IFRlbXBv cmFyeVNlbGVjdGlvbk9wdGlvbjo6RG9Ob3RTZXRGY291cy4KKwogMjAxOC0xMS0yMSAgQW5keSBF c3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDcmVhdGUgYSBzb2Z0 LWxpbmtpbmcgZmlsZSBmb3IgUGFzc0tpdApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9F ZGl0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw cAkocmV2aXNpb24gMjM4NDMxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMDYsMzUgKzIwNiw0MyBAQCBUZW1wb3JhcnlTZWxlY3Rpb25D aGFuZ2U6OlRlbXBvcmFyeVNlbGVjCiAjZW5kaWYKIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQotICAgIGlmIChvcHRpb25zICYgVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uRW5hYmxlQXBwZWFy YW5jZVVwZGF0ZXMpCisgICAgaWYgKG9wdGlvbnMgJiBUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb246 OkVuYWJsZUFwcGVhcmFuY2VVcGRhdGVzKQogICAgICAgICBmcmFtZS5zZWxlY3Rpb24oKS5zZXRV cGRhdGVBcHBlYXJhbmNlRW5hYmxlZCh0cnVlKTsKICNlbmRpZgogCi0gICAgaWYgKG9wdGlvbnMg JiBUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25JZ25vcmVTZWxlY3Rpb25DaGFuZ2VzKQorICAgIGlm IChvcHRpb25zICYgVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uOjpJZ25vcmVTZWxlY3Rpb25DaGFu Z2VzKQogICAgICAgICBmcmFtZS5lZGl0b3IoKS5zZXRJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzKHRy dWUpOwogCiAgICAgaWYgKHRlbXBvcmFyeVNlbGVjdGlvbikgewogICAgICAgICBtX3NlbGVjdGlv blRvUmVzdG9yZSA9IGZyYW1lLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOwotICAgICAgICBmcmFt ZS5zZWxlY3Rpb24oKS5zZXRTZWxlY3Rpb24odGVtcG9yYXJ5U2VsZWN0aW9uLnZhbHVlKCkpOwor ICAgICAgICBzZXRTZWxlY3Rpb24odGVtcG9yYXJ5U2VsZWN0aW9uLnZhbHVlKCkpOwogICAgIH0K IH0KIAogVGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdlOjp+VGVtcG9yYXJ5U2VsZWN0aW9uQ2hhbmdl KCkKIHsKICAgICBpZiAobV9zZWxlY3Rpb25Ub1Jlc3RvcmUpCi0gICAgICAgIG1fZnJhbWUtPnNl bGVjdGlvbigpLnNldFNlbGVjdGlvbihtX3NlbGVjdGlvblRvUmVzdG9yZS52YWx1ZSgpKTsKKyAg ICAgICAgc2V0U2VsZWN0aW9uKG1fc2VsZWN0aW9uVG9SZXN0b3JlLnZhbHVlKCkpOwogCi0gICAg aWYgKG1fb3B0aW9ucyAmIFRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbklnbm9yZVNlbGVjdGlvbkNo YW5nZXMpIHsKLSAgICAgICAgYXV0byByZXZlYWxTZWxlY3Rpb24gPSBtX29wdGlvbnMgJiBUZW1w b3JhcnlTZWxlY3Rpb25PcHRpb25SZXZlYWxTZWxlY3Rpb24gPyBFZGl0b3I6OlJldmVhbFNlbGVj dGlvbjo6WWVzIDogRWRpdG9yOjpSZXZlYWxTZWxlY3Rpb246Ok5vOworICAgIGlmIChtX29wdGlv bnMgJiBUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb246Oklnbm9yZVNlbGVjdGlvbkNoYW5nZXMpIHsK KyAgICAgICAgYXV0byByZXZlYWxTZWxlY3Rpb24gPSBtX29wdGlvbnMgJiBUZW1wb3JhcnlTZWxl Y3Rpb25PcHRpb246OlJldmVhbFNlbGVjdGlvbiA/IEVkaXRvcjo6UmV2ZWFsU2VsZWN0aW9uOjpZ ZXMgOiBFZGl0b3I6OlJldmVhbFNlbGVjdGlvbjo6Tm87CiAgICAgICAgIG1fZnJhbWUtPmVkaXRv cigpLnNldElnbm9yZVNlbGVjdGlvbkNoYW5nZXMobV93YXNJZ25vcmluZ1NlbGVjdGlvbkNoYW5n ZXMsIHJldmVhbFNlbGVjdGlvbik7CiAgICAgfQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK LSAgICBpZiAobV9vcHRpb25zICYgVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uRW5hYmxlQXBwZWFy YW5jZVVwZGF0ZXMpCisgICAgaWYgKG1fb3B0aW9ucyAmIFRlbXBvcmFyeVNlbGVjdGlvbk9wdGlv bjo6RW5hYmxlQXBwZWFyYW5jZVVwZGF0ZXMpCiAgICAgICAgIG1fZnJhbWUtPnNlbGVjdGlvbigp LnNldFVwZGF0ZUFwcGVhcmFuY2VFbmFibGVkKG1fYXBwZWFyYW5jZVVwZGF0ZXNXZXJlRW5hYmxl ZCk7CiAjZW5kaWYKIH0KIAordm9pZCBUZW1wb3JhcnlTZWxlY3Rpb25DaGFuZ2U6OnNldFNlbGVj dGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24pCit7CisgICAgYXV0byBvcHRp b25zID0gRnJhbWVTZWxlY3Rpb246OmRlZmF1bHRTZXRTZWxlY3Rpb25PcHRpb25zKCk7CisgICAg aWYgKG1fb3B0aW9ucyAmIFRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbjo6RG9Ob3RTZXRGY291cykK KyAgICAgICAgb3B0aW9ucy5hZGQoRnJhbWVTZWxlY3Rpb246OkRvTm90U2V0Rm9jdXMpOworICAg IG1fZnJhbWUtPnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihzZWxlY3Rpb24sIG9wdGlvbnMpOwor fQorCiAvLyBXaGVuIGFuIGV2ZW50IGhhbmRsZXIgaGFzIG1vdmVkIHRoZSBzZWxlY3Rpb24gb3V0 c2lkZSBvZiBhIHRleHQgY29udHJvbAogLy8gd2Ugc2hvdWxkIHVzZSB0aGUgdGFyZ2V0IGNvbnRy b2wncyBzZWxlY3Rpb24gZm9yIHRoaXMgZWRpdGluZyBvcGVyYXRpb24uCiBWaXNpYmxlU2VsZWN0 aW9uIEVkaXRvcjo6c2VsZWN0aW9uRm9yQ29tbWFuZChFdmVudCogZXZlbnQpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdG9yLmgJKHJldmlzaW9uIDIzODQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRWRpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMiwxNSArMTAyLDE1IEBAIGVudW0g Y2xhc3MgTWFpbEJsb2NrcXVvdGVIYW5kbGluZyB7CiBjbGFzcyBIVE1MQXR0YWNobWVudEVsZW1l bnQ7CiAjZW5kaWYKIAotZW51bSBUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb24gOiB1aW50OF90IHsK LSAgICAvLyBTY3JvbGwgdG8gcmV2ZWFsIHRoZSBzZWxlY3Rpb24uCi0gICAgVGVtcG9yYXJ5U2Vs ZWN0aW9uT3B0aW9uUmV2ZWFsU2VsZWN0aW9uID0gMSA8PCAwLAorZW51bSBjbGFzcyBUZW1wb3Jh cnlTZWxlY3Rpb25PcHRpb24gOiB1aW50OF90IHsKKyAgICBSZXZlYWxTZWxlY3Rpb24gPSAxIDw8 IDAsCisgICAgRG9Ob3RTZXRGY291cyA9IDEgPDwgMSwKIAogICAgIC8vIERvbid0IHByb3BhZ2F0 ZSBzZWxlY3Rpb24gY2hhbmdlcyB0byB0aGUgY2xpZW50IGxheWVyLgotICAgIFRlbXBvcmFyeVNl bGVjdGlvbk9wdGlvbklnbm9yZVNlbGVjdGlvbkNoYW5nZXMgPSAxIDw8IDEsCisgICAgSWdub3Jl U2VsZWN0aW9uQ2hhbmdlcyA9IDEgPDwgMiwKIAogICAgIC8vIEZvcmNlIHRoZSByZW5kZXIgdHJl ZSB0byB1cGRhdGUgc2VsZWN0aW9uIHN0YXRlLiBPbmx5IHJlc3BlY3RlZCBvbiBpT1MuCi0gICAg VGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uRW5hYmxlQXBwZWFyYW5jZVVwZGF0ZXMgPSAxIDw8IDIK KyAgICBFbmFibGVBcHBlYXJhbmNlVXBkYXRlcyA9IDEgPDwgMywKIH07CiAKIGNsYXNzIFRlbXBv cmFyeVNlbGVjdGlvbkNoYW5nZSB7CkBAIC0xMTksNiArMTE5LDggQEAgcHVibGljOgogICAgIH5U ZW1wb3JhcnlTZWxlY3Rpb25DaGFuZ2UoKTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIHNldFNlbGVj dGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJik7CisKICAgICBSZWY8RnJhbWU+IG1fZnJhbWU7 CiAgICAgT3B0aW9uU2V0PFRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbj4gbV9vcHRpb25zOwogICAg IGJvb2wgbV93YXNJZ25vcmluZ1NlbGVjdGlvbkNoYW5nZXM7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL0RyYWdDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjM4NDMxKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MSw3ICsyNTEs NyBAQCBpbmxpbmUgc3RhdGljIGJvb2wgZHJhZ0lzSGFuZGxlZEJ5RG9jdW1lCiBib29sIERyYWdD b250cm9sbGVyOjpwZXJmb3JtRHJhZ09wZXJhdGlvbihjb25zdCBEcmFnRGF0YSYgZHJhZ0RhdGEp CiB7CiAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaXNQZXJmb3JtaW5nRHJvcChtX2lzUGVyZm9ybWlu Z0Ryb3AsIHRydWUpOwotICAgIFRlbXBvcmFyeVNlbGVjdGlvbkNoYW5nZSBpZ25vcmVTZWxlY3Rp b25DaGFuZ2VzKG1fcGFnZS5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKSwg c3RkOjpudWxsb3B0LCBUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25JZ25vcmVTZWxlY3Rpb25DaGFu Z2VzKTsKKyAgICBUZW1wb3JhcnlTZWxlY3Rpb25DaGFuZ2UgaWdub3JlU2VsZWN0aW9uQ2hhbmdl cyhtX3BhZ2UuZm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCksIHN0ZDo6bnVs bG9wdCwgVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uOjpJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzKTsK IAogICAgIG1fZG9jdW1lbnRVbmRlck1vdXNlID0gbV9wYWdlLm1haW5GcmFtZSgpLmRvY3VtZW50 QXRQb2ludChkcmFnRGF0YS5jbGllbnRQb3NpdGlvbigpKTsKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuY3BwCShyZXZpc2lvbiAyMzg0MzEpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw5ICs3NywxMCBA QCBSZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRvcjo6Y3JlCiAKICAgICBWaXNpYmxl U2VsZWN0aW9uIG9sZFNlbGVjdGlvbiA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKTsK ICAgICBPcHRpb25TZXQ8VGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9uPiB0ZW1wb3JhcnlTZWxlY3Rp b25PcHRpb25zOworICAgIHRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbnMuYWRkKFRlbXBvcmFyeVNl bGVjdGlvbk9wdGlvbjo6RG9Ob3RTZXRGY291cyk7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK LSAgICB0ZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25zLmFkZChUZW1wb3JhcnlTZWxlY3Rpb25PcHRp b25JZ25vcmVTZWxlY3Rpb25DaGFuZ2VzKTsKLSAgICB0ZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25z LmFkZChUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25FbmFibGVBcHBlYXJhbmNlVXBkYXRlcyk7Cisg ICAgdGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9ucy5hZGQoVGVtcG9yYXJ5U2VsZWN0aW9uT3B0aW9u OjpJZ25vcmVTZWxlY3Rpb25DaGFuZ2VzKTsKKyAgICB0ZW1wb3JhcnlTZWxlY3Rpb25PcHRpb25z LmFkZChUZW1wb3JhcnlTZWxlY3Rpb25PcHRpb246OkVuYWJsZUFwcGVhcmFuY2VVcGRhdGVzKTsK ICNlbmRpZgogICAgIFRlbXBvcmFyeVNlbGVjdGlvbkNoYW5nZSBzZWxlY3Rpb25DaGFuZ2UoKmZy YW1lLCB7IHJhbmdlIH0sIHRlbXBvcmFyeVNlbGVjdGlvbk9wdGlvbnMpOwogCg==