217208 2020-10-02 03:32:08 -0700 [GTK] Fix MiniBrowser compilation warnings 2020-10-02 04:46:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand webkit-unassigned cgarcia webkit-bug-importer oldest_to_newest 1694013 0 pnormand 2020-10-02 03:32:08 -0700 [94/211] Building C object Tools/MiniBrowser/gtk/CMakeFiles/MiniBrowser.dir/main.c.o ../../Tools/MiniBrowser/gtk/main.c:653:9: warning: 'webkit_web_context_set_network_proxy_settings' is deprecated: Use 'webkit_website_data_manager_set_network_proxy_settings' instead [-Wdeprecated-declarations] webkit_web_context_set_network_proxy_settings(webContext, WEBKIT_NETWORK_PROXY_MODE_CUSTOM, webkitProxySettings); ^ DerivedSources/ForwardingHeaders/webkit2gtk/webkit2/WebKitWebContext.h:173:55: note: 'webkit_web_context_set_network_proxy_settings' has been explicitly marked deprecated here __attribute__((visibility("default"))) __attribute__((__deprecated__("Use '" "webkit_website_data_manager_set_network_proxy_settings" "' instead"))) void ^ ../../Tools/MiniBrowser/gtk/main.c:698:9: warning: 'webkit_web_context_set_tls_errors_policy' is deprecated: Use 'webkit_website_data_manager_set_tls_errors_policy' instead [-Wdeprecated-declarations] webkit_web_context_set_tls_errors_policy(webContext, WEBKIT_TLS_ERRORS_POLICY_IGNORE); ^ DerivedSources/ForwardingHeaders/webkit2gtk/webkit2/WebKitWebContext.h:250:55: note: 'webkit_web_context_set_tls_errors_policy' has been explicitly marked deprecated here __attribute__((visibility("default"))) __attribute__((__deprecated__("Use '" "webkit_website_data_manager_set_tls_errors_policy" "' instead"))) void ^ 2 warnings generated. 1694014 1 410307 pnormand 2020-10-02 03:39:50 -0700 Created attachment 410307 Patch 1694017 2 410307 cgarcia 2020-10-02 03:48:23 -0700 Comment on attachment 410307 Patch Thanks! 1694044 3 ews-feeder 2020-10-02 04:45:02 -0700 Committed r267871: <https://trac.webkit.org/changeset/267871> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410307. 1694045 4 webkit-bug-importer 2020-10-02 04:46:18 -0700 <rdar://problem/69876513> 410307 2020-10-02 03:39:50 -0700 2020-10-02 04:45:02 -0700 Patch bug-217208-20201002033948.patch text/plain 5650 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzMwYjU0MjI2MDEzZGRjNGVlOTYwMzgwMDZjNWExMzVk YWI4ZWE1Mi4uZWY5YzQ5M2ViMGE1MDgzY2RkMzcwNGE3OWViMjM4NGMzMjAzMTczZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIwLTEwLTAyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBGaXggTWluaUJyb3dzZXIgY29tcGlsYXRpb24gd2FybmluZ3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzIwOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHdlYmtpdF93ZWJf Y29udGV4dF9zZXRfbmV0d29ya19wcm94eV9zZXR0aW5ncygpIGlzIGRlcHJlY2F0ZWQgaW4gZmF2 b3Igb2YKKyAgICAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX3NldF9uZXR3b3JrX3By b3h5X3NldHRpbmdzKCkuCisgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGxzX2Vycm9y c19wb2xpY3koKSBpcyBkZXByZWNhdGVkIGluIGZhdm9yIG9mCisgICAgICAgIHdlYmtpdF93ZWJz aXRlX2RhdGFfbWFuYWdlcl9zZXRfdGxzX2Vycm9yc19wb2xpY3koKS4KKworICAgICAgICAqIE1p bmlCcm93c2VyL2d0ay9tYWluLmM6CisgICAgICAgIChhY3RpdmF0ZSk6CisgICAgICAgICogTWlu aUJyb3dzZXIvd3BlL21haW4uY3BwOgorICAgICAgICAobWFpbik6CisKIDIwMjAtMTAtMDIgIEtp bW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIFdLMV0g Q3Jhc2hlcyB3aGVuIHVzaW5nIEFOR0xFIFdlYkdMIGZyb20gYW5vdGhlciB0aHJlYWQKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvbWFpbi5jCmluZGV4IGQ2ODRmOWM4OTNkNDFkZTFlZGMxOTNlMTc1OTllNDg0NDQ5NGFjNjYu LmRjNTNkYjBjMjU4YjA0MDFlMGEyZGNhNDNlMDM4MGYxMDc0Y2UwMjQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21h aW4uYwpAQCAtNjI2LDYgKzYyNiwxNiBAQCBzdGF0aWMgdm9pZCBhY3RpdmF0ZShHQXBwbGljYXRp b24gKmFwcGxpY2F0aW9uLCBXZWJLaXRTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MpCiAgICAgfQog CiAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX3NldF9pdHBfZW5hYmxlZChtYW5hZ2Vy LCBlbmFibGVJVFApOworCisgICAgaWYgKHByb3h5KSB7CisgICAgICAgIFdlYktpdE5ldHdvcmtQ cm94eVNldHRpbmdzICp3ZWJraXRQcm94eVNldHRpbmdzID0gd2Via2l0X25ldHdvcmtfcHJveHlf c2V0dGluZ3NfbmV3KHByb3h5LCBpZ25vcmVIb3N0cyk7CisgICAgICAgIHdlYmtpdF93ZWJzaXRl X2RhdGFfbWFuYWdlcl9zZXRfbmV0d29ya19wcm94eV9zZXR0aW5ncyhtYW5hZ2VyLCBXRUJLSVRf TkVUV09SS19QUk9YWV9NT0RFX0NVU1RPTSwgd2Via2l0UHJveHlTZXR0aW5ncyk7CisgICAgICAg IHdlYmtpdF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX2ZyZWUod2Via2l0UHJveHlTZXR0aW5ncyk7 CisgICAgfQorCisgICAgaWYgKGlnbm9yZVRMU0Vycm9ycykKKyAgICAgICAgd2Via2l0X3dlYnNp dGVfZGF0YV9tYW5hZ2VyX3NldF90bHNfZXJyb3JzX3BvbGljeShtYW5hZ2VyLCBXRUJLSVRfVExT X0VSUk9SU19QT0xJQ1lfSUdOT1JFKTsKKwogICAgIFdlYktpdFdlYkNvbnRleHQgKndlYkNvbnRl eHQgPSBnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfV0VCX0NPTlRFWFQsICJ3ZWJzaXRlLWRhdGEt bWFuYWdlciIsIG1hbmFnZXIsICJwcm9jZXNzLXN3YXAtb24tY3Jvc3Mtc2l0ZS1uYXZpZ2F0aW9u LWVuYWJsZWQiLCBUUlVFLAogI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCA5OCwgMCkKICAgICAg ICAgInVzZS1zeXN0ZW0tYXBwZWFyYW5jZS1mb3Itc2Nyb2xsYmFycyIsIEZBTFNFLApAQCAtNjQ4 LDEyICs2NTgsNiBAQCBzdGF0aWMgdm9pZCBhY3RpdmF0ZShHQXBwbGljYXRpb24gKmFwcGxpY2F0 aW9uLCBXZWJLaXRTZXR0aW5ncyAqd2Via2l0U2V0dGluZ3MpCiAgICAgICAgIHdlYmtpdF9jb29r aWVfbWFuYWdlcl9zZXRfcGVyc2lzdGVudF9zdG9yYWdlKGNvb2tpZU1hbmFnZXIsIGNvb2tpZXNG aWxlLCBzdG9yYWdlVHlwZSk7CiAgICAgfQogCi0gICAgaWYgKHByb3h5KSB7Ci0gICAgICAgIFdl YktpdE5ldHdvcmtQcm94eVNldHRpbmdzICp3ZWJraXRQcm94eVNldHRpbmdzID0gd2Via2l0X25l dHdvcmtfcHJveHlfc2V0dGluZ3NfbmV3KHByb3h5LCBpZ25vcmVIb3N0cyk7Ci0gICAgICAgIHdl YmtpdF93ZWJfY29udGV4dF9zZXRfbmV0d29ya19wcm94eV9zZXR0aW5ncyh3ZWJDb250ZXh0LCBX RUJLSVRfTkVUV09SS19QUk9YWV9NT0RFX0NVU1RPTSwgd2Via2l0UHJveHlTZXR0aW5ncyk7Ci0g ICAgICAgIHdlYmtpdF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX2ZyZWUod2Via2l0UHJveHlTZXR0 aW5ncyk7Ci0gICAgfQotCiAgICAgLy8gRW5hYmxlIHRoZSBmYXZpY29uIGRhdGFiYXNlLCBieSBz cGVjaWZ5aW5nIHRoZSBkZWZhdWx0IGRpcmVjdG9yeS4KICAgICB3ZWJraXRfd2ViX2NvbnRleHRf c2V0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0b3J5KHdlYkNvbnRleHQsIE5VTEwpOwogCkBAIC02 OTQsOSArNjk4LDYgQEAgc3RhdGljIHZvaWQgYWN0aXZhdGUoR0FwcGxpY2F0aW9uICphcHBsaWNh dGlvbiwgV2ViS2l0U2V0dGluZ3MgKndlYmtpdFNldHRpbmdzKQogICAgIHdlYmtpdF93ZWJfY29u dGV4dF9zZXRfYXV0b21hdGlvbl9hbGxvd2VkKHdlYkNvbnRleHQsIGF1dG9tYXRpb25Nb2RlKTsK ICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYkNvbnRleHQsICJhdXRvbWF0aW9uLXN0YXJ0ZWQiLCBH X0NBTExCQUNLKGF1dG9tYXRpb25TdGFydGVkQ2FsbGJhY2spLCBhcHBsaWNhdGlvbik7CiAKLSAg ICBpZiAoaWdub3JlVExTRXJyb3JzKQotICAgICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Rs c19lcnJvcnNfcG9saWN5KHdlYkNvbnRleHQsIFdFQktJVF9UTFNfRVJST1JTX1BPTElDWV9JR05P UkUpOwotCiAgICAgQnJvd3NlcldpbmRvdyAqbWFpbldpbmRvdyA9IEJST1dTRVJfV0lORE9XKGJy b3dzZXJfd2luZG93X25ldyhOVUxMLCB3ZWJDb250ZXh0KSk7CiAgICAgZ3RrX2FwcGxpY2F0aW9u X2FkZF93aW5kb3coR1RLX0FQUExJQ0FUSU9OKGFwcGxpY2F0aW9uKSwgR1RLX1dJTkRPVyhtYWlu V2luZG93KSk7CiAgICAgaWYgKGRhcmtNb2RlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dz ZXIvd3BlL21haW4uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd3BlL21haW4uY3BwCmluZGV4IDUz NDg2ZDJiNDAyMmVlODgwMDdlYTFkZWUxMWI5NWFiZjFkMmU1ZTcuLjJhYjA0Y2UwNjFjZmZiZmNi YmM0ZTY0YzY2ODM5OTZiNjcyYWJiY2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dw ZS9tYWluLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93cGUvbWFpbi5jcHAKQEAgLTIxOCw2 ICsyMTgsMTYgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogICAgIGF1dG8q IG1hbmFnZXIgPSAocHJpdmF0ZU1vZGUgfHwgYXV0b21hdGlvbk1vZGUpID8gd2Via2l0X3dlYnNp dGVfZGF0YV9tYW5hZ2VyX25ld19lcGhlbWVyYWwoKSA6IHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFu YWdlcl9uZXcobnVsbHB0cik7CiAgICAgd2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX3NldF9p dHBfZW5hYmxlZChtYW5hZ2VyLCBlbmFibGVJVFApOworCisgICAgaWYgKHByb3h5KSB7CisgICAg ICAgIGF1dG8qIHdlYmtpdFByb3h5U2V0dGluZ3MgPSB3ZWJraXRfbmV0d29ya19wcm94eV9zZXR0 aW5nc19uZXcocHJveHksIGlnbm9yZUhvc3RzKTsKKyAgICAgICAgd2Via2l0X3dlYnNpdGVfZGF0 YV9tYW5hZ2VyX3NldF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzKG1hbmFnZXIsIFdFQktJVF9ORVRX T1JLX1BST1hZX01PREVfQ1VTVE9NLCB3ZWJraXRQcm94eVNldHRpbmdzKTsKKyAgICAgICAgd2Vi a2l0X25ldHdvcmtfcHJveHlfc2V0dGluZ3NfZnJlZSh3ZWJraXRQcm94eVNldHRpbmdzKTsKKyAg ICB9CisKKyAgICBpZiAoaWdub3JlVExTRXJyb3JzKQorICAgICAgICB3ZWJraXRfd2Vic2l0ZV9k YXRhX21hbmFnZXJfc2V0X3Rsc19lcnJvcnNfcG9saWN5KG1hbmFnZXIsIFdFQktJVF9UTFNfRVJS T1JTX1BPTElDWV9JR05PUkUpOworCiAgICAgYXV0byogd2ViQ29udGV4dCA9IHdlYmtpdF93ZWJf Y29udGV4dF9uZXdfd2l0aF93ZWJzaXRlX2RhdGFfbWFuYWdlcihtYW5hZ2VyKTsKICAgICBnX29i amVjdF91bnJlZihtYW5hZ2VyKTsKIApAQCAtMjM2LDEyICsyNDYsNiBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqYXJndltdKQogICAgICAgICB3ZWJraXRfY29va2llX21hbmFnZXJfc2V0X3Bl cnNpc3RlbnRfc3RvcmFnZShjb29raWVNYW5hZ2VyLCBjb29raWVzRmlsZSwgc3RvcmFnZVR5cGUp OwogICAgIH0KIAotICAgIGlmIChwcm94eSkgewotICAgICAgICBhdXRvKiB3ZWJraXRQcm94eVNl dHRpbmdzID0gd2Via2l0X25ldHdvcmtfcHJveHlfc2V0dGluZ3NfbmV3KHByb3h5LCBpZ25vcmVI b3N0cyk7Ci0gICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfbmV0d29ya19wcm94eV9zZXR0 aW5ncyh3ZWJDb250ZXh0LCBXRUJLSVRfTkVUV09SS19QUk9YWV9NT0RFX0NVU1RPTSwgd2Via2l0 UHJveHlTZXR0aW5ncyk7Ci0gICAgICAgIHdlYmtpdF9uZXR3b3JrX3Byb3h5X3NldHRpbmdzX2Zy ZWUod2Via2l0UHJveHlTZXR0aW5ncyk7Ci0gICAgfQotCiAgICAgY29uc3QgY2hhciogc2luZ2xl cHJvY2VzcyA9IGdfZ2V0ZW52KCJNSU5JQlJPV1NFUl9TSU5HTEVQUk9DRVNTIik7CiAgICAgd2Vi a2l0X3dlYl9jb250ZXh0X3NldF9wcm9jZXNzX21vZGVsKHdlYkNvbnRleHQsIChzaW5nbGVwcm9j ZXNzICYmICpzaW5nbGVwcm9jZXNzKSA/CiAgICAgICAgIFdFQktJVF9QUk9DRVNTX01PREVMX1NI QVJFRF9TRUNPTkRBUllfUFJPQ0VTUyA6IFdFQktJVF9QUk9DRVNTX01PREVMX01VTFRJUExFX1NF Q09OREFSWV9QUk9DRVNTRVMpOwpAQCAtMzA5LDkgKzMxMyw2IEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyICphcmd2W10pCiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAiY2xvc2UiLCBH X0NBTExCQUNLKHdlYlZpZXdDbG9zZSksIG51bGxwdHIpOwogICAgIGdfaGFzaF90YWJsZV9hZGQo b3BlblZpZXdzLCB3ZWJWaWV3KTsKIAotICAgIGlmIChpZ25vcmVUTFNFcnJvcnMpCi0gICAgICAg IHdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGxzX2Vycm9yc19wb2xpY3kod2ViQ29udGV4dCwgV0VC S0lUX1RMU19FUlJPUlNfUE9MSUNZX0lHTk9SRSk7Ci0KICAgICBXZWJLaXRDb2xvciBjb2xvcjsK ICAgICBpZiAoYmdDb2xvciAmJiB3ZWJraXRfY29sb3JfcGFyc2UoJmNvbG9yLCBiZ0NvbG9yKSkK ICAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF9iYWNrZ3JvdW5kX2NvbG9yKHdlYlZpZXcsICZj b2xvcik7Cg==