140414 2015-01-13 15:04:44 -0800 Convert WebUserContentControllerProxy to an API::Object bridged to WKUserContentController 2015-01-18 18:04:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140429 140432 1 sam sam cdumez commit-queue oldest_to_newest 1060955 0 sam 2015-01-13 15:04:44 -0800 Convert WebUserContentControllerProxy to an API::Object bridged to WKUserContentController 1060957 1 244552 sam 2015-01-13 15:06:43 -0800 Created attachment 244552 Patch 1060975 2 sam 2015-01-13 15:35:17 -0800 Committed r178385: <http://trac.webkit.org/changeset/178385> 1061027 3 cdumez 2015-01-13 18:35:42 -0800 Seems to have broken GTK build: Last 500 characters of output: rocess/API/gtk/WebKitUserContentManager.cpp ../../Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp: In constructor '_WebKitUserContentManagerPrivate::_WebKitUserContentManagerPrivate()': ../../Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp:37:33: error: 'create' is not a member of 'WebKit::WebUserContentControllerProxy' : userContentController(WebUserContentControllerProxy::create()) ^ ninja: build stopped: subcommand failed. 1061127 4 commit-queue 2015-01-14 02:11:56 -0800 Re-opened since this is blocked by bug 140432 244552 2015-01-13 15:06:43 -0800 2015-01-13 15:33:07 -0800 Patch bug-140414-20150113150650.patch text/plain 7078 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3ODM3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAxLTEzICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29udmVydCBXZWJVc2VyQ29udGVudENv bnRyb2xsZXJQcm94eSB0byBhbiBBUEk6Ok9iamVjdCBicmlkZ2VkIHRvIFdLVXNlckNvbnRlbnRD b250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDA0MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNoYXJlZC9BUEkvQVBJT2JqZWN0Lmg6CisgICAgICAgIEFkZCBUeXBlOjpVc2VyQ29udGVu dENvbnRyb2xsZXIuCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tOgorICAg ICAgICAoQVBJOjpPYmplY3Q6Om5ld09iamVjdCk6CisgICAgICAgIEFsbG9jYXRlIFdlYlVzZXJD b250ZW50Q29udHJvbGxlclByb3h5IHVzaW5nIFtXS1VzZXJDb250ZW50Q29udHJvbGxlciBhbGxv Y10uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlckNvbnRlbnRDb250cm9s bGVyLm1tOgorICAgICAgICAoLVtXS1VzZXJDb250ZW50Q29udHJvbGxlciBpbml0XSk6CisgICAg ICAgICgtW1dLVXNlckNvbnRlbnRDb250cm9sbGVyIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV0tV c2VyQ29udGVudENvbnRyb2xsZXIgX2FwaU9iamVjdF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvV0tVc2VyQ29udGVudENvbnRyb2xsZXJJbnRlcm5hbC5oOgorICAgICAgICAoV2Vi S2l0Ojp3cmFwcGVyKToKKyAgICAgICAgQ29udmVydCB0byB1c2luZyBBUEk6Ok9iamVjdFN0b3Jh Z2UgZm9yIHRoZSBpbnRlcm5hbCBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5Ojpj cmVhdGUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2Vy Q29udGVudENvbnRyb2xsZXJQcm94eS5oOgorICAgICAgICBDb252ZXJ0IHRvIGluaGVyaXQgZnJv bSBBUEk6Ok9iamVjdEltcGw8PiBhbmQgcmVtb3ZlIGNyZWF0ZSBmdW5jdGlvbi4KKwogMjAxNS0w MS0xMyAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbQ01ha2VdIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxNzgzNjYuCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL0FQSU9iamVjdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvQVBJT2JqZWN0LmgJKHJldmlzaW9uIDE3ODM3NCkKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvQVBJT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTEzNCw2ICsxMzQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFByZWZlcmVuY2VzLAogICAgICAgICBT ZXNzaW9uLAogICAgICAgICBUZXh0Q2hlY2tlciwKKyAgICAgICAgVXNlckNvbnRlbnRDb250cm9s bGVyLAogICAgICAgICBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdCwKICAgICAgICAgVmlicmF0 aW9uLAogICAgICAgICBWaWV3cG9ydEF0dHJpYnV0ZXMsCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9Db2NvYS9BUElPYmplY3QubW0JKHJldmlzaW9uIDE3ODM3NCkKKysrIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9Db2NvYS9BUElPYmplY3QubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0 LDcgQEAKICNpbXBvcnQgIldLTmF2aWdhdGlvbkRhdGFJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tO YXZpZ2F0aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLUHJvY2Vzc1Bvb2xJbnRlcm5hbC5oIgor I2ltcG9ydCAiV0tVc2VyQ29udGVudENvbnRyb2xsZXJJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tX ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVySW50ZXJuYWwuaCIKICNpbXBv cnQgIldLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2ViUHJv Y2Vzc1BsdWdJbkhpdFRlc3RSZXN1bHRJbnRlcm5hbC5oIgpAQCAtMTUzLDYgKzE1NCwxMCBAQCB2 b2lkKiBPYmplY3Q6Om5ld09iamVjdChzaXplX3Qgc2l6ZSwgVHlwCiAgICAgICAgIHdyYXBwZXIg PSBOU0FsbG9jYXRlT2JqZWN0KFtXS05TVVJMUmVxdWVzdCBjbGFzc10sIHNpemUsIG51bGxwdHIp OwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgVHlwZTo6VXNlckNvbnRlbnRDb250cm9sbGVy OgorICAgICAgICB3cmFwcGVyID0gW1dLVXNlckNvbnRlbnRDb250cm9sbGVyIGFsbG9jXTsKKyAg ICAgICAgYnJlYWs7CisKICAgICBjYXNlIFR5cGU6OldlYnNpdGVEYXRhU3RvcmU6CiAgICAgICAg IHdyYXBwZXIgPSBbX1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY107CiAgICAgICAgIGJyZWFrOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VzZXJDb250ZW50Q29u dHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVXNlckNvbnRlbnRDb250cm9sbGVyLm1tCShyZXZpc2lvbiAxNzgzNzQpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlckNvbnRlbnRDb250cm9sbGVyLm1t CSh3b3JraW5nIGNvcHkpCkBAIC01MCwxMiArNTAsMTkgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXQK ICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAot ICAgIF91c2VyQ29udGVudENvbnRyb2xsZXJQcm94eSA9IFdlYktpdDo6V2ViVXNlckNvbnRlbnRD b250cm9sbGVyUHJveHk6OmNyZWF0ZSgpOworICAgIEFQSTo6T2JqZWN0Ojpjb25zdHJ1Y3RJbldy YXBwZXI8V2ViS2l0OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eT4oc2VsZik7CiAgICAg X3VzZXJTY3JpcHRzID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CiAK ICAgICByZXR1cm4gc2VsZjsKIH0KIAorLSAodm9pZClkZWFsbG9jCit7CisgICAgX3VzZXJDb250 ZW50Q29udHJvbGxlclByb3h5LT5+V2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkoKTsKKwor ICAgIFtzdXBlciBkZWFsbG9jXTsKK30KKwogLSAoTlNBcnJheSAqKXVzZXJTY3JpcHRzCiB7CiAg ICAgcmV0dXJuIF91c2VyU2NyaXB0cy5nZXQoKTsKQEAgLTEzNSw2ICsxNDIsMTMgQEAgLSAodm9p ZClyZW1vdmVTY3JpcHRNZXNzYWdlSGFuZGxlckZvck5hbQogICAgIF91c2VyQ29udGVudENvbnRy b2xsZXJQcm94eS0+cmVtb3ZlVXNlck1lc3NhZ2VIYW5kbGVyRm9yTmFtZShuYW1lKTsKIH0KIAor I3ByYWdtYSBtYXJrIFdLT2JqZWN0IHByb3RvY29sIGltcGxlbWVudGF0aW9uCisKKy0gKEFQSTo6 T2JqZWN0JilfYXBpT2JqZWN0Cit7CisgICAgcmV0dXJuICpfdXNlckNvbnRlbnRDb250cm9sbGVy UHJveHk7Cit9CisKIEBlbmQKIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLVXNlckNvbnRlbnRDb250cm9sbGVySW50ZXJuYWwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlckNvbnRlbnRDb250 cm9sbGVySW50ZXJuYWwuaAkocmV2aXNpb24gMTc4Mzc0KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1VzZXJDb250ZW50Q29udHJvbGxlckludGVybmFsLmgJKHdvcmtp bmcgY29weSkKQEAgLTI3LDE1ICsyNywyNCBAQAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAotI2lt cG9ydCA8d3RmL1JlZlB0ci5oPgorI2ltcG9ydCAiV0tPYmplY3QuaCIKKyNpbXBvcnQgIldlYlVz ZXJDb250ZW50Q29udHJvbGxlclByb3h5LmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgeworCiBjbGFz cyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eTsKKworaW5saW5lIFdLVXNlckNvbnRlbnRD b250cm9sbGVyICp3cmFwcGVyKFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5JiB1c2VyQ29u dGVudENvbnRyb2xsZXIpCit7CisgICAgQVNTRVJUKFt1c2VyQ29udGVudENvbnRyb2xsZXIud3Jh cHBlcigpIGlzS2luZE9mQ2xhc3M6W1dLVXNlckNvbnRlbnRDb250cm9sbGVyIGNsYXNzXV0pOwor ICAgIHJldHVybiAoV0tVc2VyQ29udGVudENvbnRyb2xsZXIgKil1c2VyQ29udGVudENvbnRyb2xs ZXIud3JhcHBlcigpOworfQorCiB9CiAKLUBpbnRlcmZhY2UgV0tVc2VyQ29udGVudENvbnRyb2xs ZXIgKCkgeworQGludGVyZmFjZSBXS1VzZXJDb250ZW50Q29udHJvbGxlciAoKSA8V0tPYmplY3Q+ IHsKIEBwYWNrYWdlCi0gICAgUmVmUHRyPFdlYktpdDo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVy UHJveHk+IF91c2VyQ29udGVudENvbnRyb2xsZXJQcm94eTsKKyAgICBBUEk6Ok9iamVjdFN0b3Jh Z2U8V2ViS2l0OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eT4gX3VzZXJDb250ZW50Q29u dHJvbGxlclByb3h5OwogfQogQGVuZAogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv VXNlckNvbnRlbnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENv bnRyb2xsZXJQcm94eS5jcHAJKHJldmlzaW9uIDE3ODM3NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQyLDExICs0Miw2IEBAIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUlk ZW50aWZpZXIoKQogICAgIHJldHVybiArK2lkZW50aWZpZXI7CiB9CiAKLVBhc3NSZWZQdHI8V2Vi VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk+IFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5 OjpjcmVhdGUoKQotewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViVXNlckNvbnRlbnRDb250 cm9sbGVyUHJveHkpOwotfQotCiBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eTo6V2ViVXNl ckNvbnRlbnRDb250cm9sbGVyUHJveHkoKQogICAgIDogbV9pZGVudGlmaWVyKGdlbmVyYXRlSWRl bnRpZmllcigpKQogewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1VzZXJDb250ZW50 L1dlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5 LmgJKHJldmlzaW9uIDE3ODM3NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Vc2VyQ29u dGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0y Niw2ICsyNiw3IEBACiAjaWZuZGVmIFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5X2gKICNk ZWZpbmUgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHlfaAogCisjaW5jbHVkZSAiQVBJT2Jq ZWN0LmgiCiAjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVyLmgiCiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgpAQCAtNDgsOSArNDksOSBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIGNsYXNzIFdlYlByb2Nlc3NQcm94eTsKIGNsYXNzIFdlYlNjcmlwdE1lc3Nh Z2VIYW5kbGVyOwogCi1jbGFzcyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSA6IHB1Ymxp YyBSZWZDb3VudGVkPFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5PiwgcHJpdmF0ZSBJUEM6 Ok1lc3NhZ2VSZWNlaXZlciB7CitjbGFzcyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSA6 IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OlVzZXJDb250ZW50Q29u dHJvbGxlcj4sIHByaXZhdGUgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogcHVibGljOgotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5PiBjcmVhdGUoKTsK KyAgICBleHBsaWNpdCBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSgpOwogICAgIH5XZWJV c2VyQ29udGVudENvbnRyb2xsZXJQcm94eSgpOwogCiAgICAgdWludDY0X3QgaWRlbnRpZmllcigp IGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQpAQCAtNjksOCArNzAsNiBAQCBwdWJsaWM6 CiAgICAgdm9pZCByZW1vdmVVc2VyTWVzc2FnZUhhbmRsZXJGb3JOYW1lKGNvbnN0IFN0cmluZyYp OwogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5 KCk7Ci0KICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlci4KICAgICB2aXJ0dWFsIHZvaWQgZGlk UmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpNZXNzYWdlRGVjb2RlciYpIG92 ZXJyaWRlOwogCg==