213465 2020-06-22 09:03:19 -0700 [GTK] Dark mode for GTK themes that end with -Dark 2020-06-29 03:19:17 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Enhancement --- 1 CheeseEBoi webkit-unassigned berto bugs-noreply cgarcia CheeseEBoi ews-watchlist gustavo pgriffis oldest_to_newest 1665054 0 402481 CheeseEBoi 2020-06-22 09:03:19 -0700 Created attachment 402481 A patch for this issue modifying "Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp" WebKitGtk has support for automatic detection of dark mode when it comes to GTK themes with the "-dark" and ":dark" suffixes. However, when using GTK themes that end with "-Dark" or ":Dark", this is not the case. This affects many themes like "Arc" and "Flat-Remix", so adding this funcitonality would be very helpful. I have attached to this bug report a possible patch for this, however I am not sure if any other parts of the library need to be modified other than "Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp". If that is the case, then my patch should be a good example of what needs to be done. 1665220 1 pgriffis 2020-06-22 16:34:31 -0700 :Dark doesn't make any sense as that refers to GTK variants and AFAIK nothing has used a variant by that name. -Dark seems like a harmless change although Arc-Dark is a light theme. 1665256 2 402525 CheeseEBoi 2020-06-22 18:50:58 -0700 Created attachment 402525 Updated patch 1665257 3 CheeseEBoi 2020-06-22 18:51:41 -0700 (In reply to Patrick Griffis from comment #1) > :Dark doesn't make any sense as that refers to GTK variants and AFAIK > nothing has used a variant by that name. > > -Dark seems like a harmless change although Arc-Dark is a light theme. Ah, sorry for the mix up. Here's a better patch with that information in mind... Hope it can be easily applied! 1665268 4 402525 pgriffis 2020-06-22 19:49:18 -0700 Comment on attachment 402525 Updated patch >Index: Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp >=================================================================== >@@ -625,7 +625,7 @@ > GUniqueOutPtr<char> themeNameSetting; > g_object_get(gtk_widget_get_settings(m_viewWidget), "gtk-theme-name", &themeNameSetting.outPtr(), nullptr); > String name = String::fromUTF8(themeNameSetting.get()); >- if (name.endsWith("-dark")) >+ if (name.endsWith("-dark") || name.endsWith("-dark")) Typo. 1665270 5 402527 CheeseEBoi 2020-06-22 19:58:48 -0700 Created attachment 402527 Fixed typo Fixed typo 1665271 6 402528 CheeseEBoi 2020-06-22 20:00:44 -0700 Created attachment 402528 Fixed typo + obsolete old patch 1667032 7 403042 cgarcia 2020-06-29 02:44:29 -0700 Created attachment 403042 Patch for landing 1667033 8 ews-watchlist 2020-06-29 02:45:07 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1667047 9 ews-feeder 2020-06-29 03:19:15 -0700 Committed r263652: <https://trac.webkit.org/changeset/263652> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403042. 402481 2020-06-22 09:03:19 -0700 2020-06-22 18:50:58 -0700 A patch for this issue modifying "Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp" webkit-dark-gtk-themes text/plain 1770 CheeseEBoi SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiAyNjMzNDgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTkwLDExICs1OTAs MTIgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAoYXV0byogdGhlbWVOYW1lRW52 ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKQotICAgICAgICByZXR1cm4gZ19zdHJfaGFzX3N1ZmZp eCh0aGVtZU5hbWVFbnYsICItZGFyayIpIHx8IGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiOmRhcmsiKTsKKyAgICAgICAgcmV0dXJuIGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZUVudiwgIjpkYXJrIikgCisJ CXx8IGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52LCAiLURhcmsiKSB8fCBnX3N0cl9oYXNf c3VmZml4KHRoZW1lTmFtZUVudiwgIjpEYXJrIik7CiAKICAgICBHVW5pcXVlT3V0UHRyPGNoYXI+ IHRoZW1lTmFtZTsKICAgICBnX29iamVjdF9nZXQoc2V0dGluZ3MsICJndGstdGhlbWUtbmFtZSIs ICZ0aGVtZU5hbWUub3V0UHRyKCksIG51bGxwdHIpOwotICAgIGlmIChnX3N0cl9oYXNfc3VmZml4 KHRoZW1lTmFtZS5nZXQoKSwgIi1kYXJrIikpCisgICAgaWYgKGdfc3RyX2hhc19zdWZmaXgodGhl bWVOYW1lLmdldCgpLCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZS5nZXQo KSwgIi1EYXJrIikpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwpA QCAtNjE3LDcgKzYxOCw3IEBACiB7CiAgICAgaWYgKGF1dG8qIHRoZW1lTmFtZUVudiA9IGdfZ2V0 ZW52KCJHVEtfVEhFTUUiKSkgewogICAgICAgICBTdHJpbmcgbmFtZSA9IFN0cmluZzo6ZnJvbVVU RjgodGhlbWVOYW1lRW52KTsKLSAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgoIi1kYXJrIikgfHwg bmFtZS5lbmRzV2l0aCgiOmRhcmsiKSkKKyAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgoIi1kYXJr IikgfHwgbmFtZS5lbmRzV2l0aCgiOmRhcmsiKSB8fCBuYW1lLmVuZHNXaXRoKCItRGFyayIpIHx8 IG5hbWUuZW5kc1dpdGgoIjpEYXJrIikpCiAgICAgICAgICAgICByZXR1cm4gbmFtZS5zdWJzdHJp bmcoMCwgbmFtZS5sZW5ndGgoKSAtIDUpOwogICAgICAgICByZXR1cm4gbmFtZTsKICAgICB9CkBA IC02MjUsNyArNjI2LDcgQEAKICAgICBHVW5pcXVlT3V0UHRyPGNoYXI+IHRoZW1lTmFtZVNldHRp bmc7CiAgICAgZ19vYmplY3RfZ2V0KGd0a193aWRnZXRfZ2V0X3NldHRpbmdzKG1fdmlld1dpZGdl dCksICJndGstdGhlbWUtbmFtZSIsICZ0aGVtZU5hbWVTZXR0aW5nLm91dFB0cigpLCBudWxscHRy KTsKICAgICBTdHJpbmcgbmFtZSA9IFN0cmluZzo6ZnJvbVVURjgodGhlbWVOYW1lU2V0dGluZy5n ZXQoKSk7Ci0gICAgaWYgKG5hbWUuZW5kc1dpdGgoIi1kYXJrIikpCisgICAgaWYgKG5hbWUuZW5k c1dpdGgoIi1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiLURhcmsiKSkKICAgICAgICAgcmV0dXJu IG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVuZ3RoKCkgLSA1KTsKICAgICByZXR1cm4gbmFtZTsK IH0K 402525 2020-06-22 18:50:58 -0700 2020-06-22 20:00:44 -0700 Updated patch webkit-dark-gtk-themes text/plain 1699 CheeseEBoi SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiAyNjMzNDgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTkwLDExICs1OTAs MTEgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAoYXV0byogdGhlbWVOYW1lRW52 ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKQotICAgICAgICByZXR1cm4gZ19zdHJfaGFzX3N1ZmZp eCh0aGVtZU5hbWVFbnYsICItZGFyayIpIHx8IGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiOmRhcmsiKTsKKyAgICAgICAgcmV0dXJuIGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZUVudiwgIi1EYXJrIikgfHwg Z19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWVFbnYsICI6ZGFyayIpOwogCiAgICAgR1VuaXF1ZU91 dFB0cjxjaGFyPiB0aGVtZU5hbWU7CiAgICAgZ19vYmplY3RfZ2V0KHNldHRpbmdzLCAiZ3RrLXRo ZW1lLW5hbWUiLCAmdGhlbWVOYW1lLm91dFB0cigpLCBudWxscHRyKTsKLSAgICBpZiAoZ19zdHJf aGFzX3N1ZmZpeCh0aGVtZU5hbWUuZ2V0KCksICItZGFyayIpKQorICAgIGlmIChnX3N0cl9oYXNf c3VmZml4KHRoZW1lTmFtZS5nZXQoKSwgIi1kYXJrIikgfHwgKGdfc3RyX2hhc19zdWZmaXgodGhl bWVOYW1lLmdldCgpLCAiLURhcmsiKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtNjE3LDcgKzYxNyw3IEBACiB7CiAgICAgaWYgKGF1dG8qIHRoZW1lTmFt ZUVudiA9IGdfZ2V0ZW52KCJHVEtfVEhFTUUiKSkgewogICAgICAgICBTdHJpbmcgbmFtZSA9IFN0 cmluZzo6ZnJvbVVURjgodGhlbWVOYW1lRW52KTsKLSAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgo Ii1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiOmRhcmsiKSkKKyAgICAgICAgaWYgKG5hbWUuZW5k c1dpdGgoIi1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiLURhcmsiKSB8fCBuYW1lLmVuZHNXaXRo KCI6ZGFyayIpKQogICAgICAgICAgICAgcmV0dXJuIG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVu Z3RoKCkgLSA1KTsKICAgICAgICAgcmV0dXJuIG5hbWU7CiAgICAgfQpAQCAtNjI1LDcgKzYyNSw3 IEBACiAgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiB0aGVtZU5hbWVTZXR0aW5nOwogICAgIGdfb2Jq ZWN0X2dldChndGtfd2lkZ2V0X2dldF9zZXR0aW5ncyhtX3ZpZXdXaWRnZXQpLCAiZ3RrLXRoZW1l LW5hbWUiLCAmdGhlbWVOYW1lU2V0dGluZy5vdXRQdHIoKSwgbnVsbHB0cik7CiAgICAgU3RyaW5n IG5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KHRoZW1lTmFtZVNldHRpbmcuZ2V0KCkpOwotICAgIGlm IChuYW1lLmVuZHNXaXRoKCItZGFyayIpKQorICAgIGlmIChuYW1lLmVuZHNXaXRoKCItZGFyayIp IHx8IG5hbWUuZW5kc1dpdGgoIi1kYXJrIikpCiAgICAgICAgIHJldHVybiBuYW1lLnN1YnN0cmlu ZygwLCBuYW1lLmxlbmd0aCgpIC0gNSk7CiAgICAgcmV0dXJuIG5hbWU7CiB9Cg== 402527 2020-06-22 19:58:48 -0700 2020-06-22 20:00:44 -0700 Fixed typo webkit-dark-gtk-themes text/plain 1699 CheeseEBoi SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiAyNjMzNDgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTkwLDExICs1OTAs MTEgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAoYXV0byogdGhlbWVOYW1lRW52 ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKQotICAgICAgICByZXR1cm4gZ19zdHJfaGFzX3N1ZmZp eCh0aGVtZU5hbWVFbnYsICItZGFyayIpIHx8IGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiOmRhcmsiKTsKKyAgICAgICAgcmV0dXJuIGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZUVudiwgIi1EYXJrIikgfHwg Z19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWVFbnYsICI6ZGFyayIpOwogCiAgICAgR1VuaXF1ZU91 dFB0cjxjaGFyPiB0aGVtZU5hbWU7CiAgICAgZ19vYmplY3RfZ2V0KHNldHRpbmdzLCAiZ3RrLXRo ZW1lLW5hbWUiLCAmdGhlbWVOYW1lLm91dFB0cigpLCBudWxscHRyKTsKLSAgICBpZiAoZ19zdHJf aGFzX3N1ZmZpeCh0aGVtZU5hbWUuZ2V0KCksICItZGFyayIpKQorICAgIGlmIChnX3N0cl9oYXNf c3VmZml4KHRoZW1lTmFtZS5nZXQoKSwgIi1kYXJrIikgfHwgKGdfc3RyX2hhc19zdWZmaXgodGhl bWVOYW1lLmdldCgpLCAiLURhcmsiKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtNjE3LDcgKzYxNyw3IEBACiB7CiAgICAgaWYgKGF1dG8qIHRoZW1lTmFt ZUVudiA9IGdfZ2V0ZW52KCJHVEtfVEhFTUUiKSkgewogICAgICAgICBTdHJpbmcgbmFtZSA9IFN0 cmluZzo6ZnJvbVVURjgodGhlbWVOYW1lRW52KTsKLSAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgo Ii1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiOmRhcmsiKSkKKyAgICAgICAgaWYgKG5hbWUuZW5k c1dpdGgoIi1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiLURhcmsiKSB8fCBuYW1lLmVuZHNXaXRo KCI6ZGFyayIpKQogICAgICAgICAgICAgcmV0dXJuIG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVu Z3RoKCkgLSA1KTsKICAgICAgICAgcmV0dXJuIG5hbWU7CiAgICAgfQpAQCAtNjI1LDcgKzYyNSw3 IEBACiAgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiB0aGVtZU5hbWVTZXR0aW5nOwogICAgIGdfb2Jq ZWN0X2dldChndGtfd2lkZ2V0X2dldF9zZXR0aW5ncyhtX3ZpZXdXaWRnZXQpLCAiZ3RrLXRoZW1l LW5hbWUiLCAmdGhlbWVOYW1lU2V0dGluZy5vdXRQdHIoKSwgbnVsbHB0cik7CiAgICAgU3RyaW5n IG5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KHRoZW1lTmFtZVNldHRpbmcuZ2V0KCkpOwotICAgIGlm IChuYW1lLmVuZHNXaXRoKCItZGFyayIpKQorICAgIGlmIChuYW1lLmVuZHNXaXRoKCItZGFyayIp IHx8IG5hbWUuZW5kc1dpdGgoIi1EYXJrIikpCiAgICAgICAgIHJldHVybiBuYW1lLnN1YnN0cmlu ZygwLCBuYW1lLmxlbmd0aCgpIC0gNSk7CiAgICAgcmV0dXJuIG5hbWU7CiB9Cg== 402528 2020-06-22 20:00:44 -0700 2020-06-29 02:44:29 -0700 Fixed typo + obsolete old patch webkit-dark-gtk-themes text/plain 1699 CheeseEBoi SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiAyNjMzNDgpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTkwLDExICs1OTAs MTEgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAoYXV0byogdGhlbWVOYW1lRW52 ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKQotICAgICAgICByZXR1cm4gZ19zdHJfaGFzX3N1ZmZp eCh0aGVtZU5hbWVFbnYsICItZGFyayIpIHx8IGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiOmRhcmsiKTsKKyAgICAgICAgcmV0dXJuIGdfc3RyX2hhc19zdWZmaXgodGhlbWVOYW1lRW52 LCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZUVudiwgIi1EYXJrIikgfHwg Z19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWVFbnYsICI6ZGFyayIpOwogCiAgICAgR1VuaXF1ZU91 dFB0cjxjaGFyPiB0aGVtZU5hbWU7CiAgICAgZ19vYmplY3RfZ2V0KHNldHRpbmdzLCAiZ3RrLXRo ZW1lLW5hbWUiLCAmdGhlbWVOYW1lLm91dFB0cigpLCBudWxscHRyKTsKLSAgICBpZiAoZ19zdHJf aGFzX3N1ZmZpeCh0aGVtZU5hbWUuZ2V0KCksICItZGFyayIpKQorICAgIGlmIChnX3N0cl9oYXNf c3VmZml4KHRoZW1lTmFtZS5nZXQoKSwgIi1kYXJrIikgfHwgKGdfc3RyX2hhc19zdWZmaXgodGhl bWVOYW1lLmdldCgpLCAiLURhcmsiKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtNjE3LDcgKzYxNyw3IEBACiB7CiAgICAgaWYgKGF1dG8qIHRoZW1lTmFt ZUVudiA9IGdfZ2V0ZW52KCJHVEtfVEhFTUUiKSkgewogICAgICAgICBTdHJpbmcgbmFtZSA9IFN0 cmluZzo6ZnJvbVVURjgodGhlbWVOYW1lRW52KTsKLSAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgo Ii1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiOmRhcmsiKSkKKyAgICAgICAgaWYgKG5hbWUuZW5k c1dpdGgoIi1kYXJrIikgfHwgbmFtZS5lbmRzV2l0aCgiLURhcmsiKSB8fCBuYW1lLmVuZHNXaXRo KCI6ZGFyayIpKQogICAgICAgICAgICAgcmV0dXJuIG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVu Z3RoKCkgLSA1KTsKICAgICAgICAgcmV0dXJuIG5hbWU7CiAgICAgfQpAQCAtNjI1LDcgKzYyNSw3 IEBACiAgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiB0aGVtZU5hbWVTZXR0aW5nOwogICAgIGdfb2Jq ZWN0X2dldChndGtfd2lkZ2V0X2dldF9zZXR0aW5ncyhtX3ZpZXdXaWRnZXQpLCAiZ3RrLXRoZW1l LW5hbWUiLCAmdGhlbWVOYW1lU2V0dGluZy5vdXRQdHIoKSwgbnVsbHB0cik7CiAgICAgU3RyaW5n IG5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KHRoZW1lTmFtZVNldHRpbmcuZ2V0KCkpOwotICAgIGlm IChuYW1lLmVuZHNXaXRoKCItZGFyayIpKQorICAgIGlmIChuYW1lLmVuZHNXaXRoKCItZGFyayIp IHx8IG5hbWUuZW5kc1dpdGgoIi1EYXJrIikpCiAgICAgICAgIHJldHVybiBuYW1lLnN1YnN0cmlu ZygwLCBuYW1lLmxlbmd0aCgpIC0gNSk7CiAgICAgcmV0dXJuIG5hbWU7CiB9Cg== 403042 2020-06-29 02:44:29 -0700 2020-06-29 03:19:16 -0700 Patch for landing wk2-dark-theme.diff text/plain 2825 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzE2M2ZkOWViOWQ3Li4yNTgxMGExMzJmYzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMjAtMDYtMjkgIEVsbGlvdCAgPENoZWVzZUVCb2lAbWFpbG8uY29tPgorCisg ICAgICAgIFtHVEtdIERhcmsgbW9kZSBmb3IgR1RLIHRoZW1lcyB0aGF0IGVuZCB3aXRoIC1EYXJr CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM0NjUK KworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICBX ZWJLaXRHdGsgaGFzIHN1cHBvcnQgZm9yIGF1dG9tYXRpYyBkZXRlY3Rpb24gb2YgZGFyayBtb2Rl IHdoZW4gaXQgY29tZXMgdG8gR1RLIHRoZW1lcyB3aXRoIHRoZSAiLWRhcmsiIGFuZAorICAgICAg ICAiOmRhcmsiIHN1ZmZpeGVzLiBIb3dldmVyLCB3aGVuIHVzaW5nIEdUSyB0aGVtZXMgdGhhdCBl bmQgd2l0aCAiLURhcmsiIG9yICI6RGFyayIsIHRoaXMgaXMgbm90IHRoZSBjYXNlLiBUaGlzCisg ICAgICAgIGFmZmVjdHMgbWFueSB0aGVtZXMgbGlrZSAiQXJjIiBhbmQgIkZsYXQtUmVtaXgiLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZWZmZWN0aXZlQXBwZWFyYW5jZUlzRGFyayBjb25z dCk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp0aGVtZU5hbWUgY29uc3QpOgor CiAyMDIwLTA2LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXVtXUEVdIENoYW5nZSB0aGUgY29va2llcyBhY2NlcHQgcG9saWN5IHdo ZW4gSVRQIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggMGFlZTRiYzkzODBjLi5lMDc5YzcwYWQ5NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwu Y3BwCkBAIC01OTAsMTEgKzU5MCwxMSBAQCBib29sIFBhZ2VDbGllbnRJbXBsOjplZmZlY3RpdmVB cHBlYXJhbmNlSXNEYXJrKCkgY29uc3QKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAo YXV0byogdGhlbWVOYW1lRW52ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKQotICAgICAgICByZXR1 cm4gZ19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWVFbnYsICItZGFyayIpIHx8IGdfc3RyX2hhc19z dWZmaXgodGhlbWVOYW1lRW52LCAiOmRhcmsiKTsKKyAgICAgICAgcmV0dXJuIGdfc3RyX2hhc19z dWZmaXgodGhlbWVOYW1lRW52LCAiLWRhcmsiKSB8fCBnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFt ZUVudiwgIi1EYXJrIikgfHwgZ19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWVFbnYsICI6ZGFyayIp OwogCiAgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiB0aGVtZU5hbWU7CiAgICAgZ19vYmplY3RfZ2V0 KHNldHRpbmdzLCAiZ3RrLXRoZW1lLW5hbWUiLCAmdGhlbWVOYW1lLm91dFB0cigpLCBudWxscHRy KTsKLSAgICBpZiAoZ19zdHJfaGFzX3N1ZmZpeCh0aGVtZU5hbWUuZ2V0KCksICItZGFyayIpKQor ICAgIGlmIChnX3N0cl9oYXNfc3VmZml4KHRoZW1lTmFtZS5nZXQoKSwgIi1kYXJrIikgfHwgKGdf c3RyX2hhc19zdWZmaXgodGhlbWVOYW1lLmdldCgpLCAiLURhcmsiKSkpCiAgICAgICAgIHJldHVy biB0cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNjE3LDcgKzYxNyw3IEBAIFN0cmluZyBQ YWdlQ2xpZW50SW1wbDo6dGhlbWVOYW1lKCkgY29uc3QKIHsKICAgICBpZiAoYXV0byogdGhlbWVO YW1lRW52ID0gZ19nZXRlbnYoIkdUS19USEVNRSIpKSB7CiAgICAgICAgIFN0cmluZyBuYW1lID0g U3RyaW5nOjpmcm9tVVRGOCh0aGVtZU5hbWVFbnYpOwotICAgICAgICBpZiAobmFtZS5lbmRzV2l0 aCgiLWRhcmsiKSB8fCBuYW1lLmVuZHNXaXRoKCI6ZGFyayIpKQorICAgICAgICBpZiAobmFtZS5l bmRzV2l0aCgiLWRhcmsiKSB8fCBuYW1lLmVuZHNXaXRoKCItRGFyayIpIHx8IG5hbWUuZW5kc1dp dGgoIjpkYXJrIikpCiAgICAgICAgICAgICByZXR1cm4gbmFtZS5zdWJzdHJpbmcoMCwgbmFtZS5s ZW5ndGgoKSAtIDUpOwogICAgICAgICByZXR1cm4gbmFtZTsKICAgICB9CkBAIC02MjUsNyArNjI1 LDcgQEAgU3RyaW5nIFBhZ2VDbGllbnRJbXBsOjp0aGVtZU5hbWUoKSBjb25zdAogICAgIEdVbmlx dWVPdXRQdHI8Y2hhcj4gdGhlbWVOYW1lU2V0dGluZzsKICAgICBnX29iamVjdF9nZXQoZ3RrX3dp ZGdldF9nZXRfc2V0dGluZ3MobV92aWV3V2lkZ2V0KSwgImd0ay10aGVtZS1uYW1lIiwgJnRoZW1l TmFtZVNldHRpbmcub3V0UHRyKCksIG51bGxwdHIpOwogICAgIFN0cmluZyBuYW1lID0gU3RyaW5n Ojpmcm9tVVRGOCh0aGVtZU5hbWVTZXR0aW5nLmdldCgpKTsKLSAgICBpZiAobmFtZS5lbmRzV2l0 aCgiLWRhcmsiKSkKKyAgICBpZiAobmFtZS5lbmRzV2l0aCgiLWRhcmsiKSB8fCBuYW1lLmVuZHNX aXRoKCItRGFyayIpKQogICAgICAgICByZXR1cm4gbmFtZS5zdWJzdHJpbmcoMCwgbmFtZS5sZW5n dGgoKSAtIDUpOwogICAgIHJldHVybiBuYW1lOwogfQo=