96775 2012-09-14 07:01:57 -0700 [GTK] Don't use the C API internally in WebKitFindController 2012-09-25 07:15:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96774 96766 96777 1 cgarcia webkit-unassigned gustavo mario mrobinson webkit.review.bot oldest_to_newest 720708 0 cgarcia 2012-09-14 07:01:57 -0700 Use the C++ classes instead. 720710 1 164135 cgarcia 2012-09-14 07:03:16 -0700 Created attachment 164135 Patch 720715 2 webkit.review.bot 2012-09-14 07:06:14 -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 727617 3 cgarcia 2012-09-25 07:15:10 -0700 Committed r129503: <http://trac.webkit.org/changeset/129503> 164135 2012-09-14 07:03:16 -0700 2012-09-24 11:21:41 -0700 Patch wk2-no-c-api-find-controller.diff text/plain 7202 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi40MzFiM2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRGaW5kQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTY3NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVc2luZyB0aGUgQysrIGNsYXNzZXMgZGlyZWN0bHkgaW5zdGVhZCBvZiB0aGUgQyBB UEkgd3JhcHBlcnMgd2UKKyAgICAgICAgYXZvaWQgYSBsb3Qgb2YgdG9JbXBsL3RvQVBJIGNhc3Rz LCBzdHJpbmcgY29udmVyc2lvbnMgYW5kCisgICAgICAgIGFsbG9jYXRpb25zLiBUaGUgY29kZSBp cyBhbHNvIGEgbG90IHNpbXBsZXIgYW5kIGVhc2llciB0byByZWFkLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoZ2V0UGFn ZSk6CisgICAgICAgICh3ZWJraXRGaW5kQ29udHJvbGxlckNvbnN0cnVjdGVkKToKKyAgICAgICAg KHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybSk6CisgICAgICAgICh3ZWJraXRfZmluZF9jb250 cm9sbGVyX3NlYXJjaF9uZXh0KToKKyAgICAgICAgKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfc2Vh cmNoX3ByZXZpb3VzKToKKyAgICAgICAgKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfc2VhcmNoX2Zp bmlzaCk6CisKIDIwMTItMDktMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21h aWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjc4NzYuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29u dHJvbGxlci5jcHAKaW5kZXggNTZiZTNjNy4uM2U3NmIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmNwcApA QCAtNjMsMTEgKzYzLDExIEBAIHN0YXRpYyBndWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsg MCwgfTsKIAogR19ERUZJTkVfVFlQRShXZWJLaXRGaW5kQ29udHJvbGxlciwgd2Via2l0X2ZpbmRf Y29udHJvbGxlciwgR19UWVBFX09CSkVDVCkKIAotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXRUJLSVRfRklORF9PUFRJT05TX0NBU0VfSU5TRU5TSVRJVkUsIGtXS0ZpbmRPcHRpb25zQ2Fz ZUluc2Vuc2l0aXZlKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX0ZJTkRf T1BUSU9OU19BVF9XT1JEX1NUQVJUUywga1dLRmluZE9wdGlvbnNBdFdvcmRTdGFydHMpOwotQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfRklORF9PUFRJT05TX1RSRUFUX01FRElB TF9DQVBJVEFMX0FTX1dPUkRfU1RBUlQsIGtXS0ZpbmRPcHRpb25zVHJlYXRNZWRpYWxDYXBpdGFs QXNXb3JkU3RhcnQpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfRklORF9P UFRJT05TX0JBQ0tXQVJEUywga1dLRmluZE9wdGlvbnNCYWNrd2FyZHMpOwotQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfRklORF9PUFRJT05TX1dSQVBfQVJPVU5ELCBrV0tGaW5k T3B0aW9uc1dyYXBBcm91bmQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRf RklORF9PUFRJT05TX0NBU0VfSU5TRU5TSVRJVkUsIEZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZl KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX0ZJTkRfT1BUSU9OU19BVF9X T1JEX1NUQVJUUywgRmluZE9wdGlvbnNBdFdvcmRTdGFydHMpOworQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXRUJLSVRfRklORF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJVEFMX0FTX1dP UkRfU1RBUlQsIEZpbmRPcHRpb25zVHJlYXRNZWRpYWxDYXBpdGFsQXNXb3JkU3RhcnQpOworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfRklORF9PUFRJT05TX0JBQ0tXQVJEUywg RmluZE9wdGlvbnNCYWNrd2FyZHMpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJL SVRfRklORF9PUFRJT05TX1dSQVBfQVJPVU5ELCBGaW5kT3B0aW9uc1dyYXBBcm91bmQpOwogCiBz dGF0aWMgdm9pZCBkaWRGaW5kU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBzdHJp bmcsIHVuc2lnbmVkIG1hdGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CkBAIC05 MSw5ICs5MSw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfaW5pdChXZWJL aXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIpCiAgICAgbmV3IChwcml2KSBXZWJLaXRG aW5kQ29udHJvbGxlclByaXZhdGUoKTsKIH0KIAotc3RhdGljIFdLUGFnZVJlZiBpbmxpbmUgZ2V0 V0tQYWdlRnJvbVdlYktpdFdlYlZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3N0YXRpYyBp bmxpbmUgV2ViUGFnZVByb3h5KiBnZXRQYWdlKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29u dHJvbGxlcikKIHsKLSAgICByZXR1cm4gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdF QktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7CisgICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdC YXNlR2V0UGFnZShyZWludGVycHJldF9jYXN0PFdlYktpdFdlYlZpZXdCYXNlKj4oZmluZENvbnRy b2xsZXItPnByaXYtPndlYlZpZXcpKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0RmluZENvbnRy b2xsZXJDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCkBAIC0xMDcsNyArMTA3LDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0RmluZENvbnRyb2xsZXJDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3Qp CiAgICAgICAgIGRpZENvdW50U3RyaW5nTWF0Y2hlcwogICAgIH07CiAKLSAgICBXS1BhZ2VTZXRQ YWdlRmluZENsaWVudChnZXRXS1BhZ2VGcm9tV2ViS2l0V2ViVmlldyhmaW5kQ29udHJvbGxlci0+ cHJpdi0+d2ViVmlldyksICZ3a0ZpbmRDbGllbnQpOworICAgIFdLUGFnZVNldFBhZ2VGaW5kQ2xp ZW50KHRvQVBJKGdldFBhZ2UoZmluZENvbnRyb2xsZXIpKSwgJndrRmluZENsaWVudCk7CiB9CiAK IHN0YXRpYyB2b2lkIHdlYmtpdEZpbmRDb250cm9sbGVyR2V0UHJvcGVydHkoR09iamVjdCogb2Jq ZWN0LCBndWludCBwcm9wSWQsIEdWYWx1ZSogdmFsdWUsIEdQYXJhbVNwZWMqIHBhcmFtU3BlYykK QEAgLTM0MiwxNSArMzQyLDE0IEBAIFdlYktpdFdlYlZpZXcqIHdlYmtpdF9maW5kX2NvbnRyb2xs ZXJfZ2V0X3dlYl92aWV3KFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29uCiAKIHN0YXRpYyB2 b2lkIHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybShXZWJLaXRGaW5kQ29udHJvbGxlciogZmlu ZENvbnRyb2xsZXIsIFdlYktpdEZpbmRDb250cm9sbGVyT3BlcmF0aW9uIG9wZXJhdGlvbikKIHsK LSAgICBXS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMgPSBzdGF0aWNfY2FzdDxXS0ZpbmRPcHRp b25zPihmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMpOwotICAgIFdLUmV0YWluUHRy PFdLU3RyaW5nUmVmPiB3a1NlYXJjaFRleHQoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRG OENTdHJpbmcoZmluZENvbnRyb2xsZXItPnByaXYtPnNlYXJjaFRleHQuZGF0YSgpKSk7Ci0gICAg V0tQYWdlUmVmIHdrUGFnZSA9IGdldFdLUGFnZUZyb21XZWJLaXRXZWJWaWV3KGZpbmRDb250cm9s bGVyLT5wcml2LT53ZWJWaWV3KTsKLQorICAgIFdlYktpdEZpbmRDb250cm9sbGVyUHJpdmF0ZSog cHJpdiA9IGZpbmRDb250cm9sbGVyLT5wcml2OwogICAgIGlmIChvcGVyYXRpb24gPT0gQ291bnRP cGVyYXRpb24pIHsKLSAgICAgICAgV0tQYWdlQ291bnRTdHJpbmdNYXRjaGVzKHdrUGFnZSwgd2tT ZWFyY2hUZXh0LmdldCgpLCB3a0ZpbmRPcHRpb25zLCBmaW5kQ29udHJvbGxlci0+cHJpdi0+bWF4 TWF0Y2hDb3VudCk7CisgICAgICAgIGdldFBhZ2UoZmluZENvbnRyb2xsZXIpLT5jb3VudFN0cmlu Z01hdGNoZXMoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZWFyY2hUZXh0LmRhdGEoKSksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nh c3Q8V2ViS2l0OjpGaW5kT3B0aW9ucz4ocHJpdi0+ZmluZE9wdGlvbnMpLCBwcml2LT5tYXhNYXRj aENvdW50KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIHVpbnQzMl90IGZpbmRPcHRp b25zID0gcHJpdi0+ZmluZE9wdGlvbnM7CiAgICAgaWYgKG9wZXJhdGlvbiA9PSBGaW5kT3BlcmF0 aW9uKQogICAgICAgICAvLyBVbmNvbmRpdGlvbmFsbHkgaGlnaGxpZ2h0IHRleHQgbWF0Y2hlcyB3 aGVuIHRoZSBzZWFyY2gKICAgICAgICAgLy8gc3RhcnRzLiBXSzEgQVBJIHdhcyBmb3JjaW5nIGNs aWVudHMgdG8gZW5hYmxlL2Rpc2FibGUKQEAgLTM1OSw5ICszNTgsMTAgQEAgc3RhdGljIHZvaWQg d2ViS2l0RmluZENvbnRyb2xsZXJQZXJmb3JtKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29u dHJvbGxlciwgV2UKICAgICAgICAgLy8gdW5jb25kaXRpb25hbGx5IHNob3cgaGlnaGxpZ2h0cy4g Qm90aCBzZWFyY2hfbmV4dCgpIGFuZAogICAgICAgICAvLyBzZWFyY2hfcHJldigpIHNob3VsZCBu b3QgZW5hYmxlIGhpZ2hsaWdodGluZyB0byBhdm9pZCBhbgogICAgICAgICAvLyBleHRyYSB1bm1h cmtBbGxUZXh0TWF0Y2hlcygpICsgbWFya0FsbFRleHRNYXRjaGVzKCkKLSAgICAgICAgd2tGaW5k T3B0aW9ucyA9IHN0YXRpY19jYXN0PFdLRmluZE9wdGlvbnM+KGZpbmRDb250cm9sbGVyLT5wcml2 LT5maW5kT3B0aW9ucyB8IGtXS0ZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCk7CisgICAgICAgIGZp bmRPcHRpb25zIHw9IEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodDsKIAotICAgIFdLUGFnZUZpbmRT dHJpbmcod2tQYWdlLCB3a1NlYXJjaFRleHQuZ2V0KCksIHdrRmluZE9wdGlvbnMsIGZpbmRDb250 cm9sbGVyLT5wcml2LT5tYXhNYXRjaENvdW50KTsKKyAgICBnZXRQYWdlKGZpbmRDb250cm9sbGVy KS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJjaFRleHQuZGF0YSgpKSwg c3RhdGljX2Nhc3Q8V2ViS2l0OjpGaW5kT3B0aW9ucz4oZmluZE9wdGlvbnMpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaXYtPm1heE1hdGNoQ291bnQpOwogfQog CiBzdGF0aWMgaW5saW5lIHZvaWQgd2ViS2l0RmluZENvbnRyb2xsZXJTZXRTZWFyY2hEYXRhKFdl YktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciwgY29uc3QgZ2NoYXIqIHNlYXJjaFRl eHQsIGd1aW50MzIgZmluZE9wdGlvbnMsIGd1aW50IG1heE1hdGNoQ291bnQpCkBAIC00MjAsOCAr NDIwLDggQEAgdm9pZCB3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9uZXh0KFdlYktpdEZp bmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdF QktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpKTsKIAotICAgIGZpbmRDb250 cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyA9IGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0 aW9ucyAmIH5XRUJLSVRfRklORF9PUFRJT05TX0JBQ0tXQVJEUzsKLSAgICBmaW5kQ29udHJvbGxl ci0+cHJpdi0+ZmluZE9wdGlvbnMgPSBmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMg JiB+a1dLRmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0OworICAgIGZpbmRDb250cm9sbGVyLT5wcml2 LT5maW5kT3B0aW9ucyAmPSB+V0VCS0lUX0ZJTkRfT1BUSU9OU19CQUNLV0FSRFM7CisgICAgZmlu ZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zICY9IH5GaW5kT3B0aW9uc1Nob3dIaWdobGln aHQ7CiAgICAgd2ViS2l0RmluZENvbnRyb2xsZXJQZXJmb3JtKGZpbmRDb250cm9sbGVyLCBGaW5k TmV4dFByZXZPcGVyYXRpb24pOwogfQogCkBAIC00MzgsOCArNDM4LDggQEAgdm9pZCB3ZWJraXRf ZmluZF9jb250cm9sbGVyX3NlYXJjaF9wcmV2aW91cyhXZWJLaXRGaW5kQ29udHJvbGxlciogZmlu ZENvbnRyb2xsZXIKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRS T0xMRVIoZmluZENvbnRyb2xsZXIpKTsKIAotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5k T3B0aW9ucyA9IGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyB8IFdFQktJVF9GSU5E X09QVElPTlNfQkFDS1dBUkRTOwotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9u cyA9IGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAmIH5rV0tGaW5kT3B0aW9uc1No b3dIaWdobGlnaHQ7CisgICAgZmluZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zIHw9IFdF QktJVF9GSU5EX09QVElPTlNfQkFDS1dBUkRTOworICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5m aW5kT3B0aW9ucyAmPSB+RmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0OwogICAgIHdlYktpdEZpbmRD b250cm9sbGVyUGVyZm9ybShmaW5kQ29udHJvbGxlciwgRmluZE5leHRQcmV2T3BlcmF0aW9uKTsK IH0KIApAQCAtNDc5LDUgKzQ3OSw1IEBAIHZvaWQgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFy Y2hfZmluaXNoKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAgICBn X3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIp KTsKIAotICAgIFdLUGFnZUhpZGVGaW5kVUkoZ2V0V0tQYWdlRnJvbVdlYktpdFdlYlZpZXcoZmlu ZENvbnRyb2xsZXItPnByaXYtPndlYlZpZXcpKTsKKyAgICBnZXRQYWdlKGZpbmRDb250cm9sbGVy KS0+aGlkZUZpbmRVSSgpOwogfQo=