173095 2017-06-08 05:19:43 -0700 [GTK] Use API::Findclient instead of the C API in WebKitFindController 2017-06-08 22:24:44 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply buildbot gustavo mcatanzaro zan oldest_to_newest 1316868 0 cgarcia 2017-06-08 05:19:43 -0700 ssia 1316869 1 312294 cgarcia 2017-06-08 05:21:32 -0700 Created attachment 312294 Patch 1316870 2 buildbot 2017-06-08 05:22:42 -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 1316891 3 312294 zan 2017-06-08 06:33:45 -0700 Comment on attachment 312294 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312294&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:133 > + WebKitFindController* m_findController { nullptr }; We don't have to initialize this to nullptr here since the constructor initializes it anyway. 1317209 4 cgarcia 2017-06-08 22:24:44 -0700 Committed r217961: <http://trac.webkit.org/changeset/217961> 312294 2017-06-08 05:21:32 -0700 2017-06-08 06:33:45 -0700 Patch wk2-find-client.diff text/plain 4782 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhMWU5MGQyMDdkYS4uYjNmYjNmNzhlYjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOCBAQAogMjAxNy0wNi0wOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6RmluZGNsaWVudCBpbnN0ZWFkIG9m IHRoZSBDIEFQSSBpbiBXZWJLaXRGaW5kQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5k Q29udHJvbGxlci5jcHA6CisgICAgICAgIChnZXRQYWdlKToKKyAgICAgICAgKHdlYmtpdEZpbmRD b250cm9sbGVyRGlzcG9zZSk6CisgICAgICAgICh3ZWJraXRGaW5kQ29udHJvbGxlckNvbnN0cnVj dGVkKToKKyAgICAgICAgKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfY2xhc3NfaW5pdCk6CisKKzIw MTctMDYtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAg ICAgICAgIFtHVEtdIEdldCByaWQgb2YgY3VzdG9tIG1hcnNoYWxsZXJzIG9mIHNpZ25hbHMKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzA5NAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29u dHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5k Q29udHJvbGxlci5jcHAKaW5kZXggYzA1M2NmOGZjNmEuLmY3NjNkM2EyMTEwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRy b2xsZXIuY3BwCkBAIC0yMCw2ICsyMCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiV2ViS2l0RmluZENvbnRyb2xsZXIuaCIKIAorI2luY2x1ZGUgIkFQSUZpbmRDbGllbnQuaCIK ICNpbmNsdWRlICJXZWJLaXRFbnVtVHlwZXMuaCIKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgi CiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlldy5oIgpAQCAtMTAxLDQwICsxMDIsNTEgQEAgc3RhdGlj IGlubGluZSBXZWJLaXRGaW5kT3B0aW9ucyB0b1dlYktpdEZpbmRPcHRpb25zKHVpbnQzMl90IGZp bmRPcHRpb25zKQogICAgICAgICB8IChmaW5kT3B0aW9ucyAmIEZpbmRPcHRpb25zV3JhcEFyb3Vu ZCA/IFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgOiAwKSk7CiB9CiAKLXN0YXRpYyB2 b2lkIGRpZEZpbmRTdHJpbmcoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiwgdW5zaWduZWQgbWF0Y2hD b3VudCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyBpbmxpbmUgV2ViUGFnZVByb3h5 KiBnZXRQYWdlKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKLSAgICBn X3NpZ25hbF9lbWl0KFdFQktJVF9GSU5EX0NPTlRST0xMRVIoY2xpZW50SW5mbyksIHNpZ25hbHNb Rk9VTkRfVEVYVF0sIDAsIG1hdGNoQ291bnQpOworICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFz ZUdldFBhZ2UocmVpbnRlcnByZXRfY2FzdDxXZWJLaXRXZWJWaWV3QmFzZSo+KGZpbmRDb250cm9s bGVyLT5wcml2LT53ZWJWaWV3KSk7CiB9CiAKLXN0YXRpYyB2b2lkIGRpZEZhaWxUb0ZpbmRTdHJp bmcoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAg ICBnX3NpZ25hbF9lbWl0KFdFQktJVF9GSU5EX0NPTlRST0xMRVIoY2xpZW50SW5mbyksIHNpZ25h bHNbRkFJTEVEX1RPX0ZJTkRfVEVYVF0sIDApOwotfQorY2xhc3MgRmluZENsaWVudCBmaW5hbCA6 IHB1YmxpYyBBUEk6OkZpbmRDbGllbnQgeworcHVibGljOgorICAgIGV4cGxpY2l0IEZpbmRDbGll bnQoV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyKQorICAgICAgICA6IG1fZmlu ZENvbnRyb2xsZXIoZmluZENvbnRyb2xsZXIpCisgICAgeworICAgIH0KIAotc3RhdGljIHZvaWQg ZGlkQ291bnRTdHJpbmdNYXRjaGVzKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYsIHVuc2lnbmVkIG1h dGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCi17Ci0gICAgZ19zaWduYWxfZW1pdChX RUJLSVRfRklORF9DT05UUk9MTEVSKGNsaWVudEluZm8pLCBzaWduYWxzW0NPVU5URURfTUFUQ0hF U10sIDAsIG1hdGNoQ291bnQpOwotfQorcHJpdmF0ZToKKyAgICB2b2lkIGRpZENvdW50U3RyaW5n TWF0Y2hlcyhXZWJQYWdlUHJveHkqLCBjb25zdCBTdHJpbmcmLCB1aW50MzJfdCBtYXRjaENvdW50 KSBvdmVycmlkZQorICAgIHsKKyAgICAgICAgZ19zaWduYWxfZW1pdChtX2ZpbmRDb250cm9sbGVy LCBzaWduYWxzW0NPVU5URURfTUFUQ0hFU10sIDAsIG1hdGNoQ291bnQpOworICAgIH0KIAotc3Rh dGljIGlubGluZSBXZWJQYWdlUHJveHkqIGdldFBhZ2UoV2ViS2l0RmluZENvbnRyb2xsZXIqIGZp bmRDb250cm9sbGVyKQorICAgIHZvaWQgZGlkRmluZFN0cmluZyhXZWJQYWdlUHJveHkqLCBjb25z dCBTdHJpbmcmLCBjb25zdCBWZWN0b3I8SW50UmVjdD4mLCB1aW50MzJfdCBtYXRjaENvdW50LCBp bnQzMl90LCBib29sIC8qZGlkV3JhcEFyb3VuZCovKSBvdmVycmlkZQorICAgIHsKKyAgICAgICAg Z19zaWduYWxfZW1pdChtX2ZpbmRDb250cm9sbGVyLCBzaWduYWxzW0ZPVU5EX1RFWFRdLCAwLCBt YXRjaENvdW50KTsKKyAgICB9CisKKyAgICB2b2lkIGRpZEZhaWxUb0ZpbmRTdHJpbmcoV2ViUGFn ZVByb3h5KiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGUKKyAgICB7CisgICAgICAgIGdfc2lnbmFs X2VtaXQobV9maW5kQ29udHJvbGxlciwgc2lnbmFsc1tGQUlMRURfVE9fRklORF9URVhUXSwgMCk7 CisgICAgfQorCisgICAgV2ViS2l0RmluZENvbnRyb2xsZXIqIG1fZmluZENvbnRyb2xsZXIgeyBu dWxscHRyIH07Cit9OworCitzdGF0aWMgdm9pZCB3ZWJraXRGaW5kQ29udHJvbGxlckRpc3Bvc2Uo R09iamVjdCogb2JqZWN0KQogewotICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2Uo cmVpbnRlcnByZXRfY2FzdDxXZWJLaXRXZWJWaWV3QmFzZSo+KGZpbmRDb250cm9sbGVyLT5wcml2 LT53ZWJWaWV3KSk7CisgICAgV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyID0g V0VCS0lUX0ZJTkRfQ09OVFJPTExFUihvYmplY3QpOworICAgIGdldFBhZ2UoZmluZENvbnRyb2xs ZXIpLT5zZXRGaW5kQ2xpZW50KG51bGxwdHIpOworCisgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0 X2ZpbmRfY29udHJvbGxlcl9wYXJlbnRfY2xhc3MpLT5kaXNwb3NlKG9iamVjdCk7CiB9CiAKIHN0 YXRpYyB2b2lkIHdlYmtpdEZpbmRDb250cm9sbGVyQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0 KQogeworICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfcGFyZW50X2Ns YXNzKS0+Y29uc3RydWN0ZWQob2JqZWN0KTsKKwogICAgIFdlYktpdEZpbmRDb250cm9sbGVyKiBm aW5kQ29udHJvbGxlciA9IFdFQktJVF9GSU5EX0NPTlRST0xMRVIob2JqZWN0KTsKLSAgICBXS1Bh Z2VGaW5kQ2xpZW50VjAgd2tGaW5kQ2xpZW50ID0gewotICAgICAgICB7Ci0gICAgICAgICAgICAw LCAvLyB2ZXJzaW9uCi0gICAgICAgICAgICBmaW5kQ29udHJvbGxlciwgLy8gY2xpZW50SW5mbwot ICAgICAgICB9LAotICAgICAgICBkaWRGaW5kU3RyaW5nLAotICAgICAgICBkaWRGYWlsVG9GaW5k U3RyaW5nLAotICAgICAgICBkaWRDb3VudFN0cmluZ01hdGNoZXMKLSAgICB9OwotCi0gICAgV0tQ YWdlU2V0UGFnZUZpbmRDbGllbnQodG9BUEkoZ2V0UGFnZShmaW5kQ29udHJvbGxlcikpLCAmd2tG aW5kQ2xpZW50LmJhc2UpOworICAgIGdldFBhZ2UoZmluZENvbnRyb2xsZXIpLT5zZXRGaW5kQ2xp ZW50KHN0ZDo6bWFrZV91bmlxdWU8RmluZENsaWVudD4oZmluZENvbnRyb2xsZXIpKTsKIH0KIAog c3RhdGljIHZvaWQgd2Via2l0RmluZENvbnRyb2xsZXJHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmpl Y3QsIGd1aW50IHByb3BJZCwgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcGFyYW1TcGVjKQpA QCAtMTc1LDYgKzE4Nyw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEZpbmRDb250cm9sbGVyU2V0UHJv cGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0CiBzdGF0aWMgdm9pZCB3 ZWJraXRfZmluZF9jb250cm9sbGVyX2NsYXNzX2luaXQoV2ViS2l0RmluZENvbnRyb2xsZXJDbGFz cyogZmluZENsYXNzKQogewogICAgIEdPYmplY3RDbGFzcyogZ09iamVjdENsYXNzID0gR19PQkpF Q1RfQ0xBU1MoZmluZENsYXNzKTsKKyAgICBnT2JqZWN0Q2xhc3MtPmRpc3Bvc2UgPSB3ZWJraXRG aW5kQ29udHJvbGxlckRpc3Bvc2U7CiAgICAgZ09iamVjdENsYXNzLT5jb25zdHJ1Y3RlZCA9IHdl YmtpdEZpbmRDb250cm9sbGVyQ29uc3RydWN0ZWQ7CiAgICAgZ09iamVjdENsYXNzLT5nZXRfcHJv cGVydHkgPSB3ZWJraXRGaW5kQ29udHJvbGxlckdldFByb3BlcnR5OwogICAgIGdPYmplY3RDbGFz cy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0RmluZENvbnRyb2xsZXJTZXRQcm9wZXJ0eTsK