139482 2014-12-10 07:35:11 -0800 [EFL] MiniBrowser steals web view's focus 2014-12-22 07:30:18 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 g.czajkowski g.czajkowski commit-queue gyuyoung.kim lucas.de.marchi ryuan.choi seojuyung2 oldest_to_newest 1054140 0 243018 g.czajkowski 2014-12-10 07:35:11 -0800 Created attachment 243018 test case Although we set focus on ewk_view while MiniBrowser initialization Ecore steals it in a favor of main window #0 0x0000000000407285 in on_ewk_view_focus_out () #1 0x00007ffff5096073 in _eo_evas_object_cb () at lib/evas/canvas/evas_callbacks.c:84 #2 0x00007fffe7af9f9a in _eo_base_event_callback_call () at lib/eo/eo_base_class.c:713 #3 0x00007fffe7af82a9 in eo_event_callback_call () at lib/eo/eo_base.eo.c:102 #4 0x00007ffff5096599 in evas_object_event_callback_call () at lib/evas/canvas/evas_callbacks.c:256 #5 0x00007ffff50a56ef in _evas_object_focus_set () at lib/evas/canvas/evas_focus.c:40 #6 0x00007ffff50c4d8d in evas_obj_focus_set () at ../src/lib/evas/canvas/evas_object.eo.c:206 #7 0x00007ffff50a564e in _evas_object_focus_set () at lib/evas/canvas/evas_focus.c:27 #8 0x00007ffff50c4d8d in evas_obj_focus_set () at ../src/lib/evas/canvas/evas_object.eo.c:206 #9 0x00007ffff50d19c1 in evas_object_focus_set () at ../src/lib/evas/canvas/evas_object.eo.c:716 #10 0x00007ffff5692ded in _elm_widget_on_focus () at elm_widget.c:5418 #11 0x00007ffff5685170 in elm_obj_widget_on_focus () at elm_widget.eo.c:343 #12 0x00007ffff56a2e81 in _elm_win_elm_widget_on_focus () at elm_win.c:1282 #13 0x00007ffff5685170 in elm_obj_widget_on_focus () at elm_widget.eo.c:343 #14 0x00007ffff5697063 in _parent_focus () at elm_widget.c:797 #15 0x00007ffff56971cb in _elm_widget_focus_steal () at elm_widget.c:2807 #16 0x00007ffff568655a in elm_obj_widget_focus_steal () at elm_widget.eo.c:427 #17 0x00007ffff56960ab in elm_widget_focus_steal () at elm_widget.eo.c:1296 #18 0x00007ffff56a0c25 in _elm_win_focus_in () at elm_win.c:980 #19 0x00007fff968432b3 in _ecore_evas_x_event_window_focus_in () at modules/ecore_evas/engines/x/ecore_evas_x.c:1397 #20 0x00007ffff625ea07 in _ecore_event_call () at lib/ecore/ecore_private.h:359 #21 0x00007ffff6265e55 in _ecore_main_loop_iterate_internal () at lib/ecore/ecore_main.c:1940 #22 0x00007ffff6266187 in ecore_main_loop_begin () at lib/ecore/ecore_main.c:983 #23 0x000000000040d57a in elm_main () #24 0x000000000040d5ed in main () 1054141 1 243019 g.czajkowski 2014-12-10 07:39:45 -0800 Created attachment 243019 Patch 1054407 2 g.czajkowski 2014-12-10 21:30:31 -0800 I'm not sure if this is correct fix, maybe we should set ewk_view focus after elm_win initialization? Thanks 1054825 3 243196 g.czajkowski 2014-12-12 06:19:15 -0800 Created attachment 243196 Transfer focus to ewk_view when main window gets focused 1055587 4 g.czajkowski 2014-12-15 02:23:18 -0800 Hi Gyuyoung and Ryuan any comment on this? Let me describe the difference between Patch #1 and #2. First patch blocks programatically focus set on main window which Ecore set (in fact, stealing it from ewk_view) on application startup. Drawback: since we manage focus manually, caret blinks on input fields when application goes background. Second patch, transfers focus to ewk_view when main windows gets focused. As a result, when Ecore assigns focus to main window on application startup, in fact we give it to ewk_view. Additionally it fixes bugs (saving/restoring focus) when application goes background/foreground which fits common Browser behavior. 1055594 5 243196 gyuyoung.kim 2014-12-15 03:16:27 -0800 Comment on attachment 243196 Transfer focus to ewk_view when main window gets focused View in context: https://bugs.webkit.org/attachment.cgi?id=243196&action=review > Tools/ChangeLog:18 > + Otherwise, cursor may sometimes appear simultaneously. Similar bug seems to be filed before. https://bugs.webkit.org/show_bug.cgi?id=136324#c0 Ryuan, any comment on this ? > Tools/MiniBrowser/efl/main.c:1996 > +on_window_focus_in(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info) I'm not sure whether EFL application should handle focus in/out. If we should, it is very hard to make EFL application based on ewebkit. I think we need to investigate if this work is normal behavior in EFL application. 1057024 6 g.czajkowski 2014-12-19 05:01:52 -0800 (In reply to comment #5) > Comment on attachment 243196 [details] > Transfer focus to ewk_view when main window gets focused > > View in context: > https://bugs.webkit.org/attachment.cgi?id=243196&action=review > > > Tools/ChangeLog:18 > > + Otherwise, cursor may sometimes appear simultaneously. > > > I think we need to investigate if this work is normal behavior in EFL application. Not really, this is rather ewk_view (Evas_Object) specific bug as elm objects behave correctly. I did quick change by setting focus on url_bar (elm_entry) using elm_object_focus_set(window->url_bar, EINA_TRUE). In this case url_bar remains focus whereas ewk_view does not. To prevent stealing focus from ewk_view while startup application I preprepared patch #1 (Show Obsolete if you are interested in reviewing it). However, after that cursor still blinks when application goes foreground but it might be more WebKit related bug, for example WKViewSetIsActive(false)? Having this bug in the trunk causes real difference between MiniBrowser and WebKitTestRunner, especially in editing commands (some of them do not even work for unfocused view). 1057360 7 ryuan.choi 2014-12-22 01:23:45 -0800 (In reply to comment #6) > (In reply to comment #5) > > Comment on attachment 243196 [details] > > Transfer focus to ewk_view when main window gets focused > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=243196&action=review > > > > > Tools/ChangeLog:18 > > > + Otherwise, cursor may sometimes appear simultaneously. > > > > > > I think we need to investigate if this work is normal behavior in EFL application. > > Not really, this is rather ewk_view (Evas_Object) specific bug as elm > objects behave correctly. I did quick change by setting focus on url_bar > (elm_entry) using elm_object_focus_set(window->url_bar, EINA_TRUE). In this > case url_bar remains focus whereas ewk_view does not. > > To prevent stealing focus from ewk_view while startup application I > preprepared patch #1 (Show Obsolete if you are interested in reviewing it). > However, after that cursor still blinks when application goes foreground but > it might be more WebKit related bug, for example WKViewSetIsActive(false)? > > Having this bug in the trunk causes real difference between MiniBrowser and > WebKitTestRunner, especially in editing commands (some of them do not even > work for unfocused view). I preffered first option because it's simpler. In fact, I think that both are not right way but I also know that there are not right solution for ewebkit on elm. (One more hackish solution is using elm_box or similar container.) If we can't provide right solution, I think that the simpler is the better. FYI, there are two focus system in EFL. The first is for evas and the second is for elm. The focus system of ELM controls not only its own focus but also evas's focus. ewebkit which is based on evas smart object can't know the focus of elm. 1057361 8 g.czajkowski 2014-12-22 01:35:24 -0800 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > Comment on attachment 243196 [details] > > > Transfer focus to ewk_view when main window gets focused > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=243196&action=review > > > > > > > Tools/ChangeLog:18 > > > > + Otherwise, cursor may sometimes appear simultaneously. > > > > > > > > > I think we need to investigate if this work is normal behavior in EFL application. > > > > Not really, this is rather ewk_view (Evas_Object) specific bug as elm > > objects behave correctly. I did quick change by setting focus on url_bar > > (elm_entry) using elm_object_focus_set(window->url_bar, EINA_TRUE). In this > > case url_bar remains focus whereas ewk_view does not. > > > > To prevent stealing focus from ewk_view while startup application I > > preprepared patch #1 (Show Obsolete if you are interested in reviewing it). > > However, after that cursor still blinks when application goes foreground but > > it might be more WebKit related bug, for example WKViewSetIsActive(false)? > > > > Having this bug in the trunk causes real difference between MiniBrowser and > > WebKitTestRunner, especially in editing commands (some of them do not even > > work for unfocused view). > > I preffered first option because it's simpler. > In fact, I think that both are not right way but I also know that there are > not right solution for ewebkit on elm. > (One more hackish solution is using elm_box or similar container.) > If we can't provide right solution, I think that the simpler is the better. > > FYI, there are two focus system in EFL. The first is for evas and the second > is for elm. > The focus system of ELM controls not only its own focus but also evas's > focus. ewebkit which is based on evas smart object can't know the focus of > elm. Thanks for your opinion. Let me mark patch #1 for review once again than. 1057375 9 243019 gyuyoung.kim 2014-12-22 06:47:32 -0800 Comment on attachment 243019 Patch LGTM 1057377 10 243019 commit-queue 2014-12-22 07:30:12 -0800 Comment on attachment 243019 Patch Clearing flags on attachment: 243019 Committed r177632: <http://trac.webkit.org/changeset/177632> 1057378 11 commit-queue 2014-12-22 07:30:18 -0800 All reviewed patches have been landed. Closing bug. 243018 2014-12-10 07:35:11 -0800 2014-12-10 07:35:11 -0800 test case focused_input.html text/html 169 g.czajkowski PGh0bWw+Cjxib2R5PgogICAgQmVsb3cgaW5wdXQgaGFzIGZvY3VzIGFuZCB5b3Ugc2hvdWxkIGJl IGFibGUgdG8gdHlwZS48YnI+ICAgIAogICAgPGlucHV0IGF1dG9mb2N1cyBwbGFjZWhvbGRlcj0i QXJlIHlvdSBhYmxlIHRvIGVyYXNlIG1lPyIgc2l6ZT0iMTAwIj4KPC9ib2R5Pgo8L2h0bWw+Cg== 243019 2014-12-10 07:39:45 -0800 2014-12-22 07:30:12 -0800 Patch bug-139482-20141210164025.patch text/plain 1625 g.czajkowski U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjYyZDNhZWRmZDlhNTYyNDY5NjQ3ZDYxNzkyYWU0NjQ0 OWQ3YWE5Yy4uNGEzNGIxY2JlMTMyNDJjMjRiYWM3MWY3ZWVlMGM3ZDY5YjAzYjJhOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE0LTEyLTEwICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIE1pbmlCcm93c2VyIHN0ZWFscyB3ZWIgdmlldydzIGZv Y3VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0 ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHRo b3VnaCB3ZSBzZXQgZm9jdXMgb24gZXdrX3ZpZXcgd2hpbGUgTWluaUJyb3dzZXIgaW5pdGlhbGl6 YXRpb24KKyAgICAgICAgRWNvcmUgc3RlYWxzIGl0IGluIGEgZmF2b3Igb2YgbWFpbiB3aW5kb3cu IEFzIGEgcmVzdWx0CisgICAgICAgIGZvY3VzZWQgZWxlbWVudCBvbiB3ZWIgcGFnZSBpcyB1bmFi bGUgdG8gcmVjZWl2ZSBldmVudHMuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFpbi5j OgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAgIFByZXZlbnQgd2luZG93IGZyb20g c3RlYWxpbmcgd2ViIHZpZXcncyBmb2N1cyBvbiBzdGFydCB1cC4KKwogMjAxNC0xMi0wOSAgQmVu amFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggd2Via2l0 cHkgdGVzdCBleHBlY3RhdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggMTkxMWM0MThiNGNkMTk3 NThhYTVmNmY1ZTM1YzBlYjQ0OTFhNzFmMi4uN2U4NjQ5MmJlMzMwYWE3NTUxMzFiMmJiNjQwNGZj MzAxMzRmYTM4NiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysg Yi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0yMjkwLDYgKzIyOTAsOCBAQCBzdGF0 aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgaW50 IHdpZHRoLCBpbnQgaGVpZ2h0KQogICAgIHNlYXJjaF9ib3hfaGlkZSh3aW5kb3cpOwogCiAgICAg dmlld19mb2N1c19zZXQod2luZG93LCBFSU5BX1RSVUUpOworICAgIC8vIFByZXZlbnQgd2luZG93 IGZyb20gc3RlYWxpbmcgd2ViIHZpZXcncyBmb2N1cyBvbiBzdGFydCB1cC4KKyAgICBlbG1fb2Jq ZWN0X2ZvY3VzX2FsbG93X3NldCh3aW5kb3ctPmVsbV93aW5kb3csIEVJTkFfRkFMU0UpOwogCiAg ICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNf Q0FMTEJBQ0tfTU9VU0VfSU4sIG9uX21vdXNlX2luLCB3aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0 X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNF X09VVCwgb25fbW91c2Vfb3V0LCB3aW5kb3cpOwo= 243196 2014-12-12 06:19:15 -0800 2014-12-22 01:35:47 -0800 Transfer focus to ewk_view when main window gets focused bug-139482-20141212151958.patch text/plain 5468 g.czajkowski U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjYyZDNhZWRmZDlhNTYyNDY5NjQ3ZDYxNzkyYWU0NjQ0 OWQ3YWE5Yy4uM2Y0OTU2YTk2ZmM2OWU3ZWI1MWZkODdiNTNmYTgxM2M0YjgyYmI3NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE0LTEyLTEwICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdIE1pbmlCcm93c2VyIHN0ZWFscyB3ZWIgdmlldydzIGZv Y3VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0 ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHRo b3VnaCB3ZSBzZXQgZm9jdXMgb24gZXdrX3ZpZXcgd2hpbGUgTWluaUJyb3dzZXIgaW5pdGlhbGl6 YXRpb24KKyAgICAgICAgRWNvcmUgc3RlYWxzIGl0IGluIGEgZmF2b3Igb2YgbWFpbiB3aW5kb3cu IEFzIGEgcmVzdWx0LAorICAgICAgICBmb2N1c2VkIGVsZW1lbnQgb24gd2ViIHBhZ2UgaXMgdW5h YmxlIHRvIHJlY2VpdmUgZXZlbnRzLgorCisgICAgICAgIFRyYW5zZmVyIGZvY3VzIHRvIGV3a192 aWV3IHdoZW4gbWFpbiB3aW5kb3cgZ2V0cyBmb2N1c2VkCisgICAgICAgIHVubGVzcyBvdGhlciBl bG0gb2JqZWN0cyBvd24gaXQgZHVyaW5nIGFwcGxpY2F0aW9uIGxpZmV0aW1lLgorCisgICAgICAg ICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX3ZpZXdfZm9jdXNfaW4pOgor ICAgICAgICBUYWtlIGZvY3VzIGZyb20gYWxsIE1pbmlCcm93c2VyJ3MgZWxtIGVkaXRhYmxlIG9i amVjdHMsCisgICAgICAgIE90aGVyd2lzZSwgY3Vyc29yIG1heSBzb21ldGltZXMgYXBwZWFyIHNp bXVsdGFuZW91c2x5LgorCisgICAgICAgIChvbl93aW5kb3dfZm9jdXNfaW4pOgorICAgICAgICBS ZXN0b3JlIGZvY3VzIHRvIGV3a192aWV3IGlmIGl0IHdhcyBmb2N1c2VkLgorCisgICAgICAgIChv bl93aW5kb3dfZm9jdXNfb3V0KToKKyAgICAgICAgUmVtZW1iZXIgd2hldGhlciBld2tfdmlldyBp cyBmb2N1c2VkIHRvIHJlc3RvcmUgaXQgb24gZm9yZWdyb3VuZC4KKworICAgICAgICAod2luZG93 X2NyZWF0ZSk6CisgICAgICAgIERvIG5vdCBzZXQgZm9jdXMgb24gZXdrX3ZpZXcgd2hpbGUgaW5p dGlhbGl6YXRpb24sIGl0IHdpbGwgYmUKKyAgICAgICAgc3RvbGVuIGluIGZhdm9yIG9mIG1haW4g d2luZG93LgorCiAyMDE0LTEyLTA5ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCB3ZWJraXRweSB0ZXN0IGV4cGVjdGF0aW9uCmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYwppbmRleCAxOTExYzQxOGI0Y2QxOTc1OGFhNWY2ZjVlMzVjMGViNDQ5MWE3MWYyLi5hZmVh MGJiMjEyMzBjM2U4YjM1ZmFmMTk1NjlhODYwY2UzNGVhMmNiIDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK QEAgLTEzMSw2ICsxMzEsNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cgewogICAg ICAgICBFdmFzX09iamVjdCAqZWxtX21lbnU7CiAgICAgICAgIEV3a19Db250ZXh0X01lbnUgKmV3 a19tZW51OwogICAgIH0gY29udGV4dF9tZW51OworICAgIEVpbmFfQm9vbCBld2tfdmlld19mb2N1 c19hc3NpZ247CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVmIHN0cnVjdCBfRmlsZV9TZWxl Y3Rvcl9EYXRhIHsKQEAgLTkwNiw2ICs5MDcsMTQgQEAgb25fY29sb3JfcGlja2VyX2Rpc21pc3Mo RXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QpCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIAorc3Rh dGljIHZvaWQKK29uX3ZpZXdfZm9jdXNfaW4odm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFz X09iamVjdCAqZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAgQnJvd3Nlcl9XaW5k b3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKKyAgICBlbG1fb2JqZWN0 X2ZvY3VzX3NldCh3aW5kb3ctPnVybF9iYXIsIEVJTkFfRkFMU0UpOworICAgIGVsbV9vYmplY3Rf Zm9jdXNfc2V0KHdpbmRvdy0+c2VhcmNoLnNlYXJjaF9maWVsZCwgRUlOQV9GQUxTRSk7Cit9CisK IHN0YXRpYyBFaW5hX0Jvb2wKIG9uX2NvbG9yX3BpY2tlcl9yZXF1ZXN0KEV3a19WaWV3X1NtYXJ0 X0RhdGEgKnNkLCBFd2tfQ29sb3JfUGlja2VyICpjb2xvcl9waWNrZXIpCiB7CkBAIC0xOTg0LDYg KzE5OTMsMzQgQEAgb25faG9tZV9idXR0b25fY2xpY2tlZCh2b2lkICp1c2VyX2RhdGEsIEV2YXNf T2JqZWN0ICpob21lX2J1dHRvbiwgdm9pZCAqZXZlbnRfaW4KIH0KIAogc3RhdGljIHZvaWQKK29u X3dpbmRvd19mb2N1c19pbih2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpl d2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICAvKiBUcmFuc2ZlciBmb2N1cyB0byBl d2tfdmlldyB3aGVuIHdpbmRvdyBnZXRzIGZvY3VzZWQuCisgICAgICAgVXN1YWxseSwgb24gYXBw bGljYXRpb24gc3RhcnR1cCwgd2luZG93IG1hbmFnZXIgYXNzaWducworICAgICAgIGZvY3VzIHRv IHdpbmRvdywgc3RlYWxpbmcgZm9jdXMgZm9ybSBpdHMgY29tcG9uZW50LiAqLworICAgIEJyb3dz ZXJfV2luZG93ICp3aW5kb3cgPSAoQnJvd3Nlcl9XaW5kb3cgKil1c2VyX2RhdGE7CisgICAgaWYg KHdpbmRvdy0+ZXdrX3ZpZXdfZm9jdXNfYXNzaWduKQorICAgICAgICB2aWV3X2ZvY3VzX3NldCh3 aW5kb3csIEVJTkFfVFJVRSk7Cit9CisKK3N0YXRpYyB2b2lkCitvbl93aW5kb3dfZm9jdXNfb3V0 KHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpl dmVudF9pbmZvKQoreworICAgIC8qIElmIGFwcGxpY2F0aW9uIGdvZXMgYmFja2dyb3VuZCwgcmVt ZW1iZXIgd2hldGhlciBld2tfdmlldworICAgICAgIGhhcyBmb2N1cyB0byByZXN0b3JlIGl0IG9u IGZvcmVncm91bmQuCisgICAgICAgRWxtIG9iamVjdHMgY2FuIGRvIHRoaXMgYXV0b21hdGljYWxs eS4gKi8KKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNl cl9kYXRhOworICAgIGlmIChldmFzX29iamVjdF9mb2N1c19nZXQod2luZG93LT5ld2tfdmlldykp IHsKKyAgICAgICAgd2luZG93LT5ld2tfdmlld19mb2N1c19hc3NpZ24gPSBFSU5BX1RSVUU7Cisg ICAgICAgIGV2YXNfb2JqZWN0X2ZvY3VzX3NldCh3aW5kb3ctPmV3a192aWV3LCBFSU5BX0ZBTFNF KTsKKyAgICB9IGVsc2UKKyAgICAgICAgd2luZG93LT5ld2tfdmlld19mb2N1c19hc3NpZ24gPSBF SU5BX0ZBTFNFOworCisgICAgZWxtX29iamVjdF9mb2N1c19zZXQod2luZG93LT51cmxfYmFyLCBF SU5BX0ZBTFNFKTsKKyAgICBlbG1fb2JqZWN0X2ZvY3VzX3NldCh3aW5kb3ctPnNlYXJjaC5zZWFy Y2hfZmllbGQsIEVJTkFfRkFMU0UpOworfQorCitzdGF0aWMgdm9pZAogb25fd2luZG93X2RlbGV0 aW9uKHZvaWQgKnVzZXJfZGF0YSwgRXZhc19PYmplY3QgKmVsbV93aW5kb3csIHZvaWQgKmV2ZW50 X2luZm8pCiB7CiAgICAgd2luZG93X2Nsb3NlKHdpbmRvd19maW5kX3dpdGhfZWxtX3dpbmRvdyhl bG1fd2luZG93KSk7CkBAIC0yMDIyLDYgKzIwNTksOCBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cg KndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 KQogICAgIC8qIENyZWF0ZSB3aW5kb3cgKi8KICAgICB3aW5kb3ctPmVsbV93aW5kb3cgPSBlbG1f d2luX2FkZChOVUxMLCAibWluaWJyb3dzZXItd2luZG93IiwgRUxNX1dJTl9CQVNJQyk7CiAgICAg ZWxtX3dpbl90aXRsZV9zZXQod2luZG93LT5lbG1fd2luZG93LCBBUFBfTkFNRSk7CisgICAgZXZh c19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZWxtX3dpbmRvdywgRVZBU19DQUxM QkFDS19GT0NVU19JTiwgb25fd2luZG93X2ZvY3VzX2luLCB3aW5kb3cpOworICAgIGV2YXNfb2Jq ZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmVsbV93aW5kb3csIEVWQVNfQ0FMTEJBQ0tf Rk9DVVNfT1VULCBvbl93aW5kb3dfZm9jdXNfb3V0LCB3aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0 X3NtYXJ0X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmVsbV93aW5kb3csICJkZWxldGUscmVxdWVzdCIs IG9uX3dpbmRvd19kZWxldGlvbiwgJndpbmRvdyk7CiAKICAgICAvKiBDcmVhdGUgd2luZG93IGJh Y2tncm91bmQgKi8KQEAgLTIyNzksNiArMjMxOCw3IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAq d2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBpbnQgd2lkdGgsIGludCBoZWlnaHQp CiAKICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywg RVZBU19DQUxMQkFDS19LRVlfRE9XTiwgb25fa2V5X2Rvd24sIHdpbmRvdyk7CiAgICAgZXZhc19v YmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tf TU9VU0VfRE9XTiwgb25fbW91c2VfZG93biwgd2luZG93KTsKKyAgICBldmFzX29iamVjdF9ldmVu dF9jYWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxMQkFDS19GT0NVU19JTiwg b25fdmlld19mb2N1c19pbiwgd2luZG93KTsKIAogICAgIGV2YXNfb2JqZWN0X3NpemVfaGludF93 ZWlnaHRfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfSElOVF9FWFBBTkQsIEVWQVNfSElOVF9F WFBBTkQpOwogICAgIGV2YXNfb2JqZWN0X3NpemVfaGludF9hbGlnbl9zZXQod2luZG93LT5ld2tf dmlldywgRVZBU19ISU5UX0ZJTEwsIEVWQVNfSElOVF9GSUxMKTsKQEAgLTIyODksNyArMjMyOSw3 IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3Bl bmVyLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ct PmVsbV93aW5kb3cpOwogICAgIHNlYXJjaF9ib3hfaGlkZSh3aW5kb3cpOwogCi0gICAgdmlld19m b2N1c19zZXQod2luZG93LCBFSU5BX1RSVUUpOworICAgIHdpbmRvdy0+ZXdrX3ZpZXdfZm9jdXNf YXNzaWduID0gRUlOQV9UUlVFOwogCiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRk KHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfSU4sIG9uX21vdXNlX2luLCB3 aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5kb3ctPmV3a192 aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX09VVCwgb25fbW91c2Vfb3V0LCB3aW5kb3cpOwo=