200464 2019-08-05 20:44:03 -0700 [Win][MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window 2019-08-05 23:48:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii don.olmstead ross.kirsling webkit-bug-importer oldest_to_newest 1558700 0 fujii 2019-08-05 20:44:03 -0700 [MiniBrowser][WK2] Unhandled key events should be bubbled up to the parent window When WK2 WebView is focused, short cut keys (e.g. Alt-F to open File menu, Alt-F4 to close window, and etc) don't work. WK1 WebView doesn't have this issue because it processes key events properly. 1558703 1 375597 fujii 2019-08-05 20:48:10 -0700 Created attachment 375597 Patch 1558716 2 375597 ross.kirsling 2019-08-05 22:08:01 -0700 Comment on attachment 375597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375597&action=review > Tools/MiniBrowser/win/WebKitBrowserWindow.cpp:385 > + SendMessage(thisWindow.m_hMainWnd, event->message, event->wParam, event->lParam); What's the difference of SendMessage here from the DefWindowProc that's used in these places? https://github.com/WebKit/webkit/blob/master/Source/WebKitLegacy/win/WebView.cpp#L2818 https://github.com/WebKit/webkit/blob/master/Source/WebKit/UIProcess/win/WebView.cpp#L179 1558722 3 375597 fujii 2019-08-05 23:15:48 -0700 Comment on attachment 375597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375597&action=review >> Tools/MiniBrowser/win/WebKitBrowserWindow.cpp:385 >> + SendMessage(thisWindow.m_hMainWnd, event->message, event->wParam, event->lParam); > > What's the difference of SendMessage here from the DefWindowProc that's used in these places? > https://github.com/WebKit/webkit/blob/master/Source/WebKitLegacy/win/WebView.cpp#L2818 > https://github.com/WebKit/webkit/blob/master/Source/WebKit/UIProcess/win/WebView.cpp#L179 In WK1, key events are handled synchronously. If WebView doesn't handle the key event, it will be passed to DefWindowProc which sends it to the parent window. On the other hand, in WK2, key events are handled asynchronously in WebProcess. handled is always set true here. https://github.com/WebKit/webkit/tree/69699b3c92158cb980cf7d4356dfd6edaab4a35f/Source/WebKit/UIProcess/win/WebView.cpp#L451,L453 So, I need to re-post the key event in didNotHandleKeyEvent. Thanks for your comment, I realized I think I should use DefWindowProc instead of SendMessage. 1558723 4 375603 fujii 2019-08-05 23:16:32 -0700 Created attachment 375603 Patch 1558736 5 375603 fujii 2019-08-05 23:47:50 -0700 Comment on attachment 375603 Patch Clearing flags on attachment: 375603 Committed r248291: <https://trac.webkit.org/changeset/248291> 1558737 6 fujii 2019-08-05 23:47:54 -0700 All reviewed patches have been landed. Closing bug. 1558738 7 webkit-bug-importer 2019-08-05 23:48:16 -0700 <rdar://problem/53974077> 375597 2019-08-05 20:48:10 -0700 2019-08-05 23:16:23 -0700 Patch bug-200464-20190806124809.patch text/plain 4315 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4Mjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZmZmM0NzcyOTAxNjUxMDZh MGVhMzkzNjllYjdiOGVjNjI1NGI5YTIuLmU4ODMxZDg0NGQ4OTBmN2Y5ZDA2ZDIxOTgzZTFkNjQ1 NjdlZmUyNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTktMDgtMDUgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bTWluaUJy b3dzZXJdW1dLMl0gVW5oYW5kbGVkIGtleSBldmVudHMgc2hvdWxkIGJlIGJ1YmJsZWQgdXAgdG8g dGhlIHBhcmVudCB3aW5kb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMDQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTmF0aXZlRXZlbnQuaDogRGVmaW5lIFdLTmF0 aXZlRXZlbnRQdHIgZm9yIFdJTjMyLgorCiAyMDE5LTA4LTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IFJUQ1J0cFNlbmRlci5kdG1mCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS05hdGl2ZUV2ZW50LmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS05hdGl2ZUV2ZW50LmgKaW5kZXggN2Q4YjZi OWRjMGIwYTJkNjI3ZDdmNGU4ODg0NDZiNzgzZmZhMGFlYi4uOWNhMGFiM2QwZGFkODI3M2ViOThh M2ZmODU2OWRjMDc2NGQzNWRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tOYXRpdmVFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLTmF0aXZlRXZlbnQuaApAQCAtNDYsNiArNDYsOCBAQCB0eXBlZGVmIE5TRXZlbnQgKldLTmF0 aXZlRXZlbnRQdHI7CiAjZWxpZiBkZWZpbmVkKEJVSUxESU5HX0dUS19fKQogdHlwZWRlZiB1bmlv biBfR2RrRXZlbnQgR2RrRXZlbnQ7CiB0eXBlZGVmIGNvbnN0IEdka0V2ZW50KiBXS05hdGl2ZUV2 ZW50UHRyOworI2VsaWYgZGVmaW5lZChXSU4zMikKK3R5cGVkZWYgY29uc3Qgc3RydWN0IHRhZ01T RyogV0tOYXRpdmVFdmVudFB0cjsKICNlbHNlCiB0eXBlZGVmIGNvbnN0IHZvaWQqIFdLTmF0aXZl RXZlbnRQdHI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCAwNzA3ZTE2M2MwNmNkNTBkZmQ0MGUyYTY2OTM0Nzc3OTk1OTdhZGIwLi4z OGJjMDcwZTY0NzYxMzA4MTZkOTQ1M2Q1ZjgwMzE5NDg3YmE3NzA3IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTkt MDgtMDUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAg ICAgW01pbmlCcm93c2VyXVtXSzJdIFVuaGFuZGxlZCBrZXkgZXZlbnRzIHNob3VsZCBiZSBidWJi bGVkIHVwIHRvIHRoZSBwYXJlbnQgd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA0NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIFdLMiBXZWJWaWV3IGlzIGZvY3VzZWQsIHNob3J0IGN1 dCBrZXlzIChlLmcuIEFsdC1GIHRvIG9wZW4gRmlsZQorICAgICAgICBtZW51LCBBbHQtRjQgdG8g Y2xvc2Ugd2luZG93LCBhbmQgZXRjKSBkb24ndCB3b3JrLgorCisgICAgICAgIFdLMSBXZWJWaWV3 IGRvZXNuJ3QgaGF2ZSB0aGlzIGlzc3VlIGJlY2F1c2UgaXQgcHJvY2Vzc2VzIGtleSBldmVudHMK KyAgICAgICAgcHJvcGVybHkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJv d3NlcldpbmRvdy5jcHA6CisgICAgICAgIChXZWJLaXRCcm93c2VyV2luZG93OjpXZWJLaXRCcm93 c2VyV2luZG93KToKKyAgICAgICAgKFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZE5vdEhhbmRsZUtl eUV2ZW50KTogQWRkZWQuIFNlbmQgdGhlCisgICAgICAgIHVuaGFuZGxlZCBrZXkgZXZlbnRzIHRv IHRoZSBtYWluIHdpbmRvdy4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3Nl cldpbmRvdy5oOgorCiAyMDE5LTA4LTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIGlPUyAxMzogT3ZlcmZsb3c6aGlkZGVuIG9uIGJvZHkgcHJldmVu dHMgUERGIHNjcm9sbApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJy b3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5k b3cuY3BwCmluZGV4IDMzZWYzZGRlZTU2YTQ3YThhMzQ5OTQ2MGQxZTkxZjVhOTcxODBkYzYuLjZl NjFiOGExMTVjMTkxZjVjNTE4ZTllZjkzZTkzOTAyNDVjYmJlZTYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAKQEAgLTE0NSw2ICsxNDUsNyBAQCBX ZWJLaXRCcm93c2VyV2luZG93OjpXZWJLaXRCcm93c2VyV2luZG93KFdLUGFnZUNvbmZpZ3VyYXRp b25SZWYgY29uZiwgSFdORCBtYWluVwogICAgIHVpQ2xpZW50LmJhc2UudmVyc2lvbiA9IDEzOwog ICAgIHVpQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAgICAgdWlDbGllbnQuY3JlYXRl TmV3UGFnZSA9IGNyZWF0ZU5ld1BhZ2U7CisgICAgdWlDbGllbnQuZGlkTm90SGFuZGxlS2V5RXZl bnQgPSBkaWROb3RIYW5kbGVLZXlFdmVudDsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQocGFn ZSwgJnVpQ2xpZW50LmJhc2UpOwogCiAgICAgV0tQYWdlU3RhdGVDbGllbnRWMCBzdGF0ZUNsaWVu dCA9IHsgfTsKQEAgLTM3NywzICszNzgsOSBAQCBXS1BhZ2VSZWYgV2ViS2l0QnJvd3NlcldpbmRv dzo6Y3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYgcGFnZSwgV0tQYWdlQ29uZmlndXJhdGlvbgogICAg IFdLUmV0YWluUHRyPFdLUGFnZVJlZj4gbmV3UGFnZSA9IFdLVmlld0dldFBhZ2UobmV3QnJvd3Nl cldpbmRvdy5tX3ZpZXcuZ2V0KCkpOwogICAgIHJldHVybiBuZXdQYWdlLmxlYWtSZWYoKTsKIH0K Kwordm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWROb3RIYW5kbGVLZXlFdmVudChXS1BhZ2VS ZWYsIFdLTmF0aXZlRXZlbnRQdHIgZXZlbnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7Cisg ICAgYXV0byYgdGhpc1dpbmRvdyA9IHRvV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnRJbmZvKTsK KyAgICBTZW5kTWVzc2FnZSh0aGlzV2luZG93Lm1faE1haW5XbmQsIGV2ZW50LT5tZXNzYWdlLCBl dmVudC0+d1BhcmFtLCBldmVudC0+bFBhcmFtKTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4v V2ViS2l0QnJvd3NlcldpbmRvdy5oCmluZGV4IGRkYmYzZTkyNWI3ZTg4MDFkZjg1YjZlNWY4YmJl ODk3YTc0MDZlYTIuLjUzOTg1MDQ4MmI1NTczZDUxMjNkNjYyNzk0MjY5ODY2NzBkM2IyMTQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmgKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuaApAQCAtNjksNiAr NjksNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZENvbW1pdE5hdmlnYXRpb24oV0tQ YWdlUmVmLCBXS05hdmlnYXRpb25SZWYsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHN0 YXRpYyB2b2lkIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXS1BhZ2VSZWYsIFdL QXV0aGVudGljYXRpb25DaGFsbGVuZ2VSZWYsIGNvbnN0IHZvaWQqKTsKICAgICBzdGF0aWMgV0tQ YWdlUmVmIGNyZWF0ZU5ld1BhZ2UoV0tQYWdlUmVmLCBXS1BhZ2VDb25maWd1cmF0aW9uUmVmLCBX S05hdmlnYXRpb25BY3Rpb25SZWYsIFdLV2luZG93RmVhdHVyZXNSZWYsIGNvbnN0IHZvaWQgKik7 CisgICAgc3RhdGljIHZvaWQgZGlkTm90SGFuZGxlS2V5RXZlbnQoV0tQYWdlUmVmLCBXS05hdGl2 ZUV2ZW50UHRyLCBjb25zdCB2b2lkKik7CiAKICAgICBXS1JldGFpblB0cjxXS1ZpZXdSZWY+IG1f dmlldzsKICAgICBIV05EIG1faE1haW5XbmQgeyBudWxscHRyIH07Cg== 375603 2019-08-05 23:16:32 -0700 2019-08-05 23:47:50 -0700 Patch bug-200464-20190806151631.patch text/plain 4313 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4Mjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZmZmM0NzcyOTAxNjUxMDZh MGVhMzkzNjllYjdiOGVjNjI1NGI5YTIuLmU4ODMxZDg0NGQ4OTBmN2Y5ZDA2ZDIxOTgzZTFkNjQ1 NjdlZmUyNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTktMDgtMDUgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bTWluaUJy b3dzZXJdW1dLMl0gVW5oYW5kbGVkIGtleSBldmVudHMgc2hvdWxkIGJlIGJ1YmJsZWQgdXAgdG8g dGhlIHBhcmVudCB3aW5kb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMDQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTmF0aXZlRXZlbnQuaDogRGVmaW5lIFdLTmF0 aXZlRXZlbnRQdHIgZm9yIFdJTjMyLgorCiAyMDE5LTA4LTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IFJUQ1J0cFNlbmRlci5kdG1mCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS05hdGl2ZUV2ZW50LmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS05hdGl2ZUV2ZW50LmgKaW5kZXggN2Q4YjZi OWRjMGIwYTJkNjI3ZDdmNGU4ODg0NDZiNzgzZmZhMGFlYi4uOWNhMGFiM2QwZGFkODI3M2ViOThh M2ZmODU2OWRjMDc2NGQzNWRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tOYXRpdmVFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLTmF0aXZlRXZlbnQuaApAQCAtNDYsNiArNDYsOCBAQCB0eXBlZGVmIE5TRXZlbnQgKldLTmF0 aXZlRXZlbnRQdHI7CiAjZWxpZiBkZWZpbmVkKEJVSUxESU5HX0dUS19fKQogdHlwZWRlZiB1bmlv biBfR2RrRXZlbnQgR2RrRXZlbnQ7CiB0eXBlZGVmIGNvbnN0IEdka0V2ZW50KiBXS05hdGl2ZUV2 ZW50UHRyOworI2VsaWYgZGVmaW5lZChXSU4zMikKK3R5cGVkZWYgY29uc3Qgc3RydWN0IHRhZ01T RyogV0tOYXRpdmVFdmVudFB0cjsKICNlbHNlCiB0eXBlZGVmIGNvbnN0IHZvaWQqIFdLTmF0aXZl RXZlbnRQdHI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCAwNzA3ZTE2M2MwNmNkNTBkZmQ0MGUyYTY2OTM0Nzc3OTk1OTdhZGIwLi4z OGJjMDcwZTY0NzYxMzA4MTZkOTQ1M2Q1ZjgwMzE5NDg3YmE3NzA3IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTkt MDgtMDUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAg ICAgW01pbmlCcm93c2VyXVtXSzJdIFVuaGFuZGxlZCBrZXkgZXZlbnRzIHNob3VsZCBiZSBidWJi bGVkIHVwIHRvIHRoZSBwYXJlbnQgd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA0NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIFdLMiBXZWJWaWV3IGlzIGZvY3VzZWQsIHNob3J0IGN1 dCBrZXlzIChlLmcuIEFsdC1GIHRvIG9wZW4gRmlsZQorICAgICAgICBtZW51LCBBbHQtRjQgdG8g Y2xvc2Ugd2luZG93LCBhbmQgZXRjKSBkb24ndCB3b3JrLgorCisgICAgICAgIFdLMSBXZWJWaWV3 IGRvZXNuJ3QgaGF2ZSB0aGlzIGlzc3VlIGJlY2F1c2UgaXQgcHJvY2Vzc2VzIGtleSBldmVudHMK KyAgICAgICAgcHJvcGVybHkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJv d3NlcldpbmRvdy5jcHA6CisgICAgICAgIChXZWJLaXRCcm93c2VyV2luZG93OjpXZWJLaXRCcm93 c2VyV2luZG93KToKKyAgICAgICAgKFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZE5vdEhhbmRsZUtl eUV2ZW50KTogQWRkZWQuIFNlbmQgdGhlCisgICAgICAgIHVuaGFuZGxlZCBrZXkgZXZlbnRzIHRv IHRoZSBtYWluIHdpbmRvdy4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3Nl cldpbmRvdy5oOgorCiAyMDE5LTA4LTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIGlPUyAxMzogT3ZlcmZsb3c6aGlkZGVuIG9uIGJvZHkgcHJldmVu dHMgUERGIHNjcm9sbApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJy b3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5k b3cuY3BwCmluZGV4IDMzZWYzZGRlZTU2YTQ3YThhMzQ5OTQ2MGQxZTkxZjVhOTcxODBkYzYuLmYz MGU4YWYwNzMxYWE4NzIzOWQ2MTUzNWUwODdmY2RmOThiMzJhYjEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAKQEAgLTE0NSw2ICsxNDUsNyBAQCBX ZWJLaXRCcm93c2VyV2luZG93OjpXZWJLaXRCcm93c2VyV2luZG93KFdLUGFnZUNvbmZpZ3VyYXRp b25SZWYgY29uZiwgSFdORCBtYWluVwogICAgIHVpQ2xpZW50LmJhc2UudmVyc2lvbiA9IDEzOwog ICAgIHVpQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAgICAgdWlDbGllbnQuY3JlYXRl TmV3UGFnZSA9IGNyZWF0ZU5ld1BhZ2U7CisgICAgdWlDbGllbnQuZGlkTm90SGFuZGxlS2V5RXZl bnQgPSBkaWROb3RIYW5kbGVLZXlFdmVudDsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQocGFn ZSwgJnVpQ2xpZW50LmJhc2UpOwogCiAgICAgV0tQYWdlU3RhdGVDbGllbnRWMCBzdGF0ZUNsaWVu dCA9IHsgfTsKQEAgLTM3NywzICszNzgsOSBAQCBXS1BhZ2VSZWYgV2ViS2l0QnJvd3NlcldpbmRv dzo6Y3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYgcGFnZSwgV0tQYWdlQ29uZmlndXJhdGlvbgogICAg IFdLUmV0YWluUHRyPFdLUGFnZVJlZj4gbmV3UGFnZSA9IFdLVmlld0dldFBhZ2UobmV3QnJvd3Nl cldpbmRvdy5tX3ZpZXcuZ2V0KCkpOwogICAgIHJldHVybiBuZXdQYWdlLmxlYWtSZWYoKTsKIH0K Kwordm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWROb3RIYW5kbGVLZXlFdmVudChXS1BhZ2VS ZWYsIFdLTmF0aXZlRXZlbnRQdHIgZXZlbnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7Cisg ICAgYXV0byYgdGhpc1dpbmRvdyA9IHRvV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnRJbmZvKTsK KyAgICBEZWZXaW5kb3dQcm9jKHRoaXNXaW5kb3cuaHduZCgpLCBldmVudC0+bWVzc2FnZSwgZXZl bnQtPndQYXJhbSwgZXZlbnQtPmxQYXJhbSk7Cit9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dl YktpdEJyb3dzZXJXaW5kb3cuaAppbmRleCBkZGJmM2U5MjViN2U4ODAxZGY4NWI2ZTVmOGJiZTg5 N2E3NDA2ZWEyLi41Mzk4NTA0ODJiNTU3M2Q1MTIzZDY2Mjc5NDI2OTg2NjcwZDNiMjE0IDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5oCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmgKQEAgLTY5LDYgKzY5 LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBkaWRDb21taXROYXZpZ2F0aW9uKFdLUGFn ZVJlZiwgV0tOYXZpZ2F0aW9uUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqKTsKICAgICBzdGF0 aWMgdm9pZCBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoV0tQYWdlUmVmLCBXS0F1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUmVmLCBjb25zdCB2b2lkKik7CiAgICAgc3RhdGljIFdLUGFn ZVJlZiBjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiwgV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgV0tO YXZpZ2F0aW9uQWN0aW9uUmVmLCBXS1dpbmRvd0ZlYXR1cmVzUmVmLCBjb25zdCB2b2lkICopOwor ICAgIHN0YXRpYyB2b2lkIGRpZE5vdEhhbmRsZUtleUV2ZW50KFdLUGFnZVJlZiwgV0tOYXRpdmVF dmVudFB0ciwgY29uc3Qgdm9pZCopOwogCiAgICAgV0tSZXRhaW5QdHI8V0tWaWV3UmVmPiBtX3Zp ZXc7CiAgICAgSFdORCBtX2hNYWluV25kIHsgbnVsbHB0ciB9Owo=