127315 2014-01-20 15:04:10 -0800 Give each page a UserContentController 2014-01-20 15:17:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 970032 0 andersca 2014-01-20 15:04:10 -0800 Give each page a UserContentController 970033 1 221695 andersca 2014-01-20 15:06:05 -0800 Created attachment 221695 Patch 970035 2 221695 kling 2014-01-20 15:13:39 -0800 Comment on attachment 221695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221695&action=review K. r=me > Source/WebCore/page/Page.h:423 > + UserContentController* userContentController() const { return m_userContentController.get(); } I'd make this non-const. This looks very 2012. 970037 3 andersca 2014-01-20 15:17:20 -0800 Committed r162380: <http://trac.webkit.org/changeset/162380> 221695 2014-01-20 15:06:05 -0800 2014-01-20 15:13:39 -0800 Patch bug-127315-20140120150604.patch text/plain 7697 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc2N2JlZmIzOWU0MTE5 N2U2ODYwYWE5ZjcxNzlkNmQxYjg2NDQzMy4uMDZkOWIyODI1ZTYwYmJkYzE1N2JmNWI0YmE0NTRh MmE0NGEyZjBkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE0LTAxLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2l2ZSBlYWNoIHBh Z2UgYSBVc2VyQ29udGVudENvbnRyb2xsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNzMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhIFVzZXJDb250ZW50Q29udHJvbGxlciBvYmplY3QgdG8g UGFnZUdyb3VwIGFuZCBoYXZlIHRoZSBwYWdlIGdyb3VwIHNldCBpdCBvbiBhbnkKKyAgICAgICAg cGFnZXMgdGhhdCBhcmUgYWRkZWQgdG8gdGhlIHBhZ2UgZ3JvdXAuCisKKyAgICAgICAgVGhpcyBp cyBhbm90aGVyIHN0ZXAgdG93YXJkcyBtb3ZpbmcgaGFuZGxpbmcgb2YgdXNlciBjb250ZW50IGF3 YXkgZnJvbSBQYWdlR3JvdXAgYW5kIG1ha2UgaXQKKyAgICAgICAgcG9zc2libGUgZm9yIGVhY2gg cGFnZSB0byBoYXZlIGRpZmZlcmVudCB1c2VyIGNvbnRlbnQuCisKKyAgICAgICAgKiBwYWdlL1Bh Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6flBhZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6UGFnZTo6c2V0VXNlckNvbnRlbnRDb250cm9sbGVyKToKKyAgICAgICAgKiBwYWdlL1BhZ2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnVzZXJDb250ZW50Q29udHJvbGxlcik6CisgICAg ICAgICogcGFnZS9QYWdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpQ YWdlR3JvdXApOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjphZGRQYWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6cmVtb3ZlUGFnZSk6CisgICAgICAgICogcGFnZS9QYWdl R3JvdXAuaDoKKyAgICAgICAgKiBwYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpVc2VyQ29udGVudENvbnRyb2xsZXI6OmFkZFBhZ2UpOgorICAgICAgICAo V2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVQYWdlKToKKyAgICAgICAgKiBw YWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oOgorCisyMDE0LTAxLTIwICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIGVtcHR5IFVzZXJDb250ZW50 Q29udHJvbGxlciBjbGFzcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI3MzAwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTg2MTI5Nj4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuY3BwCmluZGV4IDRjOGY2NDM1MjVlNjgwZTAyZDc2MGVkNTcwNTIxNTIzMzIwYmViOWEu LjRkYjM3N2E4M2I0MjRiNGIyMWIyNzk4YTZhMmFkMjVlMDM2MThjOGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcApAQCAtODIsNiArODIsNyBAQAogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKICNpbmNs dWRlICJTdWJmcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJjZURlY29kZXIuaCIK KyNpbmNsdWRlICJVc2VyQ29udGVudENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJWaXNpdGVkTGlu a1N0YXRlLmgiCiAjaW5jbHVkZSAiVm9pZENhbGxiYWNrLmgiCiAjaW5jbHVkZSAiV2lkZ2V0Lmgi CkBAIC0yNDAsNiArMjQxLDkgQEAgUGFnZTo6flBhZ2UoKQogI2lmbmRlZiBOREVCVUcKICAgICBw YWdlQ291bnRlci5kZWNyZW1lbnQoKTsKICNlbmRpZgorCisgICAgaWYgKG1fdXNlckNvbnRlbnRD b250cm9sbGVyKQorICAgICAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlUGFnZSgq dGhpcyk7CiB9CiAKIHVpbnQ2NF90IFBhZ2U6OnJlbmRlclRyZWVTaXplKCkgY29uc3QKQEAgLTE1 NzcsNiArMTU4MSwxNyBAQCBib29sIFBhZ2U6OmlzQW55RnJhbWVIYW5kbGluZ0JlZm9yZVVubG9h ZEV2ZW50KCkKICAgICByZXR1cm4gbV9mcmFtZXNIYW5kbGluZ0JlZm9yZVVubG9hZEV2ZW50Owog fQogCit2b2lkIFBhZ2U6OnNldFVzZXJDb250ZW50Q29udHJvbGxlcihVc2VyQ29udGVudENvbnRy b2xsZXIqIHVzZXJDb250ZW50Q29udHJvbGxlcikKK3sKKyAgICBpZiAobV91c2VyQ29udGVudENv bnRyb2xsZXIpCisgICAgICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVQYWdlKCp0 aGlzKTsKKworICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyID0gdXNlckNvbnRlbnRDb250cm9s bGVyOworCisgICAgaWYgKG1fdXNlckNvbnRlbnRDb250cm9sbGVyKQorICAgICAgICBtX3VzZXJD b250ZW50Q29udHJvbGxlci0+YWRkUGFnZSgqdGhpcyk7Cit9CisKIFBhZ2U6OlBhZ2VDbGllbnRz OjpQYWdlQ2xpZW50cygpCiAgICAgOiBhbHRlcm5hdGl2ZVRleHRDbGllbnQobnVsbHB0cikKICAg ICAsIGNocm9tZUNsaWVudChudWxscHRyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCAwZTUxNzk3Y2ZhODY4 YjFlYjQ4NDAyNWE3MjUyZjYxNDdjNzhlMjhlLi41ZTg2ODAyMGM5NTJiZDRhYWE1OWVjNDFkNWI5 ZDRkMmJlY2ZhOGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMTAxLDYgKzEwMSw3IEBAIGNsYXNzIFNj cm9sbGFibGVBcmVhOwogY2xhc3MgU2Nyb2xsaW5nQ29vcmRpbmF0b3I7CiBjbGFzcyBTZXR0aW5n czsKIGNsYXNzIFN0b3JhZ2VOYW1lc3BhY2U7CitjbGFzcyBVc2VyQ29udGVudENvbnRyb2xsZXI7 CiBjbGFzcyBWYWxpZGF0aW9uTWVzc2FnZUNsaWVudDsKIAogdHlwZWRlZiB1aW50NjRfdCBMaW5r SGFzaDsKQEAgLTQxOCw2ICs0MTksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMYXN0U3BhdGlh bE5hdmlnYXRpb25DYW5kaWRhdGVDb3VudCh1bnNpZ25lZCBjb3VudCkgeyBtX2xhc3RTcGF0aWFs TmF2aWdhdGlvbkNhbmRpZGF0ZXNDb3VudCA9IGNvdW50OyB9CiAgICAgdW5zaWduZWQgbGFzdFNw YXRpYWxOYXZpZ2F0aW9uQ2FuZGlkYXRlQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2xhc3RTcGF0 aWFsTmF2aWdhdGlvbkNhbmRpZGF0ZXNDb3VudDsgfQogCisgICAgdm9pZCBzZXRVc2VyQ29udGVu dENvbnRyb2xsZXIoVXNlckNvbnRlbnRDb250cm9sbGVyKik7CisgICAgVXNlckNvbnRlbnRDb250 cm9sbGVyKiB1c2VyQ29udGVudENvbnRyb2xsZXIoKSBjb25zdCB7IHJldHVybiBtX3VzZXJDb250 ZW50Q29udHJvbGxlci5nZXQoKTsgfQorCiBwcml2YXRlOgogICAgIHZvaWQgaW5pdEdyb3VwKCk7 CiAKQEAgLTU1Niw2ICs1NjAsOCBAQCBwcml2YXRlOgogCiAgICAgdW5zaWduZWQgbV9sYXN0U3Bh dGlhbE5hdmlnYXRpb25DYW5kaWRhdGVzQ291bnQ7CiAgICAgdW5zaWduZWQgbV9mcmFtZXNIYW5k bGluZ0JlZm9yZVVubG9hZEV2ZW50OworCisgICAgUmVmUHRyPFVzZXJDb250ZW50Q29udHJvbGxl cj4gbV91c2VyQ29udGVudENvbnRyb2xsZXI7CiB9OwogCiBpbmxpbmUgUGFnZUdyb3VwJiBQYWdl Ojpncm91cCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAKaW5kZXggZTQzNTU3NmMzZGU1Yjg3 YjEwODc0M2VmOThlZmJlZWViNjBmY2ZiYS4uYjdmY2QyMjJiYWM0ODNhNDU0MDFjOGI1MGQ4NzBj ZGY1YjJjYjRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcApAQCAtMzgsNiArMzgsNyBA QAogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNp bmNsdWRlICJTdG9yYWdlTmFtZXNwYWNlLmgiCisjaW5jbHVkZSAiVXNlckNvbnRlbnRDb250cm9s bGVyLmgiCiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCiAjaWYgRU5BQkxFKFZJREVP X1RSQUNLKQpAQCAtNjQsNiArNjUsNyBAQCBQYWdlR3JvdXA6OlBhZ2VHcm91cChjb25zdCBTdHJp bmcmIG5hbWUpCiAgICAgOiBtX25hbWUobmFtZSkKICAgICAsIG1fdmlzaXRlZExpbmtzUG9wdWxh dGVkKGZhbHNlKQogICAgICwgbV9pZGVudGlmaWVyKGdldFVuaXF1ZUlkZW50aWZpZXIoKSkKKyAg ICAsIG1fdXNlckNvbnRlbnRDb250cm9sbGVyKFVzZXJDb250ZW50Q29udHJvbGxlcjo6Y3JlYXRl KCkpCiAgICAgLCBtX2dyb3VwU2V0dGluZ3Moc3RkOjptYWtlX3VuaXF1ZTxHcm91cFNldHRpbmdz PigpKQogewogfQpAQCAtMTY5LDEyICsxNzEsMTYgQEAgdm9pZCBQYWdlR3JvdXA6OmFkZFBhZ2Uo UGFnZSYgcGFnZSkKIHsKICAgICBBU1NFUlQoIW1fcGFnZXMuY29udGFpbnMoJnBhZ2UpKTsKICAg ICBtX3BhZ2VzLmFkZCgmcGFnZSk7CisKKyAgICBwYWdlLnNldFVzZXJDb250ZW50Q29udHJvbGxl cihtX3VzZXJDb250ZW50Q29udHJvbGxlci5nZXQoKSk7CiB9CiAKIHZvaWQgUGFnZUdyb3VwOjpy ZW1vdmVQYWdlKFBhZ2UmIHBhZ2UpCiB7CiAgICAgQVNTRVJUKG1fcGFnZXMuY29udGFpbnMoJnBh Z2UpKTsKICAgICBtX3BhZ2VzLnJlbW92ZSgmcGFnZSk7CisKKyAgICBwYWdlLnNldFVzZXJDb250 ZW50Q29udHJvbGxlcihudWxscHRyKTsKIH0KIAogYm9vbCBQYWdlR3JvdXA6OmlzTGlua1Zpc2l0 ZWQoTGlua0hhc2ggdmlzaXRlZExpbmtIYXNoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlR3JvdXAuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKaW5kZXgg MjU1MWVjMDU1OTY5NWU5YWRlMTg2NWQzYjJlYzU5NDM4ODQxMDAwNC4uZDYyZTQ2ODUyMjliYjA4 NmU4ZTI0YmQwYzMwMjI1YjNkNjg4NTRmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlR3JvdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oCkBAIC00 Miw2ICs0Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBQYWdlOwogICAgIGNs YXNzIFNlY3VyaXR5T3JpZ2luOwogICAgIGNsYXNzIFN0b3JhZ2VOYW1lc3BhY2U7CisgICAgY2xh c3MgVXNlckNvbnRlbnRDb250cm9sbGVyOwogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAg IGNsYXNzIENhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWRMaXN0ZW5lcjsKQEAgLTEyMyw2ICsxMjQs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFJlZlB0cjxTdG9yYWdlTmFtZXNwYWNl PiBtX2xvY2FsU3RvcmFnZTsKICAgICAgICAgSGFzaE1hcDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+ LCBSZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4+IG1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTWFwOwog CisgICAgICAgIFJlZlB0cjxVc2VyQ29udGVudENvbnRyb2xsZXI+IG1fdXNlckNvbnRlbnRDb250 cm9sbGVyOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8VXNlclNjcmlwdE1hcD4gbV91c2VyU2Ny aXB0czsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFVzZXJTdHlsZVNoZWV0TWFwPiBtX3VzZXJT dHlsZVNoZWV0czsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVu dENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xs ZXIuY3BwCmluZGV4IDBjYzYxMDRlMGQ3NTM4ODFjMDg1OWZlOTk0NmYzN2M4YTIxZjI5MGEuLjFm OTliYTQ5ZmU1NDA3NWVjMDIwYjBiYWQxYTdmOGFjY2FiYzdkODAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAKQEAgLTI2LDYgKzI2LDkgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJVc2VyQ29udGVudENvbnRyb2xsZXIuaCIKIAor I2luY2x1ZGUgIkRPTVdyYXBwZXJXb3JsZC5oIgorI2luY2x1ZGUgIlVzZXJTY3JpcHQuaCIKKwog bmFtZXNwYWNlIFdlYkNvcmUgewogCiBSZWZQdHI8VXNlckNvbnRlbnRDb250cm9sbGVyPiBVc2Vy Q29udGVudENvbnRyb2xsZXI6OmNyZWF0ZSgpCkBAIC00MSw0ICs0NCwxNiBAQCBVc2VyQ29udGVu dENvbnRyb2xsZXI6On5Vc2VyQ29udGVudENvbnRyb2xsZXIoKQogewogfQogCit2b2lkIFVzZXJD b250ZW50Q29udHJvbGxlcjo6YWRkUGFnZShQYWdlJiBwYWdlKQoreworICAgIEFTU0VSVCghbV9w YWdlcy5jb250YWlucygmcGFnZSkpOworICAgIG1fcGFnZXMuYWRkKCZwYWdlKTsKK30KKwordm9p ZCBVc2VyQ29udGVudENvbnRyb2xsZXI6OnJlbW92ZVBhZ2UoUGFnZSYgcGFnZSkKK3sKKyAgICBB U1NFUlQobV9wYWdlcy5jb250YWlucygmcGFnZSkpOworICAgIG1fcGFnZXMucmVtb3ZlKCZwYWdl KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNl ckNvbnRlbnRDb250cm9sbGVyLmgKaW5kZXggYWM4YzQ1Mzk5NTAwNjRmYzViNThlMGNhMDAyNmIy MGIwNWQyMDM5Ni4uNzY1MjlkMmQ0ZTVmZGNjM2U1MGI2MmJhNjMyNzE1MTQyN2IzNzNmNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCkBAIC0yNiwxOCAr MjYsMzEgQEAKICNpZm5kZWYgVXNlckNvbnRlbnRDb250cm9sbGVyX2gKICNkZWZpbmUgVXNlckNv bnRlbnRDb250cm9sbGVyX2gKIAorI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CisjaW5jbHVkZSA8 d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0 Zi9SZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAorY2xhc3MgRE9NV3JhcHBlcldvcmxkOworY2xhc3MgUGFnZTsKK2NsYXNzIFVSTDsKK2Ns YXNzIFVzZXJTY3JpcHQ7CisKIGNsYXNzIFVzZXJDb250ZW50Q29udHJvbGxlciA6IHB1YmxpYyBS ZWZDb3VudGVkPFVzZXJDb250ZW50Q29udHJvbGxlcj4gewogcHVibGljOgogICAgIHN0YXRpYyBS ZWZQdHI8VXNlckNvbnRlbnRDb250cm9sbGVyPiBjcmVhdGUoKTsKICAgICB+VXNlckNvbnRlbnRD b250cm9sbGVyKCk7CiAKKyAgICB2b2lkIGFkZFBhZ2UoUGFnZSYpOworICAgIHZvaWQgcmVtb3Zl UGFnZShQYWdlJik7CisKIHByaXZhdGU6CiAgICAgVXNlckNvbnRlbnRDb250cm9sbGVyKCk7CisK KyAgICBIYXNoU2V0PFBhZ2UqPiBtX3BhZ2VzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQo=