150310 2015-10-18 21:09:19 -0700 [EFL] Implement WebContextMenuProxyEfl::showContextMenu after r191194 2015-12-21 00:39:13 -0800 1 1 1 Unclassified WebKit WebKit EFL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 150240 150311 1 hs85.jeong hs85.jeong commit-queue gyuyoung.kim lucas.de.marchi ossy oldest_to_newest 1134443 0 hs85.jeong 2015-10-18 21:09:19 -0700 After r191194, showContextMenu implementation is moved from the generic file to the Mac port. It poses the compile error and the API test fail in EFL port. Compile error was already fixed in r191239 but API test still failed because showContextMenu() doesn't work correctly. So we need to implement the showContextMenu(). 1134444 1 263439 hs85.jeong 2015-10-18 21:13:14 -0700 Created attachment 263439 Patch 1134445 2 263439 gyuyoung.kim 2015-10-18 21:26:32 -0700 Comment on attachment 263439 Patch Can't we test the showContextMenu() using test_ewk2_context_menu.cpp ? 1134446 3 hs85.jeong 2015-10-18 21:48:14 -0700 Yes, we can't test using the the showContextMenu() in test_ewk2_context_menu.cpp because we don't have the implementation of the showContextMenu() in WebContexMenuProxyEfl.cpp. After r191194, showContextMenu() generic implementation codes was moved to MacPort. So we need the implementation code. Now contextMenu didn't work correctly in the MiniBrowser and API tests. 1134447 4 gyuyoung.kim 2015-10-18 21:50:38 -0700 (In reply to comment #3) > Yes, we can't test using the the showContextMenu() in > test_ewk2_context_menu.cpp because we don't have the implementation of the > showContextMenu() in WebContexMenuProxyEfl.cpp. After r191194, > showContextMenu() generic implementation codes was moved to MacPort. > So we need the implementation code. > > Now contextMenu didn't work correctly in the MiniBrowser and API tests. If so, please file a new bug for EFL context menu. (e.g. [EFL] Context menu doesn't work on MiniBrowser.) Then link this bug to the new bug. 1134450 5 hs85.jeong 2015-10-18 21:56:49 -0700 (In reply to comment #4) > (In reply to comment #3) > > Yes, we can't test using the the showContextMenu() in > > test_ewk2_context_menu.cpp because we don't have the implementation of the > > showContextMenu() in WebContexMenuProxyEfl.cpp. After r191194, > > showContextMenu() generic implementation codes was moved to MacPort. > > So we need the implementation code. > > > > Now contextMenu didn't work correctly in the MiniBrowser and API tests. > > If so, please file a new bug for EFL context menu. (e.g. [EFL] Context menu > doesn't work on MiniBrowser.) Then link this bug to the new bug. Okay, I will make the new bug followed your comment. 1134454 6 263439 gyuyoung.kim 2015-10-18 22:05:48 -0700 Comment on attachment 263439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263439&action=review > Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp:78 > + if (!m_ewkView) How can we call m_ewkView->showContextMenu() when m_ewkView is null ? 1134456 7 263439 gyuyoung.kim 2015-10-18 22:06:48 -0700 Comment on attachment 263439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263439&action=review > Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp:45 > + , m_page(&page) We don't need to manage m_page with pointer. Just use a reference. 1134458 8 263441 hs85.jeong 2015-10-18 22:15:12 -0700 Created attachment 263441 Patch 1134459 9 hs85.jeong 2015-10-18 22:18:41 -0700 (In reply to comment #7) > Comment on attachment 263439 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=263439&action=review > > > Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp:45 > > + , m_page(&page) > > We don't need to manage m_page with pointer. Just use a reference. I changed the m_page to use the reference. (In reply to comment #6) > Comment on attachment 263439 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=263439&action=review > > > Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp:78 > > + if (!m_ewkView) > > How can we call m_ewkView->showContextMenu() when m_ewkView is null ? Oops.... I want to check the m_ewkView whether is null. 1134512 10 263441 commit-queue 2015-10-19 02:14:23 -0700 Comment on attachment 263441 Patch Clearing flags on attachment: 263441 Committed r191282: <http://trac.webkit.org/changeset/191282> 1134513 11 commit-queue 2015-10-19 02:14:27 -0700 All reviewed patches have been landed. Closing bug. 263439 2015-10-18 21:13:14 -0700 2015-10-18 22:15:04 -0700 Patch bug-150310-20151019131232.patch text/plain 3739 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTI3NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTE4ICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBJbXBsZW1l bnQgV2ViQ29udGV4dE1lbnVQcm94eUVmbDo6c2hvd0NvbnRleHRNZW51IGFmdGVyIHIxOTExOTQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDMxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHNob3dDb250 ZXh0TWVudSgpIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgYWZ0ZXIgcjE5MTE5NCBpbiBFRkwgcG9y dC4KKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIFdlYkNvbnRleHRNZW51UHJveHlFZmw6 OnNob3dDb250ZXh0TWVudS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dE1l bnVQcm94eUVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlFZmw6 OldlYkNvbnRleHRNZW51UHJveHlFZmwpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVu dVByb3h5RWZsOjpzaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 TWVudVByb3h5RWZsOjpoaWRlQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwv V2ViQ29udGV4dE1lbnVQcm94eUVmbC5oOgorCiAyMDE1LTEwLTE4ICBKb29uZ2h1biBQYXJrICA8 amg3MTgucGFya0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgV2ViS2l0Q29u dGV4dE1lbnUgcmVsYXRlZCBtaXNzaW5nIGFubm90YXRpb24gd2FybmluZ3MKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dE1lbnVQcm94eUVmbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0TWVudVByb3h5 RWZsLmNwcAkocmV2aXNpb24gMTkxMjc2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9XZWJDb250ZXh0TWVudVByb3h5RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgs OSBAQAogCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAKKyNpbmNsdWRlICJBUElDb250ZXh0 TWVudUNsaWVudC5oIgogI2luY2x1ZGUgIkV3a1ZpZXcuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0 TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgiCiAjaW5jbHVk ZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgpA QCAtMzcsOCArMzksMTAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCi1XZWJDb250ZXh0TWVudVByb3h5RWZsOjpXZWJDb250ZXh0TWVudVByb3h5RWZs KEV3a1ZpZXcqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiBj b250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCitXZWJDb250ZXh0TWVudVByb3h5RWZs OjpXZWJDb250ZXh0TWVudVByb3h5RWZsKEV3a1ZpZXcqIGV3a1ZpZXcsIFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQogICAgIDogV2ViQ29udGV4dE1lbnVQcm94eShjb250ZXh0LCB1c2VyRGF0 YSkKKyAgICAsIG1fZXdrVmlldyhld2tWaWV3KQorICAgICwgbV9wYWdlKCZwYWdlKQogewogfQog CkBAIC00OCw3ICs1MiwzMSBAQCBXZWJDb250ZXh0TWVudVByb3h5RWZsOjp+V2ViQ29udGV4dE1l bnVQCiAKIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUVmbDo6c2hvd0NvbnRleHRNZW51KCkKIHsK LSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJ dGVtPj4gcHJvcG9zZWRBUElJdGVtczsKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiBtX2NvbnRleHQu bWVudUl0ZW1zKCkpIHsKKyAgICAgICAgaWYgKGl0ZW0uYWN0aW9uKCkgIT0gQ29udGV4dE1lbnVJ dGVtVGFnU2hhcmVNZW51KQorICAgICAgICAgICAgcHJvcG9zZWRBUElJdGVtcy5hcHBlbmQoV2Vi Q29udGV4dE1lbnVJdGVtOjpjcmVhdGUoaXRlbSkpOworICAgIH0KKworICAgIFZlY3RvcjxSZWZQ dHI8V2ViQ29udGV4dE1lbnVJdGVtPj4gY2xpZW50SXRlbXM7CisgICAgYm9vbCB1c2VQcm9wb3Nl ZEl0ZW1zID0gdHJ1ZTsKKworICAgIGlmIChtX3BhZ2UtPmNvbnRleHRNZW51Q2xpZW50KCkuZ2V0 Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KCptX3BhZ2UsIHByb3Bvc2VkQVBJSXRlbXMsIGNs aWVudEl0ZW1zLCBtX2NvbnRleHQud2ViSGl0VGVzdFJlc3VsdERhdGEoKSwgbV9wYWdlLT5wcm9j ZXNzKCkudHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyhtX3VzZXJEYXRhLm9iamVjdCgpKS5nZXQo KSkpCisgICAgICAgIHVzZVByb3Bvc2VkSXRlbXMgPSBmYWxzZTsKKworICAgIGNvbnN0IFZlY3Rv cjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4mIGl0ZW1zID0gdXNlUHJvcG9zZWRJdGVtcyA/ IHByb3Bvc2VkQVBJSXRlbXMgOiBjbGllbnRJdGVtczsKKworICAgIGlmIChpdGVtcy5pc0VtcHR5 KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiBt ZW51SXRlbXM7CisgICAgbWVudUl0ZW1zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoaXRlbXMuc2l6 ZSgpKTsKKworICAgIGZvciAoY29uc3QgYXV0byYgbWVudUl0ZW0gOiBpdGVtcykKKyAgICAgICAg bWVudUl0ZW1zLnVuY2hlY2tlZEFwcGVuZChtZW51SXRlbSk7CisKKyAgICBpZiAoIW1fZXdrVmll dykKKyAgICAgICAgbV9ld2tWaWV3LT5zaG93Q29udGV4dE1lbnUodG9BUEkobV9jb250ZXh0Lm1l bnVMb2NhdGlvbigpKSwgdG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShtZW51SXRl bXMpKS5wdHIoKSkpOwogfQogCiB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlFZmw6OmhpZGVDb250 ZXh0TWVudSgpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRN ZW51UHJveHlFZmwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYkNvbnRleHRNZW51UHJveHlFZmwuaAkocmV2aXNpb24gMTkxMjc2KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0TWVudVByb3h5RWZsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTU0LDYgKzU0LDkgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIFdlYkNvbnRleHRN ZW51UHJveHlFZmwoRXdrVmlldyosIFdlYlBhZ2VQcm94eSYsIGNvbnN0IENvbnRleHRNZW51Q29u dGV4dERhdGEmLCBjb25zdCBVc2VyRGF0YSYpOworCisgICAgRXdrVmlldyogbV9ld2tWaWV3Owor ICAgIFdlYlBhZ2VQcm94eSogbV9wYWdlOwogfTsKIAogCg== 263441 2015-10-18 22:15:12 -0700 2015-10-19 02:14:23 -0700 Patch bug-150310-20151019141429.patch text/plain 3734 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTI3NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTEwLTE4ICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBJbXBsZW1l bnQgV2ViQ29udGV4dE1lbnVQcm94eUVmbDo6c2hvd0NvbnRleHRNZW51IGFmdGVyIHIxOTExOTQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDMxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHNob3dDb250 ZXh0TWVudSgpIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgYWZ0ZXIgcjE5MTE5NCBpbiBFRkwgcG9y dC4KKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIFdlYkNvbnRleHRNZW51UHJveHlFZmw6 OnNob3dDb250ZXh0TWVudS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dE1l bnVQcm94eUVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlFZmw6 OldlYkNvbnRleHRNZW51UHJveHlFZmwpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVu dVByb3h5RWZsOjpzaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 TWVudVByb3h5RWZsOjpoaWRlQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwv V2ViQ29udGV4dE1lbnVQcm94eUVmbC5oOgorCiAyMDE1LTEwLTE4ICBKb29uZ2h1biBQYXJrICA8 amg3MTgucGFya0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgV2ViS2l0Q29u dGV4dE1lbnUgcmVsYXRlZCBtaXNzaW5nIGFubm90YXRpb24gd2FybmluZ3MKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dE1lbnVQcm94eUVmbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0TWVudVByb3h5 RWZsLmNwcAkocmV2aXNpb24gMTkxMjc3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9XZWJDb250ZXh0TWVudVByb3h5RWZsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgs OSBAQAogCiAjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCiAKKyNpbmNsdWRlICJBUElDb250ZXh0 TWVudUNsaWVudC5oIgogI2luY2x1ZGUgIkV3a1ZpZXcuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0 TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgiCiAjaW5jbHVk ZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgpA QCAtMzcsOCArMzksMTAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCi1XZWJDb250ZXh0TWVudVByb3h5RWZsOjpXZWJDb250ZXh0TWVudVByb3h5RWZs KEV3a1ZpZXcqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiBj b250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCitXZWJDb250ZXh0TWVudVByb3h5RWZs OjpXZWJDb250ZXh0TWVudVByb3h5RWZsKEV3a1ZpZXcqIGV3a1ZpZXcsIFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQogICAgIDogV2ViQ29udGV4dE1lbnVQcm94eShjb250ZXh0LCB1c2VyRGF0 YSkKKyAgICAsIG1fZXdrVmlldyhld2tWaWV3KQorICAgICwgbV9wYWdlKHBhZ2UpCiB7CiB9CiAK QEAgLTQ4LDcgKzUyLDMxIEBAIFdlYkNvbnRleHRNZW51UHJveHlFZmw6On5XZWJDb250ZXh0TWVu dVAKIAogdm9pZCBXZWJDb250ZXh0TWVudVByb3h5RWZsOjpzaG93Q29udGV4dE1lbnUoKQogewot ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0 ZW0+PiBwcm9wb3NlZEFQSUl0ZW1zOworICAgIGZvciAoYXV0byYgaXRlbSA6IG1fY29udGV4dC5t ZW51SXRlbXMoKSkgeworICAgICAgICBpZiAoaXRlbS5hY3Rpb24oKSAhPSBDb250ZXh0TWVudUl0 ZW1UYWdTaGFyZU1lbnUpCisgICAgICAgICAgICBwcm9wb3NlZEFQSUl0ZW1zLmFwcGVuZChXZWJD b250ZXh0TWVudUl0ZW06OmNyZWF0ZShpdGVtKSk7CisgICAgfQorCisgICAgVmVjdG9yPFJlZlB0 cjxXZWJDb250ZXh0TWVudUl0ZW0+PiBjbGllbnRJdGVtczsKKyAgICBib29sIHVzZVByb3Bvc2Vk SXRlbXMgPSB0cnVlOworCisgICAgaWYgKG1fcGFnZS5jb250ZXh0TWVudUNsaWVudCgpLmdldENv bnRleHRNZW51RnJvbVByb3Bvc2VkTWVudShtX3BhZ2UsIHByb3Bvc2VkQVBJSXRlbXMsIGNsaWVu dEl0ZW1zLCBtX2NvbnRleHQud2ViSGl0VGVzdFJlc3VsdERhdGEoKSwgbV9wYWdlLnByb2Nlc3Mo KS50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKG1fdXNlckRhdGEub2JqZWN0KCkpLmdldCgpKSkK KyAgICAgICAgdXNlUHJvcG9zZWRJdGVtcyA9IGZhbHNlOworCisgICAgY29uc3QgVmVjdG9yPFJl ZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYgaXRlbXMgPSB1c2VQcm9wb3NlZEl0ZW1zID8gcHJv cG9zZWRBUElJdGVtcyA6IGNsaWVudEl0ZW1zOworCisgICAgaWYgKGl0ZW1zLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IG1lbnVJ dGVtczsKKyAgICBtZW51SXRlbXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShpdGVtcy5zaXplKCkp OworCisgICAgZm9yIChjb25zdCBhdXRvJiBtZW51SXRlbSA6IGl0ZW1zKQorICAgICAgICBtZW51 SXRlbXMudW5jaGVja2VkQXBwZW5kKG1lbnVJdGVtKTsKKworICAgIGlmIChtX2V3a1ZpZXcpCisg ICAgICAgIG1fZXdrVmlldy0+c2hvd0NvbnRleHRNZW51KHRvQVBJKG1fY29udGV4dC5tZW51TG9j YXRpb24oKSksIHRvQVBJKEFQSTo6QXJyYXk6OmNyZWF0ZShXVEY6Om1vdmUobWVudUl0ZW1zKSku cHRyKCkpKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0TWVudVByb3h5RWZsOjpoaWRlQ29udGV4dE1l bnUoKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0TWVudVBy b3h5RWZsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJD b250ZXh0TWVudVByb3h5RWZsLmgJKHJldmlzaW9uIDE5MTI3NykKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dE1lbnVQcm94eUVmbC5oCSh3b3JraW5nIGNvcHkpCkBA IC01NCw2ICs1NCw5IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBXZWJDb250ZXh0TWVudVBy b3h5RWZsKEV3a1ZpZXcqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIEV3a1ZpZXcqIG1fZXdrVmlldzsKKyAgICBX ZWJQYWdlUHJveHkmIG1fcGFnZTsKIH07CiAKIAo=