173408 2017-06-15 04:05:50 -0700 [GTK] Do not use the C API in WebGtkExtensionManager 2017-06-15 08:37:42 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply buildbot mcatanzaro zan oldest_to_newest 1319526 0 cgarcia 2017-06-15 04:05:50 -0700 Use the C++ API instead. 1319527 1 312969 cgarcia 2017-06-15 04:07:56 -0700 Created attachment 312969 Patch 1319528 2 buildbot 2017-06-15 04:10:07 -0700 Attachment 312969 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp:22: You should add a blank line after implementation file's own header. [build/include_order] [4] ERROR: Source/WebKit2/WebProcess/gtk/WebGtkInjectedBundleMain.cpp:22: You should not add a blank line before implementation file's own header. [build/include_order] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1319560 3 312969 mcatanzaro 2017-06-15 06:47:58 -0700 Comment on attachment 312969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312969&action=review > Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp:-56 > - ASSERT(userData); Why did you remove this line? I would keep it. 1319561 4 312969 cgarcia 2017-06-15 06:50:45 -0700 Comment on attachment 312969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312969&action=review > Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.cpp:92 > + ASSERT(userDataObject); Because it's now checked earlier here :-) 1319580 5 cgarcia 2017-06-15 08:37:42 -0700 Committed r218331: <http://trac.webkit.org/changeset/218331> 312969 2017-06-15 04:07:56 -0700 2017-06-15 06:47:58 -0700 Patch wk2-extensions.diff text/plain 6204 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAzZjEwNDVjYmMzYi4uZWQ4 ZmJjNzBiMzQgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAxNy0wNi0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS10gRG8gbm90IHVzZSB0aGUgQyBBUEkgaW4gV2ViR3RrRXh0 ZW5zaW9uTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTczNDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXBkYXRlIGV4cG9ydGVkIHN5bWJvbCBzaWduYXR1cmUuCisKKyAgICAgICAgKiBTb3Vy Y2UvY21ha2UvZ3Rrc3ltYm9scy5maWx0ZXI6CisKIDIwMTctMDYtMDkgIFphbiBEb2JlcnNlayAg PHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIEVuYWJsZSBFTkNSWVBURURf TUVESUEgZm9yIGJ1aWxkLXdlYmtpdCBidWlsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAzMTZhYjJmMTQ0Ny4u YjI1ZTllNmI0ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxNy0wNi0xNSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10g RG8gbm90IHVzZSB0aGUgQyBBUEkgaW4gV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNDA4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBDKysgQVBJIGlu c3RlYWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6cGFyc2VVc2VyRGF0YSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OmluaXRpYWxpemUpOgorICAgICAgICAqIFdlYlByb2Nl c3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2d0 ay9XZWJHdGtJbmplY3RlZEJ1bmRsZU1haW4uY3BwOgorICAgICAgICAoV0tCdW5kbGVJbml0aWFs aXplKToKKworMjAxNy0wNi0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CisKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IGNvcHktcGFzdGUgZXJyb3IgaW4gR1RL KyBXRUJLSVRfSkFWQVNDUklQVF9FUlJPUiBkZWZpbml0aW9uLgogCiAgICAgICAgIFRoZSBwcmlu dCBvbmUgd2FzIGNvcGllZCB0aGVyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9ndGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5jcHAKaW5kZXggMzZiOWJmMDZmZmIu LjMyZGFkNGI3ODQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9X ZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmNwcApAQCAtMjAsMTEgKzIwLDggQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmgiCiAKKyNp bmNsdWRlICJBUElTdHJpbmcuaCIKICNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZS5oIgotI2luY2x1 ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgotI2luY2x1ZGUgIldLRGljdGlvbmFyeS5oIgotI2luY2x1 ZGUgIldLU3RyaW5nLmgiCi0jaW5jbHVkZSAiV0tUeXBlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2Vi RXh0ZW5zaW9uUHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2lu Y2x1ZGUgPG1lbW9yeT4KQEAgLTUxLDEyICs0OCwxMSBAQCB2b2lkIFdlYkd0a0V4dGVuc2lvbk1h bmFnZXI6OnNjYW5Nb2R1bGVzKGNvbnN0IFN0cmluZyYgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwg VgogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgcGFyc2VVc2VyRGF0YShXS1R5cGVSZWYgdXNlckRh dGEsIFN0cmluZyYgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwgR1JlZlB0cjxHVmFyaWFudD4mIGlu aXRpYWxpemF0aW9uVXNlckRhdGEpCitzdGF0aWMgdm9pZCBwYXJzZVVzZXJEYXRhKEFQSTo6T2Jq ZWN0KiB1c2VyRGF0YSwgU3RyaW5nJiB3ZWJFeHRlbnNpb25zRGlyZWN0b3J5LCBHUmVmUHRyPEdW YXJpYW50PiYgaW5pdGlhbGl6YXRpb25Vc2VyRGF0YSkKIHsKLSAgICBBU1NFUlQodXNlckRhdGEp OwotICAgIEFTU0VSVChXS0dldFR5cGVJRCh1c2VyRGF0YSkgPT0gV0tTdHJpbmdHZXRUeXBlSUQo KSk7CisgICAgQVNTRVJUKHVzZXJEYXRhLT50eXBlKCkgPT0gQVBJOjpPYmplY3Q6OlR5cGU6OlN0 cmluZyk7CiAKLSAgICBDU3RyaW5nIHVzZXJEYXRhU3RyaW5nID0gdG9JbXBsKHN0YXRpY19jYXN0 PFdLU3RyaW5nUmVmPih1c2VyRGF0YSkpLT5zdHJpbmcoKS51dGY4KCk7CisgICAgQ1N0cmluZyB1 c2VyRGF0YVN0cmluZyA9IHN0YXRpY19jYXN0PEFQSTo6U3RyaW5nKj4odXNlckRhdGEpLT5zdHJp bmcoKS51dGY4KCk7CiAgICAgR1JlZlB0cjxHVmFyaWFudD4gdmFyaWFudCA9IGdfdmFyaWFudF9w YXJzZShudWxscHRyLCB1c2VyRGF0YVN0cmluZy5kYXRhKCksCiAgICAgICAgIHVzZXJEYXRhU3Ry aW5nLmRhdGEoKSArIHVzZXJEYXRhU3RyaW5nLmxlbmd0aCgpLCBudWxscHRyLCBudWxscHRyKTsK IApAQCAtOTAsMTMgKzg2LDE1IEBAIGJvb2wgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcjo6aW5pdGlh bGl6ZVdlYkV4dGVuc2lvbihNb2R1bGUqIGV4dGVuc2lvbk1vZHVsZSwgR1ZhCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCi12b2lkIFdlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OmluaXRpYWxpemUoV0tC dW5kbGVSZWYgYnVuZGxlLCBXS1R5cGVSZWYgdXNlckRhdGFTdHJpbmcpCit2b2lkIFdlYkd0a0V4 dGVuc2lvbk1hbmFnZXI6OmluaXRpYWxpemUoSW5qZWN0ZWRCdW5kbGUqIGJ1bmRsZSwgQVBJOjpP YmplY3QqIHVzZXJEYXRhT2JqZWN0KQogewotICAgIG1fZXh0ZW5zaW9uID0gYWRvcHRHUmVmKHdl YmtpdFdlYkV4dGVuc2lvbkNyZWF0ZSh0b0ltcGwoYnVuZGxlKSkpOworICAgIEFTU0VSVChidW5k bGUpOworICAgIEFTU0VSVCh1c2VyRGF0YU9iamVjdCk7CisgICAgbV9leHRlbnNpb24gPSBhZG9w dEdSZWYod2Via2l0V2ViRXh0ZW5zaW9uQ3JlYXRlKGJ1bmRsZSkpOwogCiAgICAgU3RyaW5nIHdl YkV4dGVuc2lvbnNEaXJlY3Rvcnk7CiAgICAgR1JlZlB0cjxHVmFyaWFudD4gdXNlckRhdGE7Ci0g ICAgcGFyc2VVc2VyRGF0YSh1c2VyRGF0YVN0cmluZywgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwg dXNlckRhdGEpOworICAgIHBhcnNlVXNlckRhdGEodXNlckRhdGFPYmplY3QsIHdlYkV4dGVuc2lv bnNEaXJlY3RvcnksIHVzZXJEYXRhKTsKIAogICAgIGlmICh3ZWJFeHRlbnNpb25zRGlyZWN0b3J5 LmlzTnVsbCgpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmgKaW5kZXggODg0Y2EzOWY0MjQu LmRiNDhhZmEzNjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9X ZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9n dGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5oCkBAIC0xNywxMSArMTcsOSBAQAogICogQm9zdG9u LCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI2lmbmRlZiBXZWJHdGtFeHRlbnNpb25NYW5h Z2VyX2gKLSNkZWZpbmUgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcl9oCisjcHJhZ21hIG9uY2UKIAog I2luY2x1ZGUgIk1vZHVsZS5oIgotI2luY2x1ZGUgIldLQnVuZGxlLmgiCiAjaW5jbHVkZSA8d3Rm L05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgpAQCAtMjksMTkgKzI3LDIxIEBACiAKIHR5cGVkZWYgc3RydWN0IF9X ZWJLaXRXZWJFeHRlbnNpb24gV2ViS2l0V2ViRXh0ZW5zaW9uOwogCi1uYW1lc3BhY2UgV1RGIHsK LWNsYXNzIFN0cmluZzsKK25hbWVzcGFjZSBBUEkgeworY2xhc3MgT2JqZWN0OwogfQogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgSW5qZWN0ZWRCdW5kbGU7CisKIGNsYXNzIFdlYkd0a0V4 dGVuc2lvbk1hbmFnZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFdlYkd0a0V4dGVuc2lv bk1hbmFnZXIpOwogCiBwdWJsaWM6Ci0gICAgV0tfRVhQT1JUIHN0YXRpYyBXZWJHdGtFeHRlbnNp b25NYW5hZ2VyJiBzaW5nbGV0b24oKTsKKyAgICBzdGF0aWMgV2ViR3RrRXh0ZW5zaW9uTWFuYWdl ciYgc2luZ2xldG9uKCk7CiAKLSAgICBXS19FWFBPUlQgdm9pZCBpbml0aWFsaXplKFdLQnVuZGxl UmVmLCBXS1R5cGVSZWYpOworICAgIHZvaWQgaW5pdGlhbGl6ZShJbmplY3RlZEJ1bmRsZSosIEFQ STo6T2JqZWN0Kik7CiAKIHByaXZhdGU6CiAgICAgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcigpOwpA QCAtNTYsNSArNTYsMyBAQCBwcml2YXRlOgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Ci0K LSNlbmRpZiAvLyBXZWJHdGtFeHRlbnNpb25NYW5hZ2VyX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0luamVjdGVkQnVuZGxlTWFpbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJHdGtJbmplY3RlZEJ1bmRsZU1haW4uY3BwCmlu ZGV4IDAwMzdjZDQ3Njk0Li5lMGEzZDRmMzAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9ndGsvV2ViR3RrSW5qZWN0ZWRCdW5kbGVNYWluLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJHdGtJbmplY3RlZEJ1bmRsZU1haW4uY3BwCkBAIC0x OSw3ICsxOSw5IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAorI2luY2x1ZGUgIkluamVjdGVk QnVuZGxlLmgiCiAjaW5jbHVkZSAiV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5oIgorI2luY2x1ZGUg PFdlYktpdC9XS0J1bmRsZUFQSUNhc3QuaD4KICNpbmNsdWRlIDxXZWJLaXQvV0tCdW5kbGVJbml0 aWFsaXplLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC0zMSw1ICszMyw1IEBAIGV4 dGVybiAiQyIKICNlbmRpZgogdm9pZCBXS0J1bmRsZUluaXRpYWxpemUoV0tCdW5kbGVSZWYgYnVu ZGxlLCBXS1R5cGVSZWYgdXNlckRhdGEpCiB7Ci0gICAgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcjo6 c2luZ2xldG9uKCkuaW5pdGlhbGl6ZShidW5kbGUsIHVzZXJEYXRhKTsKKyAgICBXZWJHdGtFeHRl bnNpb25NYW5hZ2VyOjpzaW5nbGV0b24oKS5pbml0aWFsaXplKHRvSW1wbChidW5kbGUpLCB0b0lt cGwodXNlckRhdGEpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9ndGtzeW1ib2xzLmZp bHRlciBiL1NvdXJjZS9jbWFrZS9ndGtzeW1ib2xzLmZpbHRlcgppbmRleCAzOWFiMDljMWQxNi4u MDE0MDg4MzU0YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9ndGtzeW1ib2xzLmZpbHRlcgor KysgYi9Tb3VyY2UvY21ha2UvZ3Rrc3ltYm9scy5maWx0ZXIKQEAgLTUsNyArNSw3IEBAIGdsb2Jh bDoKICAgTmV0d29ya1Byb2Nlc3NNYWluVW5peDsKICAgUGx1Z2luUHJvY2Vzc01haW5Vbml4Owog ICBEYXRhYmFzZVByb2Nlc3NNYWluVW5peDsKLSAgX1pONldlYktpdDIyV2ViR3RrRXh0ZW5zaW9u TWFuYWdlcjEwaW5pdGlhbGl6ZUVQSzE0T3BhcXVlV0tCdW5kbGVQS3Y7CisgIF9aTjZXZWJLaXQy MldlYkd0a0V4dGVuc2lvbk1hbmFnZXIxMGluaXRpYWxpemVFUE5TXzE0SW5qZWN0ZWRCdW5kbGVF UE4zQVBJNk9iamVjdEU7CiAgIF9aTjZXZWJLaXQyMldlYkd0a0V4dGVuc2lvbk1hbmFnZXI5c2lu Z2xldG9uRXY7CiBsb2NhbDoKICAgd2Via2l0X21lZGlhX3BsYXllcl9kZWJ1ZzsK