207250 2020-02-04 23:06:35 -0800 [Win][MiniBrowser] Accelerator keys don't work unless the main window is focused 2020-02-06 17:43:14 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham don.olmstead pvollan ross.kirsling stephan.szabo webkit-bug-importer Yousuke.Kimoto oldest_to_newest 1614950 0 fujii 2020-02-04 23:06:35 -0800 [Win][MiniBrowser] Accelerator keys don't work unless the main window is focused MiniBrowser has accelerator keys, Ctrl-W to close window, Ctrl-R to reload. In Firefox and Chrome, Ctrl-R can be prevented, but Ctrl-W can't. Reloading by Ctrl-R should be implemented in WebKitBrowserWindow::didNotHandleKeyEvent. You can test it by using https://javascript.info/keyboard-events I think TranslateAccelerator should be used only for the message for main window. https://stackoverflow.com/a/20138696 1614951 1 389774 fujii 2020-02-04 23:07:24 -0800 Created attachment 389774 WIP patch 1614956 2 fujii 2020-02-04 23:40:13 -0800 I realized two problems in this WIP patch. 1. Ctrl-W can't close the window while loading a page Ctrl-W should be processed without dispatching to WebKit. 2. accelerator keys don't work if toolbar buttons or URL bar are focused. toolbar buttons should give up WM_SETFOCUS. https://stackoverflow.com/a/18540038 1614962 3 fujii 2020-02-05 00:23:10 -0800 3. By pressing Alt-Tab to switch active windows, the main window gets focused. This is the only way to focus the main window at the moment, but this seems a bug. For example, Windows File Explore restores the previous focus when re-activating. Restoring the previous focus seems a application's task by using WM_ACTIVATE. 1614965 4 fujii 2020-02-05 00:29:32 -0800 4. Ctrl++ (zoom in) and Ctrl+- (zoom out) is effective only for numpad 1614985 5 fujii 2020-02-05 02:29:06 -0800 To solve the issue #1, it seems that I should add WM_COMMAND bubble up code in WebView. > case WM_COMMAND: > PostMessage(GetParent(hWnd), message, wParam, lParam); https://stackoverflow.com/a/1963016 1614992 6 389789 fujii 2020-02-05 03:25:33 -0800 Created attachment 389789 WIP patch * Split the accelerator table into pre and post. * WebKit2 WebView bubbles up WM_COMMAND message to the parent * SetFocus the brower window when WM_ACTIVATE of the main window issue#2 and issue#4 still remain Ctrl+R doesn't work for WebKit1 because it doesn't have didNotHandleKeyEvent Ctrl+W doesn't work for WebKit1 because I din'd add the code bubbling up WM_COMMAND. Shold I add it to WebKit1? 1615539 7 389937 fujii 2020-02-05 22:13:38 -0800 Created attachment 389937 Patch 1615960 8 389937 fujii 2020-02-06 17:42:28 -0800 Comment on attachment 389937 Patch Clearing flags on attachment: 389937 Committed r255995: <https://trac.webkit.org/changeset/255995> 1615961 9 fujii 2020-02-06 17:42:31 -0800 All reviewed patches have been landed. Closing bug. 1615962 10 webkit-bug-importer 2020-02-06 17:43:14 -0800 <rdar://problem/59246127> 389774 2020-02-04 23:07:24 -0800 2020-02-05 03:25:33 -0800 WIP patch a.diff text/plain 2986 fujii ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcCBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAppbmRleCA4MmQyOGJiZDQyOC4uMDQyMDc5 OTM1ZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAor KysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKQEAgLTkxLDYgKzkxLDE0 IEBAIHZvaWQgTWFpbldpbmRvdzo6cmVnaXN0ZXJDbGFzcyhISU5TVEFOQ0UgaEluc3RhbmNlKQog ICAgIFJlZ2lzdGVyQ2xhc3NFeCgmd2NleCk7CiB9CiAKK2Jvb2wgTWFpbldpbmRvdzo6aXNJbnN0 YW5jZShIV05EIGh3bmQpCit7CisgICAgd2NoYXJfdCBidWZmWzEwMF07CisgICAgaWYgKCFHZXRD bGFzc05hbWUoaHduZCwgYnVmZiwgX2NvdW50b2YoYnVmZikpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgcmV0dXJuIHNfd2luZG93Q2xhc3MgPT0gYnVmZjsKK30KKwogTWFpbldpbmRvdzo6 TWFpbldpbmRvdygpCiB7CiAgICAgc19udW1JbnN0YW5jZXMrKzsKZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFp bldpbmRvdy5oCmluZGV4IGZiYTdmNjcwZjg5Li42MWU3NWJhMTkwZSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vTWFpbldpbmRvdy5oCkBAIC00NSw2ICs0NSw4IEBAIHB1YmxpYzoKICAgICBCcm93c2VyV2lu ZG93KiBicm93c2VyV2luZG93KCkgY29uc3QgeyByZXR1cm4gbV9icm93c2VyV2luZG93LmdldCgp OyB9CiAKICAgICB2b2lkIGxvYWRVUkwoc3RkOjp3c3RyaW5nKTsKKworICAgIHN0YXRpYyBib29s IGlzSW5zdGFuY2UoSFdORCk7CiAgICAgCiBwcml2YXRlOgogICAgIHN0YXRpYyBMUkVTVUxUIENB TExCQUNLIFduZFByb2MoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFSQU0pOwpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWlu aUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCmluZGV4IDcxYzQzZTY2OTEzLi5m NTkwNjg1MTg0ZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dz ZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2lu ZG93LmNwcApAQCAtMzk5LDUgKzM5OSw1IEBAIFdLUGFnZVJlZiBXZWJLaXRCcm93c2VyV2luZG93 OjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiBwYWdlLCBXS1BhZ2VDb25maWd1cmF0aW9uCiB2b2lk IFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZE5vdEhhbmRsZUtleUV2ZW50KFdLUGFnZVJlZiwgV0tO YXRpdmVFdmVudFB0ciBldmVudCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBhdXRv JiB0aGlzV2luZG93ID0gdG9XZWJLaXRCcm93c2VyV2luZG93KGNsaWVudEluZm8pOwotICAgIERl ZldpbmRvd1Byb2ModGhpc1dpbmRvdy5od25kKCksIGV2ZW50LT5tZXNzYWdlLCBldmVudC0+d1Bh cmFtLCBldmVudC0+bFBhcmFtKTsKKyAgICBQb3N0TWVzc2FnZSh0aGlzV2luZG93Lm1faE1haW5X bmQsIGV2ZW50LT5tZXNzYWdlLCBldmVudC0+d1BhcmFtLCBldmVudC0+bFBhcmFtKTsKIH0KZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcCBiL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9XaW5NYWluLmNwcAppbmRleCBiMWQxN2U4OGRlNi4uZDAzOTBiMTkxOTYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcAorKysgYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAKQEAgLTEwNCwyNSArMTA0LDE4IEBAIGludCBXSU5B UEkgd1dpbk1haW4oX0luXyBISU5TVEFOQ0UgaEluc3RhbmNlLCBfSW5fb3B0XyBISU5TVEFOQ0Ug aFByZXZJbnN0YW5jZSwKIAogICAgIC8vIE1haW4gbWVzc2FnZSBsb29wOgogICAgIF9fdHJ5IHsK LSNpZiBFTkFCTEUoV0VCS0lUKQogICAgICAgICB3aGlsZSAoR2V0TWVzc2FnZSgmbXNnLCBudWxs cHRyLCAwLCAwKSkgewogI2lmIFVTRShDRikKICAgICAgICAgICAgIENGUnVuTG9vcFJ1bkluTW9k ZShrQ0ZSdW5Mb29wRGVmYXVsdE1vZGUsIDAsIHRydWUpOwogI2VuZGlmCi0gICAgICAgICAgICBp ZiAoIVRyYW5zbGF0ZUFjY2VsZXJhdG9yKG1zZy5od25kLCBoQWNjZWxUYWJsZSwgJm1zZykpIHsK KyAgICAgICAgICAgIGJvb2wgcHJvY2Vzc2VkID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoTWFp bldpbmRvdzo6aXNJbnN0YW5jZShtc2cuaHduZCkpCisgICAgICAgICAgICAgICAgcHJvY2Vzc2Vk ID0gVHJhbnNsYXRlQWNjZWxlcmF0b3IobXNnLmh3bmQsIGhBY2NlbFRhYmxlLCAmbXNnKTsKKyAg ICAgICAgICAgIGlmICghcHJvY2Vzc2VkKSB7CiAgICAgICAgICAgICAgICAgVHJhbnNsYXRlTWVz c2FnZSgmbXNnKTsKICAgICAgICAgICAgICAgICBEaXNwYXRjaE1lc3NhZ2UoJm1zZyk7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0KLSNlbHNlCi0gICAgICAgIElXZWJLaXRNZXNzYWdlTG9vcFB0 ciBtZXNzYWdlTG9vcDsKLQotICAgICAgICBociA9IFdlYktpdENyZWF0ZUluc3RhbmNlKENMU0lE X1dlYktpdE1lc3NhZ2VMb29wLCAwLCBJSURfSVdlYktpdE1lc3NhZ2VMb29wLCByZWludGVycHJl dF9jYXN0PHZvaWQqKj4oJm1lc3NhZ2VMb29wLkdldEludGVyZmFjZVB0cigpKSk7Ci0gICAgICAg IGlmIChGQUlMRUQoaHIpKQotICAgICAgICAgICAgZ290byBleGl0OwotCi0gICAgICAgIG1lc3Nh Z2VMb29wLT5ydW4oaEFjY2VsVGFibGUpOwotI2VuZGlmCiAgICAgfSBfX2V4Y2VwdChjcmVhdGVD cmFzaFJlcG9ydChHZXRFeGNlcHRpb25JbmZvcm1hdGlvbigpKSwgRVhDRVBUSU9OX0VYRUNVVEVf SEFORExFUikgeyB9CiAKIGV4aXQ6Cg== 389789 2020-02-05 03:25:33 -0800 2020-02-05 22:13:19 -0800 WIP patch a.diff text/plain 6724 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAppbmRleCBkMTk2MTdiYzE2Yy4u NmRhMmYwOTg4ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJW aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKQEAg LTE4NCw2ICsxODQsOSBAQCBMUkVTVUxUIFdlYlZpZXc6OnduZFByb2MoSFdORCBoV25kLCBVSU5U IG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCiAgICAgY2FzZSBXTV9NRU5V Q09NTUFORDoKICAgICAgICAgbFJlc3VsdCA9IG9uTWVudUNvbW1hbmQoaFduZCwgbWVzc2FnZSwg d1BhcmFtLCBsUGFyYW0sIGhhbmRsZWQpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFdNX0NP TU1BTkQ6CisgICAgICAgIFBvc3RNZXNzYWdlKEdldFBhcmVudChoV25kKSwgbWVzc2FnZSwgd1Bh cmFtLCBsUGFyYW0pOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBoYW5k bGVkID0gZmFsc2U7CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dz ZXIvd2luL01haW5XaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cu Y3BwCmluZGV4IDgyZDI4YmJkNDI4Li4wNTAyZjBkM2Y5ZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9N YWluV2luZG93LmNwcApAQCAtOTEsNiArOTEsMTQgQEAgdm9pZCBNYWluV2luZG93OjpyZWdpc3Rl ckNsYXNzKEhJTlNUQU5DRSBoSW5zdGFuY2UpCiAgICAgUmVnaXN0ZXJDbGFzc0V4KCZ3Y2V4KTsK IH0KIAorYm9vbCBNYWluV2luZG93Ojppc0luc3RhbmNlKEhXTkQgaHduZCkKK3sKKyAgICB3Y2hh cl90IGJ1ZmZbNjRdOworICAgIGlmICghR2V0Q2xhc3NOYW1lKGh3bmQsIGJ1ZmYsIF9jb3VudG9m KGJ1ZmYpKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBzX3dpbmRvd0NsYXNz ID09IGJ1ZmY7Cit9CisKIE1haW5XaW5kb3c6Ok1haW5XaW5kb3coKQogewogICAgIHNfbnVtSW5z dGFuY2VzKys7CkBAIC0xNzIsNiArMTgwLDEzIEBAIExSRVNVTFQgQ0FMTEJBQ0sgTWFpbldpbmRv dzo6V25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BBUkFNIHdQYXJhbSwgTFBBCiB7 CiAgICAgUmVmUHRyPE1haW5XaW5kb3c+IHRoaXNXaW5kb3cgPSByZWludGVycHJldF9jYXN0PE1h aW5XaW5kb3cqPihHZXRXaW5kb3dMb25nUHRyKGhXbmQsIEdXTFBfVVNFUkRBVEEpKTsKICAgICBz d2l0Y2ggKG1lc3NhZ2UpIHsKKyAgICBjYXNlIFdNX0FDVElWQVRFOgorICAgICAgICBzd2l0Y2gg KExPV09SRCh3UGFyYW0pKSB7CisgICAgICAgIGNhc2UgV0FfQUNUSVZFOgorICAgICAgICBjYXNl IFdBX0NMSUNLQUNUSVZFOgorICAgICAgICAgICAgU2V0Rm9jdXModGhpc1dpbmRvdy0+YnJvd3Nl cldpbmRvdygpLT5od25kKCkpOworICAgICAgICB9CisgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug V01fQ1JFQVRFOgogICAgICAgICBTZXRXaW5kb3dMb25nUHRyKGhXbmQsIEdXTFBfVVNFUkRBVEEs IHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KHJlaW50ZXJwcmV0X2Nhc3Q8TFBDUkVBVEVTVFJV Q1Q+KGxQYXJhbSktPmxwQ3JlYXRlUGFyYW1zKSk7CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaCBiL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9NYWluV2luZG93LmgKaW5kZXggZmJhN2Y2NzBmODkuLjYxZTc1YmExOTBlIDEwMDY0NAot LS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9NYWluV2luZG93LmgKQEAgLTQ1LDYgKzQ1LDggQEAgcHVibGljOgogICAgIEJy b3dzZXJXaW5kb3cqIGJyb3dzZXJXaW5kb3coKSBjb25zdCB7IHJldHVybiBtX2Jyb3dzZXJXaW5k b3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgbG9hZFVSTChzdGQ6OndzdHJpbmcpOworCisgICAgc3Rh dGljIGJvb2wgaXNJbnN0YW5jZShIV05EKTsKICAgICAKIHByaXZhdGU6CiAgICAgc3RhdGljIExS RVNVTFQgQ0FMTEJBQ0sgV25kUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWIucmMgYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWIucmMKaW5kZXggMjQ1YzliYmZiZDcuLjExMDQy ODA0N2Y2IDEwMDc1NQotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWIu cmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyTGliLnJjCkBAIC0xMzAs MTAgKzEzMCwxNCBAQCBJRENfTUlOSUJST1dTRVIgQUNDRUxFUkFUT1JTCiBCRUdJTg0KICAgICAi LyIsICAgICAgICAgICAgSURNX0FCT1VULCAgICAgICAgICAgICAgQVNDSUksICBBTFQsIE5PSU5W RVJUDQogICAgICI/IiwgICAgICAgICAgICBJRE1fQUJPVVQsICAgICAgICAgICAgICBBU0NJSSwg IEFMVCwgTk9JTlZFUlQNCisgICAgIlIiLCAgICAgICAgICAgIElETV9SRUxPQUQsICAgICAgICAg ICAgIFZJUlRLRVksIENPTlRST0wsIE5PSU5WRVJUDQogICAgIFZLX0FERCwgICAgICAgICBJRE1f Wk9PTV9JTiwgICAgICAgICAgICBWSVJUS0VZLCBDT05UUk9MLCBOT0lOVkVSVA0KICAgICBWS19T VUJUUkFDVCwgICAgSURNX1pPT01fT1VULCAgICAgICAgICAgVklSVEtFWSwgQ09OVFJPTCwgTk9J TlZFUlQNCitFTkQNCisNCitJRFJfTUlOSUJST1dTRVJfUFJFIEFDQ0VMRVJBVE9SUw0KK0JFR0lO DQogICAgICJXIiwgICAgICAgICAgICBJRE1fQ0xPU0VfV0lORE9XLCAgICAgICBWSVJUS0VZLCBD T05UUk9MLCBOT0lOVkVSVA0KLSAgICAiUiIsICAgICAgICAgICAgSURNX1JFTE9BRCwgICAgICAg ICAgICAgVklSVEtFWSwgQ09OVFJPTCwgTk9JTlZFUlQNCiBFTkQNCiANCiANCmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWJSZXNvdXJjZS5oIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyTGliUmVzb3VyY2UuaAppbmRleCBkNGIwNmIyZWI1 My4uMzE3ZDA3MGYxZDQgMTAwNzU1Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJv d3NlckxpYlJlc291cmNlLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2Vy TGliUmVzb3VyY2UuaApAQCAtNTgsNiArNTgsNyBAQAogI2RlZmluZSBJRE1fREVCVUdfSU5GT19M QVlFUiAgICAgICAgICAgIDE3NwogI2RlZmluZSBJRERfUFJPWFkgICAgICAgICAgICAgICAgICAg ICAgIDE3OAogI2RlZmluZSBJRERfU0VSVkVSX1RSVVNUICAgICAgICAgICAgICAgIDE3OQorI2Rl ZmluZSBJRFJfTUlOSUJST1dTRVJfUFJFICAgICAgICAgICAgIDE4MAogI2RlZmluZSBJRENfRU1Q VFlfVVJMX0NBQ0hFICAgICAgICAgICAgIDEwMDAKICNkZWZpbmUgSURDX1JFVFVSTl9GUkVFX01F TU9SWSAgICAgICAgICAxMDAxCiAjZGVmaW5lIElEQ19FTVBUWV9XRUJDT1JFX0NBQ0hFICAgICAg ICAgMTAwMgpAQCAtMTMyLDcgKzEzMyw3IEBACiAjaWZkZWYgQVBTVFVESU9fSU5WT0tFRAogI2lm bmRlZiBBUFNUVURJT19SRUFET05MWV9TWU1CT0xTCiAjZGVmaW5lIF9BUFNfTk9fTUZDICAgICAg ICAgICAgICAgICAgICAgMQotI2RlZmluZSBfQVBTX05FWFRfUkVTT1VSQ0VfVkFMVUUgICAgICAg IDE4MAorI2RlZmluZSBfQVBTX05FWFRfUkVTT1VSQ0VfVkFMVUUgICAgICAgIDE4MQogI2RlZmlu ZSBfQVBTX05FWFRfQ09NTUFORF9WQUxVRSAgICAgICAgIDMyNzgxCiAjZGVmaW5lIF9BUFNfTkVY VF9DT05UUk9MX1ZBTFVFICAgICAgICAgMTA2MwogI2RlZmluZSBfQVBTX05FWFRfU1lNRURfVkFM VUUgICAgICAgICAgIDExMApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktp dEJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJX aW5kb3cuY3BwCmluZGV4IDcxYzQzZTY2OTEzLi5mNTkwNjg1MTg0ZSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcApAQCAtMzk5LDUgKzM5OSw1IEBA IFdLUGFnZVJlZiBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiBw YWdlLCBXS1BhZ2VDb25maWd1cmF0aW9uCiB2b2lkIFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZE5v dEhhbmRsZUtleUV2ZW50KFdLUGFnZVJlZiwgV0tOYXRpdmVFdmVudFB0ciBldmVudCwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKICAgICBhdXRvJiB0aGlzV2luZG93ID0gdG9XZWJLaXRCcm93 c2VyV2luZG93KGNsaWVudEluZm8pOwotICAgIERlZldpbmRvd1Byb2ModGhpc1dpbmRvdy5od25k KCksIGV2ZW50LT5tZXNzYWdlLCBldmVudC0+d1BhcmFtLCBldmVudC0+bFBhcmFtKTsKKyAgICBQ b3N0TWVzc2FnZSh0aGlzV2luZG93Lm1faE1haW5XbmQsIGV2ZW50LT5tZXNzYWdlLCBldmVudC0+ d1BhcmFtLCBldmVudC0+bFBhcmFtKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9XaW5NYWluLmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcAppbmRl eCBiMWQxN2U4OGRlNi4uOGY4NDljOTYwYzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9XaW5NYWluLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAK QEAgLTU4LDcgKzU4LDcgQEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNUQU5DRSBoSW5z dGFuY2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogI2VuZGlmCiAKICAgICBN U0cgbXNnIHsgfTsKLSAgICBIQUNDRUwgaEFjY2VsVGFibGU7CisgICAgSEFDQ0VMIGhBY2NlbFRh YmxlLCBoUHJlQWNjZWxUYWJsZTsKIAogICAgIElOSVRDT01NT05DT05UUk9MU0VYIEluaXRDdHJs RXg7CiAKQEAgLTk0LDYgKzk0LDcgQEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNUQU5D RSBoSW5zdGFuY2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogICAgIFNob3dX aW5kb3cobWFpbldpbmRvdy5od25kKCksIG5DbWRTaG93KTsKIAogICAgIGhBY2NlbFRhYmxlID0g TG9hZEFjY2VsZXJhdG9ycyhoSW5zdCwgTUFLRUlOVFJFU09VUkNFKElEQ19NSU5JQlJPV1NFUikp OworICAgIGhQcmVBY2NlbFRhYmxlID0gTG9hZEFjY2VsZXJhdG9ycyhoSW5zdCwgTUFLRUlOVFJF U09VUkNFKElEUl9NSU5JQlJPV1NFUl9QUkUpKTsKIAogICAgIGlmIChvcHRpb25zLnJlcXVlc3Rl ZFVSTC5sZW5ndGgoKSkKICAgICAgICAgbWFpbldpbmRvdy5sb2FkVVJMKG9wdGlvbnMucmVxdWVz dGVkVVJMLkdldEJTVFIoKSk7CkBAIC0xMDQsMjUgKzEwNSwyMCBAQCBpbnQgV0lOQVBJIHdXaW5N YWluKF9Jbl8gSElOU1RBTkNFIGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RBTkNFIGhQcmV2SW5z dGFuY2UsCiAKICAgICAvLyBNYWluIG1lc3NhZ2UgbG9vcDoKICAgICBfX3RyeSB7Ci0jaWYgRU5B QkxFKFdFQktJVCkKICAgICAgICAgd2hpbGUgKEdldE1lc3NhZ2UoJm1zZywgbnVsbHB0ciwgMCwg MCkpIHsKICNpZiBVU0UoQ0YpCiAgICAgICAgICAgICBDRlJ1bkxvb3BSdW5Jbk1vZGUoa0NGUnVu TG9vcERlZmF1bHRNb2RlLCAwLCB0cnVlKTsKICNlbmRpZgotICAgICAgICAgICAgaWYgKCFUcmFu c2xhdGVBY2NlbGVyYXRvcihtc2cuaHduZCwgaEFjY2VsVGFibGUsICZtc2cpKSB7CisgICAgICAg ICAgICBpZiAoVHJhbnNsYXRlQWNjZWxlcmF0b3IobXNnLmh3bmQsIGhQcmVBY2NlbFRhYmxlLCAm bXNnKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGJvb2wgcHJvY2Vz c2VkID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoTWFpbldpbmRvdzo6aXNJbnN0YW5jZShtc2cu aHduZCkpCisgICAgICAgICAgICAgICAgcHJvY2Vzc2VkID0gVHJhbnNsYXRlQWNjZWxlcmF0b3Io bXNnLmh3bmQsIGhBY2NlbFRhYmxlLCAmbXNnKTsKKyAgICAgICAgICAgIGlmICghcHJvY2Vzc2Vk KSB7CiAgICAgICAgICAgICAgICAgVHJhbnNsYXRlTWVzc2FnZSgmbXNnKTsKICAgICAgICAgICAg ICAgICBEaXNwYXRjaE1lc3NhZ2UoJm1zZyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSNl bHNlCi0gICAgICAgIElXZWJLaXRNZXNzYWdlTG9vcFB0ciBtZXNzYWdlTG9vcDsKLQotICAgICAg ICBociA9IFdlYktpdENyZWF0ZUluc3RhbmNlKENMU0lEX1dlYktpdE1lc3NhZ2VMb29wLCAwLCBJ SURfSVdlYktpdE1lc3NhZ2VMb29wLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJm1lc3NhZ2VM b29wLkdldEludGVyZmFjZVB0cigpKSk7Ci0gICAgICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAg ICAgICAgZ290byBleGl0OwotCi0gICAgICAgIG1lc3NhZ2VMb29wLT5ydW4oaEFjY2VsVGFibGUp OwotI2VuZGlmCiAgICAgfSBfX2V4Y2VwdChjcmVhdGVDcmFzaFJlcG9ydChHZXRFeGNlcHRpb25J bmZvcm1hdGlvbigpKSwgRVhDRVBUSU9OX0VYRUNVVEVfSEFORExFUikgeyB9CiAKIGV4aXQ6Cg== 389937 2020-02-05 22:13:38 -0800 2020-02-06 17:42:28 -0800 Patch bug-207250-20200206151337.patch text/plain 11868 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjYWY2OThhZGUzOTQxZDI2 ZjVlNmQyNjJjNGQyYzQ2OTJlZDU5MGQuLjMzZmI5NmMwNjkxY2ZlYTg5YTFiNjFkMjFmZDE3ZTli YWUwOWM2NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDItMDUgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bTWluaUJy b3dzZXJdIEFjY2VsZXJhdG9yIGtleXMgZG9uJ3Qgd29yayB1bmxlc3MgdGhlIG1haW4gd2luZG93 IGlzIGZvY3VzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNzI1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmll dzo6d25kUHJvYyk6IEJ1YmJsZSB1cCB1bmhhbmRsZWQgV01fQ09NTUFORCB0byB0aGUKKyAgICAg ICAgcGFyZW50IHdpbmRvdy4KKwogMjAyMC0wMi0wNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjUxMzIwKTogQ2FuJ3QgZG91 YmxlIHRhcCB0byBzZWxlY3Qgd29yZCBpbiBOb3RlcyBvbiBpQ2xvdWQuY29tCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKaW5kZXggZDE5NjE3YmMxNmNjZjQ1NGZmZWE2Nzk0 NjY1MDVhN2E0Y2Y5NzcyYS4uNGE5NmI1ZTk5ODgwMGJiN2IxY2ExMDRmODYwZTk2ZGNmNDE4ZDE3 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcApAQCAtMTg0LDYgKzE4 NCw5IEBAIExSRVNVTFQgV2ViVmlldzo6d25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwg V1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKICAgICBjYXNlIFdNX01FTlVDT01NQU5EOgog ICAgICAgICBsUmVzdWx0ID0gb25NZW51Q29tbWFuZChoV25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQ YXJhbSwgaGFuZGxlZCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgV01fQ09NTUFORDoKKyAg ICAgICAgU2VuZE1lc3NhZ2UoR2V0UGFyZW50KGhXbmQpLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJh bSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGhhbmRsZWQgPSBmYWxz ZTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMjU3ZGUxYjEyYzlmYTYyYjhmZGJiMzZiZGMyNDgwYzU5Y2NlYWNmZS4u ODg5ZjgyYjU1NzdjYTQxMTBkNWUzYjI4Mzg2NWUwOTc0NTMyZmFkNiAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDIw LTAyLTA1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAg ICAgIFtXaW5dW01pbmlCcm93c2VyXSBBY2NlbGVyYXRvciBrZXlzIGRvbid0IHdvcmsgdW5sZXNz IHRoZSBtYWluIHdpbmRvdyBpcyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDcyNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNaW5pQnJvd3NlciBoYXMgc2hvcnRjdXQga2V5cywgQ3RybC1X IHRvIGNsb3NlIHdpbmRvdywgQ3RybC1SIHRvCisgICAgICAgIHJlbG9hZC4gSG93ZXZlciwgdGhl eSBkb24ndCB3b3JrIHVubGVzcyB0aGUgbWFpbiB3aW5kb3cgaXMKKyAgICAgICAgZm9jdXNlZC4K KworICAgICAgICBDdHJsLVcgc2hvdWxkIGJlIHByb2Nlc3NlZCBkaWZmZXJlbnRseS4gQ3RybC1X IHNob3VsZCBiZSBoYW5kbGVkCisgICAgICAgIHdpdGhvdXQgZGlzcGF0Y2hpbmcgdG8gV2ViS2l0 LCBvdGhlcnMgc2hvdWxkIGJlIGhhbmRsZWQgb25seSB3aGVuCisgICAgICAgIFdlYktpdCBkaWRu J3QgY29uc3VtZS4gU28sIHRoaXMgY2hhbmdlIHNwbGl0IHRoZSBhY2NlbGVyYXRvciB0YWJsZQor ICAgICAgICBpbnRvIHR3bywgb25lIGlzIGZvciBDdHJsLVcsIGFub3RoZXIgaXMgZm9yIG90aGVy IHNob3J0Y3V0IGtleXMuCisKKyAgICAgICAgRm9yIEN0cmwtVywga2V5IGV2ZW50cyBhcmUgcHJv Y2Vzc2VkIGJlZm9yZSBkaXNwYXRjaGluZyB0bworICAgICAgICBXZWJWaWV3LiBJdCBpcyBjb252 ZXJ0ZWQgdG8gSURNX0NMT1NFX1dJTkRPVyBvZiBXTV9DT01NQU5ELCBhbmQKKyAgICAgICAgZGlz cGF0Y2hlZCB0byBXZWJWaWV3LiBXZWJLaXQyIFdlYlZpZXcgYnViYmxlcyB1cCB1bmhhbmRsZWQK KyAgICAgICAgV01fQ09NTUFORCB0byB0aGUgcGFyZW50IHdpbmRvdy4gVGhlbiwgSURNX0NMT1NF X1dJTkRPVyBpcyBoYW5kbGVkCisgICAgICAgIGluIHRoZSBtYWluIHdpbmRvdydzIFduZFByb2Mu IEhvd2V2ZXIsIGl0IGRvZXNuJ3Qgd29yayBmb3IgV2ViS2l0MQorICAgICAgICBiZWNhdXNlIHRo aXMgY2hhbmdlIGRvZXNuJ3QgYWRkIHRoZSBidWJibGluZyB1cCBjb2RlIHRvIFdlYktpdDEKKyAg ICAgICAgV2ViVmlldy4KKworICAgICAgICBGb3Igb3RoZXIgc2hvcnRjdXQga2V5cywgZm9yIGV4 YW1wbGUgQ3RybC1SLCBrZXkgZXZlbnRzIGFyZQorICAgICAgICBkaXNwYXRjaGVkIHRvIFdlYlZp ZXcgd2l0aG91dCBhY2NlbGVyYXRvciBrZXkgdHJhbnNsYXRpb25zLiBUaGVuLAorICAgICAgICBX ZWJLaXRCcm93c2VyV2luZG93OjpkaWROb3RIYW5kbGVLZXlFdmVudCBpcyBjYWxsZWQgYmFjayBp ZiB0aGV5CisgICAgICAgIGFyZW4ndCBjb25zdW1lZC4gZGlkTm90SGFuZGxlS2V5RXZlbnQgcG9z dHMgdGhlIG1lc3Nhc2dlIHRvIHRoZQorICAgICAgICBtYWluIHdpbmRvdy4gVGhlIG1lc3NhZ2Ug bG9vcCBwcm9jZXNzZWQga2V5IGV2ZW50cyBkaXNwYXRjaGVkIHRvCisgICAgICAgIHRoZSBtYWlu IHdpbmRvdyB3aXRoIGFub3RoZXIgYWNjZWxlcmF0b3IgdGFibGUuIEhvd2V2ZXIsIGl0CisgICAg ICAgIGRvZXNuJ3Qgd29yayBmb3IgV2ViS2l0MSwgYmVjYXVzZSBXZWJLaXQxIGRvZXNuJ3QgaGF2 ZSBhIEFQSQorICAgICAgICBlcXVpdmFsZW50IHRvIGRpZE5vdEhhbmRsZUtleUV2ZW50LgorCisg ICAgICAgIEFmdGVyIHN3aXRjaGluZyB0aGUgYWN0aXZlIHdpbmRvdyBieSBwcmVzc2luZyBBbHQt VGFiIGFuZAorICAgICAgICByZWFjdGl2YXRpbmcgdGhlIG1haW4gd2luZG93LCB0aGUgbWFpbiB3 aW5kb3cgZ290IHRoZSBmb2N1cy4gVGhpcworICAgICAgICB3YXMgdGhlIHJlYXNvbiBzaG9ydGN1 dCBrZXlzIHdvcmtlZCBvbmx5IGFmdGVyIHJlYWN0aXZhdGluZyB0aGUKKyAgICAgICAgbWFpbiB3 aW5kb3cuIEJ1dCwgdGhpcyBpcyBub3QgdGhlIGRlc2lyZWQgYmVoYXZpb3IgYWZ0ZXIgdGhpcwor ICAgICAgICBjaGFuZ2UgYmVjYXVzZSBvdGhlciBzaG9ydGN1dCBrZXlzIGRvbid0IHdvcmsgaWYg dGhlIG1haW4gd2luZG93CisgICAgICAgIGlzIGZvY3VzZWQuIFNvLiBzZXQgdGhlIGZvY3VzIHRv IHRoZSBicm93ZXIgd2luZG93IHdoZW4KKyAgICAgICAgV01fQUNUSVZBVEUgb2YgdGhlIG1haW4g d2luZG93LgorCisgICAgICAgIFNob3J0Y3V0IGtleXMgQ3RybCsrICh6b29tIGluKSBhbmQgQ3Ry bCstICh6b29tIG91dCkgd2VyZQorICAgICAgICBlZmZlY3RpdmUgb25seSBmb3Iga2V5Ym9hcmQg bnVtcGFkLiBBZGQgVktfT0VNX01JTlVTIGFuZAorICAgICAgICBWS19PRU1fUExVUyBmb3IgdGhl bS4KKworICAgICAgICBBZGQgYSBzaG9ydGN1dCBrZXkgQ3RybC0wIHRvIHJlc2V0IHBhZ2Ugem9v bSBzY2FsZSB0byBhY3R1YWwuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWFpbldpbmRv dy5jcHA6CisgICAgICAgIChNYWluV2luZG93Ojppc0luc3RhbmNlKToKKyAgICAgICAgKE1haW5X aW5kb3c6OlduZFByb2MpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NYWluV2luZG93Lmg6 CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyTGliLnJjOiBBZGQgYSBuZXcg YWNjZWxlcmF0b3IgdGFibGUKKyAgICAgICAgSURSX0FDQ0VMRVJBVE9SU19QUkUgZm9yIEN0cmwt Vy4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWJSZXNvdXJjZS5oOgor ICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcDoKKyAgICAg ICAgKFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZE5vdEhhbmRsZUtleUV2ZW50KToKKyAgICAgICAg KiBNaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHA6CisgICAgICAgICh3V2luTWFpbik6CisKIDIw MjAtMDItMDEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlcGxh Y2UgUkdCQTMyIHR5cGVkZWYgd2l0aCBhIGNsYXNzIHRvIGltcHJvdmUgdHlwZSBzYWZldHkKZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcCBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAppbmRleCA4MmQyOGJiZDQyODJjMmI2YjNkMTQ0 MWU4MjJiNGZhNDFlNjk5ZTc4Li4wNTAyZjBkM2Y5ZWY2MzI1YzM5OTdlYWNiOTc1ZjQ1MjAxMWE4 NjQ0IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCkBAIC05MSw2ICs5MSwxNCBA QCB2b2lkIE1haW5XaW5kb3c6OnJlZ2lzdGVyQ2xhc3MoSElOU1RBTkNFIGhJbnN0YW5jZSkKICAg ICBSZWdpc3RlckNsYXNzRXgoJndjZXgpOwogfQogCitib29sIE1haW5XaW5kb3c6OmlzSW5zdGFu Y2UoSFdORCBod25kKQoreworICAgIHdjaGFyX3QgYnVmZls2NF07CisgICAgaWYgKCFHZXRDbGFz c05hbWUoaHduZCwgYnVmZiwgX2NvdW50b2YoYnVmZikpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIHNfd2luZG93Q2xhc3MgPT0gYnVmZjsKK30KKwogTWFpbldpbmRvdzo6TWFp bldpbmRvdygpCiB7CiAgICAgc19udW1JbnN0YW5jZXMrKzsKQEAgLTE3Miw2ICsxODAsMTMgQEAg TFJFU1VMVCBDQUxMQkFDSyBNYWluV2luZG93OjpXbmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNz YWdlLCBXUEFSQU0gd1BhcmFtLCBMUEEKIHsKICAgICBSZWZQdHI8TWFpbldpbmRvdz4gdGhpc1dp bmRvdyA9IHJlaW50ZXJwcmV0X2Nhc3Q8TWFpbldpbmRvdyo+KEdldFdpbmRvd0xvbmdQdHIoaFdu ZCwgR1dMUF9VU0VSREFUQSkpOwogICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNhc2UgV01f QUNUSVZBVEU6CisgICAgICAgIHN3aXRjaCAoTE9XT1JEKHdQYXJhbSkpIHsKKyAgICAgICAgY2Fz ZSBXQV9BQ1RJVkU6CisgICAgICAgIGNhc2UgV0FfQ0xJQ0tBQ1RJVkU6CisgICAgICAgICAgICBT ZXRGb2N1cyh0aGlzV2luZG93LT5icm93c2VyV2luZG93KCktPmh3bmQoKSk7CisgICAgICAgIH0K KyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXTV9DUkVBVEU6CiAgICAgICAgIFNldFdpbmRvd0xv bmdQdHIoaFduZCwgR1dMUF9VU0VSREFUQSwgcmVpbnRlcnByZXRfY2FzdDxMT05HX1BUUj4ocmVp bnRlcnByZXRfY2FzdDxMUENSRUFURVNUUlVDVD4obFBhcmFtKS0+bHBDcmVhdGVQYXJhbXMpKTsK ICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldp bmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaAppbmRleCBmYmE3ZjY3 MGY4OTUzNTYzZDhkMGQyYjhkNDJhNjM2YzY1M2Y5ZDVmLi42MWU3NWJhMTkwZWUyZGU1ZTQyMjlj YjRiYWFlODUyNDhhOWIzNWIzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFp bldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgKQEAgLTQ1 LDYgKzQ1LDggQEAgcHVibGljOgogICAgIEJyb3dzZXJXaW5kb3cqIGJyb3dzZXJXaW5kb3coKSBj b25zdCB7IHJldHVybiBtX2Jyb3dzZXJXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgbG9hZFVS TChzdGQ6OndzdHJpbmcpOworCisgICAgc3RhdGljIGJvb2wgaXNJbnN0YW5jZShIV05EKTsKICAg ICAKIHByaXZhdGU6CiAgICAgc3RhdGljIExSRVNVTFQgQ0FMTEJBQ0sgV25kUHJvYyhIV05ELCBV SU5ULCBXUEFSQU0sIExQQVJBTSk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4v TWluaUJyb3dzZXJMaWIucmMgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWIu cmMKaW5kZXggMjQ1YzliYmZiZDdjOGE1NzRhNzA0ZjRjY2Y3OTBjMDM4MjYyNzkwYy4uZGQ4ZDYy MmY0MWNkYmIwYzQ1MzgwYzkwMTBkY2FmZWM0MmUyNmU1MSAxMDA3NTUKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL01pbmlCcm93c2VyTGliLnJjCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9NaW5pQnJvd3NlckxpYi5yYwpAQCAtNTEsNyArNTEsNyBAQCBCRUdJTgogICAgIFBPUFVQICIm VmlldyINCiAgICAgQkVHSU4NCiAgICAgICAgIE1FTlVJVEVNICJSZWxvYWRcdEN0cmwtUiIsICAg ICAgICAgICAgICBJRE1fUkVMT0FEDQotICAgICAgICBNRU5VSVRFTSAiQWN0dWFsIFNpemUiLCAg ICAgICAgICAgICAgICAgSURNX0FDVFVBTF9TSVpFDQorICAgICAgICBNRU5VSVRFTSAiQWN0dWFs IFNpemVcdEN0cmwrMCIsICAgICAgICAgSURNX0FDVFVBTF9TSVpFDQogICAgICAgICBNRU5VSVRF TSAiWm9vbSBJblx0Q3RybCsrIiwgICAgICAgICAgICAgSURNX1pPT01fSU4NCiAgICAgICAgIE1F TlVJVEVNICJab29tIE91dFx0Q3RybCstIiwgICAgICAgICAgICBJRE1fWk9PTV9PVVQNCiAgICAg ICAgIE1FTlVJVEVNICJJbnZlcnQgQ29sb3JzIiwgICAgICAgICAgICAgICBJRE1fSU5WRVJUX0NP TE9SUw0KQEAgLTEyOSwxMSArMTI5LDE4IEBAIEVORAogSURDX01JTklCUk9XU0VSIEFDQ0VMRVJB VE9SUw0KIEJFR0lODQogICAgICIvIiwgICAgICAgICAgICBJRE1fQUJPVVQsICAgICAgICAgICAg ICBBU0NJSSwgIEFMVCwgTk9JTlZFUlQNCisgICAgIjAiLCAgICAgICAgICAgIElETV9BQ1RVQUxf U0laRSwgICAgICAgIFZJUlRLRVksIENPTlRST0wsIE5PSU5WRVJUDQogICAgICI/IiwgICAgICAg ICAgICBJRE1fQUJPVVQsICAgICAgICAgICAgICBBU0NJSSwgIEFMVCwgTk9JTlZFUlQNCisgICAg IlIiLCAgICAgICAgICAgIElETV9SRUxPQUQsICAgICAgICAgICAgIFZJUlRLRVksIENPTlRST0ws IE5PSU5WRVJUDQogICAgIFZLX0FERCwgICAgICAgICBJRE1fWk9PTV9JTiwgICAgICAgICAgICBW SVJUS0VZLCBDT05UUk9MLCBOT0lOVkVSVA0KKyAgICBWS19PRU1fTUlOVVMsICAgSURNX1pPT01f T1VULCAgICAgICAgICAgVklSVEtFWSwgQ09OVFJPTCwgTk9JTlZFUlQNCisgICAgVktfT0VNX1BM VVMsICAgIElETV9aT09NX0lOLCAgICAgICAgICAgIFZJUlRLRVksIENPTlRST0wsIE5PSU5WRVJU DQogICAgIFZLX1NVQlRSQUNULCAgICBJRE1fWk9PTV9PVVQsICAgICAgICAgICBWSVJUS0VZLCBD T05UUk9MLCBOT0lOVkVSVA0KK0VORA0KKw0KK0lEUl9BQ0NFTEVSQVRPUlNfUFJFIEFDQ0VMRVJB VE9SUw0KK0JFR0lODQogICAgICJXIiwgICAgICAgICAgICBJRE1fQ0xPU0VfV0lORE9XLCAgICAg ICBWSVJUS0VZLCBDT05UUk9MLCBOT0lOVkVSVA0KLSAgICAiUiIsICAgICAgICAgICAgSURNX1JF TE9BRCwgICAgICAgICAgICAgVklSVEtFWSwgQ09OVFJPTCwgTk9JTlZFUlQNCiBFTkQNCiANCiAN CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJMaWJSZXNvdXJj ZS5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyTGliUmVzb3VyY2UuaAppbmRl eCBkNGIwNmIyZWI1Mzc4OWYzYTY0MmU4NzgzZDI5ZjE1NTFkYzI0MmU2Li44NjljM2I3ZDQ5MzEy NDhmOTk0YmE3NWFlOTJlYWVjZGFhYjBkYmI2IDEwMDc1NQotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci93aW4vTWluaUJyb3dzZXJMaWJSZXNvdXJjZS5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9NaW5pQnJvd3NlckxpYlJlc291cmNlLmgKQEAgLTU4LDYgKzU4LDcgQEAKICNkZWZpbmUgSURN X0RFQlVHX0lORk9fTEFZRVIgICAgICAgICAgICAxNzcKICNkZWZpbmUgSUREX1BST1hZICAgICAg ICAgICAgICAgICAgICAgICAxNzgKICNkZWZpbmUgSUREX1NFUlZFUl9UUlVTVCAgICAgICAgICAg ICAgICAxNzkKKyNkZWZpbmUgSURSX0FDQ0VMRVJBVE9SU19QUkUgICAgICAgICAgICAxODAKICNk ZWZpbmUgSURDX0VNUFRZX1VSTF9DQUNIRSAgICAgICAgICAgICAxMDAwCiAjZGVmaW5lIElEQ19S RVRVUk5fRlJFRV9NRU1PUlkgICAgICAgICAgMTAwMQogI2RlZmluZSBJRENfRU1QVFlfV0VCQ09S RV9DQUNIRSAgICAgICAgIDEwMDIKQEAgLTEzMiw4ICsxMzMsOCBAQAogI2lmZGVmIEFQU1RVRElP X0lOVk9LRUQKICNpZm5kZWYgQVBTVFVESU9fUkVBRE9OTFlfU1lNQk9MUwogI2RlZmluZSBfQVBT X05PX01GQyAgICAgICAgICAgICAgICAgICAgIDEKLSNkZWZpbmUgX0FQU19ORVhUX1JFU09VUkNF X1ZBTFVFICAgICAgICAxODAKLSNkZWZpbmUgX0FQU19ORVhUX0NPTU1BTkRfVkFMVUUgICAgICAg ICAzMjc4MQorI2RlZmluZSBfQVBTX05FWFRfUkVTT1VSQ0VfVkFMVUUgICAgICAgIDE4MQorI2Rl ZmluZSBfQVBTX05FWFRfQ09NTUFORF9WQUxVRSAgICAgICAgIDMyNzg1CiAjZGVmaW5lIF9BUFNf TkVYVF9DT05UUk9MX1ZBTFVFICAgICAgICAgMTA2MwogI2RlZmluZSBfQVBTX05FWFRfU1lNRURf VkFMVUUgICAgICAgICAgIDExMAogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2Vi S2l0QnJvd3NlcldpbmRvdy5jcHAKaW5kZXggNzFjNDNlNjY5MTM5NWI3ODcxNDBjYTA2MDM1NTBh YWMxYzg1MTNkNS4uZjU5MDY4NTE4NGU3ODg4MmY2MTExNjRhMjg0ZWIzNmJmNTBiNTA5OSAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcApAQCAtMzk5 LDUgKzM5OSw1IEBAIFdLUGFnZVJlZiBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGVOZXdQYWdl KFdLUGFnZVJlZiBwYWdlLCBXS1BhZ2VDb25maWd1cmF0aW9uCiB2b2lkIFdlYktpdEJyb3dzZXJX aW5kb3c6OmRpZE5vdEhhbmRsZUtleUV2ZW50KFdLUGFnZVJlZiwgV0tOYXRpdmVFdmVudFB0ciBl dmVudCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBhdXRvJiB0aGlzV2luZG93ID0g dG9XZWJLaXRCcm93c2VyV2luZG93KGNsaWVudEluZm8pOwotICAgIERlZldpbmRvd1Byb2ModGhp c1dpbmRvdy5od25kKCksIGV2ZW50LT5tZXNzYWdlLCBldmVudC0+d1BhcmFtLCBldmVudC0+bFBh cmFtKTsKKyAgICBQb3N0TWVzc2FnZSh0aGlzV2luZG93Lm1faE1haW5XbmQsIGV2ZW50LT5tZXNz YWdlLCBldmVudC0+d1BhcmFtLCBldmVudC0+bFBhcmFtKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5N YWluLmNwcAppbmRleCBiMWQxN2U4OGRlNjFhNmYxOTY4MzBmNjI2MDRlNDE3NDU2NDUwNmJkLi42 MjM4NmY2OTBiMDkzMzViNWRjN2M2ZmRkODBiZDliNjJjMzg1NmFhIDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2lu L1dpbk1haW4uY3BwCkBAIC01OCw3ICs1OCw3IEBAIGludCBXSU5BUEkgd1dpbk1haW4oX0luXyBI SU5TVEFOQ0UgaEluc3RhbmNlLCBfSW5fb3B0XyBISU5TVEFOQ0UgaFByZXZJbnN0YW5jZSwKICNl bmRpZgogCiAgICAgTVNHIG1zZyB7IH07Ci0gICAgSEFDQ0VMIGhBY2NlbFRhYmxlOworICAgIEhB Q0NFTCBoQWNjZWxUYWJsZSwgaFByZUFjY2VsVGFibGU7CiAKICAgICBJTklUQ09NTU9OQ09OVFJP TFNFWCBJbml0Q3RybEV4OwogCkBAIC05NCw2ICs5NCw3IEBAIGludCBXSU5BUEkgd1dpbk1haW4o X0luXyBISU5TVEFOQ0UgaEluc3RhbmNlLCBfSW5fb3B0XyBISU5TVEFOQ0UgaFByZXZJbnN0YW5j ZSwKICAgICBTaG93V2luZG93KG1haW5XaW5kb3cuaHduZCgpLCBuQ21kU2hvdyk7CiAKICAgICBo QWNjZWxUYWJsZSA9IExvYWRBY2NlbGVyYXRvcnMoaEluc3QsIE1BS0VJTlRSRVNPVVJDRShJRENf TUlOSUJST1dTRVIpKTsKKyAgICBoUHJlQWNjZWxUYWJsZSA9IExvYWRBY2NlbGVyYXRvcnMoaElu c3QsIE1BS0VJTlRSRVNPVVJDRShJRFJfQUNDRUxFUkFUT1JTX1BSRSkpOwogCiAgICAgaWYgKG9w dGlvbnMucmVxdWVzdGVkVVJMLmxlbmd0aCgpKQogICAgICAgICBtYWluV2luZG93LmxvYWRVUkwo b3B0aW9ucy5yZXF1ZXN0ZWRVUkwuR2V0QlNUUigpKTsKQEAgLTEwNCwyNSArMTA1LDIwIEBAIGlu dCBXSU5BUEkgd1dpbk1haW4oX0luXyBISU5TVEFOQ0UgaEluc3RhbmNlLCBfSW5fb3B0XyBISU5T VEFOQ0UgaFByZXZJbnN0YW5jZSwKIAogICAgIC8vIE1haW4gbWVzc2FnZSBsb29wOgogICAgIF9f dHJ5IHsKLSNpZiBFTkFCTEUoV0VCS0lUKQogICAgICAgICB3aGlsZSAoR2V0TWVzc2FnZSgmbXNn LCBudWxscHRyLCAwLCAwKSkgewogI2lmIFVTRShDRikKICAgICAgICAgICAgIENGUnVuTG9vcFJ1 bkluTW9kZShrQ0ZSdW5Mb29wRGVmYXVsdE1vZGUsIDAsIHRydWUpOwogI2VuZGlmCi0gICAgICAg ICAgICBpZiAoIVRyYW5zbGF0ZUFjY2VsZXJhdG9yKG1zZy5od25kLCBoQWNjZWxUYWJsZSwgJm1z ZykpIHsKKyAgICAgICAgICAgIGlmIChUcmFuc2xhdGVBY2NlbGVyYXRvcihtc2cuaHduZCwgaFBy ZUFjY2VsVGFibGUsICZtc2cpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgYm9vbCBwcm9jZXNzZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGlmIChNYWluV2luZG93Ojpp c0luc3RhbmNlKG1zZy5od25kKSkKKyAgICAgICAgICAgICAgICBwcm9jZXNzZWQgPSBUcmFuc2xh dGVBY2NlbGVyYXRvcihtc2cuaHduZCwgaEFjY2VsVGFibGUsICZtc2cpOworICAgICAgICAgICAg aWYgKCFwcm9jZXNzZWQpIHsKICAgICAgICAgICAgICAgICBUcmFuc2xhdGVNZXNzYWdlKCZtc2cp OwogICAgICAgICAgICAgICAgIERpc3BhdGNoTWVzc2FnZSgmbXNnKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQotI2Vsc2UKLSAgICAgICAgSVdlYktpdE1lc3NhZ2VMb29wUHRyIG1lc3NhZ2VM b29wOwotCi0gICAgICAgIGhyID0gV2ViS2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURfV2ViS2l0TWVz c2FnZUxvb3AsIDAsIElJRF9JV2ViS2l0TWVzc2FnZUxvb3AsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCoqPigmbWVzc2FnZUxvb3AuR2V0SW50ZXJmYWNlUHRyKCkpKTsKLSAgICAgICAgaWYgKEZBSUxF RChocikpCi0gICAgICAgICAgICBnb3RvIGV4aXQ7Ci0KLSAgICAgICAgbWVzc2FnZUxvb3AtPnJ1 bihoQWNjZWxUYWJsZSk7Ci0jZW5kaWYKICAgICB9IF9fZXhjZXB0KGNyZWF0ZUNyYXNoUmVwb3J0 KEdldEV4Y2VwdGlvbkluZm9ybWF0aW9uKCkpLCBFWENFUFRJT05fRVhFQ1VURV9IQU5ETEVSKSB7 IH0KIAogZXhpdDoK