136854 2014-09-16 05:34:54 -0700 [EFL][WK2] Minibrowser : Fix the 'Escape' button issue to exit fullscreen 2014-09-25 23:24:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kumar.rohit webkit-unassigned commit-queue gyuyoung.kim ryuan.choi oldest_to_newest 1035446 0 kumar.rohit 2014-09-16 05:34:54 -0700 Escape button does not work when try to exit Minibrowser fullscreen mode. 1035449 1 238176 kumar.rohit 2014-09-16 05:38:50 -0700 Created attachment 238176 Patch 1035840 2 238176 gyuyoung.kim 2014-09-17 22:51:24 -0700 Comment on attachment 238176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238176&action=review > Tools/MiniBrowser/efl/main.c:-565 > - ewk_view_fullscreen_exit(ewk_view); Doesn't this function work now ? 1035908 3 kumar.rohit 2014-09-18 05:12:31 -0700 (In reply to comment #2) > (From update of attachment 238176 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238176&action=review > > > Tools/MiniBrowser/efl/main.c:-565 > > - ewk_view_fullscreen_exit(ewk_view); > > Doesn't this function work now ? This function doesn't work now. I think reason behind this is that the Webview does not know that it has gone full screen. We use elm_win_fullscreen_set to toggle full screen and elm_window has fullscreen state information, and not the ewk_view. There is no specific API calls to enter full screen for ewk_view. So ewk_view_fullscreen_exit doesn't work as ewk_view doesn't have information about current fullscreen state. 1036063 4 gyuyoung.kim 2014-09-18 23:00:55 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 238176 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=238176&action=review > > > > > Tools/MiniBrowser/efl/main.c:-565 > > > - ewk_view_fullscreen_exit(ewk_view); > > > > Doesn't this function work now ? > > This function doesn't work now. I think reason behind this is that the Webview does not know that it has gone full screen. > We use elm_win_fullscreen_set to toggle full screen and elm_window has fullscreen state information, and not the ewk_view. There is no specific API calls to enter full screen for ewk_view. So ewk_view_fullscreen_exit doesn't work as ewk_view doesn't have information about current fullscreen state. If so, I think we should remove the APIs, Probably new bug ? 1036064 5 238176 gyuyoung.kim 2014-09-18 23:09:42 -0700 Comment on attachment 238176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238176&action=review Basically patch looks good. r=me. Please update ChangeLog before landing. > Tools/ChangeLog:7 > + It would be nicer if you mention what is problem, how to fix this problem. 1036487 6 238468 kumar.rohit 2014-09-22 02:25:22 -0700 Created attachment 238468 Patch for landing 1036501 7 238468 gyuyoung.kim 2014-09-22 03:05:53 -0700 Comment on attachment 238468 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=238468&action=review > Tools/ChangeLog:6 > + Reviewed by Gyuyoung Kim. Add a new line. 1036512 8 238468 ryuan.choi 2014-09-22 04:14:38 -0700 Comment on attachment 238468 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=238468&action=review > Tools/ChangeLog:9 > + ewk_view_fullscreen_exit(ewk_view) doesn't work as ewk_view does not know that it has gone fullscreen. > + We use elm_win_fullscreen_set to toggle fullscreen and elm_window has fullscreen state information, and not the ewk_view. > + There is no specific API calls to enter fullscreen for ewk_view. So either we need to add API for enter fullscreen or remove ewk_view_fullscreen_exit. Sorry for late comment. But, I think that this comment looks wrong. This issue is the bug of MiniBrowser. ewk_view_fullscreen_exit() is to notify the changes of state to ewk_view when user cancelled HTML5's fullscreen API. For example, w3c fullscreen API can make specific element as full screen (ex, video element). So, ewk_view should know the exit to restore the web contents from specific element to whole contents when user cancelled requests of w3c fullscreen. I think that MiniBrowser should distinguish which events started current full screen status, w3c's fullscreen API or shortcut(F11) 1036703 9 kumar.rohit 2014-09-23 06:23:23 -0700 (In reply to comment #8) > (From update of attachment 238468 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238468&action=review > > > Tools/ChangeLog:9 > > + ewk_view_fullscreen_exit(ewk_view) doesn't work as ewk_view does not know that it has gone fullscreen. > > + We use elm_win_fullscreen_set to toggle fullscreen and elm_window has fullscreen state information, and not the ewk_view. > > + There is no specific API calls to enter fullscreen for ewk_view. So either we need to add API for enter fullscreen or remove ewk_view_fullscreen_exit. > > Sorry for late comment. > > But, I think that this comment looks wrong. > > This issue is the bug of MiniBrowser. > ewk_view_fullscreen_exit() is to notify the changes of state to ewk_view when user cancelled HTML5's fullscreen API. > For example, w3c fullscreen API can make specific element as full screen (ex, video element). > So, ewk_view should know the exit to restore the web contents from specific element to whole contents when user cancelled requests of w3c fullscreen. > > I think that MiniBrowser should distinguish which events started current full screen status, w3c's fullscreen API or shortcut(F11) Thanks for the insight. It makes sense. On observing behaviours for other broswers, I found that 'Esc'is used only for exiting fullscreen when a specific element is fullscreen and not in case of window fullscreen. In case when browser window is fullscreen, F11 is used to exit fullscreen. However, F11 can be used to exit fullscreen even when a window element has gone fullscreen as specific element makes window go fullscreen along with it. I will submit the modified patch based on this observation. 1036704 10 238531 kumar.rohit 2014-09-23 06:37:54 -0700 Created attachment 238531 Patch 1036961 11 ryuan.choi 2014-09-24 05:02:41 -0700 Looks good to me. 1037414 12 238531 gyuyoung.kim 2014-09-25 22:49:21 -0700 Comment on attachment 238531 Patch LGTM too. 1037419 13 238531 commit-queue 2014-09-25 23:24:08 -0700 Comment on attachment 238531 Patch Clearing flags on attachment: 238531 Committed r173997: <http://trac.webkit.org/changeset/173997> 1037420 14 commit-queue 2014-09-25 23:24:13 -0700 All reviewed patches have been landed. Closing bug. 238176 2014-09-16 05:38:50 -0700 2014-09-22 02:25:09 -0700 Patch bug-136854-20140916180950.patch text/plain 2154 kumar.rohit U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNjU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjIwODQwOTFiZDdjMmVjNzlhYzQ4YzM2MmI1NzQ3Zjlk NjBmOTkyNC4uZjg2ZDkxYjMxZmI0Y2Q4MTc5MThlY2RmZWExMjM1MjE3ZjU2M2NlMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE0LTA5LTE2ICBSb2hpdCBLdW1hciAgPGt1bWFyLnJvaGl0QHNhbXN1bmcuY29tPgor CisgICAgICAgIFtFRkxdW1dLMl0gTWluaWJyb3dzZXIgOiBGaXggdGhlICdFc2NhcGUnIGJ1dHRv biBpc3N1ZSB0byBleGl0IGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9u X2tleV9kb3duKToKKwogMjAxNC0wOS0xNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLCBza2lwIG9uZSBtb3JlIHRl c3RzIG9uIFdpbmRvd3MuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5j IGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCBmYWMwNmY5NDMwYmNlYTNkNzUw ZGUzY2IyYWY2Mzk2NGE2MGU0NWQ3Li5iNjVkNzc4ZmJkODZmNjAzOWI0MzY2N2NjNDUwZGU0NWMx NGJhNjA1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTUzMCw4ICs1MzAsOCBAQCBvbl9rZXlfZG93 bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAq ZXZlbnRfaW5mbykKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY1IikpIHsKICAg ICAgICAgaW5mbygiUmVsb2FkIChGNSkgd2FzIHByZXNzZWQsIHJlbG9hZGluZy4iKTsKICAgICAg ICAgZXdrX3ZpZXdfcmVsb2FkKGV3a192aWV3KTsKLSAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYt PmtleSwgIkY2IikgfHwgIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKLSAgICAgICAgaW5m bygiU3RvcCAoRjYgb3IgRXNjYXBlKSB3YXMgcHJlc3NlZCwgc3RvcCBsb2FkaW5nLiIpOworICAg IH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjYiKSkgeworICAgICAgICBpbmZvKCJTdG9w IChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy4iKTsKICAgICAgICAgZXdrX3ZpZXdfc3Rv cChld2tfdmlldyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7CiAg ICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9kZSA9ICBld2tfdmlld19wYWdpbmF0aW9uX21v ZGVfZ2V0KGV3a192aWV3KTsKQEAgLTU2Miw3ICs1NjIsOSBAQCBvbl9rZXlfZG93bih2b2lkICp1 c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5m bykKICAgICAgICAgZWxzZSBpZiAoZXZhc19vYmplY3RfdmlzaWJsZV9nZXQod2luZG93LT5oaXN0 b3J5Lmhpc3RvcnlfYm94KSkKICAgICAgICAgICAgIGhpc3RvcnlfbGlzdF9oaWRlKHdpbmRvdyk7 CiAgICAgICAgIGVsc2UgaWYgKGVsbV93aW5fZnVsbHNjcmVlbl9nZXQod2luZG93LT5lbG1fd2lu ZG93KSkKLSAgICAgICAgICAgIGV3a192aWV3X2Z1bGxzY3JlZW5fZXhpdChld2tfdmlldyk7Cisg ICAgICAgICAgICBlbG1fd2luX2Z1bGxzY3JlZW5fc2V0KHdpbmRvdy0+ZWxtX3dpbmRvdywgRUlO QV9GQUxTRSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGV3a192aWV3X3N0b3AoZXdrX3Zp ZXcpOwogICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgKCFzdHJjbXAoZXYtPmtleSwgIm1p bnVzIikgfHwgIXN0cmNtcChldi0+a2V5LCAiS1BfU3VidHJhY3QiKSkpIHsKICAgICAgICAgaWYg KHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCAtIDEp KQogICAgICAgICAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwtLTsK 238468 2014-09-22 02:25:22 -0700 2014-09-23 06:37:39 -0700 Patch for landing bug-136854-20140922145626.patch text/plain 2541 kumar.rohit U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDU2ODllZDc2OGY2MTljMDU3ODg5ZTk3ZDRiZjkwZDM3 NjEwNzY0OS4uZDE3NDk3OThkN2QzNWFjNWQ2ZTE4NDE4OTE3NGFhODg1MWYwNzFmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTA5LTIyICBSb2hpdCBLdW1hciAgPGt1bWFyLnJvaGl0QHNhbXN1bmcuY29tPgor CisgICAgICAgIFtFRkxdW1dLMl0gTWluaWJyb3dzZXIgOiBGaXggdGhlICdFc2NhcGUnIGJ1dHRv biBpc3N1ZSB0byBleGl0IGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IEd5dXlvdW5n IEtpbS4KKyAgICAgICAgZXdrX3ZpZXdfZnVsbHNjcmVlbl9leGl0KGV3a192aWV3KSBkb2Vzbid0 IHdvcmsgYXMgZXdrX3ZpZXcgZG9lcyBub3Qga25vdyB0aGF0IGl0IGhhcyBnb25lIGZ1bGxzY3Jl ZW4uCisgICAgICAgIFdlIHVzZSBlbG1fd2luX2Z1bGxzY3JlZW5fc2V0IHRvIHRvZ2dsZSBmdWxs c2NyZWVuIGFuZCBlbG1fd2luZG93IGhhcyBmdWxsc2NyZWVuIHN0YXRlIGluZm9ybWF0aW9uLCBh bmQgbm90IHRoZSBld2tfdmlldy4KKyAgICAgICAgVGhlcmUgaXMgbm8gc3BlY2lmaWMgQVBJIGNh bGxzIHRvIGVudGVyIGZ1bGxzY3JlZW4gZm9yIGV3a192aWV3LiBTbyBlaXRoZXIgd2UgbmVlZCB0 byBhZGQgQVBJIGZvciBlbnRlciBmdWxsc2NyZWVuIG9yIHJlbW92ZSBld2tfdmlld19mdWxsc2Ny ZWVuX2V4aXQuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAo b25fa2V5X2Rvd24pOgorCiAyMDE0LTA5LTIyICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBnbWFp bC5jb20+CiAKICAgICAgICAgRml4IHN5bnRheEVycm9yIGluIHdhdGNobGlzdCBzaW5jZSByMTcz NTk0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWlu aUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA4MzhhNDYwMTQ4YmZhNDA4MjU3YmM2MGZhMGI1NDY0 ZTg2NWE5ZGFkLi45ZjY1NTNkZmYxNDZiNDg5Y2Q4MDZiMGYxNjcwY2Y1OWYwMTIwMzY1IDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL2VmbC9tYWluLmMKQEAgLTU0MSw4ICs1NDEsOCBAQCBvbl9rZXlfZG93bih2b2lkICp1c2Vy X2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY1IikpIHsKICAgICAgICAgaW5mbygi UmVsb2FkIChGNSkgd2FzIHByZXNzZWQsIHJlbG9hZGluZy4iKTsKICAgICAgICAgZXdrX3ZpZXdf cmVsb2FkKGV3a192aWV3KTsKLSAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY2Iikg fHwgIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKLSAgICAgICAgaW5mbygiU3RvcCAoRjYg b3IgRXNjYXBlKSB3YXMgcHJlc3NlZCwgc3RvcCBsb2FkaW5nLiIpOworICAgIH0gZWxzZSBpZiAo IXN0cmNtcChldi0+a2V5LCAiRjYiKSkgeworICAgICAgICBpbmZvKCJTdG9wIChGNikgd2FzIHBy ZXNzZWQsIHN0b3AgbG9hZGluZy4iKTsKICAgICAgICAgZXdrX3ZpZXdfc3RvcChld2tfdmlldyk7 CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19Q YWdpbmF0aW9uX01vZGUgbW9kZSA9ICBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192 aWV3KTsKQEAgLTU3Myw3ICs1NzMsOSBAQCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2RhdGEsIEV2 YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAg ZWxzZSBpZiAoZXZhc19vYmplY3RfdmlzaWJsZV9nZXQod2luZG93LT5oaXN0b3J5Lmhpc3Rvcnlf Ym94KSkKICAgICAgICAgICAgIGhpc3RvcnlfbGlzdF9oaWRlKHdpbmRvdyk7CiAgICAgICAgIGVs c2UgaWYgKGVsbV93aW5fZnVsbHNjcmVlbl9nZXQod2luZG93LT5lbG1fd2luZG93KSkKLSAgICAg ICAgICAgIGV3a192aWV3X2Z1bGxzY3JlZW5fZXhpdChld2tfdmlldyk7CisgICAgICAgICAgICBl bG1fd2luX2Z1bGxzY3JlZW5fc2V0KHdpbmRvdy0+ZWxtX3dpbmRvdywgRUlOQV9GQUxTRSk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGV3a192aWV3X3N0b3AoZXdrX3ZpZXcpOwogICAgIH0g ZWxzZSBpZiAoY3RybFByZXNzZWQgJiYgKCFzdHJjbXAoZXYtPmtleSwgIm1pbnVzIikgfHwgIXN0 cmNtcChldi0+a2V5LCAiS1BfU3VidHJhY3QiKSkpIHsKICAgICAgICAgaWYgKHpvb21fbGV2ZWxf c2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCAtIDEpKQogICAgICAgICAg ICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwtLTsK 238531 2014-09-23 06:37:54 -0700 2014-09-25 23:24:07 -0700 Patch bug-136854-20140923190858.patch text/plain 2193 kumar.rohit U3VidmVyc2lvbiBSZXZpc2lvbjogMTczODY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWZiY2RkMmE3ZmJkYTY2NGE3NDExMWVhZjcxZmQ2ZTM1 M2EwMTAxYS4uOWY1MmVhMzc5ZTQ3NTZiZTkwZmQzZWUxOTM4MDBjMDk0MzQxZjQ0MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTA5LTIzICBSb2hpdCBLdW1hciAgPGt1bWFyLnJvaGl0QHNhbXN1bmcuY29tPgor CisgICAgICAgIFtFRkxdW1dLMl0gTWluaWJyb3dzZXIgOiBGaXggdGhlICdFc2NhcGUnIGJ1dHRv biBpc3N1ZSB0byBleGl0IGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICdFc2NhcGUnIGtleSBzaG91bGQgZXhpdCBmdWxsc2NyZWVuIGZp cnN0IGFuZCB0aGVuIHNob3VsZCBiZSB1c2VkIHRvIHN0b3AgcGFnZSBsb2FkLgorCisgICAgICAg ICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKwogMjAx NC0wOS0yMiAgUm9oaXQgS3VtYXIgIDxrdW1hci5yb2hpdEBzYW1zdW5nLmNvbT4KIAogICAgICAg ICBbRUZMXVtXSzJdIE1pbmlicm93c2VyIDogQWRkIGtleWJvYXJkIHN1cHBvcnQgZm9yIHBhZ2Ug cmVsb2FkIHdoaWxlIGlnbm9yaW5nIGNhY2hlCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA3NjBmZmI5 OTIzZGFhMGZjN2ZmZjMzZmIxMWM0ODI4Y2NjNjAwYjg1Li5lNTVhY2RiZDNmMDJhMmJiZmE2ZTVi M2JhYmM3M2IyM2E1YTkyYTZkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTU0NSw4ICs1NDUsOCBA QCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tf dmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwg IkY1IikgfHwgKCFzdHJjbXAoZXYtPmtleSwgInIiKSAmJiBjdHJsUHJlc3NlZCkpIHsKICAgICAg ICAgaW5mbygiUmVsb2FkIChGNSBvciBDdHJsK3IpIHdhcyBwcmVzc2VkLCByZWxvYWRpbmcuLi4i KTsKICAgICAgICAgZXdrX3ZpZXdfcmVsb2FkKGV3a192aWV3KTsKLSAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgIkY2IikgfHwgIXN0cmNtcChldi0+a2V5LCAiRXNjYXBlIikpIHsKLSAg ICAgICAgaW5mbygiU3RvcCAoRjYgb3IgRXNjYXBlKSB3YXMgcHJlc3NlZCwgc3RvcCBsb2FkaW5n LiIpOworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjYiKSkgeworICAgICAgICBp bmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy4iKTsKICAgICAgICAgZXdr X3ZpZXdfc3RvcChld2tfdmlldyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJG NyIpKSB7CiAgICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9kZSA9ICBld2tfdmlld19wYWdp bmF0aW9uX21vZGVfZ2V0KGV3a192aWV3KTsKQEAgLTU3OCw2ICs1NzgsOCBAQCBvbl9rZXlfZG93 bih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAq ZXZlbnRfaW5mbykKICAgICAgICAgICAgIGhpc3RvcnlfbGlzdF9oaWRlKHdpbmRvdyk7CiAgICAg ICAgIGVsc2UgaWYgKGVsbV93aW5fZnVsbHNjcmVlbl9nZXQod2luZG93LT5lbG1fd2luZG93KSkK ICAgICAgICAgICAgIGV3a192aWV3X2Z1bGxzY3JlZW5fZXhpdChld2tfdmlldyk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGV3a192aWV3X3N0b3AoZXdrX3ZpZXcpOwogICAgIH0gZWxzZSBp ZiAoY3RybFByZXNzZWQgJiYgKCFzdHJjbXAoZXYtPmtleSwgIm1pbnVzIikgfHwgIXN0cmNtcChl di0+a2V5LCAiS1BfU3VidHJhY3QiKSkpIHsKICAgICAgICAgaWYgKHpvb21fbGV2ZWxfc2V0KGV3 a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCAtIDEpKQogICAgICAgICAgICAgd2lu ZG93LT5jdXJyZW50X3pvb21fbGV2ZWwtLTsK