114728 2013-04-17 02:24:44 -0700 [EFL][WK2] Add sub menus to MiniBrowser 2013-05-22 07:16:33 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 114729 116549 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue lucas.de.marchi oldest_to_newest 877088 0 mpakulavelrutka 2013-04-17 02:24:44 -0700 MiniBrowser should support sub menus. 881173 1 199643 mpakulavelrutka 2013-04-25 02:45:34 -0700 Created attachment 199643 proposed patch Current implementation uses Elementary Ctxpopup widget, which does not support submenus. To implement submenus in Minibrowser, widget should be changed to Elementary Menu widget. 891658 2 199643 cdumez 2013-05-21 02:16:15 -0700 Comment on attachment 199643 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=199643&action=review > Tools/MiniBrowser/efl/main.c:1180 > + Evas_Coord ewk_x, ewk_y; Why is this coordinate translation needed now? 891661 3 199643 mpakulavelrutka 2013-05-21 02:23:22 -0700 Comment on attachment 199643 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=199643&action=review >> Tools/MiniBrowser/efl/main.c:1180 >> + Evas_Coord ewk_x, ewk_y; > > Why is this coordinate translation needed now? It is just something I forgot to add in earlier patch. Parent object for elm_menu is elm_window and the coordinates received from WebKit are webview coordinates, which position differs from window because of i.e. url bar. 891700 4 199643 jinwoo7.song 2013-05-21 04:09:27 -0700 Comment on attachment 199643 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=199643&action=review >>> Tools/MiniBrowser/efl/main.c:1180 >>> + Evas_Coord ewk_x, ewk_y; >> >> Why is this coordinate translation needed now? > > It is just something I forgot to add in earlier patch. Parent object for elm_menu is elm_window and the coordinates received from WebKit are webview coordinates, which position differs from window because of i.e. url bar. The context menu is created in wrong places when the window is resized. 891875 5 mpakulavelrutka 2013-05-21 10:22:20 -0700 (In reply to comment #4) > (From update of attachment 199643 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=199643&action=review > > >>> Tools/MiniBrowser/efl/main.c:1180 > >>> + Evas_Coord ewk_x, ewk_y; > >> > >> Why is this coordinate translation needed now? > > > > It is just something I forgot to add in earlier patch. Parent object for elm_menu is elm_window and the coordinates received from WebKit are webview coordinates, which position differs from window because of i.e. url bar. > > The context menu is created in wrong places when the window is resized. We should disable window resizing during showing context menu/select popup, as it is done in other browsers. I will try to find solution for that. 892206 6 199643 cdumez 2013-05-22 03:02:16 -0700 Comment on attachment 199643 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=199643&action=review >>>>> Tools/MiniBrowser/efl/main.c:1180 >>>>> + Evas_Coord ewk_x, ewk_y; >>>> >>>> Why is this coordinate translation needed now? >>> >>> It is just something I forgot to add in earlier patch. Parent object for elm_menu is elm_window and the coordinates received from WebKit are webview coordinates, which position differs from window because of i.e. url bar. >> >> The context menu is created in wrong places when the window is resized. > > We should disable window resizing during showing context menu/select popup, as it is done in other browsers. I will try to find solution for that. I personally think it would be better to dismiss the context menu when the window gets resized. 892241 7 202527 mpakulavelrutka 2013-05-22 05:18:10 -0700 Created attachment 202527 hiding menu on window resize added 892242 8 202528 mpakulavelrutka 2013-05-22 05:19:34 -0700 Created attachment 202528 hiding menu on window resize added 892244 9 cdumez 2013-05-22 05:24:34 -0700 It crashes when I maximize the window and the context menu is shown: Showing context menu at (457, 355). Program received signal SIGSEGV, Segmentation fault. 0x00007ffff78c08f0 in ewk_object_is_of_type<EwkContextMenu*> (object=0x17db8c0) at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:40 40 return (reinterpret_cast<T>(0)->className() == object->instanceClassName()); (gdb) bt #0 0x00007ffff78c08f0 in ewk_object_is_of_type<EwkContextMenu*> (object=0x17db8c0) at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:40 #1 0x00007ffff78c0717 in ewk_object_cast_check<EwkContextMenu*> (object=0x17db8c0) at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:48 #2 0x00007ffff78c0614 in ewk_object_cast<EwkContextMenu*> (object=0x17db8c0) at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:67 #3 0x00007ffff78bfb80 in ewk_context_menu_hide (menu=0x17db8c0) at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp:128 #4 0x0000000000405602 in on_window_resize (user_data=0x47ec30, e=0x480260, elm_window=0x8006b0, event_info=0x0) at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:275 #5 0x00007ffff7e35252 in evas_object_event_callback_call (obj=obj@entry=0x8006b0, type=type@entry=EVAS_CALLBACK_RESIZE, event_info=event_info@entry=0x0, event_id=10884) at evas_callbacks.c:232 #6 0x00007ffff7e4f99e in evas_object_inform_call_resize (obj=0x8006b0) at evas_object_inform.c:38 #7 0x00007ffff7e4cfd1 in evas_object_resize (obj=<optimized out>, w=<optimized out>, h=<optimized out>) at evas_object_main.c:753 #8 0x00007ffff6dfa228 in _elm_win_resize_job (data=0x88e180) at elm_win.c:578 #9 0x00007ffff7fd56cb in _ecore_job_event_handler (data=<optimized out>, type=<optimized out>, ev=<optimized out>) at ecore_job.c:115 #10 0x00007ffff7fd210c in _ecore_call_handler_cb (event=<optimized out>, type=<optimized out>, data=<optimized out>, func=<optimized out>) at ecore_private.h:321 #11 _ecore_event_call () at ecore_events.c:559 #12 0x00007ffff7fd6909 in _ecore_main_loop_iterate_internal (once_only=once_only@entry=0) at ecore_main.c:1922 #13 0x00007ffff7fd6e97 in ecore_main_loop_begin () at ecore_main.c:956 #14 0x0000000000409bfa in elm_main (argc=1, argv=0x7fffffffe0d8) at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:1719 #15 0x0000000000409c3c in main (argc=1, argv=0x7fffffffe0d8) at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:1723 892247 10 202528 cdumez 2013-05-22 05:26:05 -0700 Comment on attachment 202528 hiding menu on window resize added View in context: https://bugs.webkit.org/attachment.cgi?id=202528&action=review r- due to crashing. > Tools/MiniBrowser/efl/main.c:1620 > nit: useless blank line here. 892253 11 mpakulavelrutka 2013-05-22 06:01:18 -0700 (In reply to comment #9) > It crashes when I maximize the window and the context menu is shown: > > Showing context menu at (457, 355). > > Program received signal SIGSEGV, Segmentation fault. > 0x00007ffff78c08f0 in ewk_object_is_of_type<EwkContextMenu*> (object=0x17db8c0) > at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:40 > 40 return (reinterpret_cast<T>(0)->className() == object->instanceClassName()); > (gdb) bt > #0 0x00007ffff78c08f0 in ewk_object_is_of_type<EwkContextMenu*> (object=0x17db8c0) > at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:40 > #1 0x00007ffff78c0717 in ewk_object_cast_check<EwkContextMenu*> (object=0x17db8c0) > at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:48 > #2 0x00007ffff78c0614 in ewk_object_cast<EwkContextMenu*> (object=0x17db8c0) > at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_object_private.h:67 > #3 0x00007ffff78bfb80 in ewk_context_menu_hide (menu=0x17db8c0) > at /home/chris/devel/WebKit/Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp:128 > #4 0x0000000000405602 in on_window_resize (user_data=0x47ec30, e=0x480260, elm_window=0x8006b0, event_info=0x0) > at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:275 > #5 0x00007ffff7e35252 in evas_object_event_callback_call (obj=obj@entry=0x8006b0, type=type@entry=EVAS_CALLBACK_RESIZE, > event_info=event_info@entry=0x0, event_id=10884) at evas_callbacks.c:232 > #6 0x00007ffff7e4f99e in evas_object_inform_call_resize (obj=0x8006b0) at evas_object_inform.c:38 > #7 0x00007ffff7e4cfd1 in evas_object_resize (obj=<optimized out>, w=<optimized out>, h=<optimized out>) at evas_object_main.c:753 > #8 0x00007ffff6dfa228 in _elm_win_resize_job (data=0x88e180) at elm_win.c:578 > #9 0x00007ffff7fd56cb in _ecore_job_event_handler (data=<optimized out>, type=<optimized out>, ev=<optimized out>) at ecore_job.c:115 > #10 0x00007ffff7fd210c in _ecore_call_handler_cb (event=<optimized out>, type=<optimized out>, data=<optimized out>, func=<optimized out>) > at ecore_private.h:321 > #11 _ecore_event_call () at ecore_events.c:559 > #12 0x00007ffff7fd6909 in _ecore_main_loop_iterate_internal (once_only=once_only@entry=0) at ecore_main.c:1922 > #13 0x00007ffff7fd6e97 in ecore_main_loop_begin () at ecore_main.c:956 > #14 0x0000000000409bfa in elm_main (argc=1, argv=0x7fffffffe0d8) at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:1719 > #15 0x0000000000409c3c in main (argc=1, argv=0x7fffffffe0d8) at /home/chris/devel/WebKit/Tools/MiniBrowser/efl/main.c:1723 window->context_menu.ewk_menu was not nulled after menu was hidden by WebKit 892256 12 202531 mpakulavelrutka 2013-05-22 06:05:50 -0700 Created attachment 202531 added nulling context_menu.ewk_menu 892258 13 cdumez 2013-05-22 06:15:18 -0700 wr(In reply to comment #12) > Created an attachment (id=202531) [details] > added nulling context_menu.ewk_menu wrong patch 892261 14 202532 mpakulavelrutka 2013-05-22 06:19:40 -0700 Created attachment 202532 added nulling context_menu.ewk_menu 892267 15 202532 cdumez 2013-05-22 06:37:42 -0700 Comment on attachment 202532 added nulling context_menu.ewk_menu LGTM. r=me. However, the "go back" item shows as enabled on a page where going back is impossible. This is not related to this patch as the value provided by WebKit is wrong. Could you please look into this issue? 892278 16 202532 commit-queue 2013-05-22 07:16:30 -0700 Comment on attachment 202532 added nulling context_menu.ewk_menu Clearing flags on attachment: 202532 Committed r150515: <http://trac.webkit.org/changeset/150515> 892279 17 commit-queue 2013-05-22 07:16:33 -0700 All reviewed patches have been landed. Closing bug. 199643 2013-04-25 02:45:34 -0700 2013-05-22 05:18:10 -0700 proposed patch minibrowser-submenus2.diff text/plain 6393 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4Zjg3 NDk5Li5kZTg5ZThlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMDQtMjUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBz dWIgbWVudXMgdG8gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEVsZW1lbnRhcnkgQ3R4cG9wdXAgd2lkZ2V0IEFQSSBkb2VzIG5vdCBw cm92aWRlIHN1cHBvcnQgZm9yIHN1Ym1lbnUgaXRlbS4KKyAgICAgICAgVG8gaW1wbGVtZW50IGV3 ayBzdWJtZW51cyBpbiBNaW5pYnJvd3NlciwgQ3R4cG9wdXAgaGFzIHRvIGJlIHJlcGxhY2VkIHdp dGgKKyAgICAgICAgRWxlbWVudGFyeSBNZW51IHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgorICAgICAgICAoY29u dGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2IpOgorICAgICAgICAoY29udGV4dF9tZW51X3BvcHVs YXRlKToKKyAgICAgICAgKG9uX2NvbnRleHRfbWVudV9zaG93KToKKyAgICAgICAgKG9uX2NvbnRl eHRfbWVudV9oaWRlKToKKwogMjAxMy0wNC0yNCAgU2Vva2p1IEt3b24gIDxzZW9ranUua3dvbkBn bWFpbC5jb20+CiAKICAgICAgICAgUmVtb3ZlIGNoZWNraW5nIGNocm9taXVtIGZyb20gcnVuLXdl YmtpdC10ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggM2IzOTUxZi4uNjQzYzdmYSAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCkBAIC0xMDgsNyArMTA4LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJf V2luZG93IHsKICAgICB9IHNlYXJjaDsKICAgICBpbnQgY3VycmVudF96b29tX2xldmVsOyAKICAg ICBUb29sdGlwX0luZm9ybWF0aW9uIHRvb2x0aXA7Ci0gICAgRXZhc19PYmplY3QgKmNvbnRleHRf cG9wdXA7CisgICAgRXZhc19PYmplY3QgKmNvbnRleHRfbWVudTsKIH0gQnJvd3Nlcl9XaW5kb3c7 CiAKIHR5cGVkZWYgc3RydWN0IF9GaWxlX1NlbGVjdG9yX0RhdGEgewpAQCAtMTEwNSw0OSArMTEw NSw1NiBAQCBvbl93aW5kb3dfY2xvc2UoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc21hcnREYXRhKQog fQogCiBzdGF0aWMgdm9pZAotY29udGV4dF9wb3B1cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRvdyAq d2luZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSk7Ci0KLXN0YXRpYyB2b2lkCi1jb250 ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmplY3QgKm9iaiwg dm9pZCAqZXZlbnRfaW5mbykKK2NvbnRleHRfbWVudV9pdGVtX3NlbGVjdGVkX2NiKHZvaWQgKmRh dGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiB7CiAgICAgaWYgKCFkYXRh KSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBjb250ZXh0IHBvcHVwIGNhbGxiYWNrIGRhdGEgaXMg TlVMTC4iKTsKKyAgICAgICAgaW5mbygiRVJST1I6IGNvbnRleHQgbWVudSBjYWxsYmFjayBkYXRh IGlzIE5VTEwuIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9N ZW51X0l0ZW0gKmV3a19pdGVtID0gKEV3a19Db250ZXh0X01lbnVfSXRlbSAqKWRhdGE7Ci0gICAg aW5mbygiU2VsZWN0ZWQgY29udGV4dCBwb3B1cCBpdGVtOiAlcy4iLCBld2tfY29udGV4dF9tZW51 X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSk7CisgICAgaW5mbygiU2VsZWN0ZWQgY29udGV4dCBt ZW51IGl0ZW06ICVzLiIsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0p KTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0KGV3a19jb250ZXh0X21lbnVfaXRl bV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pLCBld2tfaXRlbSk7CiAgICAgZXdrX2NvbnRleHRf bWVudV9oaWRlKGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0p KTsKIH0KIAogc3RhdGljIHZvaWQKLWNvbnRleHRfcG9wdXBfcG9wdWxhdGUoQnJvd3Nlcl9XaW5k b3cgKndpbmRvdywgRXdrX0NvbnRleHRfTWVudSAqZXdrX21lbnUpCitjb250ZXh0X21lbnVfcG9w dWxhdGUoRXZhc19PYmplY3QqIGNvbnRleHRfbWVudSwgRXdrX0NvbnRleHRfTWVudSAqZXdrX21l bnUsIEVsbV9PYmplY3RfSXRlbSAqcGFyZW50X2l0ZW0pCiB7CisgICAgaWYgKCFjb250ZXh0X21l bnUgfHwgIWV3a19tZW51KSB7CisgICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0 cyBhcmUgTlVMTC4iKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGNvbnN0IEVpbmFf TGlzdCAqbGlzdCA9IGV3a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0KGV3a19tZW51KTsKICAgICBj b25zdCBFaW5hX0xpc3QgKmw7CiAgICAgdm9pZCAqZGF0YTsKIAogICAgIEV3a19Db250ZXh0X01l bnVfSXRlbSAqZXdrX2l0ZW07Ci0gICAgRWxtX09iamVjdF9JdGVtICplbG1fcG9wdXBfaXRlbTsK KyAgICBFbG1fT2JqZWN0X0l0ZW0gKmVsbV9tZW51X2l0ZW07CiAgICAgRXZhc19PYmplY3QgKmVs bV9jaGVja19pdGVtOwogCiAgICAgRUlOQV9MSVNUX0ZPUkVBQ0gobGlzdCwgbCwgZGF0YSkgewog ICAgICAgICBld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKilkYXRhOwogICAgICAg ICBzd2l0Y2ggKGV3a19jb250ZXh0X21lbnVfaXRlbV90eXBlX2dldChld2tfaXRlbSkpIHsKICAg ICAgICAgY2FzZSBFV0tfQUNUSU9OX1RZUEU6Ci0gICAgICAgICAgICBlbG1fcG9wdXBfaXRlbSA9 IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3aW5kb3ctPmNvbnRleHRfcG9wdXAsIGV3a19jb250 ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBOVUxMLCBjb250ZXh0X3BvcHVwX2l0 ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBl bG1fbWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUsIHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29u dGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgY29udGV4dF9tZW51X2l0ZW1fc2Vs ZWN0ZWRfY2IsIGV3a19pdGVtKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEVX S19DSEVDS0FCTEVfQUNUSU9OX1RZUEU6Ci0gICAgICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVs bV9jaGVja19hZGQod2luZG93LT5jb250ZXh0X3BvcHVwKTsKLSAgICAgICAgICAgIGVsbV9wb3B1 cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBwZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwg ZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRf cG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOwotICAgICAgICAgICAgZWxtX29iamVj dF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9wb3B1cF9pdGVtLCBlbG1fY2hlY2tfaXRlbSk7CisgICAg ICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9jaGVja19hZGQoY29udGV4dF9tZW51KTsKKyAg ICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBlbG1fbWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUs IHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19p dGVtKSwgY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAg ICAgIGVsbV9vYmplY3RfaXRlbV9jb250ZW50X3NldChlbG1fbWVudV9pdGVtLCBlbG1fY2hlY2tf aXRlbSk7CiAgICAgICAgICAgICBlbG1fY2hlY2tfc3RhdGVfc2V0KGVsbV9jaGVja19pdGVtLCBl d2tfY29udGV4dF9tZW51X2l0ZW1fY2hlY2tlZF9nZXQoZXdrX2l0ZW0pKTsKICAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIEVXS19TVUJNRU5VX1RZUEU6CisgICAgICAgICAgICBlbG1f bWVudV9pdGVtID0gZWxtX21lbnVfaXRlbV9hZGQoY29udGV4dF9tZW51LCBwYXJlbnRfaXRlbSwg TlVMTCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSksIE5VTEwsIGV3 a19pdGVtKTsKKyAgICAgICAgICAgIGlmIChlbG1fbWVudV9pdGVtKQorICAgICAgICAgICAgICAg IGNvbnRleHRfbWVudV9wb3B1bGF0ZShjb250ZXh0X21lbnUsIGV3a19jb250ZXh0X21lbnVfaXRl bV9zdWJtZW51X2dldChld2tfaXRlbSksIGVsbV9tZW51X2l0ZW0pOworICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQot ICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fZGlzYWJsZWRfc2V0KGVsbV9wb3B1cF9pdGVtLCAhZXdr X2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0KGV3a19pdGVtKSk7CisgICAgICAgIGVsbV9v YmplY3RfaXRlbV9kaXNhYmxlZF9zZXQoZWxtX21lbnVfaXRlbSwgIWV3a19jb250ZXh0X21lbnVf aXRlbV9lbmFibGVkX2dldChld2tfaXRlbSkpOwogICAgIH0KIH0KIApAQCAtMTE2MSwxOCArMTE2 OCwyMyBAQCBvbl9jb250ZXh0X21lbnVfc2hvdyhFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZh c19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19DbwogICAgICAgICByZXR1cm4gRUlOQV9GQUxT RTsKICAgICB9CiAKLSAgICB3aW5kb3ctPmNvbnRleHRfcG9wdXAgPSBlbG1fY3R4cG9wdXBfYWRk KHdpbmRvdy0+ZWxtX3dpbmRvdyk7CisgICAgd2luZG93LT5jb250ZXh0X21lbnUgPSBlbG1fbWVu dV9hZGQod2luZG93LT5lbG1fd2luZG93KTsKIAotICAgIGlmICghd2luZG93LT5jb250ZXh0X3Bv cHVwKSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGNvbnRleHQgcG9w dXAgd2lkZ2V0LiIpOworICAgIGlmICghd2luZG93LT5jb250ZXh0X21lbnUpIHsKKyAgICAgICAg aW5mbygiRVJST1I6IGNvdWxkIG5vdCBjcmVhdGUgbWVudSB3aWRnZXQuIik7CiAgICAgICAgIHJl dHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIAotICAgIGNvbnRleHRfcG9wdXBfcG9wdWxhdGUod2lu ZG93LCBtZW51KTsKKyAgICBjb250ZXh0X21lbnVfcG9wdWxhdGUod2luZG93LT5jb250ZXh0X21l bnUsIG1lbnUsIE5VTEwpOworCisgICAgRXZhc19Db29yZCBld2tfeCwgZXdrX3k7CisgICAgZXZh c19vYmplY3RfZ2VvbWV0cnlfZ2V0KHdpbmRvdy0+ZXdrX3ZpZXcsICZld2tfeCwgJmV3a195LCBO VUxMLCBOVUxMKTsKKyAgICB4ICs9IGV3a194OworICAgIHkgKz0gZXdrX3k7CiAKLSAgICBpbmZv KCJTaG93aW5nIGNvbnRleHQgcG9wdXAgYXQgKCVkLCAlZCkuIiwgeCwgeSk7Ci0gICAgZXZhc19v YmplY3RfbW92ZSh3aW5kb3ctPmNvbnRleHRfcG9wdXAsIHgsIHkpOwotICAgIGV2YXNfb2JqZWN0 X3Nob3cod2luZG93LT5jb250ZXh0X3BvcHVwKTsKKyAgICBpbmZvKCJTaG93aW5nIGNvbnRleHQg bWVudSBhdCAoJWQsICVkKS4iLCB4LCB5KTsKKyAgICBlbG1fbWVudV9tb3ZlKHdpbmRvdy0+Y29u dGV4dF9tZW51LCB4LCB5KTsKKyAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9t ZW51KTsKIAogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CkBAIC0xMTgyLDE0ICsxMTk0LDE0IEBA IG9uX2NvbnRleHRfbWVudV9oaWRlKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKQogewogICAgIEJy b3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfZmluZF93aXRoX2V3a192aWV3KHNkLT5zZWxm KTsKIAotICAgIGlmICghd2luZG93IHx8ICF3aW5kb3ctPmNvbnRleHRfcG9wdXApIHsKKyAgICBp ZiAoIXdpbmRvdyB8fCAhd2luZG93LT5jb250ZXh0X21lbnUpIHsKICAgICAgICAgaW5mbygiRVJS T1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLiIpOwogICAgICAgICByZXR1cm4gRUlOQV9G QUxTRTsKICAgICB9CiAKLSAgICBlbG1fY3R4cG9wdXBfZGlzbWlzcyh3aW5kb3ctPmNvbnRleHRf cG9wdXApOwotICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmNvbnRleHRfcG9wdXApOwotICAg IHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisgICAgZWxtX21lbnVfY2xvc2Uod2luZG93 LT5jb250ZXh0X21lbnUpOworICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmNvbnRleHRfbWVu dSk7CisgICAgd2luZG93LT5jb250ZXh0X21lbnUgPSBOVUxMOwogCiAgICAgcmV0dXJuIEVJTkFf VFJVRTsKIH0K 202527 2013-05-22 05:18:10 -0700 2013-05-22 05:19:34 -0700 hiding menu on window resize added minibrowser-submenus4.diff text/plain 8186 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhN2Qz YWY0Li5hYTdkNjBjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTMtMDUtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBz dWIgbWVudXMgdG8gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEVsZW1lbnRhcnkgQ3R4cG9wdXAgd2lkZ2V0IEFQSSBkb2VzIG5vdCBw cm92aWRlIHN1cHBvcnQgZm9yIHN1Ym1lbnUgaXRlbS4KKyAgICAgICAgVG8gaW1wbGVtZW50IGV3 ayBzdWJtZW51cyBpbiBNaW5pYnJvd3NlciwgQ3R4cG9wdXAgaGFzIHRvIGJlIHJlcGxhY2VkIHdp dGgKKyAgICAgICAgRWxlbWVudGFyeSBNZW51IHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgorICAgICAgICAob25f d2luZG93X3Jlc2l6ZSk6CisgICAgICAgICh3aW5kb3dfZnJlZSk6CisgICAgICAgIChjb250ZXh0 X21lbnVfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChjb250ZXh0X21lbnVfcG9wdWxhdGUp OgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAob25fY29udGV4dF9t ZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMtMDUtMjEgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTUwMzY5 KTogV2ViS2l0MldpbGxMb2FkVGVzdCB0ZXN0cyBhcmUgZmFpbGluZwpkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK aW5kZXggZjU1NzY5OC4uMDVhOWVkYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMDksNyArMTA5 LDEwIEBAIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgfSBzZWFyY2g7CiAg ICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29s dGlwOwotICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOworICAgIHN0cnVjdCB7CisgICAg ICAgIEV2YXNfT2JqZWN0ICplbG1fbWVudTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSAqZXdr X21lbnU7CisgICAgfSBjb250ZXh0X21lbnU7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVm IHN0cnVjdCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTI1OCwxMiArMjYxLDI3IEBAIG9uX21v dXNlX291dCh2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywg dm9pZCAqZXZlbnRfaW5mbykKICAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUod2luZG93KTsKIH0K IAorc3RhdGljIHZvaWQKK29uX3dpbmRvd19yZXNpemUodm9pZCAqdXNlcl9kYXRhLCBFdmFzICpl LCBFdmFzX09iamVjdCAqZWxtX3dpbmRvdywgdm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOworCisgICAg aWYgKCF3aW5kb3cpIHsKKyAgICAgICAgaW5mbygiRVJST1I6IHdpbmRvdyBpcyBOVUxMLiIpOwor ICAgIH0KKworICAgIGlmICh3aW5kb3ctPmNvbnRleHRfbWVudS5ld2tfbWVudSkKKyAgICAgICAg ZXdrX2NvbnRleHRfbWVudV9oaWRlKHdpbmRvdy0+Y29udGV4dF9tZW51LmV3a19tZW51KTsKK30K Kwogc3RhdGljIHZvaWQgd2luZG93X2ZyZWUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdykKIHsKICAg ICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19kZWwod2luZG93LT5ld2tfdmlldywgRVZBU19D QUxMQkFDS19NT1VTRV9JTiwgb25fbW91c2VfaW4pOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2Nh bGxiYWNrX2RlbCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX09VVCwgb25f bW91c2Vfb3V0KTsKICAgICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19kZWwod2luZG93LT5l d2tfdmlldywgRVZBU19DQUxMQkFDS19NT1VTRV9NT1ZFLCBvbl9tb3VzZV9tb3ZlKTsKIAorICAg IGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ctPmVsbV93aW5kb3csIEVWQVNf Q0FMTEJBQ0tfUkVTSVpFLCBvbl93aW5kb3dfcmVzaXplKTsKKwogICAgIGV2YXNfb2JqZWN0X2Rl bCh3aW5kb3ctPmV3a192aWV3KTsKICAgICAvKiBUaGUgZWxtX3dpbiB3aWxsIHRha2UgY2FyZSBv ZiBmcmVlaW5nIGl0cyBjaGlsZHJlbiAqLwogICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmVs bV93aW5kb3cpOwpAQCAtMTEwOCw0OSArMTEyNiw1NiBAQCBvbl93aW5kb3dfY2xvc2UoRXdrX1Zp ZXdfU21hcnRfRGF0YSAqc21hcnREYXRhKQogfQogCiBzdGF0aWMgdm9pZAotY29udGV4dF9wb3B1 cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRvdyAqd2luZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tf bWVudSk7Ci0KLXN0YXRpYyB2b2lkCi1jb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2Iodm9p ZCAqZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKK2NvbnRleHRfbWVu dV9pdGVtX3NlbGVjdGVkX2NiKHZvaWQgKmRhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2 ZW50X2luZm8pCiB7CiAgICAgaWYgKCFkYXRhKSB7Ci0gICAgICAgIGluZm8oIkVSUk9SOiBjb250 ZXh0IHBvcHVwIGNhbGxiYWNrIGRhdGEgaXMgTlVMTC4iKTsKKyAgICAgICAgaW5mbygiRVJST1I6 IGNvbnRleHQgbWVudSBjYWxsYmFjayBkYXRhIGlzIE5VTEwuIik7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKmV3a19pdGVtID0gKEV3a19Db250 ZXh0X01lbnVfSXRlbSAqKWRhdGE7Ci0gICAgaW5mbygiU2VsZWN0ZWQgY29udGV4dCBwb3B1cCBp dGVtOiAlcy4iLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSk7Cisg ICAgaW5mbygiU2VsZWN0ZWQgY29udGV4dCBtZW51IGl0ZW06ICVzLiIsIGV3a19jb250ZXh0X21l bnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1f c2VsZWN0KGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pLCBl d2tfaXRlbSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9oaWRlKGV3a19jb250ZXh0X21lbnVfaXRl bV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pKTsKIH0KIAogc3RhdGljIHZvaWQKLWNvbnRleHRf cG9wdXBfcG9wdWxhdGUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdywgRXdrX0NvbnRleHRfTWVudSAq ZXdrX21lbnUpCitjb250ZXh0X21lbnVfcG9wdWxhdGUoRXZhc19PYmplY3QqIGNvbnRleHRfbWVu dSwgRXdrX0NvbnRleHRfTWVudSAqZXdrX21lbnUsIEVsbV9PYmplY3RfSXRlbSAqcGFyZW50X2l0 ZW0pCiB7CisgICAgaWYgKCFjb250ZXh0X21lbnUgfHwgIWV3a19tZW51KSB7CisgICAgICAgIGlu Zm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC4iKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKwogICAgIGNvbnN0IEVpbmFfTGlzdCAqbGlzdCA9IGV3a19jb250ZXh0X21lbnVf aXRlbXNfZ2V0KGV3a19tZW51KTsKICAgICBjb25zdCBFaW5hX0xpc3QgKmw7CiAgICAgdm9pZCAq ZGF0YTsKIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW07Ci0gICAgRWxtX09i amVjdF9JdGVtICplbG1fcG9wdXBfaXRlbTsKKyAgICBFbG1fT2JqZWN0X0l0ZW0gKmVsbV9tZW51 X2l0ZW07CiAgICAgRXZhc19PYmplY3QgKmVsbV9jaGVja19pdGVtOwogCiAgICAgRUlOQV9MSVNU X0ZPUkVBQ0gobGlzdCwgbCwgZGF0YSkgewogICAgICAgICBld2tfaXRlbSA9IChFd2tfQ29udGV4 dF9NZW51X0l0ZW0gKilkYXRhOwogICAgICAgICBzd2l0Y2ggKGV3a19jb250ZXh0X21lbnVfaXRl bV90eXBlX2dldChld2tfaXRlbSkpIHsKICAgICAgICAgY2FzZSBFV0tfQUNUSU9OX1RZUEU6Ci0g ICAgICAgICAgICBlbG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3aW5k b3ctPmNvbnRleHRfcG9wdXAsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0 ZW0pLCBOVUxMLCBjb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAg ICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBlbG1fbWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUs IHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19p dGVtKSwgY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBjYXNlIEVXS19DSEVDS0FCTEVfQUNUSU9OX1RZUEU6Ci0gICAg ICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9jaGVja19hZGQod2luZG93LT5jb250ZXh0X3Bv cHVwKTsKLSAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBw ZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dl dChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0 ZW0pOwotICAgICAgICAgICAgZWxtX29iamVjdF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9wb3B1cF9p dGVtLCBlbG1fY2hlY2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9j aGVja19hZGQoY29udGV4dF9tZW51KTsKKyAgICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBlbG1f bWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUsIHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29udGV4 dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0 ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9vYmplY3RfaXRlbV9jb250ZW50X3Nl dChlbG1fbWVudV9pdGVtLCBlbG1fY2hlY2tfaXRlbSk7CiAgICAgICAgICAgICBlbG1fY2hlY2tf c3RhdGVfc2V0KGVsbV9jaGVja19pdGVtLCBld2tfY29udGV4dF9tZW51X2l0ZW1fY2hlY2tlZF9n ZXQoZXdrX2l0ZW0pKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEVXS19TVUJN RU5VX1RZUEU6CisgICAgICAgICAgICBlbG1fbWVudV9pdGVtID0gZWxtX21lbnVfaXRlbV9hZGQo Y29udGV4dF9tZW51LCBwYXJlbnRfaXRlbSwgTlVMTCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3Rp dGxlX2dldChld2tfaXRlbSksIE5VTEwsIGV3a19pdGVtKTsKKyAgICAgICAgICAgIGlmIChlbG1f bWVudV9pdGVtKQorICAgICAgICAgICAgICAgIGNvbnRleHRfbWVudV9wb3B1bGF0ZShjb250ZXh0 X21lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChld2tfaXRlbSksIGVsbV9t ZW51X2l0ZW0pOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fZGlzYWJs ZWRfc2V0KGVsbV9wb3B1cF9pdGVtLCAhZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0 KGV3a19pdGVtKSk7CisgICAgICAgIGVsbV9vYmplY3RfaXRlbV9kaXNhYmxlZF9zZXQoZWxtX21l bnVfaXRlbSwgIWV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChld2tfaXRlbSkpOwog ICAgIH0KIH0KIApAQCAtMTE2NCwxOCArMTE4OSwyNSBAQCBvbl9jb250ZXh0X21lbnVfc2hvdyhF d2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19D bwogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9CiAKLSAgICB3aW5kb3ctPmNvbnRl eHRfcG9wdXAgPSBlbG1fY3R4cG9wdXBfYWRkKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CisgICAgd2lu ZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUgPSBlbG1fbWVudV9hZGQod2luZG93LT5lbG1fd2lu ZG93KTsKIAotICAgIGlmICghd2luZG93LT5jb250ZXh0X3BvcHVwKSB7Ci0gICAgICAgIGluZm8o IkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGNvbnRleHQgcG9wdXAgd2lkZ2V0LiIpOworICAgIGlm ICghd2luZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUpIHsKKyAgICAgICAgaW5mbygiRVJST1I6 IGNvdWxkIG5vdCBjcmVhdGUgbWVudSB3aWRnZXQuIik7CiAgICAgICAgIHJldHVybiBFSU5BX0ZB TFNFOwogICAgIH0KIAotICAgIGNvbnRleHRfcG9wdXBfcG9wdWxhdGUod2luZG93LCBtZW51KTsK KyAgICB3aW5kb3ctPmNvbnRleHRfbWVudS5ld2tfbWVudSA9IG1lbnU7CisKKyAgICBjb250ZXh0 X21lbnVfcG9wdWxhdGUod2luZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUsIG1lbnUsIE5VTEwp OwogCi0gICAgaW5mbygiU2hvd2luZyBjb250ZXh0IHBvcHVwIGF0ICglZCwgJWQpLiIsIHgsIHkp OwotICAgIGV2YXNfb2JqZWN0X21vdmUod2luZG93LT5jb250ZXh0X3BvcHVwLCB4LCB5KTsKLSAg ICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7CisgICAgRXZhc19Db29y ZCBld2tfeCwgZXdrX3k7CisgICAgZXZhc19vYmplY3RfZ2VvbWV0cnlfZ2V0KHdpbmRvdy0+ZXdr X3ZpZXcsICZld2tfeCwgJmV3a195LCBOVUxMLCBOVUxMKTsKKyAgICB4ICs9IGV3a194OworICAg IHkgKz0gZXdrX3k7CisKKyAgICBpbmZvKCJTaG93aW5nIGNvbnRleHQgbWVudSBhdCAoJWQsICVk KS4iLCB4LCB5KTsKKyAgICBlbG1fbWVudV9tb3ZlKHdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9t ZW51LCB4LCB5KTsKKyAgICBldmFzX29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9tZW51LmVs bV9tZW51KTsKIAogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CkBAIC0xMTg1LDE0ICsxMjE3LDE0 IEBAIG9uX2NvbnRleHRfbWVudV9oaWRlKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKQogewogICAg IEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfZmluZF93aXRoX2V3a192aWV3KHNkLT5z ZWxmKTsKIAotICAgIGlmICghd2luZG93IHx8ICF3aW5kb3ctPmNvbnRleHRfcG9wdXApIHsKKyAg ICBpZiAoIXdpbmRvdyB8fCAhd2luZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUpIHsKICAgICAg ICAgaW5mbygiRVJST1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLiIpOwogICAgICAgICBy ZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9CiAKLSAgICBlbG1fY3R4cG9wdXBfZGlzbWlzcyh3aW5k b3ctPmNvbnRleHRfcG9wdXApOwotICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ctPmNvbnRleHRf cG9wdXApOwotICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisgICAgZWxtX21lbnVf Y2xvc2Uod2luZG93LT5jb250ZXh0X21lbnUuZWxtX21lbnUpOworICAgIGV2YXNfb2JqZWN0X2Rl bCh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSk7CisgICAgd2luZG93LT5jb250ZXh0X21l bnUuZWxtX21lbnUgPSBOVUxMOwogCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KQEAgLTE1ODUs NiArMTYxNyw4IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09i amVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3CiAgICAgZXZhc19vYmplY3RfZXZl bnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfT1VU LCBvbl9tb3VzZV9vdXQsIHdpbmRvdyk7CiAgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tf YWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0VfTU9WRSwgb25fbW91c2Vf bW92ZSwgd2luZG93KTsKIAorICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5k b3ctPmVsbV93aW5kb3csIEVWQVNfQ0FMTEJBQ0tfUkVTSVpFLCBvbl93aW5kb3dfcmVzaXplLCB3 aW5kb3cpOworCiAgICAgcmV0dXJuIHdpbmRvdzsKIH0KIAo= 202528 2013-05-22 05:19:34 -0700 2013-05-22 06:05:50 -0700 hiding menu on window resize added minibrowser-submenus5.diff text/plain 8203 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhN2Qz YWY0Li5hYTdkNjBjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTMtMDUtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBz dWIgbWVudXMgdG8gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEVsZW1lbnRhcnkgQ3R4cG9wdXAgd2lkZ2V0IEFQSSBkb2VzIG5vdCBw cm92aWRlIHN1cHBvcnQgZm9yIHN1Ym1lbnUgaXRlbS4KKyAgICAgICAgVG8gaW1wbGVtZW50IGV3 ayBzdWJtZW51cyBpbiBNaW5pYnJvd3NlciwgQ3R4cG9wdXAgaGFzIHRvIGJlIHJlcGxhY2VkIHdp dGgKKyAgICAgICAgRWxlbWVudGFyeSBNZW51IHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgorICAgICAgICAob25f d2luZG93X3Jlc2l6ZSk6CisgICAgICAgICh3aW5kb3dfZnJlZSk6CisgICAgICAgIChjb250ZXh0 X21lbnVfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChjb250ZXh0X21lbnVfcG9wdWxhdGUp OgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAob25fY29udGV4dF9t ZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMtMDUtMjEgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTUwMzY5 KTogV2ViS2l0MldpbGxMb2FkVGVzdCB0ZXN0cyBhcmUgZmFpbGluZwpkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK aW5kZXggZjU1NzY5OC4uNTI4MDdhNSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMDksNyArMTA5 LDEwIEBAIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgfSBzZWFyY2g7CiAg ICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29s dGlwOwotICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOworICAgIHN0cnVjdCB7CisgICAg ICAgIEV2YXNfT2JqZWN0ICplbG1fbWVudTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSAqZXdr X21lbnU7CisgICAgfSBjb250ZXh0X21lbnU7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVm IHN0cnVjdCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTI1OCwxMiArMjYxLDI4IEBAIG9uX21v dXNlX291dCh2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywg dm9pZCAqZXZlbnRfaW5mbykKICAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUod2luZG93KTsKIH0K IAorc3RhdGljIHZvaWQKK29uX3dpbmRvd19yZXNpemUodm9pZCAqdXNlcl9kYXRhLCBFdmFzICpl LCBFdmFzX09iamVjdCAqZWxtX3dpbmRvdywgdm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOworCisgICAg aWYgKCF3aW5kb3cpIHsKKyAgICAgICAgaW5mbygiRVJST1I6IHdpbmRvdyBpcyBOVUxMLiIpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHdpbmRvdy0+Y29udGV4dF9tZW51LmV3 a19tZW51KQorICAgICAgICBld2tfY29udGV4dF9tZW51X2hpZGUod2luZG93LT5jb250ZXh0X21l bnUuZXdrX21lbnUpOworfQorCiBzdGF0aWMgdm9pZCB3aW5kb3dfZnJlZShCcm93c2VyX1dpbmRv dyAqd2luZG93KQogewogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ct PmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX0lOLCBvbl9tb3VzZV9pbik7CiAgICAgZXZh c19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJB Q0tfTU9VU0VfT1VULCBvbl9tb3VzZV9vdXQpOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxi YWNrX2RlbCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX01PVkUsIG9uX21v dXNlX21vdmUpOwogCisgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKHdpbmRvdy0+ ZWxtX3dpbmRvdywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9uX3dpbmRvd19yZXNpemUpOworCiAg ICAgZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcpOwogICAgIC8qIFRoZSBlbG1fd2lu IHdpbGwgdGFrZSBjYXJlIG9mIGZyZWVpbmcgaXRzIGNoaWxkcmVuICovCiAgICAgZXZhc19vYmpl Y3RfZGVsKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CkBAIC0xMTA4LDQ5ICsxMTI3LDU2IEBAIG9uX3dp bmRvd19jbG9zZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEpCiB9CiAKIHN0YXRpYyB2 b2lkCi1jb250ZXh0X3BvcHVwX3BvcHVsYXRlKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIEV3a19D b250ZXh0X01lbnUgKmV3a19tZW51KTsKLQotc3RhdGljIHZvaWQKLWNvbnRleHRfcG9wdXBfaXRl bV9zZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9p bmZvKQorY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmpl Y3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKIHsKICAgICBpZiAoIWRhdGEpIHsKLSAgICAgICAg aW5mbygiRVJST1I6IGNvbnRleHQgcG9wdXAgY2FsbGJhY2sgZGF0YSBpcyBOVUxMLiIpOworICAg ICAgICBpbmZvKCJFUlJPUjogY29udGV4dCBtZW51IGNhbGxiYWNrIGRhdGEgaXMgTlVMTC4iKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdr X2l0ZW0gPSAoRXdrX0NvbnRleHRfTWVudV9JdGVtICopZGF0YTsKLSAgICBpbmZvKCJTZWxlY3Rl ZCBjb250ZXh0IHBvcHVwIGl0ZW06ICVzLiIsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9n ZXQoZXdrX2l0ZW0pKTsKKyAgICBpbmZvKCJTZWxlY3RlZCBjb250ZXh0IG1lbnUgaXRlbTogJXMu IiwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSkpOwogICAgIGV3a19j b250ZXh0X21lbnVfaXRlbV9zZWxlY3QoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldChld2tfaXRlbSksIGV3a19pdGVtKTsKICAgICBld2tfY29udGV4dF9tZW51X2hpZGUoZXdr X2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChld2tfaXRlbSkpOwogfQogCiBzdGF0 aWMgdm9pZAotY29udGV4dF9wb3B1cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRvdyAqd2luZG93LCBF d2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKK2NvbnRleHRfbWVudV9wb3B1bGF0ZShFdmFzX09i amVjdCogY29udGV4dF9tZW51LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSwgRWxtX09iamVj dF9JdGVtICpwYXJlbnRfaXRlbSkKIHsKKyAgICBpZiAoIWNvbnRleHRfbWVudSB8fCAhZXdrX21l bnUpIHsKKyAgICAgICAgaW5mbygiRVJST1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLiIp OworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgY29uc3QgRWluYV9MaXN0ICpsaXN0ID0g ZXdrX2NvbnRleHRfbWVudV9pdGVtc19nZXQoZXdrX21lbnUpOwogICAgIGNvbnN0IEVpbmFfTGlz dCAqbDsKICAgICB2b2lkICpkYXRhOwogCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtICpld2tf aXRlbTsKLSAgICBFbG1fT2JqZWN0X0l0ZW0gKmVsbV9wb3B1cF9pdGVtOworICAgIEVsbV9PYmpl Y3RfSXRlbSAqZWxtX21lbnVfaXRlbTsKICAgICBFdmFzX09iamVjdCAqZWxtX2NoZWNrX2l0ZW07 CiAKICAgICBFSU5BX0xJU1RfRk9SRUFDSChsaXN0LCBsLCBkYXRhKSB7CiAgICAgICAgIGV3a19p dGVtID0gKEV3a19Db250ZXh0X01lbnVfSXRlbSAqKWRhdGE7CiAgICAgICAgIHN3aXRjaCAoZXdr X2NvbnRleHRfbWVudV9pdGVtX3R5cGVfZ2V0KGV3a19pdGVtKSkgewogICAgICAgICBjYXNlIEVX S19BQ1RJT05fVFlQRToKLSAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVw X2l0ZW1fYXBwZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVt X3RpdGxlX2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9j YiwgZXdrX2l0ZW0pOworICAgICAgICAgICAgZWxtX21lbnVfaXRlbSA9IGVsbV9tZW51X2l0ZW1f YWRkKGNvbnRleHRfbWVudSwgcGFyZW50X2l0ZW0sIE5VTEwsIGV3a19jb250ZXh0X21lbnVfaXRl bV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBjb250ZXh0X21lbnVfaXRlbV9zZWxlY3RlZF9jYiwgZXdr X2l0ZW0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9B Q1RJT05fVFlQRToKLSAgICAgICAgICAgIGVsbV9jaGVja19pdGVtID0gZWxtX2NoZWNrX2FkZCh3 aW5kb3ctPmNvbnRleHRfcG9wdXApOwotICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1f Y3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9t ZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3Nl bGVjdGVkX2NiLCBld2tfaXRlbSk7Ci0gICAgICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fY29udGVu dF9zZXQoZWxtX3BvcHVwX2l0ZW0sIGVsbV9jaGVja19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9j aGVja19pdGVtID0gZWxtX2NoZWNrX2FkZChjb250ZXh0X21lbnUpOworICAgICAgICAgICAgZWxt X21lbnVfaXRlbSA9IGVsbV9tZW51X2l0ZW1fYWRkKGNvbnRleHRfbWVudSwgcGFyZW50X2l0ZW0s IE5VTEwsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBjb250ZXh0 X21lbnVfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOworICAgICAgICAgICAgZWxtX29iamVj dF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9tZW51X2l0ZW0sIGVsbV9jaGVja19pdGVtKTsKICAgICAg ICAgICAgIGVsbV9jaGVja19zdGF0ZV9zZXQoZWxtX2NoZWNrX2l0ZW0sIGV3a19jb250ZXh0X21l bnVfaXRlbV9jaGVja2VkX2dldChld2tfaXRlbSkpOwogICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgRVdLX1NVQk1FTlVfVFlQRToKKyAgICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBl bG1fbWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUsIHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29u dGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgZXdrX2l0ZW0pOworICAg ICAgICAgICAgaWYgKGVsbV9tZW51X2l0ZW0pCisgICAgICAgICAgICAgICAgY29udGV4dF9tZW51 X3BvcHVsYXRlKGNvbnRleHRfbWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0 KGV3a19pdGVtKSwgZWxtX21lbnVfaXRlbSk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAg ZGVmYXVsdDoKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGVsbV9v YmplY3RfaXRlbV9kaXNhYmxlZF9zZXQoZWxtX3BvcHVwX2l0ZW0sICFld2tfY29udGV4dF9tZW51 X2l0ZW1fZW5hYmxlZF9nZXQoZXdrX2l0ZW0pKTsKKyAgICAgICAgZWxtX29iamVjdF9pdGVtX2Rp c2FibGVkX3NldChlbG1fbWVudV9pdGVtLCAhZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRf Z2V0KGV3a19pdGVtKSk7CiAgICAgfQogfQogCkBAIC0xMTY0LDE4ICsxMTkwLDI1IEBAIG9uX2Nv bnRleHRfbWVudV9zaG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHgsIEV2 YXNfQ29vcmQgeSwgRXdrX0NvCiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIAot ICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IGVsbV9jdHhwb3B1cF9hZGQod2luZG93LT5lbG1f d2luZG93KTsKKyAgICB3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSA9IGVsbV9tZW51X2Fk ZCh3aW5kb3ctPmVsbV93aW5kb3cpOwogCi0gICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfcG9wdXAp IHsKLSAgICAgICAgaW5mbygiRVJST1I6IGNvdWxkIG5vdCBjcmVhdGUgY29udGV4dCBwb3B1cCB3 aWRnZXQuIik7CisgICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSkgeworICAg ICAgICBpbmZvKCJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBtZW51IHdpZGdldC4iKTsKICAgICAg ICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQogCi0gICAgY29udGV4dF9wb3B1cF9wb3B1bGF0 ZSh3aW5kb3csIG1lbnUpOworICAgIHdpbmRvdy0+Y29udGV4dF9tZW51LmV3a19tZW51ID0gbWVu dTsKKworICAgIGNvbnRleHRfbWVudV9wb3B1bGF0ZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1f bWVudSwgbWVudSwgTlVMTCk7CiAKLSAgICBpbmZvKCJTaG93aW5nIGNvbnRleHQgcG9wdXAgYXQg KCVkLCAlZCkuIiwgeCwgeSk7Ci0gICAgZXZhc19vYmplY3RfbW92ZSh3aW5kb3ctPmNvbnRleHRf cG9wdXAsIHgsIHkpOwotICAgIGV2YXNfb2JqZWN0X3Nob3cod2luZG93LT5jb250ZXh0X3BvcHVw KTsKKyAgICBFdmFzX0Nvb3JkIGV3a194LCBld2tfeTsKKyAgICBldmFzX29iamVjdF9nZW9tZXRy eV9nZXQod2luZG93LT5ld2tfdmlldywgJmV3a194LCAmZXdrX3ksIE5VTEwsIE5VTEwpOworICAg IHggKz0gZXdrX3g7CisgICAgeSArPSBld2tfeTsKKworICAgIGluZm8oIlNob3dpbmcgY29udGV4 dCBtZW51IGF0ICglZCwgJWQpLiIsIHgsIHkpOworICAgIGVsbV9tZW51X21vdmUod2luZG93LT5j b250ZXh0X21lbnUuZWxtX21lbnUsIHgsIHkpOworICAgIGV2YXNfb2JqZWN0X3Nob3cod2luZG93 LT5jb250ZXh0X21lbnUuZWxtX21lbnUpOwogCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KQEAg LTExODUsMTQgKzEyMTgsMTQgQEAgb25fY29udGV4dF9tZW51X2hpZGUoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc2QpCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19maW5kX3dp dGhfZXdrX3ZpZXcoc2QtPnNlbGYpOwogCi0gICAgaWYgKCF3aW5kb3cgfHwgIXdpbmRvdy0+Y29u dGV4dF9wb3B1cCkgeworICAgIGlmICghd2luZG93IHx8ICF3aW5kb3ctPmNvbnRleHRfbWVudS5l bG1fbWVudSkgewogICAgICAgICBpbmZvKCJFUlJPUjogbmVjZXNzYXJ5IG9iamVjdHMgYXJlIE5V TEwuIik7CiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIAotICAgIGVsbV9jdHhw b3B1cF9kaXNtaXNzKHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7Ci0gICAgZXZhc19vYmplY3RfZGVs KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7Ci0gICAgd2luZG93LT5jb250ZXh0X3BvcHVwID0gTlVM TDsKKyAgICBlbG1fbWVudV9jbG9zZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSk7Cisg ICAgZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9tZW51KTsKKyAgICB3 aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSA9IE5VTEw7CiAKICAgICByZXR1cm4gRUlOQV9U UlVFOwogfQpAQCAtMTU4NSw2ICsxNjE4LDggQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5k b3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKICAg ICBldmFzX29iamVjdF9ldmVudF9jYWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19D QUxMQkFDS19NT1VTRV9PVVQsIG9uX21vdXNlX291dCwgd2luZG93KTsKICAgICBldmFzX29iamVj dF9ldmVudF9jYWxsYmFja19hZGQod2luZG93LT5ld2tfdmlldywgRVZBU19DQUxMQkFDS19NT1VT RV9NT1ZFLCBvbl9tb3VzZV9tb3ZlLCB3aW5kb3cpOwogCisgICAgZXZhc19vYmplY3RfZXZlbnRf Y2FsbGJhY2tfYWRkKHdpbmRvdy0+ZWxtX3dpbmRvdywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9u X3dpbmRvd19yZXNpemUsIHdpbmRvdyk7CisKICAgICByZXR1cm4gd2luZG93OwogfQogCg== 202531 2013-05-22 06:05:50 -0700 2013-05-22 06:19:40 -0700 added nulling context_menu.ewk_menu ewk-submenus6.diff text/plain 10880 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzYTZhNzE0Li44MjE3OGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTMtMDUtMTcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1Ym1lbnUg Y29udGV4dCBtZW51IGl0ZW0uIEEgdGVzdCBjYXNlIHdhcyBhZGRlZAorICAgICAgICBmb3IgbmV3 IEFQSSBmdW5jdGlvbi4KKyAgICAgICAgRXdrQ29udGV4dE1lbnUgaXMgbm93IGFuIEV3a09iamVj dCBhbGxvd2luZyBtdWx0aXBsZSBpbnN0YW5jZXMgb2Ygc3VibWVudQorICAgICAgICB0byBiZSB1 c2VkIGluIGRpZmZlcmVudCBzdWJtZW51IHR5cGUgY29udGV4dCBtZW51IGl0ZW1zLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcDoKKyAgICAg ICAgKEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9uZXcpOgorICAgICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVt X3BhcmVudF9tZW51X2dldCk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVu dV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRl bS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9w cml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAg IChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVudE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1l bnVJdGVtOjpzdWJNZW51KToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmg6CisgICAgICAg IChFd2tDb250ZXh0TWVudTo6ZXdrVmlldyk6CisgICAgICAgIChFd2tDb250ZXh0TWVudSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5j cHA6CisgICAgICAgIChzaG93Q29udGV4dE1lbnUpOgorCiAyMDEzLTA1LTE2ICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgV0tCdW5kbGVQYWdlR2V0SGVh ZGVyTGF5ZXIvRm9vdGVyIFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggNzgwODUwYi4uNjJh ZmQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nv bnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAi ZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCiAKICNpbmNsdWRlICJld2tfY29udGV4dF9tZW51X2l0 ZW1fcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oIgogI2lu Y2x1ZGUgImV3a19wcml2YXRlLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0NvbnRleHRNZW51SXRl bVR5cGVzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMzUsMTggKzM2LDIx IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHN0YXRpYyBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGdldEV3a0FjdGlvbkZyb21XS1RhZyhXS0NvbnRleHRNZW51SXRlbVRhZyBhY3Rp b24pOwogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRN ZW51SXRlbVJlZiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkKK0V3a0NvbnRleHRN ZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0sIFBh c3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUoc3RhdGlj X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGU+KFdLQ29udGV4dE1lbnVJdGVtR2V0VHlw ZShpdGVtKSkpCiAgICAgLCBtX2FjdGlvbihnZXRFd2tBY3Rpb25Gcm9tV0tUYWcoKFdLQ29udGV4 dE1lbnVJdGVtR2V0VGFnKGl0ZW0pKSkpCiAgICAgLCBtX3RpdGxlKFdLRWluYVNoYXJlZFN0cmlu ZyhBZG9wdFdLLCBXS0NvbnRleHRNZW51SXRlbUNvcHlUaXRsZShpdGVtKSkpCiAgICAgLCBtX2lz Q2hlY2tlZChXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5h YmxlZChXS0NvbnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCiAgICAgLCBtX3BhcmVudE1l bnUocGFyZW50TWVudSkKLSAgICAsIG1fc3ViTWVudSgwKQogeworICAgIGlmIChXS0NvbnRleHRN ZW51SXRlbUdldFR5cGUoaXRlbSkgPT0ga1dLQ29udGV4dE1lbnVJdGVtVHlwZVN1Ym1lbnUpIHsK KyAgICAgICAgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gbWVudUl0ZW1zID0gYWRvcHRXSyhXS0Nv bnRleHRNZW51Q29weVN1Ym1lbnVJdGVtcyhpdGVtKSk7CisgICAgICAgIG1fc3ViTWVudSA9IEV3 a0NvbnRleHRNZW51OjpjcmVhdGUocGFyZW50TWVudS0+ZXdrVmlldygpLCBtZW51SXRlbXMuZ2V0 KCkpOworICAgIH0KIH0KIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0o RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0Fj dGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9C b29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFy ZW50TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBQYXNzUmVmUHRyPEV3a0Nv bnRleHRNZW51PiBwYXJlbnRNZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlv bihhY3Rpb24pCiAgICAgLCBtX3RpdGxlKHRpdGxlKQpAQCAtNTksNyArNjMsNyBAQCBFd2tDb250 ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udAogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21l bnVfaXRlbV9uZXcoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRf TWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hl Y2tlZCwgRWluYV9Cb29sIGVuYWJsZWQpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVf SXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIDApLmxl YWtQdHIoKTsKKyAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwg YWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCkubGVha1B0cigpOwogfQogCiBFd2tfQ29u dGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3 a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rp b24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9v bCBlbmFibGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQpAQCAtMTUzLDcgKzE1NywxNCBA QCBFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0 KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVU VVJOX1ZBTChpdGVtLCAwKTsKIAotICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01l bnVfSXRlbSo+KGl0ZW0pLT5wYXJlbnRNZW51KCk7CisgICAgcmV0dXJuIGl0ZW0tPnBhcmVudE1l bnUoKTsKK30KKworRXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1l bnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1cm4gaXRlbS0+c3Vi TWVudSgpOwogfQogCiBzdGF0aWMgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBnZXRFd2tB Y3Rpb25Gcm9tV0tUYWcoV0tDb250ZXh0TWVudUl0ZW1UYWcgYWN0aW9uKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0u aAppbmRleCAyMDhlMGFkLi5iMDE0Y2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaApAQCAtMjY4LDYgKzI2 OCwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4dF9tZW51X2l0ZW1fZW5hYmxlZF9zZXQo RXdrX0NvbnRleHRfTWVudV9JdGVtICpvLCBFaW5hXwogICovCiBFQVBJIEV3a19Db250ZXh0X01l bnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRl eHRfTWVudV9JdGVtICpvKTsKIAorLyoqCisgKiBHZXRzIHRoZSBzdWJtZW51IGZvciB0aGUgaXRl bS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0aGUgc3VibWVudQorICoKKyAqIEByZXR1 cm4gdGhlIHBvaW50ZXIgdG8gc3VibWVudSBvbiBzdWNjZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVy ZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJt ZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pOworCiAjaWZkZWYgX19jcGx1 c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKaW5kZXggZTlj NDQ2ZS4uMzI4N2QxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCkBAIC0zMiw2 ICszMiw4IEBACiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCiAjaW5jbHVkZSAi ZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4K KyNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAog LyoqCiAgKiBcc3RydWN0ICBFd2tfQ29udGV4dF9NZW51X0l0ZW0KQEAgLTM5LDEyICs0MSwxMiBA QAogICovCiBjbGFzcyBFd2tDb250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQ YXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKFdLQ29udGV4dE1lbnVJdGVtUmVm IGl0ZW0sIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51ID0gMCkKKyAgICBzdGF0aWMgUGFzc093 blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVt LCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBwYXJlbnRNZW51ID0gMCkKICAgICB7CiAgICAg ICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0sIHBhcmVudE1l bnUpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+ IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2Vk LCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRN ZW51KiBwYXJlbnRNZW51ID0gMCkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVu dUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBj aGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3Vi TWVudSA9IDAsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHBhcmVudE1lbnUgPSAwKQogICAg IHsKICAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwg YWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSwgcGFyZW50TWVudSkpOwog ICAgIH0KQEAgLTY0LDEyICs2NiwxNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCkgY29u c3QgeyByZXR1cm4gbV9pc0VuYWJsZWQ7IH0KICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCBlbmFi bGVkKSB7IG1faXNFbmFibGVkID0gZW5hYmxlZDsgfQogCi0gICAgRXdrQ29udGV4dE1lbnUqIHBh cmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0KKyAgICBFd2tDb250ZXh0 TWVudSogcGFyZW50TWVudSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50TWVudS5nZXQoKTsgfQog ICAgIHZvaWQgc2V0UGFyZW50TWVudShFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkgeyBtX3Bh cmVudE1lbnUgPSBwYXJlbnRNZW51OyB9CiAKKyAgICBFd2tDb250ZXh0TWVudSogc3ViTWVudSgp IGNvbnN0IHsgcmV0dXJuIG1fc3ViTWVudS5nZXQoKTsgfQorCiBwcml2YXRlOgotICAgIEV3a0Nv bnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiwgRXdrQ29udGV4dE1lbnUqIHBhcmVu dE1lbnUpOwotICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciog dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1l bnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KTsKKyAgICBFd2tDb250ZXh0 TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+ IHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0 ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3Qg Y2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1Jl ZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4g cGFyZW50TWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSBtX3R5cGU7CiAg ICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2FjdGlvbjsKQEAgLTc5LDggKzgzLDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1faXNDaGVja2VkOwogICAgIGJvb2wgbV9pc0VuYWJsZWQ7 CiAKLSAgICBFd2tDb250ZXh0TWVudSogbV9wYXJlbnRNZW51OwotICAgIEV3a0NvbnRleHRNZW51 KiBtX3N1Yk1lbnU7CisgICAgUmVmUHRyPEV3a0NvbnRleHRNZW51PiBtX3BhcmVudE1lbnU7Cisg ICAgUmVmUHRyPEV3a0NvbnRleHRNZW51PiBtX3N1Yk1lbnU7CiB9OwogCiAjZW5kaWYgLy8gZXdr X2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAppbmRleCA4 ZmMzZDJlLi40OWI1Zjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaApAQCAtNjEsNiArNjEsOCBA QCBwdWJsaWM6CiAgICAgY29uc3QgRWluYV9MaXN0KiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1f Y29udGV4dE1lbnVJdGVtczsgfQogICAgIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbSk7CiAKKyAgICBFd2tWaWV3KiBld2tWaWV3KCkgY29uc3Qg eyByZXR1cm4gbV92aWV3SW1wbDsgfQorCiBwcml2YXRlOgogICAgIEV3a0NvbnRleHRNZW51KCk7 CiAgICAgRXdrQ29udGV4dE1lbnUoRWluYV9MaXN0KiBpdGVtcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9j b250ZXh0X21lbnUuY3BwCmluZGV4IDczMDZlYjQuLmJhMmM4ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9jb250ZXh0X21lbnUuY3BwCkBAIC03Myw2ICs3Myw5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hv d0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4 LCBFCiAgICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBhZGRlZCB0byBtZW51IHVzaW5n IGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQsIGl0IHNob3VsZCBoYXZlIHBhcmVudCBtZW51 LgogICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVu dF9tZW51X2dldChuZXdJdGVtKSk7CiAKKyAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIHdh cyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcsIHN1Ym1lbnUgc2hvdWxk IGJlIDAuCisgICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dl dChuZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0 ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwg Ik5ldyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElP Tl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRl bSAyIiwgZmFsc2UsIHRydWUpOwpAQCAtOTAsNiArOTMsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNo b3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQg eCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRN ZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUgcmVjZWl2ZWQgZnJvbSBld2tf Y29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJlIHRoZSBzYW1lIGFzIG9uZSB1 c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEoc3ViTWVudSwgZXdrX2NvbnRl eHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisKICAgICAvLyBXaGVuIGNvbnRl eHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193 aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQg aXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBl d2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKIAo= 202532 2013-05-22 06:19:40 -0700 2013-05-22 07:16:29 -0700 added nulling context_menu.ewk_menu minibrowser-submenus6.diff text/plain 8342 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhN2Qz YWY0Li5hYTdkNjBjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTMtMDUtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBz dWIgbWVudXMgdG8gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEVsZW1lbnRhcnkgQ3R4cG9wdXAgd2lkZ2V0IEFQSSBkb2VzIG5vdCBw cm92aWRlIHN1cHBvcnQgZm9yIHN1Ym1lbnUgaXRlbS4KKyAgICAgICAgVG8gaW1wbGVtZW50IGV3 ayBzdWJtZW51cyBpbiBNaW5pYnJvd3NlciwgQ3R4cG9wdXAgaGFzIHRvIGJlIHJlcGxhY2VkIHdp dGgKKyAgICAgICAgRWxlbWVudGFyeSBNZW51IHdpZGdldC4KKworICAgICAgICAqIE1pbmlCcm93 c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgorICAgICAgICAob25f d2luZG93X3Jlc2l6ZSk6CisgICAgICAgICh3aW5kb3dfZnJlZSk6CisgICAgICAgIChjb250ZXh0 X21lbnVfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChjb250ZXh0X21lbnVfcG9wdWxhdGUp OgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAob25fY29udGV4dF9t ZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMtMDUtMjEgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTUwMzY5 KTogV2ViS2l0MldpbGxMb2FkVGVzdCB0ZXN0cyBhcmUgZmFpbGluZwpkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK aW5kZXggZjU1NzY5OC4uMWEzOGNlMCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMDksNyArMTA5 LDEwIEBAIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgfSBzZWFyY2g7CiAg ICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29s dGlwOwotICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOworICAgIHN0cnVjdCB7CisgICAg ICAgIEV2YXNfT2JqZWN0ICplbG1fbWVudTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSAqZXdr X21lbnU7CisgICAgfSBjb250ZXh0X21lbnU7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVm IHN0cnVjdCBfRmlsZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTI1OCwxMiArMjYxLDI4IEBAIG9uX21v dXNlX291dCh2b2lkICp1c2VyX2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywg dm9pZCAqZXZlbnRfaW5mbykKICAgICB3aW5kb3dfdG9vbHRpcF91cGRhdGUod2luZG93KTsKIH0K IAorc3RhdGljIHZvaWQKK29uX3dpbmRvd19yZXNpemUodm9pZCAqdXNlcl9kYXRhLCBFdmFzICpl LCBFdmFzX09iamVjdCAqZWxtX3dpbmRvdywgdm9pZCAqZXZlbnRfaW5mbykKK3sKKyAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gKEJyb3dzZXJfV2luZG93ICopdXNlcl9kYXRhOworCisgICAg aWYgKCF3aW5kb3cpIHsKKyAgICAgICAgaW5mbygiRVJST1I6IHdpbmRvdyBpcyBOVUxMLiIpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHdpbmRvdy0+Y29udGV4dF9tZW51LmV3 a19tZW51KQorICAgICAgICBld2tfY29udGV4dF9tZW51X2hpZGUod2luZG93LT5jb250ZXh0X21l bnUuZXdrX21lbnUpOworfQorCiBzdGF0aWMgdm9pZCB3aW5kb3dfZnJlZShCcm93c2VyX1dpbmRv dyAqd2luZG93KQogewogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2RlbCh3aW5kb3ct PmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX0lOLCBvbl9tb3VzZV9pbik7CiAgICAgZXZh c19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJB Q0tfTU9VU0VfT1VULCBvbl9tb3VzZV9vdXQpOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxi YWNrX2RlbCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX01PVkUsIG9uX21v dXNlX21vdmUpOwogCisgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfZGVsKHdpbmRvdy0+ ZWxtX3dpbmRvdywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9uX3dpbmRvd19yZXNpemUpOworCiAg ICAgZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+ZXdrX3ZpZXcpOwogICAgIC8qIFRoZSBlbG1fd2lu IHdpbGwgdGFrZSBjYXJlIG9mIGZyZWVpbmcgaXRzIGNoaWxkcmVuICovCiAgICAgZXZhc19vYmpl Y3RfZGVsKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CkBAIC0xMTA4LDQ5ICsxMTI3LDU2IEBAIG9uX3dp bmRvd19jbG9zZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEpCiB9CiAKIHN0YXRpYyB2 b2lkCi1jb250ZXh0X3BvcHVwX3BvcHVsYXRlKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIEV3a19D b250ZXh0X01lbnUgKmV3a19tZW51KTsKLQotc3RhdGljIHZvaWQKLWNvbnRleHRfcG9wdXBfaXRl bV9zZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9p bmZvKQorY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmpl Y3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKIHsKICAgICBpZiAoIWRhdGEpIHsKLSAgICAgICAg aW5mbygiRVJST1I6IGNvbnRleHQgcG9wdXAgY2FsbGJhY2sgZGF0YSBpcyBOVUxMLiIpOworICAg ICAgICBpbmZvKCJFUlJPUjogY29udGV4dCBtZW51IGNhbGxiYWNrIGRhdGEgaXMgTlVMTC4iKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdr X2l0ZW0gPSAoRXdrX0NvbnRleHRfTWVudV9JdGVtICopZGF0YTsKLSAgICBpbmZvKCJTZWxlY3Rl ZCBjb250ZXh0IHBvcHVwIGl0ZW06ICVzLiIsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9n ZXQoZXdrX2l0ZW0pKTsKKyAgICBpbmZvKCJTZWxlY3RlZCBjb250ZXh0IG1lbnUgaXRlbTogJXMu IiwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSkpOwogICAgIGV3a19j b250ZXh0X21lbnVfaXRlbV9zZWxlY3QoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldChld2tfaXRlbSksIGV3a19pdGVtKTsKICAgICBld2tfY29udGV4dF9tZW51X2hpZGUoZXdr X2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChld2tfaXRlbSkpOwogfQogCiBzdGF0 aWMgdm9pZAotY29udGV4dF9wb3B1cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRvdyAqd2luZG93LCBF d2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKK2NvbnRleHRfbWVudV9wb3B1bGF0ZShFdmFzX09i amVjdCogY29udGV4dF9tZW51LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSwgRWxtX09iamVj dF9JdGVtICpwYXJlbnRfaXRlbSkKIHsKKyAgICBpZiAoIWNvbnRleHRfbWVudSB8fCAhZXdrX21l bnUpIHsKKyAgICAgICAgaW5mbygiRVJST1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLiIp OworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgY29uc3QgRWluYV9MaXN0ICpsaXN0ID0g ZXdrX2NvbnRleHRfbWVudV9pdGVtc19nZXQoZXdrX21lbnUpOwogICAgIGNvbnN0IEVpbmFfTGlz dCAqbDsKICAgICB2b2lkICpkYXRhOwogCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtICpld2tf aXRlbTsKLSAgICBFbG1fT2JqZWN0X0l0ZW0gKmVsbV9wb3B1cF9pdGVtOworICAgIEVsbV9PYmpl Y3RfSXRlbSAqZWxtX21lbnVfaXRlbTsKICAgICBFdmFzX09iamVjdCAqZWxtX2NoZWNrX2l0ZW07 CiAKICAgICBFSU5BX0xJU1RfRk9SRUFDSChsaXN0LCBsLCBkYXRhKSB7CiAgICAgICAgIGV3a19p dGVtID0gKEV3a19Db250ZXh0X01lbnVfSXRlbSAqKWRhdGE7CiAgICAgICAgIHN3aXRjaCAoZXdr X2NvbnRleHRfbWVudV9pdGVtX3R5cGVfZ2V0KGV3a19pdGVtKSkgewogICAgICAgICBjYXNlIEVX S19BQ1RJT05fVFlQRToKLSAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVw X2l0ZW1fYXBwZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVt X3RpdGxlX2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9j YiwgZXdrX2l0ZW0pOworICAgICAgICAgICAgZWxtX21lbnVfaXRlbSA9IGVsbV9tZW51X2l0ZW1f YWRkKGNvbnRleHRfbWVudSwgcGFyZW50X2l0ZW0sIE5VTEwsIGV3a19jb250ZXh0X21lbnVfaXRl bV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBjb250ZXh0X21lbnVfaXRlbV9zZWxlY3RlZF9jYiwgZXdr X2l0ZW0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9B Q1RJT05fVFlQRToKLSAgICAgICAgICAgIGVsbV9jaGVja19pdGVtID0gZWxtX2NoZWNrX2FkZCh3 aW5kb3ctPmNvbnRleHRfcG9wdXApOwotICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1f Y3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9t ZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3Nl bGVjdGVkX2NiLCBld2tfaXRlbSk7Ci0gICAgICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fY29udGVu dF9zZXQoZWxtX3BvcHVwX2l0ZW0sIGVsbV9jaGVja19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9j aGVja19pdGVtID0gZWxtX2NoZWNrX2FkZChjb250ZXh0X21lbnUpOworICAgICAgICAgICAgZWxt X21lbnVfaXRlbSA9IGVsbV9tZW51X2l0ZW1fYWRkKGNvbnRleHRfbWVudSwgcGFyZW50X2l0ZW0s IE5VTEwsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBjb250ZXh0 X21lbnVfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOworICAgICAgICAgICAgZWxtX29iamVj dF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9tZW51X2l0ZW0sIGVsbV9jaGVja19pdGVtKTsKICAgICAg ICAgICAgIGVsbV9jaGVja19zdGF0ZV9zZXQoZWxtX2NoZWNrX2l0ZW0sIGV3a19jb250ZXh0X21l bnVfaXRlbV9jaGVja2VkX2dldChld2tfaXRlbSkpOwogICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgRVdLX1NVQk1FTlVfVFlQRToKKyAgICAgICAgICAgIGVsbV9tZW51X2l0ZW0gPSBl bG1fbWVudV9pdGVtX2FkZChjb250ZXh0X21lbnUsIHBhcmVudF9pdGVtLCBOVUxMLCBld2tfY29u dGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgZXdrX2l0ZW0pOworICAg ICAgICAgICAgaWYgKGVsbV9tZW51X2l0ZW0pCisgICAgICAgICAgICAgICAgY29udGV4dF9tZW51 X3BvcHVsYXRlKGNvbnRleHRfbWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0 KGV3a19pdGVtKSwgZWxtX21lbnVfaXRlbSk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAg ZGVmYXVsdDoKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGVsbV9v YmplY3RfaXRlbV9kaXNhYmxlZF9zZXQoZWxtX3BvcHVwX2l0ZW0sICFld2tfY29udGV4dF9tZW51 X2l0ZW1fZW5hYmxlZF9nZXQoZXdrX2l0ZW0pKTsKKyAgICAgICAgZWxtX29iamVjdF9pdGVtX2Rp c2FibGVkX3NldChlbG1fbWVudV9pdGVtLCAhZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRf Z2V0KGV3a19pdGVtKSk7CiAgICAgfQogfQogCkBAIC0xMTY0LDE4ICsxMTkwLDI1IEBAIG9uX2Nv bnRleHRfbWVudV9zaG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHgsIEV2 YXNfQ29vcmQgeSwgRXdrX0NvCiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIAot ICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IGVsbV9jdHhwb3B1cF9hZGQod2luZG93LT5lbG1f d2luZG93KTsKKyAgICB3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSA9IGVsbV9tZW51X2Fk ZCh3aW5kb3ctPmVsbV93aW5kb3cpOwogCi0gICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfcG9wdXAp IHsKLSAgICAgICAgaW5mbygiRVJST1I6IGNvdWxkIG5vdCBjcmVhdGUgY29udGV4dCBwb3B1cCB3 aWRnZXQuIik7CisgICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSkgeworICAg ICAgICBpbmZvKCJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBtZW51IHdpZGdldC4iKTsKICAgICAg ICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQogCi0gICAgY29udGV4dF9wb3B1cF9wb3B1bGF0 ZSh3aW5kb3csIG1lbnUpOworICAgIHdpbmRvdy0+Y29udGV4dF9tZW51LmV3a19tZW51ID0gbWVu dTsKKworICAgIGNvbnRleHRfbWVudV9wb3B1bGF0ZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1f bWVudSwgbWVudSwgTlVMTCk7CisKKyAgICBFdmFzX0Nvb3JkIGV3a194LCBld2tfeTsKKyAgICBl dmFzX29iamVjdF9nZW9tZXRyeV9nZXQod2luZG93LT5ld2tfdmlldywgJmV3a194LCAmZXdrX3ks IE5VTEwsIE5VTEwpOworICAgIHggKz0gZXdrX3g7CisgICAgeSArPSBld2tfeTsKIAotICAgIGlu Zm8oIlNob3dpbmcgY29udGV4dCBwb3B1cCBhdCAoJWQsICVkKS4iLCB4LCB5KTsKLSAgICBldmFz X29iamVjdF9tb3ZlKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgeCwgeSk7Ci0gICAgZXZhc19vYmpl Y3Rfc2hvdyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgIGluZm8oIlNob3dpbmcgY29udGV4 dCBtZW51IGF0ICglZCwgJWQpLiIsIHgsIHkpOworICAgIGVsbV9tZW51X21vdmUod2luZG93LT5j b250ZXh0X21lbnUuZWxtX21lbnUsIHgsIHkpOworICAgIGV2YXNfb2JqZWN0X3Nob3cod2luZG93 LT5jb250ZXh0X21lbnUuZWxtX21lbnUpOwogCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KQEAg LTExODUsMTQgKzEyMTgsMTUgQEAgb25fY29udGV4dF9tZW51X2hpZGUoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc2QpCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19maW5kX3dp dGhfZXdrX3ZpZXcoc2QtPnNlbGYpOwogCi0gICAgaWYgKCF3aW5kb3cgfHwgIXdpbmRvdy0+Y29u dGV4dF9wb3B1cCkgeworICAgIGlmICghd2luZG93IHx8ICF3aW5kb3ctPmNvbnRleHRfbWVudS5l bG1fbWVudSkgewogICAgICAgICBpbmZvKCJFUlJPUjogbmVjZXNzYXJ5IG9iamVjdHMgYXJlIE5V TEwuIik7CiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KIAotICAgIGVsbV9jdHhw b3B1cF9kaXNtaXNzKHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7Ci0gICAgZXZhc19vYmplY3RfZGVs KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7Ci0gICAgd2luZG93LT5jb250ZXh0X3BvcHVwID0gTlVM TDsKKyAgICBlbG1fbWVudV9jbG9zZSh3aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSk7Cisg ICAgZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+Y29udGV4dF9tZW51LmVsbV9tZW51KTsKKyAgICB3 aW5kb3ctPmNvbnRleHRfbWVudS5lbG1fbWVudSA9IE5VTEw7CisgICAgd2luZG93LT5jb250ZXh0 X21lbnUuZXdrX21lbnUgPSBOVUxMOwogCiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KQEAgLTE1 ODQsNiArMTYxOCw3IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFz X09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3CiAgICAgZXZhc19vYmplY3Rf ZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZXdrX3ZpZXcsIEVWQVNfQ0FMTEJBQ0tfTU9VU0Vf SU4sIG9uX21vdXNlX2luLCB3aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNr X2FkZCh3aW5kb3ctPmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX09VVCwgb25fbW91c2Vf b3V0LCB3aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0X2V2ZW50X2NhbGxiYWNrX2FkZCh3aW5kb3ct PmV3a192aWV3LCBFVkFTX0NBTExCQUNLX01PVVNFX01PVkUsIG9uX21vdXNlX21vdmUsIHdpbmRv dyk7CisgICAgZXZhc19vYmplY3RfZXZlbnRfY2FsbGJhY2tfYWRkKHdpbmRvdy0+ZWxtX3dpbmRv dywgRVZBU19DQUxMQkFDS19SRVNJWkUsIG9uX3dpbmRvd19yZXNpemUsIHdpbmRvdyk7CiAKICAg ICByZXR1cm4gd2luZG93OwogfQo=