207529 2020-02-10 19:27:10 -0800 [WPE][WebDriver] MiniBrowser should react to close session commands 2020-03-06 02:02:35 -0800 1 1 1 Unclassified WebKit WPE WebKit Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 208689 1 lmoura lmoura bugs-noreply cgarcia commit-queue yurys oldest_to_newest 1617255 0 lmoura 2020-02-10 19:27:10 -0800 - Many WebDriver tests require the current WebDriver session to be closed and a new one to be created. - When a session is closed, it causes the associated WebView to trigger the "close" signal. - Currently, WPE's MiniBrowser only listens to "close" on the child WebViews and not in the main one, which is registered as the automation WebView - This causes lots of timeouts when running the WebDriver tests. Delete session command: https://www.w3.org/TR/webdriver/#delete-session 1617260 1 390336 lmoura 2020-02-10 19:32:20 -0800 Created attachment 390336 Patch 1617267 2 lmoura 2020-02-10 19:35:31 -0800 (In reply to Lauro Moura from comment #1) > Created attachment 390336 [details] > Patch With this, the test run went from ~26min to 14min. Output comparing upstream (baseline) and patched (current): Summary of changes from baseline: ERROR -> PASS : 74 FAIL -> PASS : 1 TIMEOUT -> PASS : 1 This should also improve the results for bug207372. 1617330 3 commit-queue 2020-02-11 04:54:05 -0800 The commit-queue encountered the following flaky tests while processing attachment 390336: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1617333 4 commit-queue 2020-02-11 04:54:28 -0800 The commit-queue encountered the following flaky tests while processing attachment 390336: editing/spelling/spellcheck-attribute.html bug 206178 (authors: g.czajkowski@samsung.com, mark.lam@apple.com, and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1617337 5 390336 commit-queue 2020-02-11 05:10:03 -0800 Comment on attachment 390336 Patch Clearing flags on attachment: 390336 Committed r256302: <https://trac.webkit.org/changeset/256302> 1617339 6 commit-queue 2020-02-11 05:10:05 -0800 All reviewed patches have been landed. Closing bug. 1618619 7 390336 yurys 2020-02-13 11:38:35 -0800 Comment on attachment 390336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390336&action=review > Tools/MiniBrowser/wpe/main.cpp:303 > + g_signal_connect(webView, "close", G_CALLBACK(webViewClose), nullptr); This handler unrefs the webView and may cause it to be deleted, in which case g_object_unref(webView); call below (https://trac.webkit.org/browser/webkit/trunk/Tools/MiniBrowser/wpe/main.cpp?rev=256302#L329) will cause use after free. I'm observing the following crash: Thread 1 (Thread 0x7fb9572f99c0 (LWP 25208)): #0 g_type_check_instance_is_fundamentally_a (type_instance=0x2188130, fundamental_type=80) at ../../Source/glib-2.58.1/gobject/gtype.c:4025 node = <optimized out> #1 0x00007fb95d295785 in g_object_unref (_object=0x2188130) at ../../Source/glib-2.58.1/gobject/gobject.c:3243 _g_boolean_var_ = <optimized out> object = 0x2188130 old_ref = <optimized out> #2 0x0000000000405ccd in main () 1618702 8 yurys 2020-02-13 14:06:44 -0800 Reopening to attach new patch. 1618703 9 390685 yurys 2020-02-13 14:06:45 -0800 Created attachment 390685 Patch 1618707 10 yurys 2020-02-13 14:16:32 -0800 The patch removes now redundant g_object_unref but I'm not entirely sure about what is expected to happen to the existing WebKitWebViews should g_main_loop_run terminate before they are all closed. It looks like if Ctrl+Q is pressed g_main_loop_quit will be called and the process may exit with a bunch of WebKitWebViews still alive. In GTK the loop is only terminated once all mini browser windows are gone so maybe WPE mini browser should also keep track of all created views and close them before exiting? 1618891 11 390685 cgarcia 2020-02-14 00:39:04 -0800 Comment on attachment 390685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390685&action=review > Tools/MiniBrowser/wpe/main.cpp:-329 > - g_object_unref(webView); hmm, I don't think close is emitted for the main web view when it's closed with CTRL+Q. We might need to use a weak pointer. 1619122 12 390792 yurys 2020-02-14 11:57:17 -0800 Created attachment 390792 Patch 1619124 13 yurys 2020-02-14 12:00:01 -0800 (In reply to Carlos Garcia Campos from comment #11) > Comment on attachment 390685 [details] > hmm, I don't think close is emitted for the main web view when it's closed > with CTRL+Q. We might need to use a weak pointer. Updated the fix to use weak ref instead. Do you think it'd make sense to also close child views if they are still alive? (something like Comment#10) 1619595 14 390792 cgarcia 2020-02-17 00:55:24 -0800 Comment on attachment 390792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390792&action=review > Tools/MiniBrowser/wpe/main.cpp:179 > +void webViewFinalized(gpointer data, GObject*) > +{ > + auto viewPointer = static_cast<WebKitWebView**>(data); > + *viewPointer = nullptr; > +} You don't need this ifg you use a weak pointer. > Tools/MiniBrowser/wpe/main.cpp:297 > + g_object_weak_ref(G_OBJECT(webView), webViewFinalized, &webView); Use g_object_add_weak_pointer() instead. > Tools/MiniBrowser/wpe/main.cpp:337 > + g_object_weak_unref(G_OBJECT(webView), webViewFinalized, &webView); And g_object_remove_weak_pointer here. 1619596 15 cgarcia 2020-02-17 00:56:11 -0800 (In reply to Yury Semikhatsky from comment #13) > (In reply to Carlos Garcia Campos from comment #11) > > Comment on attachment 390685 [details] > > hmm, I don't think close is emitted for the main web view when it's closed > > with CTRL+Q. We might need to use a weak pointer. > > Updated the fix to use weak ref instead. Do you think it'd make sense to > also close child views if they are still alive? (something like Comment#10) Yes, I guess so. 1626469 16 392662 lmoura 2020-03-05 19:51:37 -0800 Created attachment 392662 Updated patch after cgarcia comments. Updated with the weakref comments. Opened bug208689 for the closing of child views. 1626564 17 commit-queue 2020-03-06 02:01:55 -0800 The commit-queue encountered the following flaky tests while processing attachment 392662: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1626566 18 392662 commit-queue 2020-03-06 02:02:33 -0800 Comment on attachment 392662 Updated patch after cgarcia comments. Clearing flags on attachment: 392662 Committed r257973: <https://trac.webkit.org/changeset/257973> 1626567 19 commit-queue 2020-03-06 02:02:35 -0800 All reviewed patches have been landed. Closing bug. 390336 2020-02-10 19:32:20 -0800 2020-03-05 19:51:18 -0800 Patch bug-207529-20200211003219.patch text/plain 1634 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MTcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjkwOGU1MzU4N2FmNjIyZTc2MjAxYjMyY2IxNWNmNTAz MmE3ZjkxOC4uOWYwMTViM2UyYjBjNmJlMmU1M2E2ODdjMmU5OTVkZWI5ZTljNDViNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAyLTEwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdW1dlYkRyaXZlcl0gTWluaUJyb3dzZXIgc2hvdWxkIHJlYWN0IHRvIGNsb3NlIHNl c3Npb24gY29tbWFuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNzUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlYkRyaXZlciBkZWxldGUgc2Vzc2lvbiBjb21tYW5kIGFza3MgdG8gY2xvc2UgdGhl IFdlYlZpZXcgYXNzb2NpYXRlZCB0byB0aGUKKyAgICAgICAgY3VycmVudCBhdXRvbWF0aW9uIHNl c3Npb24uIFdlIG11c3QgcmVhY3QgdG8gaXQgdG8gYXZvaWQgbG90cyBvZgorICAgICAgICB0aW1l b3V0cyBhbmQgZXJyb3JzLgorCisgICAgICAgICogTWluaUJyb3dzZXIvd3BlL21haW4uY3BwOgor ICAgICAgICAobWFpbik6IExpc3RlbiB0byAiY2xvc2UiIHNpZ25hbCBvbiB0aGUgbWFpbiBXZWJW aWV3LgorCiAyMDIwLTAyLTA5ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdW1dQRV0gRXhwb3NlIGFsbG93VG9wTmF2aWdhdGlvblRvRGF0YVVSTApkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwIGIvVG9vbHMvTWluaUJyb3dz ZXIvd3BlL21haW4uY3BwCmluZGV4IDJkMTgzZDM5NDEyM2JkODQ1NDVkYzUxZjUzZWI5YmU3OTZm Yjg4NzMuLmEwY2E5NGFjMmRjYzAwNWI0MDMxODBhYTExNDA3ZmY3YjMzZGNiYzYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93cGUvbWFpbi5jcHAKQEAgLTMwMCw2ICszMDAsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hh ciAqYXJndltdKQogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViQ29udGV4dCwgImF1dG9tYXRpb24t c3RhcnRlZCIsIEdfQ0FMTEJBQ0soYXV0b21hdGlvblN0YXJ0ZWRDYWxsYmFjayksIHdlYlZpZXcp OwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgInBlcm1pc3Npb24tcmVxdWVzdCIsIEdf Q0FMTEJBQ0soZGVjaWRlUGVybWlzc2lvblJlcXVlc3QpLCBudWxscHRyKTsKICAgICBnX3NpZ25h bF9jb25uZWN0KHdlYlZpZXcsICJjcmVhdGUiLCBHX0NBTExCQUNLKGNyZWF0ZVdlYlZpZXcpLCBu dWxscHRyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdlYlZpZXcsICJjbG9zZSIsIEdfQ0FMTEJB Q0sod2ViVmlld0Nsb3NlKSwgbnVsbHB0cik7CiAKICAgICBpZiAoaWdub3JlVExTRXJyb3JzKQog ICAgICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Rsc19lcnJvcnNfcG9saWN5KHdlYkNvbnRl eHQsIFdFQktJVF9UTFNfRVJST1JTX1BPTElDWV9JR05PUkUpOwo= 390685 2020-02-13 14:06:45 -0800 2020-02-14 11:57:46 -0800 Patch bug-207529-20200213140644.patch text/plain 1287 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDU2ZmU4ZTRiMzExMTMwNzIyYjU0NTZlZWNmNzA5OTRj YTMzN2M1Mi4uNmJjN2U1Y2RhYzMwMzQ1MTM1NTM3YWY3ZTNhMzNjMDg2YTI4ZDNiOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAyLTEzICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtXUEVdW1dlYkRyaXZlcl0gTWluaUJyb3dzZXIgc2hvdWxkIHJlYWN0IHRvIGNs b3NlIHNlc3Npb24gY29tbWFuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIERvIG5vdCBjYWxsIGdfb2JqZWN0X3VucmVmIG9uIHRoZSBmaXJzdCBjcmVh dGVkIHZpZXcgYXMgaXQgaXMgbm93CisgICAgICAgIGhhcHBlbnMgImNsb3NlIiBzaWduYWwgaGFu ZGxlci4gVGhpcyBmaXhlcyB0aGUgdXNlIGFmdGVyIGZyZWUgZXJyb3IKKyAgICAgICAgZGVzY3Jp YmVkIGluIHRoZSBidWcuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93cGUvbWFpbi5jcHA6Cisg ICAgICAgIChtYWluKToKKwogMjAyMC0wMi0xMyAgU3RlcGhhbiBTemFibyAgPHN0ZXBoYW4uc3ph Ym9Ac29ueS5jb20+CiAKICAgICAgICAgW1BsYXlTdGF0aW9uXSBBZGQgQnVpbGRib3RzIGZvciBE ZWJ1Zy9SZWxlYXNlIGJ1aWxkcwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21h aW4uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwCmluZGV4IGEwY2E5NGFjMmRj YzAwNWI0MDMxODBhYTExNDA3ZmY3YjMzZGNiYzYuLmYzYzA5ODZkZTVmMjY1NTBhZjBjZTE1MjQ1 NjA5OTY2OTEwN2ViMWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNw cAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKQEAgLTMyNiw3ICszMjYsNiBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAgICAgZ19tYWluX2xvb3BfcnVu KGxvb3ApOwogCi0gICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7CiAgICAgaWYgKHByaXZhdGVN b2RlIHx8IGF1dG9tYXRpb25Nb2RlKQogICAgICAgICBnX29iamVjdF91bnJlZih3ZWJDb250ZXh0 KTsKICAgICBnX21haW5fbG9vcF91bnJlZihsb29wKTsK 390792 2020-02-14 11:57:17 -0800 2020-03-05 19:51:28 -0800 Patch bug-207529-20200214115717.patch text/plain 2084 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDU2ZmU4ZTRiMzExMTMwNzIyYjU0NTZlZWNmNzA5OTRj YTMzN2M1Mi4uMTMwNGRiMTBjNzdiMDI1ZDYzZGUxMjZiMGFkNGZiMjllODhkMjA0MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIwLTAyLTEzICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtXUEVdW1dlYkRyaXZlcl0gTWluaUJyb3dzZXIgc2hvdWxkIHJlYWN0IHRvIGNs b3NlIHNlc3Npb24gY29tbWFuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIERvIG5vdCBjYWxsIGdfb2JqZWN0X3VucmVmIG9uIHRoZSBmaXJzdCBjcmVh dGVkIHZpZXcgaWYgaXQgaGFzIGFscmVhZHkKKyAgICAgICAgYmVlbiBkaXNwb3NlZCBpbiB0aGUg ImNsb3NlIiBzaWduYWwgaGFuZGxlci4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3dwZS9tYWlu LmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDIwLTAyLTEzICBTdGVwaGFuIFN6YWJvICA8c3Rl cGhhbi5zemFib0Bzb255LmNvbT4KIAogICAgICAgICBbUGxheVN0YXRpb25dIEFkZCBCdWlsZGJv dHMgZm9yIERlYnVnL1JlbGVhc2UgYnVpbGRzCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci93cGUvbWFpbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKaW5kZXggYTBj YTk0YWMyZGNjMDA1YjQwMzE4MGFhMTE0MDdmZjdiMzNkY2JjNi4uMTFlMWRlMzRjNmE5ZTA3NzJm OGEwOGE0MDBlMzdkZGI4NzZjMDA2YSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd3Bl L21haW4uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNwcApAQCAtMTcyLDYg KzE3MiwxMiBAQCBzdGF0aWMgV2ViS2l0V2ViVmlldyogY3JlYXRlV2ViVmlldyhXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3LCBXZWJLaXROYXZpZ2F0aW9uQWN0aQogICAgIHJldHVybiBuZXdXZWJWaWV3 OwogfQogCit2b2lkIHdlYlZpZXdGaW5hbGl6ZWQoZ3BvaW50ZXIgZGF0YSwgR09iamVjdCopCit7 CisgICAgYXV0byB2aWV3UG9pbnRlciA9IHN0YXRpY19jYXN0PFdlYktpdFdlYlZpZXcqKj4oZGF0 YSk7CisgICAgKnZpZXdQb2ludGVyID0gbnVsbHB0cjsKK30KKwogaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIgKmFyZ3ZbXSkKIHsKICNpZiBFTkFCTEVfREVWRUxPUEVSX01PREUKQEAgLTI4OCw2ICsy OTQsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgICAgICAiaXMtY29u dHJvbGxlZC1ieS1hdXRvbWF0aW9uIiwgYXV0b21hdGlvbk1vZGUsCiAgICAgICAgIG51bGxwdHIp KTsKICAgICBnX29iamVjdF91bnJlZihzZXR0aW5ncyk7CisgICAgZ19vYmplY3Rfd2Vha19yZWYo R19PQkpFQ1Qod2ViVmlldyksIHdlYlZpZXdGaW5hbGl6ZWQsICZ3ZWJWaWV3KTsKIAogICAgIGJh Y2tlbmRQdHItPnNldElucHV0Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8SW5wdXRDbGllbnQ+KGxv b3AsIHdlYlZpZXcpKTsKICNpZiBkZWZpbmVkKEhBVkVfQUNDRVNTSUJJTElUWSkgJiYgSEFWRV9B Q0NFU1NJQklMSVRZCkBAIC0zMjYsNyArMzMzLDEwIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy ICphcmd2W10pCiAKICAgICBnX21haW5fbG9vcF9ydW4obG9vcCk7CiAKLSAgICBnX29iamVjdF91 bnJlZih3ZWJWaWV3KTsKKyAgICBpZiAod2ViVmlldykgeworICAgICAgICBnX29iamVjdF93ZWFr X3VucmVmKEdfT0JKRUNUKHdlYlZpZXcpLCB3ZWJWaWV3RmluYWxpemVkLCAmd2ViVmlldyk7Cisg ICAgICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOworICAgIH0KICAgICBpZiAocHJpdmF0ZU1v ZGUgfHwgYXV0b21hdGlvbk1vZGUpCiAgICAgICAgIGdfb2JqZWN0X3VucmVmKHdlYkNvbnRleHQp OwogICAgIGdfbWFpbl9sb29wX3VucmVmKGxvb3ApOwo= 392662 2020-03-05 19:51:37 -0800 2020-03-06 02:02:33 -0800 Updated patch after cgarcia comments. bug-207529-20200306005134.patch text/plain 1816 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTgwMzBiMmIxNmVlNjIwZGIxMWFkMDY2ODgyYzVkYjM0 ZDJmZDRiNy4uMzIyYTk3YTU0MjAwNWQ0ZTUxMDE5MTAzNjYwNGU4YmZlYzFiODZjNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTAzLTA1ICBMYXVybyBNb3VyYSA8bG1vdXJhQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW1dQRV1bV2ViRHJpdmVyXSBNaW5pQnJvd3NlciBzaG91bGQgcmVhY3QgdG8gY2xvc2Ugc2Vz c2lvbiBjb21tYW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA3NTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRG8gbm90IGNhbGwgZ19vYmplY3RfdW5yZWYgb24gdGhlIGZpcnN0IGNyZWF0ZWQgdmll dyBpZiBpdCBoYXMgYWxyZWFkeQorICAgICAgICBiZWVuIGRpc3Bvc2VkIGluIHRoZSAiY2xvc2Ui IHNpZ25hbCBoYW5kbGVyLgorCisgICAgICAgIEJhc2VkIG9uIG9yaWdpbmFsIHBhdGNoIGJ5IFl1 cnkgU2VtaWtoYXRza3kuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93cGUvbWFpbi5jcHA6Cisg ICAgICAgIChtYWluKToKKwogMjAyMC0wMy0wNCAgQmFzdWtlIFN1enVraSAgPGJhc3VrZS5zdXp1 a2lAc29ueS5jb20+CiAKICAgICAgICAgW01TVkNdIEFkZCAubmF0dmlzIHN1cHBvcnQgb2YgV2Vi S2l0IHR5cGVzCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAgYi9U b29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKaW5kZXggYTBjYTk0YWMyZGNjMDA1YjQwMzE4 MGFhMTE0MDdmZjdiMzNkY2JjNi4uYmIwMTQ1MTY5MjMxZmZiY2VlMWIwZTliY2Y0M2M3ZDE4Nzc0 NjM1MSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNwcApAQCAtMjg4LDYgKzI4OCw3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAgICAgICAgICJpcy1jb250cm9sbGVkLWJ5LWF1dG9t YXRpb24iLCBhdXRvbWF0aW9uTW9kZSwKICAgICAgICAgbnVsbHB0cikpOwogICAgIGdfb2JqZWN0 X3VucmVmKHNldHRpbmdzKTsKKyAgICBnX29iamVjdF9hZGRfd2Vha19wb2ludGVyKEdfT0JKRUNU KHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJndlYlZpZXcpKTsKIAogICAgIGJh Y2tlbmRQdHItPnNldElucHV0Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8SW5wdXRDbGllbnQ+KGxv b3AsIHdlYlZpZXcpKTsKICNpZiBkZWZpbmVkKEhBVkVfQUNDRVNTSUJJTElUWSkgJiYgSEFWRV9B Q0NFU1NJQklMSVRZCkBAIC0zMjYsNyArMzI3LDEwIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy ICphcmd2W10pCiAKICAgICBnX21haW5fbG9vcF9ydW4obG9vcCk7CiAKLSAgICBnX29iamVjdF91 bnJlZih3ZWJWaWV3KTsKKyAgICBpZiAod2ViVmlldykgeworICAgICAgICBnX29iamVjdF9yZW1v dmVfd2Vha19wb2ludGVyKEdfT0JKRUNUKHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PHZvaWQq Kj4oJndlYlZpZXcpKTsKKyAgICAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7CisgICAgfQog ICAgIGlmIChwcml2YXRlTW9kZSB8fCBhdXRvbWF0aW9uTW9kZSkKICAgICAgICAgZ19vYmplY3Rf dW5yZWYod2ViQ29udGV4dCk7CiAgICAgZ19tYWluX2xvb3BfdW5yZWYobG9vcCk7Cg==