208689 2020-03-05 19:43:51 -0800 [WPE] MiniBrowser: Close child WebViews when exiting 2020-03-10 09:11:31 -0700 1 1 1 Unclassified WebKit WPE WebKit Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 207529 1 lmoura lmoura bugs-noreply cgarcia commit-queue zan oldest_to_newest 1626463 0 lmoura 2020-03-05 19:43:51 -0800 During the discussion in bug207529, it was noted that WPE's MiniBrowser only cleans up the main webview when exiting, while ideally it should also clean up any child view created. 1627662 1 393008 lmoura 2020-03-08 22:17:16 -0700 Created attachment 393008 Patch 1627686 2 393008 zan 2020-03-09 01:06:47 -0700 Comment on attachment 393008 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393008&action=review > Tools/MiniBrowser/wpe/main.cpp:308 > + g_signal_connect(webView, "close", G_CALLBACK(+[](WebKitWebView *view, gpointer) { That + is redundant. 1627687 3 393008 cgarcia 2020-03-09 01:10:47 -0700 Comment on attachment 393008 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393008&action=review >> Tools/MiniBrowser/wpe/main.cpp:308 >> + g_signal_connect(webView, "close", G_CALLBACK(+[](WebKitWebView *view, gpointer) { > > That + is redundant. I think you can use G_CALLBACK(g_object_unref) directly. Maybe it's easier to add the main web view to the hash table and you don't need to handle it differently. You could use a weak ref to remove the web views from the hash table when they are destroyed, too. 1628065 4 393105 lmoura 2020-03-09 18:12:59 -0700 Created attachment 393105 Patch 1628099 5 393119 lmoura 2020-03-09 20:32:54 -0700 Created attachment 393119 Patch 1628136 6 393119 cgarcia 2020-03-10 00:41:05 -0700 Comment on attachment 393119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393119&action=review > Tools/MiniBrowser/wpe/main.cpp:154 > + g_hash_table_remove(openViews, (gpointer*)webView); This is cpp file, use C++ cast. > Tools/MiniBrowser/wpe/main.cpp:174 > + g_hash_table_add(openViews, (gpointer*)newWebView); Ditto. > Tools/MiniBrowser/wpe/main.cpp:303 > + openViews = g_hash_table_new_full(NULL, NULL, g_object_unref, NULL); And nullptr instead of NULL. 1628259 7 393153 lmoura 2020-03-10 08:26:51 -0700 Created attachment 393153 Patch 1628270 8 393153 commit-queue 2020-03-10 09:11:29 -0700 Comment on attachment 393153 Patch Clearing flags on attachment: 393153 Committed r258211: <https://trac.webkit.org/changeset/258211> 1628271 9 commit-queue 2020-03-10 09:11:31 -0700 All reviewed patches have been landed. Closing bug. 393008 2020-03-08 22:17:16 -0700 2020-03-09 18:12:51 -0700 Patch bug-208689-20200309021714.patch text/plain 3249 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTJhNWJhOWNjZWE0NDM5NDZkYzEzOGQ5NmZhMTQxZDgy NzUyY2RhNC4uMjY4ZmMzMGUwY2M5MzNiZDg3NGJiZWVjY2RkYmFkMGI1OTY2ODZhYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAzLTA1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIE1pbmlCcm93c2VyOiBDbG9zZSBjaGlsZCBXZWJWaWV3cyB3aGVuIGV4aXRpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY4OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNy ZWF0ZWQgc3Vidmlld3Mgc28gd2UgY2FuIHJlbGVhc2UgdGhlbSBiZWZvcmUgZXhpdGluZy4KKwor ICAgICAgICAqIE1pbmlCcm93c2VyL3dwZS9tYWluLmNwcDoKKyAgICAgICAgKHdlYlZpZXdDbG9z ZSk6CisgICAgICAgIChjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKG1haW4pOgorCiAyMDIwLTAz LTA3ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBS ZXBsYWNlIHRoZSB1c2Ugb2YgdGVybSAicm9sbG91dCIgdG8gInJldmVydCIgaW4gdmFyaW91cyB0 b29scwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwIGIvVG9vbHMv TWluaUJyb3dzZXIvd3BlL21haW4uY3BwCmluZGV4IGJiMDE0NTE2OTIzMWZmYmNlZTFiMGU5YmNm NDNjN2QxODc3NDYzNTEuLjhkZDkwZTRjZDZjODI2YWI5YTZhYTA2M2U5Y2I0MTYzYTg5N2RiZGQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNwcAorKysgYi9Ub29scy9N aW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKQEAgLTQ5LDYgKzQ5LDcgQEAgc3RhdGljIGNvbnN0IGNo YXIqIGNvb2tpZXNQb2xpY3k7CiBzdGF0aWMgY29uc3QgY2hhciogcHJveHk7CiBjb25zdCBjaGFy KiBiZ0NvbG9yOwogc3RhdGljIGdib29sZWFuIHByaW50VmVyc2lvbjsKK3N0YXRpYyBHSGFzaFRh YmxlKiBjaGlsZHJlblZpZXdzOwogCiBzdGF0aWMgY29uc3QgR09wdGlvbkVudHJ5IGNvbW1hbmRM aW5lT3B0aW9uc1tdID0KIHsKQEAgLTE0OSw2ICsxNTAsNyBAQCBzdGF0aWMgdm9pZCBmaWx0ZXJT YXZlZENhbGxiYWNrKFdlYktpdFVzZXJDb250ZW50RmlsdGVyU3RvcmUgKnN0b3JlLCBHQXN5bmNS ZXN1bAogCiBzdGF0aWMgdm9pZCB3ZWJWaWV3Q2xvc2UoV2ViS2l0V2ViVmlldyogd2ViVmlldywg Z3BvaW50ZXIpCiB7CisgICAgZ19oYXNoX3RhYmxlX3JlbW92ZShjaGlsZHJlblZpZXdzLCAoZ3Bv aW50ZXIqKXdlYlZpZXcpOwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogfQogCkBAIC0x NjksNiArMTcxLDggQEAgc3RhdGljIFdlYktpdFdlYlZpZXcqIGNyZWF0ZVdlYlZpZXcoV2ViS2l0 V2ViVmlldyogd2ViVmlldywgV2ViS2l0TmF2aWdhdGlvbkFjdGkKIAogICAgIGdfc2lnbmFsX2Nv bm5lY3QobmV3V2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh3ZWJWaWV3Q2xvc2UpLCBudWxs cHRyKTsKIAorICAgIGdfaGFzaF90YWJsZV9hZGQoY2hpbGRyZW5WaWV3cywgKGdwb2ludGVyKilu ZXdXZWJWaWV3KTsKKwogICAgIHJldHVybiBuZXdXZWJWaWV3OwogfQogCkBAIC0zMDEsNyArMzA1 LDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBnX3NpZ25hbF9jb25u ZWN0KHdlYkNvbnRleHQsICJhdXRvbWF0aW9uLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKGF1dG9tYXRp b25TdGFydGVkQ2FsbGJhY2spLCB3ZWJWaWV3KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYlZp ZXcsICJwZXJtaXNzaW9uLXJlcXVlc3QiLCBHX0NBTExCQUNLKGRlY2lkZVBlcm1pc3Npb25SZXF1 ZXN0KSwgbnVsbHB0cik7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAiY3JlYXRlIiwg R19DQUxMQkFDSyhjcmVhdGVXZWJWaWV3KSwgbnVsbHB0cik7Ci0gICAgZ19zaWduYWxfY29ubmVj dCh3ZWJWaWV3LCAiY2xvc2UiLCBHX0NBTExCQUNLKHdlYlZpZXdDbG9zZSksIG51bGxwdHIpOwor ICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSygrW10oV2Vi S2l0V2ViVmlldyAqdmlldywgZ3BvaW50ZXIpIHsKKyAgICAgICAgZ19vYmplY3RfdW5yZWYodmll dyk7CisgICAgfSksIHdlYlZpZXcpOwogCiAgICAgaWYgKGlnbm9yZVRMU0Vycm9ycykKICAgICAg ICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF90bHNfZXJyb3JzX3BvbGljeSh3ZWJDb250ZXh0LCBX RUJLSVRfVExTX0VSUk9SU19QT0xJQ1lfSUdOT1JFKTsKQEAgLTMxMCw2ICszMTYsOCBAQCBpbnQg bWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGlmIChiZ0NvbG9yICYmIHdlYmtpdF9j b2xvcl9wYXJzZSgmY29sb3IsIGJnQ29sb3IpKQogICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0 X2JhY2tncm91bmRfY29sb3Iod2ViVmlldywgJmNvbG9yKTsKIAorICAgIGNoaWxkcmVuVmlld3Mg PSBnX2hhc2hfdGFibGVfbmV3KE5VTEwsIE5VTEwpOworCiAgICAgaWYgKHVyaUFyZ3VtZW50cykg ewogICAgICAgICBjb25zdCBjaGFyKiB1cmkgPSB1cmlBcmd1bWVudHNbMF07CiAgICAgICAgIGlm IChnX3N0cl9lcXVhbCh1cmksICJhYm91dDpncHUiKSkKQEAgLTMzMSw2ICszMzksMTIgQEAgaW50 IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICAgICAgZ19vYmplY3RfcmVtb3ZlX3dl YWtfcG9pbnRlcihHX09CSkVDVCh3ZWJWaWV3KSwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZ3 ZWJWaWV3KSk7CiAgICAgICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogICAgIH0KKworICAg IGdfaGFzaF90YWJsZV9mb3JlYWNoKGNoaWxkcmVuVmlld3MsIFtdKGdwb2ludGVyIGtleSwgZ3Bv aW50ZXIsIGdwb2ludGVyKSB7CisgICAgICAgIGdfb2JqZWN0X3VucmVmKChHT2JqZWN0KilrZXkp OworICAgIH0sIG51bGxwdHIpOworICAgIGdfaGFzaF90YWJsZV9kZXN0cm95KGNoaWxkcmVuVmll d3MpOworCiAgICAgaWYgKHByaXZhdGVNb2RlIHx8IGF1dG9tYXRpb25Nb2RlKQogICAgICAgICBn X29iamVjdF91bnJlZih3ZWJDb250ZXh0KTsKICAgICBnX21haW5fbG9vcF91bnJlZihsb29wKTsK 393105 2020-03-09 18:12:59 -0700 2020-03-09 20:32:49 -0700 Patch bug-208689-20200309221256.patch text/plain 3324 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FiZDc5MjZkMmE5ODZmMTA0NTM5Mjg5MmE5Y2E5NjE5 YTdhMGM3OS4uMjlkMTBjNThiNzBjODllYjI3MzYzNjM1NzM2OWVlNzYyZjFiNjBiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAzLTA1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIE1pbmlCcm93c2VyOiBDbG9zZSBjaGlsZCBXZWJWaWV3cyB3aGVuIGV4aXRpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY4OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNy ZWF0ZWQgdmlld3Mgc28gd2UgY2FuIHJlbGVhc2UgdGhlbSBiZWZvcmUgZXhpdGluZy4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL3dwZS9tYWluLmNwcDoKKyAgICAgICAgKHdlYlZpZXdDbG9zZSk6 CisgICAgICAgIChjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKG1haW4pOgorCiAyMDIwLTAzLTA5 ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YktpdFRlc3RSdW5uZXIgYnVuZGxlSUQgc2hvdWxkIG5vdCBiZSBjbGVhcmVkIGJlZm9yZSBldmVy eSB0ZXN0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAgYi9Ub29s cy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKaW5kZXggYmIwMTQ1MTY5MjMxZmZiY2VlMWIwZTli Y2Y0M2M3ZDE4Nzc0NjM1MS4uZmZjMzVjZmUxYjNkMjE1OGYwNGJkZmEyYmE5OWM4ZWM2YjFkMGIw NCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL3dwZS9tYWluLmNwcApAQCAtNDksNiArNDksNyBAQCBzdGF0aWMgY29uc3Qg Y2hhciogY29va2llc1BvbGljeTsKIHN0YXRpYyBjb25zdCBjaGFyKiBwcm94eTsKIGNvbnN0IGNo YXIqIGJnQ29sb3I7CiBzdGF0aWMgZ2Jvb2xlYW4gcHJpbnRWZXJzaW9uOworc3RhdGljIEdIYXNo VGFibGUqIG9wZW5WaWV3czsKIAogc3RhdGljIGNvbnN0IEdPcHRpb25FbnRyeSBjb21tYW5kTGlu ZU9wdGlvbnNbXSA9CiB7CkBAIC0xNDksNiArMTUwLDcgQEAgc3RhdGljIHZvaWQgZmlsdGVyU2F2 ZWRDYWxsYmFjayhXZWJLaXRVc2VyQ29udGVudEZpbHRlclN0b3JlICpzdG9yZSwgR0FzeW5jUmVz dWwKIAogc3RhdGljIHZvaWQgd2ViVmlld0Nsb3NlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdw b2ludGVyKQogeworICAgIGdfaGFzaF90YWJsZV9yZW1vdmUob3BlblZpZXdzLCAoZ3BvaW50ZXIq KXdlYlZpZXcpOwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogfQogCkBAIC0xNjksNiAr MTcxLDggQEAgc3RhdGljIFdlYktpdFdlYlZpZXcqIGNyZWF0ZVdlYlZpZXcoV2ViS2l0V2ViVmll dyogd2ViVmlldywgV2ViS2l0TmF2aWdhdGlvbkFjdGkKIAogICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bmV3V2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh3ZWJWaWV3Q2xvc2UpLCBudWxscHRyKTsK IAorICAgIGdfaGFzaF90YWJsZV9hZGQob3BlblZpZXdzLCAoZ3BvaW50ZXIqKW5ld1dlYlZpZXcp OworCiAgICAgcmV0dXJuIG5ld1dlYlZpZXc7CiB9CiAKQEAgLTI4OCw3ICsyOTIsNiBAQCBpbnQg bWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgICAgICAiaXMtY29udHJvbGxlZC1ieS1h dXRvbWF0aW9uIiwgYXV0b21hdGlvbk1vZGUsCiAgICAgICAgIG51bGxwdHIpKTsKICAgICBnX29i amVjdF91bnJlZihzZXR0aW5ncyk7Ci0gICAgZ19vYmplY3RfYWRkX3dlYWtfcG9pbnRlcihHX09C SkVDVCh3ZWJWaWV3KSwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZ3ZWJWaWV3KSk7CiAKICAg ICBiYWNrZW5kUHRyLT5zZXRJbnB1dENsaWVudChzdGQ6Om1ha2VfdW5pcXVlPElucHV0Q2xpZW50 Pihsb29wLCB3ZWJWaWV3KSk7CiAjaWYgZGVmaW5lZChIQVZFX0FDQ0VTU0lCSUxJVFkpICYmIEhB VkVfQUNDRVNTSUJJTElUWQpAQCAtMjk3LDExICszMDAsMTQgQEAgaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIgKmFyZ3ZbXSkKICAgICAgICAgYmFja2VuZFB0ci0+c2V0QWNjZXNzaWJsZUNoaWxkKEFU S19PQkpFQ1QoYWNjZXNzaWJsZSkpOwogI2VuZGlmCiAKKyAgICBvcGVuVmlld3MgPSBnX2hhc2hf dGFibGVfbmV3X2Z1bGwoTlVMTCwgTlVMTCwgZ19vYmplY3RfdW5yZWYsIE5VTEwpOworCiAgICAg d2Via2l0X3dlYl9jb250ZXh0X3NldF9hdXRvbWF0aW9uX2FsbG93ZWQod2ViQ29udGV4dCwgYXV0 b21hdGlvbk1vZGUpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViQ29udGV4dCwgImF1dG9tYXRp b24tc3RhcnRlZCIsIEdfQ0FMTEJBQ0soYXV0b21hdGlvblN0YXJ0ZWRDYWxsYmFjayksIHdlYlZp ZXcpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgInBlcm1pc3Npb24tcmVxdWVzdCIs IEdfQ0FMTEJBQ0soZGVjaWRlUGVybWlzc2lvblJlcXVlc3QpLCBudWxscHRyKTsKICAgICBnX3Np Z25hbF9jb25uZWN0KHdlYlZpZXcsICJjcmVhdGUiLCBHX0NBTExCQUNLKGNyZWF0ZVdlYlZpZXcp LCBudWxscHRyKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYlZpZXcsICJjbG9zZSIsIEdfQ0FM TEJBQ0sod2ViVmlld0Nsb3NlKSwgbnVsbHB0cik7CisgICAgZ19oYXNoX3RhYmxlX2FkZChvcGVu Vmlld3MsIHdlYlZpZXcpOwogCiAgICAgaWYgKGlnbm9yZVRMU0Vycm9ycykKICAgICAgICAgd2Vi a2l0X3dlYl9jb250ZXh0X3NldF90bHNfZXJyb3JzX3BvbGljeSh3ZWJDb250ZXh0LCBXRUJLSVRf VExTX0VSUk9SU19QT0xJQ1lfSUdOT1JFKTsKQEAgLTMyNywxMCArMzMzLDkgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogICAgIGdfbWFpbl9sb29wX3J1bihsb29wKTsKIAot ICAgIGlmICh3ZWJWaWV3KSB7Ci0gICAgICAgIGdfb2JqZWN0X3JlbW92ZV93ZWFrX3BvaW50ZXIo R19PQkpFQ1Qod2ViVmlldyksIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmd2ViVmlldykpOwot ICAgICAgICBnX29iamVjdF91bnJlZih3ZWJWaWV3KTsKLSAgICB9CisgICAgZ19oYXNoX3RhYmxl X2Rlc3Ryb3kob3BlblZpZXdzKTsKKworCiAgICAgaWYgKHByaXZhdGVNb2RlIHx8IGF1dG9tYXRp b25Nb2RlKQogICAgICAgICBnX29iamVjdF91bnJlZih3ZWJDb250ZXh0KTsKICAgICBnX21haW5f bG9vcF91bnJlZihsb29wKTsK 393119 2020-03-09 20:32:54 -0700 2020-03-10 08:26:46 -0700 Patch bug-208689-20200310003253.patch text/plain 3488 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FiZDc5MjZkMmE5ODZmMTA0NTM5Mjg5MmE5Y2E5NjE5 YTdhMGM3OS4uMjlkMTBjNThiNzBjODllYjI3MzYzNjM1NzM2OWVlNzYyZjFiNjBiYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAzLTA1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIE1pbmlCcm93c2VyOiBDbG9zZSBjaGlsZCBXZWJWaWV3cyB3aGVuIGV4aXRpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY4OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIGNy ZWF0ZWQgdmlld3Mgc28gd2UgY2FuIHJlbGVhc2UgdGhlbSBiZWZvcmUgZXhpdGluZy4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL3dwZS9tYWluLmNwcDoKKyAgICAgICAgKHdlYlZpZXdDbG9zZSk6 CisgICAgICAgIChjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKG1haW4pOgorCiAyMDIwLTAzLTA5 ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YktpdFRlc3RSdW5uZXIgYnVuZGxlSUQgc2hvdWxkIG5vdCBiZSBjbGVhcmVkIGJlZm9yZSBldmVy eSB0ZXN0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAgYi9Ub29s cy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKaW5kZXggYmIwMTQ1MTY5MjMxZmZiY2VlMWIwZTli Y2Y0M2M3ZDE4Nzc0NjM1MS4uOTkxZDRhZmJlNTNiNWY4MDQ0ZGVhYTBkZjQ1NzQwZTVjNDI4YTll ZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL3dwZS9tYWluLmNwcApAQCAtNDksNiArNDksNyBAQCBzdGF0aWMgY29uc3Qg Y2hhciogY29va2llc1BvbGljeTsKIHN0YXRpYyBjb25zdCBjaGFyKiBwcm94eTsKIGNvbnN0IGNo YXIqIGJnQ29sb3I7CiBzdGF0aWMgZ2Jvb2xlYW4gcHJpbnRWZXJzaW9uOworc3RhdGljIEdIYXNo VGFibGUqIG9wZW5WaWV3czsKIAogc3RhdGljIGNvbnN0IEdPcHRpb25FbnRyeSBjb21tYW5kTGlu ZU9wdGlvbnNbXSA9CiB7CkBAIC0xNDksNyArMTUwLDggQEAgc3RhdGljIHZvaWQgZmlsdGVyU2F2 ZWRDYWxsYmFjayhXZWJLaXRVc2VyQ29udGVudEZpbHRlclN0b3JlICpzdG9yZSwgR0FzeW5jUmVz dWwKIAogc3RhdGljIHZvaWQgd2ViVmlld0Nsb3NlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdw b2ludGVyKQogewotICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOworICAgIC8vIEhhc2ggdGFi bGUga2V5IGRlbGV0ZSBmdW5jIHRha2VzIGNhcmUgb2YgdW5yZWYnaW5nIHRoZSB2aWV3CisgICAg Z19oYXNoX3RhYmxlX3JlbW92ZShvcGVuVmlld3MsIChncG9pbnRlciopd2ViVmlldyk7CiB9CiAK IHN0YXRpYyBXZWJLaXRXZWJWaWV3KiBjcmVhdGVXZWJWaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIFdlYktpdE5hdmlnYXRpb25BY3Rpb24qLCBncG9pbnRlcikKQEAgLTE2OSw2ICsxNzEsOCBA QCBzdGF0aWMgV2ViS2l0V2ViVmlldyogY3JlYXRlV2ViVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXZWJLaXROYXZpZ2F0aW9uQWN0aQogCiAgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJW aWV3LCAiY2xvc2UiLCBHX0NBTExCQUNLKHdlYlZpZXdDbG9zZSksIG51bGxwdHIpOwogCisgICAg Z19oYXNoX3RhYmxlX2FkZChvcGVuVmlld3MsIChncG9pbnRlciopbmV3V2ViVmlldyk7CisKICAg ICByZXR1cm4gbmV3V2ViVmlldzsKIH0KIApAQCAtMjg4LDcgKzI5Miw2IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAgICAgICAgICJpcy1jb250cm9sbGVkLWJ5LWF1dG9tYXRp b24iLCBhdXRvbWF0aW9uTW9kZSwKICAgICAgICAgbnVsbHB0cikpOwogICAgIGdfb2JqZWN0X3Vu cmVmKHNldHRpbmdzKTsKLSAgICBnX29iamVjdF9hZGRfd2Vha19wb2ludGVyKEdfT0JKRUNUKHdl YlZpZXcpLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJndlYlZpZXcpKTsKIAogICAgIGJhY2tl bmRQdHItPnNldElucHV0Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8SW5wdXRDbGllbnQ+KGxvb3As IHdlYlZpZXcpKTsKICNpZiBkZWZpbmVkKEhBVkVfQUNDRVNTSUJJTElUWSkgJiYgSEFWRV9BQ0NF U1NJQklMSVRZCkBAIC0yOTcsMTEgKzMwMCwxNCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq YXJndltdKQogICAgICAgICBiYWNrZW5kUHRyLT5zZXRBY2Nlc3NpYmxlQ2hpbGQoQVRLX09CSkVD VChhY2Nlc3NpYmxlKSk7CiAjZW5kaWYKIAorICAgIG9wZW5WaWV3cyA9IGdfaGFzaF90YWJsZV9u ZXdfZnVsbChOVUxMLCBOVUxMLCBnX29iamVjdF91bnJlZiwgTlVMTCk7CisKICAgICB3ZWJraXRf d2ViX2NvbnRleHRfc2V0X2F1dG9tYXRpb25fYWxsb3dlZCh3ZWJDb250ZXh0LCBhdXRvbWF0aW9u TW9kZSk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJDb250ZXh0LCAiYXV0b21hdGlvbi1zdGFy dGVkIiwgR19DQUxMQkFDSyhhdXRvbWF0aW9uU3RhcnRlZENhbGxiYWNrKSwgd2ViVmlldyk7CiAg ICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAicGVybWlzc2lvbi1yZXF1ZXN0IiwgR19DQUxM QkFDSyhkZWNpZGVQZXJtaXNzaW9uUmVxdWVzdCksIG51bGxwdHIpOwogICAgIGdfc2lnbmFsX2Nv bm5lY3Qod2ViVmlldywgImNyZWF0ZSIsIEdfQ0FMTEJBQ0soY3JlYXRlV2ViVmlldyksIG51bGxw dHIpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh3 ZWJWaWV3Q2xvc2UpLCBudWxscHRyKTsKKyAgICBnX2hhc2hfdGFibGVfYWRkKG9wZW5WaWV3cywg d2ViVmlldyk7CiAKICAgICBpZiAoaWdub3JlVExTRXJyb3JzKQogICAgICAgICB3ZWJraXRfd2Vi X2NvbnRleHRfc2V0X3Rsc19lcnJvcnNfcG9saWN5KHdlYkNvbnRleHQsIFdFQktJVF9UTFNfRVJS T1JTX1BPTElDWV9JR05PUkUpOwpAQCAtMzI3LDEwICszMzMsOSBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqYXJndltdKQogCiAgICAgZ19tYWluX2xvb3BfcnVuKGxvb3ApOwogCi0gICAgaWYg KHdlYlZpZXcpIHsKLSAgICAgICAgZ19vYmplY3RfcmVtb3ZlX3dlYWtfcG9pbnRlcihHX09CSkVD VCh3ZWJWaWV3KSwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZ3ZWJWaWV3KSk7Ci0gICAgICAg IGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwotICAgIH0KKyAgICBnX2hhc2hfdGFibGVfZGVzdHJv eShvcGVuVmlld3MpOworCisKICAgICBpZiAocHJpdmF0ZU1vZGUgfHwgYXV0b21hdGlvbk1vZGUp CiAgICAgICAgIGdfb2JqZWN0X3VucmVmKHdlYkNvbnRleHQpOwogICAgIGdfbWFpbl9sb29wX3Vu cmVmKGxvb3ApOwo= 393153 2020-03-10 08:26:51 -0700 2020-03-10 09:11:29 -0700 Patch bug-208689-20200310122649.patch text/plain 3451 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MjA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGEyMmRlYzYyYzEzNjExZmM0YzFjOThkMGM4NTE1YjIw MzA5ZTI1OS4uMTU3ZTJkODdiOTE5NTg3NDUwYTk5YzgwMzk5Yjk5ZDIzODYwNjlhYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTAzLTEwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIE1pbmlCcm93c2VyOiBDbG9zZSBjaGlsZCBXZWJWaWV3cyB3aGVuIGV4aXRpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY4OQor CisgICAgICAgIFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAgICAgIFN0 b3JlIGNyZWF0ZWQgdmlld3Mgc28gd2UgY2FuIHJlbGVhc2UgdGhlbSBiZWZvcmUgZXhpdGluZy4K KworICAgICAgICAqIE1pbmlCcm93c2VyL3dwZS9tYWluLmNwcDoKKyAgICAgICAgKHdlYlZpZXdD bG9zZSk6CisgICAgICAgIChjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKG1haW4pOgorCiAyMDIw LTAzLTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBBUEkgZmF2aWNvbiB0ZXN0IGZsYWt5IHRpbWVvdXRzCmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5j cHAKaW5kZXggYmIwMTQ1MTY5MjMxZmZiY2VlMWIwZTliY2Y0M2M3ZDE4Nzc0NjM1MS4uYThjY2Ni NmMxZDU2NzgyM2ZlOGU2NTAzZjFhMTM3ODU2YjBhOTk3NSAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvd3BlL21haW4uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dwZS9tYWluLmNw cApAQCAtNDksNiArNDksNyBAQCBzdGF0aWMgY29uc3QgY2hhciogY29va2llc1BvbGljeTsKIHN0 YXRpYyBjb25zdCBjaGFyKiBwcm94eTsKIGNvbnN0IGNoYXIqIGJnQ29sb3I7CiBzdGF0aWMgZ2Jv b2xlYW4gcHJpbnRWZXJzaW9uOworc3RhdGljIEdIYXNoVGFibGUqIG9wZW5WaWV3czsKIAogc3Rh dGljIGNvbnN0IEdPcHRpb25FbnRyeSBjb21tYW5kTGluZU9wdGlvbnNbXSA9CiB7CkBAIC0xNDks NyArMTUwLDggQEAgc3RhdGljIHZvaWQgZmlsdGVyU2F2ZWRDYWxsYmFjayhXZWJLaXRVc2VyQ29u dGVudEZpbHRlclN0b3JlICpzdG9yZSwgR0FzeW5jUmVzdWwKIAogc3RhdGljIHZvaWQgd2ViVmll d0Nsb3NlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGdwb2ludGVyKQogewotICAgIGdfb2JqZWN0 X3VucmVmKHdlYlZpZXcpOworICAgIC8vIEhhc2ggdGFibGUga2V5IGRlbGV0ZSBmdW5jIHRha2Vz IGNhcmUgb2YgdW5yZWYnaW5nIHRoZSB2aWV3CisgICAgZ19oYXNoX3RhYmxlX3JlbW92ZShvcGVu Vmlld3MsIHdlYlZpZXcpOwogfQogCiBzdGF0aWMgV2ViS2l0V2ViVmlldyogY3JlYXRlV2ViVmll dyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXROYXZpZ2F0aW9uQWN0aW9uKiwgZ3BvaW50 ZXIpCkBAIC0xNjksNiArMTcxLDggQEAgc3RhdGljIFdlYktpdFdlYlZpZXcqIGNyZWF0ZVdlYlZp ZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0TmF2aWdhdGlvbkFjdGkKIAogICAgIGdf c2lnbmFsX2Nvbm5lY3QobmV3V2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh3ZWJWaWV3Q2xv c2UpLCBudWxscHRyKTsKIAorICAgIGdfaGFzaF90YWJsZV9hZGQob3BlblZpZXdzLCBuZXdXZWJW aWV3KTsKKwogICAgIHJldHVybiBuZXdXZWJWaWV3OwogfQogCkBAIC0yODgsNyArMjkyLDYgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICAgICAgImlzLWNvbnRyb2xsZWQt YnktYXV0b21hdGlvbiIsIGF1dG9tYXRpb25Nb2RlLAogICAgICAgICBudWxscHRyKSk7CiAgICAg Z19vYmplY3RfdW5yZWYoc2V0dGluZ3MpOwotICAgIGdfb2JqZWN0X2FkZF93ZWFrX3BvaW50ZXIo R19PQkpFQ1Qod2ViVmlldyksIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmd2ViVmlldykpOwog CiAgICAgYmFja2VuZFB0ci0+c2V0SW5wdXRDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxJbnB1dENs aWVudD4obG9vcCwgd2ViVmlldykpOwogI2lmIGRlZmluZWQoSEFWRV9BQ0NFU1NJQklMSVRZKSAm JiBIQVZFX0FDQ0VTU0lCSUxJVFkKQEAgLTI5NywxMSArMzAwLDE0IEBAIGludCBtYWluKGludCBh cmdjLCBjaGFyICphcmd2W10pCiAgICAgICAgIGJhY2tlbmRQdHItPnNldEFjY2Vzc2libGVDaGls ZChBVEtfT0JKRUNUKGFjY2Vzc2libGUpKTsKICNlbmRpZgogCisgICAgb3BlblZpZXdzID0gZ19o YXNoX3RhYmxlX25ld19mdWxsKG51bGxwdHIsIG51bGxwdHIsIGdfb2JqZWN0X3VucmVmLCBudWxs cHRyKTsKKwogICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfYXV0b21hdGlvbl9hbGxvd2VkKHdl YkNvbnRleHQsIGF1dG9tYXRpb25Nb2RlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYkNvbnRl eHQsICJhdXRvbWF0aW9uLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKGF1dG9tYXRpb25TdGFydGVkQ2Fs bGJhY2spLCB3ZWJWaWV3KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYlZpZXcsICJwZXJtaXNz aW9uLXJlcXVlc3QiLCBHX0NBTExCQUNLKGRlY2lkZVBlcm1pc3Npb25SZXF1ZXN0KSwgbnVsbHB0 cik7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAiY3JlYXRlIiwgR19DQUxMQkFDSyhj cmVhdGVXZWJWaWV3KSwgbnVsbHB0cik7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAi Y2xvc2UiLCBHX0NBTExCQUNLKHdlYlZpZXdDbG9zZSksIG51bGxwdHIpOworICAgIGdfaGFzaF90 YWJsZV9hZGQob3BlblZpZXdzLCB3ZWJWaWV3KTsKIAogICAgIGlmIChpZ25vcmVUTFNFcnJvcnMp CiAgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGxzX2Vycm9yc19wb2xpY3kod2ViQ29u dGV4dCwgV0VCS0lUX1RMU19FUlJPUlNfUE9MSUNZX0lHTk9SRSk7CkBAIC0zMjcsMTAgKzMzMyw5 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAKICAgICBnX21haW5fbG9vcF9y dW4obG9vcCk7CiAKLSAgICBpZiAod2ViVmlldykgewotICAgICAgICBnX29iamVjdF9yZW1vdmVf d2Vha19wb2ludGVyKEdfT0JKRUNUKHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4o JndlYlZpZXcpKTsKLSAgICAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7Ci0gICAgfQorICAg IGdfaGFzaF90YWJsZV9kZXN0cm95KG9wZW5WaWV3cyk7CisKKwogICAgIGlmIChwcml2YXRlTW9k ZSB8fCBhdXRvbWF0aW9uTW9kZSkKICAgICAgICAgZ19vYmplY3RfdW5yZWYod2ViQ29udGV4dCk7 CiAgICAgZ19tYWluX2xvb3BfdW5yZWYobG9vcCk7Cg==