50762 2010-12-09 07:56:14 -0800 [EFL] ContextMenu implementation is broken 2011-02-09 05:56:35 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 44609 1 lucas.de.marchi webkit-unassigned antognolli+webkit bweinstein gyuyoung.kim leandro Martin.Jansa oldest_to_newest 319461 0 lucas.de.marchi 2010-12-09 07:56:14 -0800 After patch in bug 73535 has landed, current implementation of context menus in EFL port is broken. This also affects bug 44609 because the to-be-landed patch depends on symbols from WebCore::ContextMenu class, which has been fixed by the commit that broke current EFL implementation. The error when compiling is: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp: In constructor ‘WebCore::ContextMenu::ContextMenu()’: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:34: error: ‘m_view’ was not declared in this scope /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:34: error: ‘menu’ was not declared in this scope /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:34: error: ‘ewk_context_menu_new’ was not declared in this scope /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp: In destructor ‘WebCore::ContextMenu::~ContextMenu()’: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:45: error: ‘ewk_context_menu_free’ was not declared in this scope /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp: In member function ‘void WebCore::ContextMenu::appendItem(WebCore::ContextMenuItem&)’: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:50: error: ‘ewk_context_menu_item_append’ was not declared in this scope /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp: In member function ‘void WebCore::ContextMenu::setPlatformDescription(void*)’: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebCore/platform/efl/ContextMenuEfl.cpp:58: error: ‘ewk_context_menu_show’ was not declared in this scope make[2]: *** [WebCore/CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [WebCore/CMakeFiles/webcore_efl.dir/all] Error 2 make: *** [all] Error 2 Failed to build Efl port 321964 1 76537 leandro 2010-12-14 07:53:01 -0800 Created attachment 76537 Possible solution The attached patch is a possible solution. The reason it does not have a ChangeLog entry is that I'd like some opinion on it before going further. The EFL port menu implementation is a bit tricky since we delegate menu creation to the browser (mobile and desktop have different UIs and needs different widgets) -- thus we can't call EFL directly from our WebCore classes. Although this patch is filled with #ifdefs, EFL tree is currently red and we're out of time this year to move to the new context menu API. Is this patch acceptable, even if temporarily while we work on updating the port to use the new API? 322492 2 76537 bweinstein 2010-12-14 20:57:15 -0800 Comment on attachment 76537 Possible solution Is there a way you can do this without passing a ContextMenuController to the ContextMenu constructor? That is a layering violation in itself, ContextMenu can't know about ContextMenuController. 322556 3 lucas.de.marchi 2010-12-15 02:55:31 -0800 (In reply to comment #2) > (From update of attachment 76537 [details]) > Is there a way you can do this without passing a ContextMenuController to the ContextMenu constructor? That is a layering violation in itself, ContextMenu can't know about ContextMenuController. The two places in which it's needed inside our APIs are (WebKit/efl/ewk_contextmenu.c): Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu) Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item) With these functions we can respectively tell WebCore to destroy de ContextMenu and select an item. How would this be accomplished without access to the controller? Should I go through page->contextMenuController()? I'm almost sure I can do this because there's a ref to webview in WebCore::ContextMenuClientEfl, but I need to check. 322567 4 lucas.de.marchi 2010-12-15 03:43:49 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 76537 [details] [details]) > > Is there a way you can do this without passing a ContextMenuController to the ContextMenu constructor? That is a layering violation in itself, ContextMenu can't know about ContextMenuController. > > The two places in which it's needed inside our APIs are (WebKit/efl/ewk_contextmenu.c): > > Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu) > Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item) > > > With these functions we can respectively tell WebCore to destroy de ContextMenu and select an item. How would this be accomplished without access to the controller? > > Should I go through page->contextMenuController()? I'm almost sure I can do this because there's a ref to webview in WebCore::ContextMenuClientEfl, but I need to check. Checking again, the problem with this is that we need access to ContextMenuClient from within ContextMenu. When we create the ContextMenu, we give the ContextMenuClient (through the controller) because we don't create the widgets. We need to forward this call to browser so it can actually create them. 322695 5 bweinstein 2010-12-15 10:50:40 -0800 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 76537 [details] [details] [details]) > > > Is there a way you can do this without passing a ContextMenuController to the ContextMenu constructor? That is a layering violation in itself, ContextMenu can't know about ContextMenuController. > > > > The two places in which it's needed inside our APIs are (WebKit/efl/ewk_contextmenu.c): > > > > Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu) > > Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item) > > > > > > With these functions we can respectively tell WebCore to destroy de ContextMenu and select an item. How would this be accomplished without access to the controller? > > > > Should I go through page->contextMenuController()? I'm almost sure I can do this because there's a ref to webview in WebCore::ContextMenuClientEfl, but I need to check. > > Checking again, the problem with this is that we need access to ContextMenuClient from within ContextMenu. When we create the ContextMenu, we give the ContextMenuClient (through the controller) because we don't create the widgets. We need to forward this call to browser so it can actually create them. Could you pass the ContextMenuClient instead of the ContextMenuController? I think that would be okay, but would need to see a patch to know for sure. One option would be to hook into the new USE(CROSS_PLATFORM_CONTEXT_MENUS) macro, which gives you a representation of ContextMenus and ContextMenuItems not using native types, and all you need to do is write functions that convert from ContextMenu <-> Native EFL Menus, and ContextMenuItem <-> Native EFL Menu Items. If you want to see how that is done currently, look at ContextMenu{.h|.cpp}, ContextMenuItem{.h|.cpp}, ContextMenuItemWin.cpp and ContextMenuWin.cpp. All you would need to do is to write ContextMenuItemEfl.cpp and ContextMenuEfl.cpp, which convert to/from the native types. 322702 6 leandro 2010-12-15 11:14:24 -0800 (In reply to comment #5) > > Could you pass the ContextMenuClient instead of the ContextMenuController? I > think that would be okay, but would need to see a patch to know for sure. > This seems possible, yes. I'll give it a try. > One option would be to hook into the new USE(CROSS_PLATFORM_CONTEXT_MENUS) > macro, which gives you a representation of ContextMenus and ContextMenuItems > not using native types, and all you need to do is write functions that convert > from ContextMenu <-> Native EFL Menus, and ContextMenuItem <-> Native EFL Menu > Items. If you want to see how that is done currently, look at > ContextMenu{.h|.cpp}, ContextMenuItem{.h|.cpp}, ContextMenuItemWin.cpp and > ContextMenuWin.cpp. > Already looked at it. The problem is: EFL does not have a native widget set. Our current implementation delegates the responsibility to create the menu UI to the browser, so it can use whatever UI toolkit it is already using, by choosing the appropriate widget for the task (pop-up menus on desktop, lists on mobile/touch screen devices, etc). This delegation is currently implemented on EWK (short for EFL-WebKit), so we can't really expose those functions to WebCore as it would be way nastier than HitTestResult being there :) I'll see if I can do that with ContextMenuClient, by creating a façade to our menu-delegating functions in EWK. Does this sound OK? If so, to get rid of all those #ifdefs inside platform-independent code I could add a ContextMenuClient* to ContextMenu; most ports don't use this, however, so I'm on a bit of impasse here. 322854 7 76537 eric 2010-12-15 15:21:42 -0800 Comment on attachment 76537 Possible solution Needs a ChangeLog. 323506 8 gyuyoung.kim 2010-12-16 16:26:31 -0800 (In reply to comment #7) > (From update of attachment 76537 [details]) > Needs a ChangeLog. Leandro, Could you please add ChangeLog to this patch ? As you know, WebKit EFL have failed to build since last week. I think this patch should be landed to mainline as soon as possible. 323515 9 gyuyoung.kim 2010-12-16 16:43:35 -0800 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 76537 [details] [details]) > > Needs a ChangeLog. > > Leandro, > > Could you please add ChangeLog to this patch ? As you know, WebKit EFL have failed to build since last week. I think this patch should be landed to mainline as soon as possible. I just check you fix this build break for a while. Thank you. 346983 10 lucas.de.marchi 2011-02-07 17:44:57 -0800 After some code changes last year, it's broken again :(. I think the EFL builders are green because they are not cleaning the tree between builds. Gyuyoung Kim: are you compiling the latest svn revision? 346989 11 gyuyoung.kim 2011-02-07 17:59:26 -0800 (In reply to comment #10) > After some code changes last year, it's broken again :(. I think the EFL builders are green because they are not cleaning the tree between builds. > > Gyuyoung Kim: are you compiling the latest svn revision? Yes, in my linux box, there is no build breaks in latest svn revision. I remember leandro fixed this build break without review. Do you have build break due to the context menu ? 347273 12 lucas.de.marchi 2011-02-08 04:50:08 -0800 (In reply to comment #11) > (In reply to comment #10) > > After some code changes last year, it's broken again :(. I think the EFL builders are green because they are not cleaning the tree between builds. > > > > Gyuyoung Kim: are you compiling the latest svn revision? > > Yes, in my linux box, there is no build breaks in latest svn revision. I remember leandro fixed this build break without review. Do you have build break due to the context menu ? Yes. See below: Linking CXX shared library libwebcore_efl.so CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': ContextMenuEfl.cpp:(.text+0x0): multiple definition of `WebCore::ContextMenu::ContextMenu()' CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x560): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': ContextMenuEfl.cpp:(.text+0x0): multiple definition of `WebCore::ContextMenu::ContextMenu()' CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x560): first defined here CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)': ... I've just noticed this will only occur when configuring with SHARED_CORE=ON. This is how I'm configure webkit: cmake ../Source -DPORT=Efl \ -DCMAKE_INSTALL_PREFIX=$HOME/dev/e/ \ -DENABLE_JIT=ON \ -DSHARED_CORE=ON \ -DNETWORK_BACKEND=curl \ -DENABLE_GLIB_SUPPORT=ON \ -DENABLE_VIDEO=ON \ -DENABLE_PROGRESS_TAG=ON Can you reproduce? 347808 13 gyuyoung.kim 2011-02-08 16:47:08 -0800 (In reply to comment #12) > (In reply to comment #11) > > (In reply to comment #10) > > > After some code changes last year, it's broken again :(. I think the EFL builders are green because they are not cleaning the tree between builds. > > > > > > Gyuyoung Kim: are you compiling the latest svn revision? > > > > Yes, in my linux box, there is no build breaks in latest svn revision. I remember leandro fixed this build break without review. Do you have build break due to the context menu ? > > Yes. See below: > > Linking CXX shared library libwebcore_efl.so > CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': > ContextMenuEfl.cpp:(.text+0x0): multiple definition of `WebCore::ContextMenu::ContextMenu()' > CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x560): first defined here > CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuEfl.cpp.o: In function `WebCore::ContextMenu::ContextMenu()': > ContextMenuEfl.cpp:(.text+0x0): multiple definition of `WebCore::ContextMenu::ContextMenu()' > CMakeFiles/webcore_efl.dir/platform/ContextMenu.cpp.o:ContextMenu.cpp:(.text+0x560): first defined here > CMakeFiles/webcore_efl.dir/platform/efl/ContextMenuItemEfl.cpp.o: In function `WebCore::ContextMenuItem::ContextMenuItem(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, WTF::String const&, WebCore::ContextMenu*)': > ... > > I've just noticed this will only occur when configuring with SHARED_CORE=ON. This is how I'm configure webkit: > > cmake ../Source -DPORT=Efl \ > -DCMAKE_INSTALL_PREFIX=$HOME/dev/e/ \ > -DENABLE_JIT=ON \ > -DSHARED_CORE=ON \ > -DNETWORK_BACKEND=curl \ > -DENABLE_GLIB_SUPPORT=ON \ > -DENABLE_VIDEO=ON \ > -DENABLE_PROGRESS_TAG=ON > > Can you reproduce? Yes, I can reproduce this build break. However, when I build with this simple command "cmake ../Source -DPORT=Efl", there are no build breaks. It seems the build configuration makes problems. 347841 14 lucas.de.marchi 2011-02-08 17:29:13 -0800 (In reply to comment #13) > Yes, I can reproduce this build break. However, when I build with this simple command "cmake ../Source -DPORT=Efl", there are no build breaks. > It seems the build configuration makes problems. The problem is building it with shared core enabled, since the symbols regarding the context menu will be present both in webkit *and* webcore. 347847 15 gyuyoung.kim 2011-02-08 17:33:42 -0800 (In reply to comment #14) > (In reply to comment #13) > > Yes, I can reproduce this build break. However, when I build with this simple command "cmake ../Source -DPORT=Efl", there are no build breaks. > > It seems the build configuration makes problems. > > The problem is building it with shared core enabled, since the symbols regarding the context menu will be present both in webkit *and* webcore. Will you make a patch for this problem ? 347854 16 lucas.de.marchi 2011-02-08 17:39:12 -0800 (In reply to comment #15) > (In reply to comment #14) > > (In reply to comment #13) > > > Yes, I can reproduce this build break. However, when I build with this simple command "cmake ../Source -DPORT=Efl", there are no build breaks. > > > It seems the build configuration makes problems. > > > > The problem is building it with shared core enabled, since the symbols regarding the context menu will be present both in webkit *and* webcore. > > Will you make a patch for this problem ? Can you take a look on this? I'm running out of time now. 347859 17 gyuyoung.kim 2011-02-08 17:42:06 -0800 (In reply to comment #16) > (In reply to comment #15) > > (In reply to comment #14) > > > (In reply to comment #13) > > > > Yes, I can reproduce this build break. However, when I build with this simple command "cmake ../Source -DPORT=Efl", there are no build breaks. > > > > It seems the build configuration makes problems. > > > > > > The problem is building it with shared core enabled, since the symbols regarding the context menu will be present both in webkit *and* webcore. > > > > Will you make a patch for this problem ? > > Can you take a look on this? I'm running out of time now. Now, I can't look on this. But, if this is not fixed till I have free time, I will fix it. :-) 348173 18 lucas.de.marchi 2011-02-09 05:56:35 -0800 Committed r78047: <http://trac.webkit.org/changeset/78047> 76537 2010-12-14 07:53:01 -0800 2010-12-15 15:21:41 -0800 Possible solution ewk-contextmenu2.diff text/plain 8262 leandro SW5kZXg6IFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRFZmwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGll bnRFZmwuY3BwCShyZXZpc2lvbiA3MzkxMykKKysrIFdlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv Q29udGV4dE1lbnVDbGllbnRFZmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNyArMTAyLDcg QEAKIAogUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbnRFZmw6OmNyZWF0 ZVBsYXRmb3JtRGVzY3JpcHRpb24oQ29udGV4dE1lbnUqIG1lbnUpCiB7Ci0gICAgcmV0dXJuIChQ bGF0Zm9ybU1lbnVEZXNjcmlwdGlvbikgZXdrX2NvbnRleHRfbWVudV9uZXcobV92aWV3LCBtZW51 LT5jb250cm9sbGVyKCkpOworICAgIHJldHVybiAoUGxhdGZvcm1NZW51RGVzY3JpcHRpb24pIGV3 a19jb250ZXh0X21lbnVfbmV3KG1fdmlldyk7CiB9CiAKIHZvaWQgQ29udGV4dE1lbnVDbGllbnRF Zmw6OmZyZWVQbGF0Zm9ybURlc2NyaXB0aW9uKFBsYXRmb3JtTWVudURlc2NyaXB0aW9uIG1lbnUp CkluZGV4OiBXZWJLaXQvZWZsL2V3ay9ld2tfY29udGV4dG1lbnUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9lZmwvZXdrL2V3a19jb250ZXh0bWVudS5jcHAJKHJldmlzaW9uIDczOTEzKQorKysg V2ViS2l0L2VmbC9ld2svZXdrX2NvbnRleHRtZW51LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk5 LDE1ICsxOTksMTQgQEAKICAqIENyZWF0ZXMgY29udGV4dCBvbiB2aWV3LgogICoKICAqIEBwYXJh bSB2aWV3IFZpZXcuCi0gKiBAcGFyYW0gQ29udHJvbGxlciBDb250ZXh0IE1lbnUgQ29udHJvbGxl ci4KICAqCiAgKiBAcmV0dXJuIG5ld2x5IGFsbG9jYXRlZCBjb250ZXh0IG1lbnUgb3IgQGMgMCBv biBlcnJvcnMuCiAgKi8KLUV3a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0X21lbnVfbmV3KEV2 YXNfT2JqZWN0KiB2aWV3LCBXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXIqIGNvbnRyb2xs ZXIpCitFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X25ldyhFdmFzX09iamVjdCog dmlldykKIHsKICAgICBFd2tfQ29udGV4dF9NZW51KiBtZW51OworICAgIFdlYkNvcmU6OlBhZ2Uq IHBhZ2U7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHZpZXcsIDApOwotICAg IEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjb250cm9sbGVyLCAwKTsKIAogICAgIG1l bnUgPSBzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51Kj4obWFsbG9jKHNpemVvZigqbWVudSkp KTsKICAgICBpZiAoIW1lbnUpIHsKQEAgLTIxNSw5ICsyMTQsMTEgQEAKICAgICAgICAgcmV0dXJu IDA7CiAgICAgfQogCisgICAgcGFnZSA9IGV3a192aWV3X2NvcmVfcGFnZV9nZXQodmlldyk7CisK ICAgICBtZW51LT5fX3JlZiA9IDE7CiAgICAgbWVudS0+dmlldyA9IHZpZXc7Ci0gICAgbWVudS0+ Y29udHJvbGxlciA9IGNvbnRyb2xsZXI7CisgICAgbWVudS0+Y29udHJvbGxlciA9IHBhZ2UtPmNv bnRleHRNZW51Q29udHJvbGxlcigpOwogICAgIG1lbnUtPml0ZW1zID0gMDsKICAgICBldmFzX29i amVjdF9zbWFydF9jYWxsYmFja19jYWxsKG1lbnUtPnZpZXcsICJjb250ZXh0bWVudSxuZXciLCBt ZW51KTsKIApJbmRleDogV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oCShyZXZpc2lvbiA3MzkxMykKKysrIFdlYktp dC9lZmwvZXdrL2V3a19wcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExMSw3ICsxMTEsNyBA QAogRXdrX0hpc3RvcnkgKmV3a19oaXN0b3J5X25ldyhXZWJDb3JlOjpCYWNrRm9yd2FyZExpc3RJ bXBsICpoaXN0b3J5KTsKIHZvaWQgZXdrX2hpc3RvcnlfZnJlZShFd2tfSGlzdG9yeSAqaGlzdG9y eSk7CiAKLUV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfbmV3KEV2YXNfT2JqZWN0 ICp2aWV3LCBXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRyb2xsZXIgKmNvbnRyb2xsZXIpOworRXdr X0NvbnRleHRfTWVudSAqZXdrX2NvbnRleHRfbWVudV9uZXcoRXZhc19PYmplY3QgKnZpZXcpOwog RWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfZnJlZShFd2tfQ29udGV4dF9NZW51ICpvKTsKIHZv aWQgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChFd2tfQ29udGV4dF9NZW51ICpvLCBXZWJD b3JlOjpDb250ZXh0TWVudUl0ZW0mIGNvcmUpOwogRXdrX0NvbnRleHRfTWVudSAqZXdrX2NvbnRl eHRfbWVudV9jdXN0b21fZ2V0KEV3a19Db250ZXh0X01lbnUgKm8pOwpJbmRleDogV2ViQ29yZS9w YWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdl L0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDczOTEzKQorKysgV2ViQ29yZS9w YWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNSw3ICsx MzUsMTEgQEAKIAogICAgIG1faGl0VGVzdFJlc3VsdCA9IHJlc3VsdDsKIAorI2lmIFBMQVRGT1JN KEVGTCkKKyAgICByZXR1cm4gbmV3IENvbnRleHRNZW51KHRoaXMpOworI2Vsc2UKICAgICByZXR1 cm4gbmV3IENvbnRleHRNZW51OworI2VuZGlmCiB9CiAKIHZvaWQgQ29udGV4dE1lbnVDb250cm9s bGVyOjpzaG93Q29udGV4dE1lbnUoRXZlbnQqIGV2ZW50KQpAQCAtNDI5LDcgKzQzMywxMSBAQAog CiB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6Y3JlYXRlQW5kQXBwZW5kRm9udFN1Yk1lbnUo Q29udGV4dE1lbnVJdGVtJiBmb250TWVudUl0ZW0pCiB7CisjaWYgUExBVEZPUk0oRUZMKQorICAg IENvbnRleHRNZW51IGZvbnRNZW51KHRoaXMpOworI2Vsc2UKICAgICBDb250ZXh0TWVudSBmb250 TWVudTsKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIENvbnRleHRNZW51SXRlbSBz aG93Rm9udHMoQWN0aW9uVHlwZSwgQ29udGV4dE1lbnVJdGVtVGFnU2hvd0ZvbnRzLCBjb250ZXh0 TWVudUl0ZW1UYWdTaG93Rm9udHMoKSk7CkBAIC00NjUsNyArNDczLDExIEBACiAKIHZvaWQgQ29u dGV4dE1lbnVDb250cm9sbGVyOjpjcmVhdGVBbmRBcHBlbmRTcGVsbGluZ0FuZEdyYW1tYXJTdWJN ZW51KENvbnRleHRNZW51SXRlbSYgc3BlbGxpbmdBbmRHcmFtbWFyTWVudUl0ZW0pCiB7CisjaWYg UExBVEZPUk0oRUZMKQorICAgIENvbnRleHRNZW51IHNwZWxsaW5nQW5kR3JhbW1hck1lbnUodGhp cyk7CisjZWxzZQogICAgIENvbnRleHRNZW51IHNwZWxsaW5nQW5kR3JhbW1hck1lbnU7CisjZW5k aWYKIAogICAgIENvbnRleHRNZW51SXRlbSBzaG93U3BlbGxpbmdQYW5lbChBY3Rpb25UeXBlLCBD b250ZXh0TWVudUl0ZW1UYWdTaG93U3BlbGxpbmdQYW5lbCwgCiAgICAgICAgIGNvbnRleHRNZW51 SXRlbVRhZ1Nob3dTcGVsbGluZ1BhbmVsKHRydWUpKTsKQEAgLTUwMCw3ICs1MTIsMTEgQEAKIAog dm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNyZWF0ZUFuZEFwcGVuZFNwZWxsaW5nQW5kR3Jh bW1hclN1Yk1lbnUoQ29udGV4dE1lbnVJdGVtJiBzcGVsbGluZ0FuZEdyYW1tYXJNZW51SXRlbSkK IHsKKyNpZmRlZiBQTEFURk9STShFRkwpCisgICAgQ29udGV4dE1lbnUgc3BlbGxpbmdNZW51KHRo aXMpOworI2Vsc2UKICAgICBDb250ZXh0TWVudSBzcGVsbGluZ01lbnU7CisjZW5kaWYKIAogICAg IENvbnRleHRNZW51SXRlbSBzaG93U3BlbGxpbmdQYW5lbChBY3Rpb25UeXBlLCBDb250ZXh0TWVu dUl0ZW1UYWdTaG93U3BlbGxpbmdQYW5lbCwgCiAgICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ1No b3dTcGVsbGluZ1BhbmVsKHRydWUpKTsKQEAgLTUzOSw3ICs1NTUsMTEgQEAKIAogdm9pZCBDb250 ZXh0TWVudUNvbnRyb2xsZXI6OmNyZWF0ZUFuZEFwcGVuZFdyaXRpbmdEaXJlY3Rpb25TdWJNZW51 KENvbnRleHRNZW51SXRlbSYgd3JpdGluZ0RpcmVjdGlvbk1lbnVJdGVtKQogeworI2lmIFBMQVRG T1JNKEVGTCkKKyAgICBDb250ZXh0TWVudSB3cml0aW5nRGlyZWN0aW9uTWVudSh0aGlzKTsKKyNl bHNlCiAgICAgQ29udGV4dE1lbnUgd3JpdGluZ0RpcmVjdGlvbk1lbnU7CisjZW5kaWYKIAogICAg IENvbnRleHRNZW51SXRlbSBkZWZhdWx0SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1U YWdEZWZhdWx0RGlyZWN0aW9uLCAKICAgICAgICAgY29udGV4dE1lbnVJdGVtVGFnRGVmYXVsdERp cmVjdGlvbigpKTsKQEAgLTU1NSw3ICs1NzUsMTEgQEAKIAogdm9pZCBDb250ZXh0TWVudUNvbnRy b2xsZXI6OmNyZWF0ZUFuZEFwcGVuZFRleHREaXJlY3Rpb25TdWJNZW51KENvbnRleHRNZW51SXRl bSYgdGV4dERpcmVjdGlvbk1lbnVJdGVtKQogeworI2lmIFBMQVRGT1JNKEVGTCkKKyAgICBDb250 ZXh0TWVudSB0ZXh0RGlyZWN0aW9uTWVudSh0aGlzKTsKKyNlbHNlCiAgICAgQ29udGV4dE1lbnUg dGV4dERpcmVjdGlvbk1lbnU7CisjZW5kaWYKIAogICAgIENvbnRleHRNZW51SXRlbSBkZWZhdWx0 SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdUZXh0RGlyZWN0aW9uRGVmYXVsdCwg Y29udGV4dE1lbnVJdGVtVGFnRGVmYXVsdERpcmVjdGlvbigpKTsKICAgICBDb250ZXh0TWVudUl0 ZW0gbHRyKENoZWNrYWJsZUFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbVRhZ1RleHREaXJlY3Rp b25MZWZ0VG9SaWdodCwgY29udGV4dE1lbnVJdGVtVGFnTGVmdFRvUmlnaHQoKSk7CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9Db250ZXh0TWVudS5oCShyZXZpc2lvbiA3MzkxMykKKysrIFdlYkNvcmUvcGxhdGZvcm0v Q29udGV4dE1lbnUuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUg PHd0Zi9SZXRhaW5QdHIuaD4KICNlbGlmIFBMQVRGT1JNKFFUKQogI2luY2x1ZGUgPFFNZW51Pgor I2VsaWYgUExBVEZPUk0oRUZMKQorI2luY2x1ZGUgIkNvbnRleHRNZW51Q2xpZW50LmgiCiAjZW5k aWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNzAsNiArNzIsMTEgQEAKIAogICAgICAgICB2 b2lkIGFwcGVuZEl0ZW0oY29uc3QgQ29udGV4dE1lbnVJdGVtJiBpdGVtKSB7IG1faXRlbXMuYXBw ZW5kKGl0ZW0pOyB9IAogI2Vsc2UKKyNpZiBQTEFURk9STShFRkwpCisgICAgICAgIENvbnRleHRN ZW51KENvbnRleHRNZW51Q29udHJvbGxlciopOworICAgICAgICBDb250ZXh0TWVudShjb25zdCBQ bGF0Zm9ybU1lbnVEZXNjcmlwdGlvbiwgQ29udGV4dE1lbnVDbGllbnRFZmwqKTsKKyNlbmRpZgor CiAgICAgICAgIENvbnRleHRNZW51KGNvbnN0IFBsYXRmb3JtTWVudURlc2NyaXB0aW9uKTsKICAg ICAgICAgfkNvbnRleHRNZW51KCk7CiAKQEAgLTg1LDYgKzkyLDEwIEBACiAKICAgICAgICAgUGxh dGZvcm1NZW51RGVzY3JpcHRpb24gcmVsZWFzZVBsYXRmb3JtRGVzY3JpcHRpb24oKTsKIAorI2lm IFBMQVRGT1JNKEVGTCkKKyAgICAgICAgQ29udGV4dE1lbnVDbGllbnRFZmwqIGNsaWVudCgpIGNv bnN0IHsgcmV0dXJuIG1fY29udGV4dE1lbnVDbGllbnQ7IH0KKyNlbmRpZgorCiAjaWYgUExBVEZP Uk0oV1gpCiAgICAgICAgIHN0YXRpYyBDb250ZXh0TWVudUl0ZW0qIGl0ZW1XaXRoSWQoaW50KTsK ICNlbmRpZgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9lZmwvQ29udGV4dE1lbnVFZmwuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZWZsL0NvbnRleHRNZW51RWZsLmNwcAkocmV2 aXNpb24gNzM5MTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVudUVmbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI5LDI1ICsyOSwyNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLUNvbnRleHRNZW51OjpDb250ZXh0TWVudSgpCitDb250ZXh0TWVudTo6Q29udGV4dE1lbnUo Q29udGV4dE1lbnVDb250cm9sbGVyKiBjb250cm9sbGVyKQogewotICAgIG1fcGxhdGZvcm1EZXNj cmlwdGlvbiA9IChQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbikgZXdrX2NvbnRleHRfbWVudV9uZXco bV92aWV3LCBtZW51LT5jb250cm9sbGVyKCkpOworICAgIG1fY29udGV4dE1lbnVDbGllbnQgPSBz dGF0aWNfY2FzdDxDb250ZXh0TWVudUNsaWVudEVmbCo+KGNvbnRyb2xsZXItPmNsaWVudCgpKTsK KyAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24gPSBtX2NvbnRleHRNZW51Q2xpZW50LT5jcmVhdGVQ bGF0Zm9ybURlc2NyaXB0aW9uKHRoaXMpOwogfQogCi1Db250ZXh0TWVudTo6Q29udGV4dE1lbnUo Y29uc3QgUGxhdGZvcm1NZW51RGVzY3JpcHRpb24gbWVudSkKLSAgICA6IG1fcGxhdGZvcm1EZXNj cmlwdGlvbihtZW51KQorQ29udGV4dE1lbnU6OkNvbnRleHRNZW51KGNvbnN0IFBsYXRmb3JtTWVu dURlc2NyaXB0aW9uIG1lbnUsIENvbnRleHRNZW51Q2xpZW50RWZsKiBjbGllbnQpCisgICAgOiBt X2NvbnRleHRNZW51Q2xpZW50KGNsaWVudCkKKyAgICAsIG1fcGxhdGZvcm1EZXNjcmlwdGlvbiht ZW51KQogewogfQogCiBDb250ZXh0TWVudTo6fkNvbnRleHRNZW51KCkKIHsKLSAgICBpZiAobV9w bGF0Zm9ybURlc2NyaXB0aW9uKQotICAgICAgICBld2tfY29udGV4dF9tZW51X2ZyZWUoc3RhdGlj X2Nhc3Q8RXdrX0NvbnRleHRfTWVudSo+KG1fcGxhdGZvcm1EZXNjcmlwdGlvbikpOworICAgIG1f Y29udGV4dE1lbnVDbGllbnQtPmZyZWVQbGF0Zm9ybURlc2NyaXB0aW9uKG1fcGxhdGZvcm1EZXNj cmlwdGlvbik7CiB9CiAKIHZvaWQgQ29udGV4dE1lbnU6OmFwcGVuZEl0ZW0oQ29udGV4dE1lbnVJ dGVtJiBpdGVtKQogewotICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoc3RhdGljX2Nh c3Q8RXdrX0NvbnRleHRfTWVudSo+KG1fcGxhdGZvcm1EZXNjcmlwdGlvbiksIGl0ZW0pOworICAg IG1fY29udGV4dE1lbnVDbGllbnQtPmFwcGVuZEl0ZW0obV9wbGF0Zm9ybURlc2NyaXB0aW9uLCBp dGVtKTsKIH0KIAogdm9pZCBDb250ZXh0TWVudTo6c2V0UGxhdGZvcm1EZXNjcmlwdGlvbihQbGF0 Zm9ybU1lbnVEZXNjcmlwdGlvbiBtZW51KQpAQCAtNTUsNyArNTYsNyBAQAogICAgIEFTU0VSVCgh bV9wbGF0Zm9ybURlc2NyaXB0aW9uKTsKIAogICAgIG1fcGxhdGZvcm1EZXNjcmlwdGlvbiA9IG1l bnU7Ci0gICAgZXdrX2NvbnRleHRfbWVudV9zaG93KHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01l bnUqPihtX3BsYXRmb3JtRGVzY3JpcHRpb24pKTsKKyAgICBtX2NvbnRleHRNZW51Q2xpZW50LT5z aG93KG1fcGxhdGZvcm1EZXNjcmlwdGlvbik7CiB9CiAKIFBsYXRmb3JtTWVudURlc2NyaXB0aW9u IENvbnRleHRNZW51OjpwbGF0Zm9ybURlc2NyaXB0aW9uKCkgY29uc3QKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZWZsL0NvbnRleHRNZW51SXRlbUVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9lZmwvQ29udGV4dE1lbnVJdGVtRWZsLmNwcAkocmV2aXNpb24gNzM5MTMpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2VmbC9Db250ZXh0TWVudUl0ZW1FZmwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTYsNyArMTE2LDcgQEAKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9wbGF0Zm9y bURlc2NyaXB0aW9uLnR5cGUgPSBTdWJtZW51VHlwZTsKLSAgICBtX3BsYXRmb3JtRGVzY3JpcHRp b24uc3ViTWVudSA9IG5ldyBDb250ZXh0TWVudShzdWJNZW51LT5yZWxlYXNlUGxhdGZvcm1EZXNj cmlwdGlvbigpKTsKKyAgICBtX3BsYXRmb3JtRGVzY3JpcHRpb24uc3ViTWVudSA9IG5ldyBDb250 ZXh0TWVudShzdWJNZW51LT5yZWxlYXNlUGxhdGZvcm1EZXNjcmlwdGlvbigpLCBzdWJNZW51LT5j bGllbnQoKSk7CiB9CiAKIGJvb2wgQ29udGV4dE1lbnVJdGVtOjpjaGVja2VkKCkgY29uc3QK