96786 2012-09-14 07:35:54 -0700 [GTK] Don't use the C API internally in WebKitWebInspector 2012-10-17 08:31:55 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96785 96766 96787 1 cgarcia webkit-unassigned mario oldest_to_newest 720756 0 cgarcia 2012-09-14 07:35:54 -0700 Use the C++ classes instead. 720758 1 164152 cgarcia 2012-09-14 07:37:10 -0700 Created attachment 164152 Patch 733455 2 164152 mario 2012-10-03 01:52:30 -0700 Comment on attachment 164152 Patch Looks good to me 744260 3 cgarcia 2012-10-17 08:31:55 -0700 Committed r131600: <http://trac.webkit.org/changeset/131600> 164152 2012-09-14 07:37:10 -0700 2012-10-17 05:25:14 -0700 Patch wk2-no-c-api-inspector.diff text/plain 7102 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi5hODA5NDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRXZWJJbnNwZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk2Nzg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXNpbmcgdGhlIEMrKyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2YgdGhlIEMgQVBJ IHdyYXBwZXJzIHdlCisgICAgICAgIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQSSBjYXN0cywg c3RyaW5nIGNvbnZlcnNpb25zIGFuZAorICAgICAgICBhbGxvY2F0aW9ucy4gVGhlIGNvZGUgaXMg YWxzbyBhIGxvdCBzaW1wbGVyIGFuZCBlYXNpZXIgdG8gcmVhZC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkluc3BlY3Rvci5jcHA6CisgICAgICAgIChfV2ViS2l0V2Vi SW5zcGVjdG9yUHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRXZWJJbnNwZWN0b3JGaW5hbGl6ZSk6 CisgICAgICAgICh3ZWJraXRXZWJJbnNwZWN0b3JDcmVhdGUpOgorICAgICAgICAod2Via2l0X3dl Yl9pbnNwZWN0b3JfZ2V0X3dlYl92aWV3KToKKyAgICAgICAgKHdlYmtpdF93ZWJfaW5zcGVjdG9y X2lzX2F0dGFjaGVkKToKKyAgICAgICAgKHdlYmtpdF93ZWJfaW5zcGVjdG9yX2F0dGFjaCk6Cisg ICAgICAgICh3ZWJraXRfd2ViX2luc3BlY3Rvcl9kZXRhY2gpOgorICAgICAgICAod2Via2l0X3dl Yl9pbnNwZWN0b3Jfc2hvdyk6CisgICAgICAgICh3ZWJraXRfd2ViX2luc3BlY3Rvcl9jbG9zZSk6 CisgICAgICAgICh3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVpZ2h0KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJJbnNwZWN0b3JQcml2YXRlLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3 ZWJraXRfd2ViX3ZpZXdfZ2V0X2luc3BlY3Rvcik6CisKIDIwMTItMDktMTIgIFNoZXJpZmYgQm90 ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIxMjc4NzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJJbnNwZWN0b3IuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViSW5zcGVjdG9yLmNwcAppbmRleCAyNTAyM2NmLi5kMzg0YWMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJJbnNw ZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl Ykluc3BlY3Rvci5jcHAKQEAgLTI3LDggKzI3LDYgQEAKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9H UmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCi11c2luZyBuYW1lc3Bh Y2UgV2ViS2l0OwotCiBlbnVtIHsKICAgICBPUEVOX1dJTkRPVywKICAgICBCUklOR19UT19GUk9O VCwKQEAgLTQ3LDcgKzQ1LDcgQEAgZW51bSB7CiB9OwogCiBzdHJ1Y3QgX1dlYktpdFdlYkluc3Bl Y3RvclByaXZhdGUgewotICAgIFdLUmV0YWluUHRyPFdLSW5zcGVjdG9yUmVmPiB3a0luc3BlY3Rv cjsKKyAgICBSZWZQdHI8V2ViSW5zcGVjdG9yUHJveHk+IHdlYkluc3BlY3RvcjsKICAgICBDU3Ry aW5nIGluc3BlY3RlZFVSSTsKICAgICB1bnNpZ25lZCBhdHRhY2hlZEhlaWdodDsKIH07CkBAIC03 NSw3ICs3Myw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYkluc3BlY3RvckdldFByb3BlcnR5KEdP YmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqCiBzdGF0aWMgdm9pZCB3ZWJraXRX ZWJJbnNwZWN0b3JGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCiB7CiAgICAgV2ViS2l0V2ViSW5z cGVjdG9yUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfSU5TUEVDVE9SKG9iamVjdCktPnByaXY7 Ci0gICAgV0tJbnNwZWN0b3JTZXRJbnNwZWN0b3JDbGllbnRHdGsocHJpdi0+d2tJbnNwZWN0b3Iu Z2V0KCksIDApOworICAgIFdLSW5zcGVjdG9yU2V0SW5zcGVjdG9yQ2xpZW50R3RrKHRvQVBJKHBy aXYtPndlYkluc3BlY3Rvci5nZXQoKSksIDApOwogICAgIHByaXYtPn5XZWJLaXRXZWJJbnNwZWN0 b3JQcml2YXRlKCk7CiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl9pbnNwZWN0b3JfcGFy ZW50X2NsYXNzKS0+ZmluYWxpemUob2JqZWN0KTsKIH0KQEAgLTI5NSwxMCArMjkzLDEwIEBAIHN0 YXRpYyB2b2lkIGRpZENoYW5nZUF0dGFjaGVkSGVpZ2h0KFdLSW5zcGVjdG9yUmVmLCB1bnNpZ25l ZCBoZWlnaHQsIGNvbnN0IHZvaWQqCiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKGluc3Bl Y3RvciksICJhdHRhY2hlZC1oZWlnaHQiKTsKIH0KIAotV2ViS2l0V2ViSW5zcGVjdG9yKiB3ZWJr aXRXZWJJbnNwZWN0b3JDcmVhdGUoV0tJbnNwZWN0b3JSZWYgd2tJbnNwZWN0b3IpCitXZWJLaXRX ZWJJbnNwZWN0b3IqIHdlYmtpdFdlYkluc3BlY3RvckNyZWF0ZShXZWJJbnNwZWN0b3JQcm94eSog d2ViSW5zcGVjdG9yKQogewogICAgIFdlYktpdFdlYkluc3BlY3RvciogaW5zcGVjdG9yID0gV0VC S0lUX1dFQl9JTlNQRUNUT1IoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9JTlNQRUNUT1Is IE5VTEwpKTsKLSAgICBpbnNwZWN0b3ItPnByaXYtPndrSW5zcGVjdG9yID0gd2tJbnNwZWN0b3I7 CisgICAgaW5zcGVjdG9yLT5wcml2LT53ZWJJbnNwZWN0b3IgPSB3ZWJJbnNwZWN0b3I7CiAKICAg ICBXS0luc3BlY3RvckNsaWVudEd0ayB3a0luc3BlY3RvckNsaWVudEd0ayA9IHsKICAgICAgICAg a1dLSW5zcGVjdG9yQ2xpZW50R3RrQ3VycmVudFZlcnNpb24sCkBAIC0zMTEsNyArMzA5LDcgQEAg V2ViS2l0V2ViSW5zcGVjdG9yKiB3ZWJraXRXZWJJbnNwZWN0b3JDcmVhdGUoV0tJbnNwZWN0b3JS ZWYgd2tJbnNwZWN0b3IpCiAgICAgICAgIGRldGFjaCwKICAgICAgICAgZGlkQ2hhbmdlQXR0YWNo ZWRIZWlnaHQKICAgICB9OwotICAgIFdLSW5zcGVjdG9yU2V0SW5zcGVjdG9yQ2xpZW50R3RrKHdr SW5zcGVjdG9yLCAmd2tJbnNwZWN0b3JDbGllbnRHdGspOworICAgIFdLSW5zcGVjdG9yU2V0SW5z cGVjdG9yQ2xpZW50R3RrKHRvQVBJKHdlYkluc3BlY3RvciksICZ3a0luc3BlY3RvckNsaWVudEd0 ayk7CiAKICAgICByZXR1cm4gaW5zcGVjdG9yOwogfQpAQCAtMzMwLDcgKzMyOCw3IEBAIFdlYktp dFdlYlZpZXdCYXNlKiB3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfd2ViX3ZpZXcoV2ViS2l0V2Vi SW5zcGVjdG9yKiBpbnNwZWN0CiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lT X1dFQl9JTlNQRUNUT1IoaW5zcGVjdG9yKSwgMCk7CiAKLSAgICByZXR1cm4gV0VCS0lUX1dFQl9W SUVXX0JBU0UodG9JbXBsKGluc3BlY3Rvci0+cHJpdi0+d2tJbnNwZWN0b3IuZ2V0KCkpLT5pbnNw ZWN0b3JWaWV3KCkpOworICAgIHJldHVybiBXRUJLSVRfV0VCX1ZJRVdfQkFTRShpbnNwZWN0b3It PnByaXYtPndlYkluc3BlY3Rvci0+aW5zcGVjdG9yVmlldygpKTsKIH0KIAogLyoqCkBAIC0zNjQs NyArMzYyLDcgQEAgZ2Jvb2xlYW4gd2Via2l0X3dlYl9pbnNwZWN0b3JfaXNfYXR0YWNoZWQoV2Vi S2l0V2ViSW5zcGVjdG9yKiBpbnNwZWN0b3IpCiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwo V0VCS0lUX0lTX1dFQl9JTlNQRUNUT1IoaW5zcGVjdG9yKSwgRkFMU0UpOwogCi0gICAgcmV0dXJu IFdLSW5zcGVjdG9ySXNBdHRhY2hlZChpbnNwZWN0b3ItPnByaXYtPndrSW5zcGVjdG9yLmdldCgp KTsKKyAgICByZXR1cm4gaW5zcGVjdG9yLT5wcml2LT53ZWJJbnNwZWN0b3ItPmlzQXR0YWNoZWQo KTsKIH0KIAogLyoqCkBAIC0zNzgsOSArMzc2LDkgQEAgdm9pZCB3ZWJraXRfd2ViX2luc3BlY3Rv cl9hdHRhY2goV2ViS2l0V2ViSW5zcGVjdG9yKiBpbnNwZWN0b3IpCiB7CiAgICAgZ19yZXR1cm5f aWZfZmFpbChXRUJLSVRfSVNfV0VCX0lOU1BFQ1RPUihpbnNwZWN0b3IpKTsKIAotICAgIGlmIChX S0luc3BlY3RvcklzQXR0YWNoZWQoaW5zcGVjdG9yLT5wcml2LT53a0luc3BlY3Rvci5nZXQoKSkp CisgICAgaWYgKGluc3BlY3Rvci0+cHJpdi0+d2ViSW5zcGVjdG9yLT5pc0F0dGFjaGVkKCkpCiAg ICAgICAgIHJldHVybjsKLSAgICBXS0luc3BlY3RvckF0dGFjaChpbnNwZWN0b3ItPnByaXYtPndr SW5zcGVjdG9yLmdldCgpKTsKKyAgICBpbnNwZWN0b3ItPnByaXYtPndlYkluc3BlY3Rvci0+YXR0 YWNoKCk7CiB9CiAKIC8qKgpAQCAtMzk0LDkgKzM5Miw5IEBAIHZvaWQgd2Via2l0X3dlYl9pbnNw ZWN0b3JfZGV0YWNoKFdlYktpdFdlYkluc3BlY3RvciogaW5zcGVjdG9yKQogewogICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9JTlNQRUNUT1IoaW5zcGVjdG9yKSk7CiAKLSAgICBp ZiAoIVdLSW5zcGVjdG9ySXNBdHRhY2hlZChpbnNwZWN0b3ItPnByaXYtPndrSW5zcGVjdG9yLmdl dCgpKSkKKyAgICBpZiAoIWluc3BlY3Rvci0+cHJpdi0+d2ViSW5zcGVjdG9yLT5pc0F0dGFjaGVk KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBXS0luc3BlY3RvckRldGFjaChpbnNwZWN0b3ItPnBy aXYtPndrSW5zcGVjdG9yLmdldCgpKTsKKyAgICBpbnNwZWN0b3ItPnByaXYtPndlYkluc3BlY3Rv ci0+ZGV0YWNoKCk7CiB9CiAKIC8qKgpAQCAtNDA5LDcgKzQwNyw3IEBAIHZvaWQgd2Via2l0X3dl Yl9pbnNwZWN0b3Jfc2hvdyhXZWJLaXRXZWJJbnNwZWN0b3IqIGluc3BlY3RvcikKIHsKICAgICBn X3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfSU5TUEVDVE9SKGluc3BlY3RvcikpOwogCi0g ICAgV0tJbnNwZWN0b3JTaG93KGluc3BlY3Rvci0+cHJpdi0+d2tJbnNwZWN0b3IuZ2V0KCkpOwor ICAgIGluc3BlY3Rvci0+cHJpdi0+d2ViSW5zcGVjdG9yLT5zaG93KCk7CiB9CiAKIC8qKgpAQCAt NDIyLDcgKzQyMCw3IEBAIHZvaWQgd2Via2l0X3dlYl9pbnNwZWN0b3JfY2xvc2UoV2ViS2l0V2Vi SW5zcGVjdG9yKiBpbnNwZWN0b3IpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNf V0VCX0lOU1BFQ1RPUihpbnNwZWN0b3IpKTsKIAotICAgIFdLSW5zcGVjdG9yQ2xvc2UoaW5zcGVj dG9yLT5wcml2LT53a0luc3BlY3Rvci5nZXQoKSk7CisgICAgaW5zcGVjdG9yLT5wcml2LT53ZWJJ bnNwZWN0b3ItPmNsb3NlKCk7CiB9CiAKIC8qKgpAQCAtNDM5LDcgKzQzNyw3IEBAIGd1aW50IHdl YmtpdF93ZWJfaW5zcGVjdG9yX2dldF9hdHRhY2hlZF9oZWlnaHQoV2ViS2l0V2ViSW5zcGVjdG9y KiBpbnNwZWN0b3IpCiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9J TlNQRUNUT1IoaW5zcGVjdG9yKSwgMCk7CiAKLSAgICBpZiAoIVdLSW5zcGVjdG9ySXNBdHRhY2hl ZChpbnNwZWN0b3ItPnByaXYtPndrSW5zcGVjdG9yLmdldCgpKSkKKyAgICBpZiAoIWluc3BlY3Rv ci0+cHJpdi0+d2ViSW5zcGVjdG9yLT5pc0F0dGFjaGVkKCkpCiAgICAgICAgIHJldHVybiAwOwog ICAgIHJldHVybiBpbnNwZWN0b3ItPnByaXYtPmF0dGFjaGVkSGVpZ2h0OwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViSW5zcGVjdG9yUHJp dmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViSW5zcGVj dG9yUHJpdmF0ZS5oCmluZGV4IDcwMzQ3MjEuLjU0MjRlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkluc3BlY3RvclByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJJbnNwZWN0b3JQcml2 YXRlLmgKQEAgLTIzLDYgKzIzLDggQEAKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5j bHVkZSAiV2ViS2l0V2ViSW5zcGVjdG9yLmgiCiAKLVdlYktpdFdlYkluc3BlY3Rvciogd2Via2l0 V2ViSW5zcGVjdG9yQ3JlYXRlKFdLSW5zcGVjdG9yUmVmKTsKK3VzaW5nIG5hbWVzcGFjZSBXZWJL aXQ7CisKK1dlYktpdFdlYkluc3BlY3Rvciogd2Via2l0V2ViSW5zcGVjdG9yQ3JlYXRlKFdlYklu c3BlY3RvclByb3h5Kik7CiAKICNlbmRpZiAvLyBXZWJLaXRXZWJJbnNwZWN0b3JQcml2YXRlX2gK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAKaW5kZXggNWIyNDI5ZC4uNWFiOTI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTIyOTQsNyArMjI5NCw3IEBAIFdl YktpdFdlYkluc3BlY3Rvciogd2Via2l0X3dlYl92aWV3X2dldF9pbnNwZWN0b3IoV2ViS2l0V2Vi Vmlldyogd2ViVmlldykKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJ RVcod2ViVmlldyksIDApOwogCiAgICAgaWYgKCF3ZWJWaWV3LT5wcml2LT5pbnNwZWN0b3IpCi0g ICAgICAgIHdlYlZpZXctPnByaXYtPmluc3BlY3RvciA9IGFkb3B0R1JlZih3ZWJraXRXZWJJbnNw ZWN0b3JDcmVhdGUodG9BUEkoZ2V0UGFnZSh3ZWJWaWV3KS0+aW5zcGVjdG9yKCkpKSk7CisgICAg ICAgIHdlYlZpZXctPnByaXYtPmluc3BlY3RvciA9IGFkb3B0R1JlZih3ZWJraXRXZWJJbnNwZWN0 b3JDcmVhdGUoZ2V0UGFnZSh3ZWJWaWV3KS0+aW5zcGVjdG9yKCkpKTsKIAogICAgIHJldHVybiB3 ZWJWaWV3LT5wcml2LT5pbnNwZWN0b3IuZ2V0KCk7CiB9Cg==