96779 2012-09-14 07:13:17 -0700 [GTK] Don't use the C API internally in WebKitHitTestResult 2012-10-18 05:16:57 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96778 96766 96780 99705 1 cgarcia webkit-unassigned mario oldest_to_newest 720727 0 cgarcia 2012-09-14 07:13:17 -0700 Use the C++ classes instead. 720729 1 164141 cgarcia 2012-09-14 07:14:38 -0700 Created attachment 164141 Patch 733448 2 164141 mario 2012-10-03 01:46:09 -0700 Comment on attachment 164141 Patch Looks good to me 745163 3 164141 xan.lopez 2012-10-18 04:58:00 -0700 Comment on attachment 164141 Patch Looks good, the 'using namespace' thing in the header will be fixed in a follow-up. 745175 4 cgarcia 2012-10-18 05:16:57 -0700 Committed r131729: <http://trac.webkit.org/changeset/131729> 164141 2012-09-14 07:14:38 -0700 2012-10-18 04:58:00 -0700 Patch wk2-no-c-api-hit-test-result.diff text/plain 7094 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi45OTQyYTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRIaXRUZXN0UmVzdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05Njc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBDIEFQ SSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkgY2FzdHMs IHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBjb2RlIGlz IGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRIaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAgICAgKHdlYmtpdEhp dFRlc3RSZXN1bHRDcmVhdGUpOgorICAgICAgICAod2Via2l0SGl0VGVzdFJlc3VsdENvbXBhcmUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEhpdFRlc3RSZXN1bHRQcml2YXRl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAg ICAgICh3ZWJraXRXZWJWaWV3TW91c2VUYXJnZXRDaGFuZ2VkKToKKyAgICAgICAgKHdlYmtpdFdl YlZpZXdQb3B1bGF0ZUNvbnRleHRNZW51KToKKwogMjAxMi0wOS0xMiAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEyNzg3Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEhpdFRlc3RSZXN1bHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0SGl0VGVzdFJlc3VsdC5jcHAKaW5kZXggODExNWQ2My4uM2YzMWViMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SGl0VGVzdFJl c3VsdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SGl0 VGVzdFJlc3VsdC5jcHAKQEAgLTUyLDggKzUyLDYgQEAKICAqCiAgKi8KIAotdXNpbmcgbmFtZXNw YWNlIFdlYktpdDsKLQogZW51bSB7CiAgICAgUFJPUF8wLAogCkBAIC0yMzcsMjcgKzIzNSwyNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfaGl0X3Rlc3RfcmVzdWx0X2NsYXNzX2luaXQoV2ViS2l0SGl0 VGVzdFJlc3VsdENsYXNzKiBoaXRUZXN0UgogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZSho aXRUZXN0UmVzdWx0Q2xhc3MsIHNpemVvZihXZWJLaXRIaXRUZXN0UmVzdWx0UHJpdmF0ZSkpOwog fQogCi1XZWJLaXRIaXRUZXN0UmVzdWx0KiB3ZWJraXRIaXRUZXN0UmVzdWx0Q3JlYXRlKFdLSGl0 VGVzdFJlc3VsdFJlZiB3a0hpdFRlc3RSZXN1bHQpCitXZWJLaXRIaXRUZXN0UmVzdWx0KiB3ZWJr aXRIaXRUZXN0UmVzdWx0Q3JlYXRlKFdlYkhpdFRlc3RSZXN1bHQqIGhpdFRlc3RSZXN1bHQpCiB7 CiAgICAgdW5zaWduZWQgY29udGV4dCA9IFdFQktJVF9ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9E T0NVTUVOVDsKIAotICAgIGNvbnN0IFN0cmluZyYgbGlua1VSTCA9IHRvSW1wbCh3a0hpdFRlc3RS ZXN1bHQpLT5hYnNvbHV0ZUxpbmtVUkwoKTsKKyAgICBjb25zdCBTdHJpbmcmIGxpbmtVUkwgPSBo aXRUZXN0UmVzdWx0LT5hYnNvbHV0ZUxpbmtVUkwoKTsKICAgICBpZiAoIWxpbmtVUkwuaXNFbXB0 eSgpKQogICAgICAgICBjb250ZXh0IHw9IFdFQktJVF9ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9M SU5LOwogCi0gICAgY29uc3QgU3RyaW5nJiBpbWFnZVVSTCA9IHRvSW1wbCh3a0hpdFRlc3RSZXN1 bHQpLT5hYnNvbHV0ZUltYWdlVVJMKCk7CisgICAgY29uc3QgU3RyaW5nJiBpbWFnZVVSTCA9IGhp dFRlc3RSZXN1bHQtPmFic29sdXRlSW1hZ2VVUkwoKTsKICAgICBpZiAoIWltYWdlVVJMLmlzRW1w dHkoKSkKICAgICAgICAgY29udGV4dCB8PSBXRUJLSVRfSElUX1RFU1RfUkVTVUxUX0NPTlRFWFRf SU1BR0U7CiAKLSAgICBjb25zdCBTdHJpbmcmIG1lZGlhVVJMID0gdG9JbXBsKHdrSGl0VGVzdFJl c3VsdCktPmFic29sdXRlTWVkaWFVUkwoKTsKKyAgICBjb25zdCBTdHJpbmcmIG1lZGlhVVJMID0g aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVNZWRpYVVSTCgpOwogICAgIGlmICghbWVkaWFVUkwuaXNF bXB0eSgpKQogICAgICAgICBjb250ZXh0IHw9IFdFQktJVF9ISVRfVEVTVF9SRVNVTFRfQ09OVEVY VF9NRURJQTsKIAotICAgIGlmIChXS0hpdFRlc3RSZXN1bHRJc0NvbnRlbnRFZGl0YWJsZSh3a0hp dFRlc3RSZXN1bHQpKQorICAgIGlmIChoaXRUZXN0UmVzdWx0LT5pc0NvbnRlbnRFZGl0YWJsZSgp KQogICAgICAgICBjb250ZXh0IHw9IFdFQktJVF9ISVRfVEVTVF9SRVNVTFRfQ09OVEVYVF9FRElU QUJMRTsKIAotICAgIGNvbnN0IFN0cmluZyYgbGlua1RpdGxlID0gdG9JbXBsKHdrSGl0VGVzdFJl c3VsdCktPmxpbmtUaXRsZSgpOwotICAgIGNvbnN0IFN0cmluZyYgbGlua0xhYmVsID0gdG9JbXBs KHdrSGl0VGVzdFJlc3VsdCktPmxpbmtMYWJlbCgpOworICAgIGNvbnN0IFN0cmluZyYgbGlua1Rp dGxlID0gaGl0VGVzdFJlc3VsdC0+bGlua1RpdGxlKCk7CisgICAgY29uc3QgU3RyaW5nJiBsaW5r TGFiZWwgPSBoaXRUZXN0UmVzdWx0LT5saW5rTGFiZWwoKTsKIAogICAgIHJldHVybiBXRUJLSVRf SElUX1RFU1RfUkVTVUxUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9ISVRfVEVTVF9SRVNVTFQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjb250ZXh0 IiwgY29udGV4dCwKQEAgLTI3NCwxNSArMjcyLDE1IEBAIHN0YXRpYyBib29sIHN0cmluZ0lzRXF1 YWxUb0NTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIGNvbnN0IENTdHJpbmcmIGNTdHJpbmcp CiAgICAgcmV0dXJuICgoc3RyaW5nLmlzRW1wdHkoKSAmJiBjU3RyaW5nLmlzTnVsbCgpKSB8fCAo c3RyaW5nLnV0ZjgoKSA9PSBjU3RyaW5nKSk7CiB9CiAKLWJvb2wgd2Via2l0SGl0VGVzdFJlc3Vs dENvbXBhcmUoV2ViS2l0SGl0VGVzdFJlc3VsdCogaGl0VGVzdFJlc3VsdCwgV0tIaXRUZXN0UmVz dWx0UmVmIHdrSGl0VGVzdFJlc3VsdCkKK2Jvb2wgd2Via2l0SGl0VGVzdFJlc3VsdENvbXBhcmUo V2ViS2l0SGl0VGVzdFJlc3VsdCogaGl0VGVzdFJlc3VsdCwgV2ViSGl0VGVzdFJlc3VsdCogd2Vi SGl0VGVzdFJlc3VsdCkKIHsKICAgICBXZWJLaXRIaXRUZXN0UmVzdWx0UHJpdmF0ZSogcHJpdiA9 IGhpdFRlc3RSZXN1bHQtPnByaXY7Ci0gICAgcmV0dXJuIFdLSGl0VGVzdFJlc3VsdElzQ29udGVu dEVkaXRhYmxlKHdrSGl0VGVzdFJlc3VsdCkgPT0gd2Via2l0X2hpdF90ZXN0X3Jlc3VsdF9jb250 ZXh0X2lzX2VkaXRhYmxlKGhpdFRlc3RSZXN1bHQpCi0gICAgICAgICYmIHN0cmluZ0lzRXF1YWxU b0NTdHJpbmcodG9JbXBsKHdrSGl0VGVzdFJlc3VsdCktPmFic29sdXRlTGlua1VSTCgpLCBwcml2 LT5saW5rVVJJKQotICAgICAgICAmJiBzdHJpbmdJc0VxdWFsVG9DU3RyaW5nKHRvSW1wbCh3a0hp dFRlc3RSZXN1bHQpLT5saW5rVGl0bGUoKSwgcHJpdi0+bGlua1RpdGxlKQotICAgICAgICAmJiBz dHJpbmdJc0VxdWFsVG9DU3RyaW5nKHRvSW1wbCh3a0hpdFRlc3RSZXN1bHQpLT5saW5rTGFiZWwo KSwgcHJpdi0+bGlua0xhYmVsKQotICAgICAgICAmJiBzdHJpbmdJc0VxdWFsVG9DU3RyaW5nKHRv SW1wbCh3a0hpdFRlc3RSZXN1bHQpLT5hYnNvbHV0ZUltYWdlVVJMKCksIHByaXYtPmltYWdlVVJJ KQotICAgICAgICAmJiBzdHJpbmdJc0VxdWFsVG9DU3RyaW5nKHRvSW1wbCh3a0hpdFRlc3RSZXN1 bHQpLT5hYnNvbHV0ZU1lZGlhVVJMKCksIHByaXYtPm1lZGlhVVJJKTsKKyAgICByZXR1cm4gd2Vi SGl0VGVzdFJlc3VsdC0+aXNDb250ZW50RWRpdGFibGUoKSA9PSB3ZWJraXRfaGl0X3Rlc3RfcmVz dWx0X2NvbnRleHRfaXNfZWRpdGFibGUoaGl0VGVzdFJlc3VsdCkKKyAgICAgICAgJiYgc3RyaW5n SXNFcXVhbFRvQ1N0cmluZyh3ZWJIaXRUZXN0UmVzdWx0LT5hYnNvbHV0ZUxpbmtVUkwoKSwgcHJp di0+bGlua1VSSSkKKyAgICAgICAgJiYgc3RyaW5nSXNFcXVhbFRvQ1N0cmluZyh3ZWJIaXRUZXN0 UmVzdWx0LT5saW5rVGl0bGUoKSwgcHJpdi0+bGlua1RpdGxlKQorICAgICAgICAmJiBzdHJpbmdJ c0VxdWFsVG9DU3RyaW5nKHdlYkhpdFRlc3RSZXN1bHQtPmxpbmtMYWJlbCgpLCBwcml2LT5saW5r TGFiZWwpCisgICAgICAgICYmIHN0cmluZ0lzRXF1YWxUb0NTdHJpbmcod2ViSGl0VGVzdFJlc3Vs dC0+YWJzb2x1dGVJbWFnZVVSTCgpLCBwcml2LT5pbWFnZVVSSSkKKyAgICAgICAgJiYgc3RyaW5n SXNFcXVhbFRvQ1N0cmluZyh3ZWJIaXRUZXN0UmVzdWx0LT5hYnNvbHV0ZU1lZGlhVVJMKCksIHBy aXYtPm1lZGlhVVJJKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRIaXRUZXN0UmVzdWx0UHJpdmF0ZS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SGl0VGVzdFJlc3VsdFByaXZhdGUuaAppbmRleCA2 MDg4MDA2Li43OTcwZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRIaXRUZXN0UmVzdWx0UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEhpdFRlc3RSZXN1bHRQcml2YXRlLmgKQEAgLTIzLDcgKzIz LDkgQEAKICNpbmNsdWRlICJXZWJLaXRIaXRUZXN0UmVzdWx0LmgiCiAjaW5jbHVkZSAiV2ViS2l0 UHJpdmF0ZS5oIgogCi1XZWJLaXRIaXRUZXN0UmVzdWx0KiB3ZWJraXRIaXRUZXN0UmVzdWx0Q3Jl YXRlKFdLSGl0VGVzdFJlc3VsdFJlZik7Ci1ib29sIHdlYmtpdEhpdFRlc3RSZXN1bHRDb21wYXJl KFdlYktpdEhpdFRlc3RSZXN1bHQqLCBXS0hpdFRlc3RSZXN1bHRSZWYpOwordXNpbmcgbmFtZXNw YWNlIFdlYktpdDsKKworV2ViS2l0SGl0VGVzdFJlc3VsdCogd2Via2l0SGl0VGVzdFJlc3VsdENy ZWF0ZShXZWJIaXRUZXN0UmVzdWx0Kik7Citib29sIHdlYmtpdEhpdFRlc3RSZXN1bHRDb21wYXJl KFdlYktpdEhpdFRlc3RSZXN1bHQqLCBXZWJIaXRUZXN0UmVzdWx0Kik7CiAKICNlbmRpZiAvLyBX ZWJLaXRIaXRUZXN0UmVzdWx0UHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDEyMWFjNDIuLjZiZjYxN2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwCkBAIC0xMjY4LDExICsxMjY4LDExIEBAIHZvaWQgd2Via2l0V2ViVmlld01vdXNlVGFyZ2V0 Q2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJIaXRUZXN0UmVzdWx0KiBoCiAgICAg V2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwogICAgIGlmIChwcml2 LT5tb3VzZVRhcmdldEhpdFRlc3RSZXN1bHQKICAgICAgICAgJiYgcHJpdi0+bW91c2VUYXJnZXRN b2RpZmllcnMgPT0gbW9kaWZpZXJzCi0gICAgICAgICYmIHdlYmtpdEhpdFRlc3RSZXN1bHRDb21w YXJlKHByaXYtPm1vdXNlVGFyZ2V0SGl0VGVzdFJlc3VsdC5nZXQoKSwgdG9BUEkoaGl0VGVzdFJl c3VsdCkpKQorICAgICAgICAmJiB3ZWJraXRIaXRUZXN0UmVzdWx0Q29tcGFyZShwcml2LT5tb3Vz ZVRhcmdldEhpdFRlc3RSZXN1bHQuZ2V0KCksIGhpdFRlc3RSZXN1bHQpKQogICAgICAgICByZXR1 cm47CiAKICAgICBwcml2LT5tb3VzZVRhcmdldE1vZGlmaWVycyA9IG1vZGlmaWVyczsKLSAgICBw cml2LT5tb3VzZVRhcmdldEhpdFRlc3RSZXN1bHQgPSBhZG9wdEdSZWYod2Via2l0SGl0VGVzdFJl c3VsdENyZWF0ZSh0b0FQSShoaXRUZXN0UmVzdWx0KSkpOworICAgIHByaXYtPm1vdXNlVGFyZ2V0 SGl0VGVzdFJlc3VsdCA9IGFkb3B0R1JlZih3ZWJraXRIaXRUZXN0UmVzdWx0Q3JlYXRlKGhpdFRl c3RSZXN1bHQpKTsKICAgICBnX3NpZ25hbF9lbWl0KHdlYlZpZXcsIHNpZ25hbHNbTU9VU0VfVEFS R0VUX0NIQU5HRURdLCAwLCBwcml2LT5tb3VzZVRhcmdldEhpdFRlc3RSZXN1bHQuZ2V0KCksIG1v ZGlmaWVycyk7CiB9CiAKQEAgLTE0MjYsNyArMTQyNiw3IEBAIHZvaWQgd2Via2l0V2ViVmlld1Bv cHVsYXRlQ29udGV4dE1lbnUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgSW1tdXRhYmxlQXJyYXkq IHByCiAgICAgaWYgKHdlYkhpdFRlc3RSZXN1bHQtPmlzQ29udGVudEVkaXRhYmxlKCkpCiAgICAg ICAgIHdlYmtpdFdlYlZpZXdDcmVhdGVBbmRBcHBlbmRJbnB1dE1ldGhvZHNNZW51SXRlbSh3ZWJW aWV3LCBjb250ZXh0TWVudS5nZXQoKSk7CiAKLSAgICBHUmVmUHRyPFdlYktpdEhpdFRlc3RSZXN1 bHQ+IGhpdFRlc3RSZXN1bHQgPSBhZG9wdEdSZWYod2Via2l0SGl0VGVzdFJlc3VsdENyZWF0ZSh0 b0FQSSh3ZWJIaXRUZXN0UmVzdWx0KSkpOworICAgIEdSZWZQdHI8V2ViS2l0SGl0VGVzdFJlc3Vs dD4gaGl0VGVzdFJlc3VsdCA9IGFkb3B0R1JlZih3ZWJraXRIaXRUZXN0UmVzdWx0Q3JlYXRlKHdl YkhpdFRlc3RSZXN1bHQpKTsKICAgICBHT3duUHRyPEdka0V2ZW50PiBjb250ZXh0TWVudUV2ZW50 KHdlYmtpdFdlYlZpZXdCYXNlVGFrZUNvbnRleHRNZW51RXZlbnQod2ViVmlld0Jhc2UpKTsKIAog ICAgIGdib29sZWFuIHJldHVyblZhbHVlOwo=