139993 2014-12-29 11:23:24 -0800 Convert injected bundle message posting to UserData 2014-12-29 11:27:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1058118 0 andersca 2014-12-29 11:23:24 -0800 Convert injected bundle message posting to UserData 1058119 1 243803 andersca 2014-12-29 11:23:50 -0800 Created attachment 243803 Patch 1058120 2 andersca 2014-12-29 11:27:33 -0800 Committed r177803: <http://trac.webkit.org/changeset/177803> 243803 2014-12-29 11:23:50 -0800 2014-12-29 11:26:07 -0800 Patch bug-139993-20141229112356.patch text/plain 6180 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmE3NmEzMGY4ZmE3OWE1 YTJhMjFlZjdkMDY3ZmNmODNkMmZjOTg5YS4uY2RkOTFiNWMyNTMyNTcwMGZkZjQ0N2ZmZmNmMjJm MjJmNTVkYTJlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTEyLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ29udmVydCBpbmpl Y3RlZCBidW5kbGUgbWVzc2FnZSBwb3N0aW5nIHRvIFVzZXJEYXRhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5OTMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9j ZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBvc3RNZXNzYWdlVG9Jbmpl Y3RlZEJ1bmRsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6aGFuZGxlSW5qZWN0ZWRCdW5kbGVNZXNzYWdlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cG9zdEluamVjdGVkQnVuZGxlTWVzc2FnZSk6IERl bGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorCisyMDE0LTEyLTI5ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQ29udmVydCBhbGwgdmFyaWFk aWMgd2ViIHByb2Nlc3MgbWVzc2FnZXMgdG8gVXNlckRhdGEKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTk5MQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBjYjM0YWRlMWMxYjc4MjhhMmFiN2Q3Njk0 NGUwZjQwYjQ5MzM2YTNkLi5mMDZkMDE1YzVkMWU4M2JlYTc4NjM2NDdlOTFmZDMyMzA4NTVkYTgw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTcy MCwxMyArNzIwLDkgQEAgV2ViUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTmV3 V2ViUHJvY2VzcygpCiAKICAgICBpZiAobV9wcm9jZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsU2hh cmVkU2Vjb25kYXJ5UHJvY2VzcykgewogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSAhPSBt X21lc3NhZ2VzVG9JbmplY3RlZEJ1bmRsZVBvc3RlZFRvRW1wdHlDb250ZXh0LnNpemUoKTsgKytp KSB7Ci0gICAgICAgICAgICBzdGQ6OnBhaXI8U3RyaW5nLCBSZWZQdHI8QVBJOjpPYmplY3Q+PiYg bWVzc2FnZSA9IG1fbWVzc2FnZXNUb0luamVjdGVkQnVuZGxlUG9zdGVkVG9FbXB0eUNvbnRleHRb aV07CisgICAgICAgICAgICBhdXRvJiBtZXNzYWdlTmFtZUFuZEJvZHkgPSBtX21lc3NhZ2VzVG9J bmplY3RlZEJ1bmRsZVBvc3RlZFRvRW1wdHlDb250ZXh0W2ldOwogCi0gICAgICAgICAgICBJUEM6 OkFyZ3VtZW50RW5jb2RlciBtZXNzYWdlRGF0YTsKLQotICAgICAgICAgICAgbWVzc2FnZURhdGEu ZW5jb2RlKG1lc3NhZ2UuZmlyc3QpOwotICAgICAgICAgICAgbWVzc2FnZURhdGEuZW5jb2RlKFdl YkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIobWVzc2FnZS5zZWNvbmQuZ2V0KCksIHByb2Nlc3Mp KTsKLSAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlBvc3RJ bmplY3RlZEJ1bmRsZU1lc3NhZ2UoSVBDOjpEYXRhUmVmZXJlbmNlKG1lc3NhZ2VEYXRhLmJ1ZmZl cigpLCBtZXNzYWdlRGF0YS5idWZmZXJTaXplKCkpKSwgMCk7CisgICAgICAgICAgICBwcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpIYW5kbGVJbmplY3RlZEJ1bmRsZU1lc3NhZ2Uo bWVzc2FnZU5hbWVBbmRCb2R5LmZpcnN0LCBVc2VyRGF0YShwcm9jZXNzLT50cmFuc2Zvcm1PYmpl Y3RzVG9IYW5kbGVzKG1lc3NhZ2VOYW1lQW5kQm9keS5zZWNvbmQuZ2V0KCkpLmdldCgpKSksIDAp OwogICAgICAgICB9CiAgICAgICAgIG1fbWVzc2FnZXNUb0luamVjdGVkQnVuZGxlUG9zdGVkVG9F bXB0eUNvbnRleHQuY2xlYXIoKTsKICAgICB9IGVsc2UKQEAgLTk0MSwxMSArOTM3LDcgQEAgdm9p ZCBXZWJQcm9jZXNzUG9vbDo6cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxlKGNvbnN0IFN0cmlu ZyYgbWVzc2FnZU5hbWUsIEFQSToKIAogICAgIGZvciAoYXV0byYgcHJvY2VzcyA6IG1fcHJvY2Vz c2VzKSB7CiAgICAgICAgIC8vIEZJWE1FOiBSZXR1cm4gZWFybHkgaWYgdGhlIG1lc3NhZ2UgYm9k eSBjb250YWlucyBhbnkgcmVmZXJlbmNlcyB0byBXS1BhZ2VSZWZzL1dLRnJhbWVSZWZzIGV0Yy4g c2luY2UgdGhleSdyZSBsb2NhbCB0byBhIHByb2Nlc3MuCi0gICAgICAgIElQQzo6QXJndW1lbnRF bmNvZGVyIG1lc3NhZ2VEYXRhOwotICAgICAgICBtZXNzYWdlRGF0YS5lbmNvZGUobWVzc2FnZU5h bWUpOwotICAgICAgICBtZXNzYWdlRGF0YS5lbmNvZGUoV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5j b2RlcihtZXNzYWdlQm9keSwgKnByb2Nlc3MuZ2V0KCkpKTsKLQotICAgICAgICBwcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpQb3N0SW5qZWN0ZWRCdW5kbGVNZXNzYWdlKElQQzo6 RGF0YVJlZmVyZW5jZShtZXNzYWdlRGF0YS5idWZmZXIoKSwgbWVzc2FnZURhdGEuYnVmZmVyU2l6 ZSgpKSksIDApOworICAgICAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpI YW5kbGVJbmplY3RlZEJ1bmRsZU1lc3NhZ2UobWVzc2FnZU5hbWUsIFVzZXJEYXRhKHByb2Nlc3Mt PnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXMobWVzc2FnZUJvZHkpLmdldCgpKSksIDApOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggMjll NDIxNTQwNmRmNDc5YzdiMzI4ZTc5MjI4NGNjZmVkOWJkNDJmYS4uZTQ3MGM5M2MxNmQxYmY3NTY4 NjA3M2Y2OGU5M2ZmYzhiZDE3YjM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCkBAIC05NDcsMjQgKzk0NywxMyBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldEphdmFT Y3JpcHRHYXJiYWdlQ29sbGVjdG9yVGltZXJFbmFibGVkKGJvb2wgZmxhZykKICAgICBnY0NvbnRy b2xsZXIoKS5zZXRKYXZhU2NyaXB0R2FyYmFnZUNvbGxlY3RvclRpbWVyRW5hYmxlZChmbGFnKTsK IH0KIAotdm9pZCBXZWJQcm9jZXNzOjpwb3N0SW5qZWN0ZWRCdW5kbGVNZXNzYWdlKGNvbnN0IElQ Qzo6RGF0YVJlZmVyZW5jZSYgbWVzc2FnZURhdGEpCit2b2lkIFdlYlByb2Nlc3M6OmhhbmRsZUlu amVjdGVkQnVuZGxlTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBVc2Vy RGF0YSYgbWVzc2FnZUJvZHkpCiB7CiAgICAgSW5qZWN0ZWRCdW5kbGUqIGluamVjdGVkQnVuZGxl ID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkuaW5qZWN0ZWRCdW5kbGUoKTsKICAgICBpZiAoIWluamVj dGVkQnVuZGxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBJUEM6OkFyZ3VtZW50RGVjb2RlciBk ZWNvZGVyKG1lc3NhZ2VEYXRhLmRhdGEoKSwgbWVzc2FnZURhdGEuc2l6ZSgpKTsKLQotICAgIFN0 cmluZyBtZXNzYWdlTmFtZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKG1lc3NhZ2VOYW1lKSkK LSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBtZXNzYWdlQm9keTsK LSAgICBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlQm9keURlY29kZXIo bWVzc2FnZUJvZHkpOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUobWVzc2FnZUJvZHlEZWNvZGVy KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaW5qZWN0ZWRCdW5kbGUtPmRpZFJlY2VpdmVNZXNz YWdlKG1lc3NhZ2VOYW1lLCBtZXNzYWdlQm9keS5nZXQoKSk7CisgICAgaW5qZWN0ZWRCdW5kbGUt PmRpZFJlY2VpdmVNZXNzYWdlKG1lc3NhZ2VOYW1lLCB0cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3Rz KG1lc3NhZ2VCb2R5Lm9iamVjdCgpKS5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6c2V0 SW5qZWN0ZWRCdW5kbGVQYXJhbWV0ZXIoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IElQQzo6RGF0 YVJlZmVyZW5jZSYgdmFsdWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCmlu ZGV4IDNjOTMzODBmMGU5ZjA0YjU0ZWJiMWZmNzkyOGYzOTBiNWE4N2Y5NWMuLjNjYzI2ODgwNDY5 ZDhhMjMwN2IyN2EwMjI3Yzk5ZjhiOGJmMTgwNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5oCkBAIC02OCw2ICs2OCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3Mg RG93bmxvYWRNYW5hZ2VyOwogY2xhc3MgRXZlbnREaXNwYXRjaGVyOwogY2xhc3MgSW5qZWN0ZWRC dW5kbGU7CitjbGFzcyBVc2VyRGF0YTsKIGNsYXNzIFdlYkNvbm5lY3Rpb25Ub1VJUHJvY2VzczsK IGNsYXNzIFdlYkZyYW1lOwogY2xhc3MgV2ViSWNvbkRhdGFiYXNlUHJveHk7CkBAIC0yNjYsNyAr MjY3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldEVuYWJsZWRTZXJ2aWNlcyhib29sIGhhc0lt YWdlU2VydmljZXMsIGJvb2wgaGFzU2VsZWN0aW9uU2VydmljZXMsIGJvb2wgaGFzUmljaENvbnRl bnRTZXJ2aWNlcyk7CiAjZW5kaWYKIAotICAgIHZvaWQgcG9zdEluamVjdGVkQnVuZGxlTWVzc2Fn ZShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIG1lc3NhZ2VEYXRhKTsKKyAgICB2b2lkIGhhbmRs ZUluamVjdGVkQnVuZGxlTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBV c2VyRGF0YSYgbWVzc2FnZUJvZHkpOwogICAgIHZvaWQgc2V0SW5qZWN0ZWRCdW5kbGVQYXJhbWV0 ZXIoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpOwogCiAgICAg Ly8gQ2hpbGRQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlByb2Nlc3MubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nl c3MubWVzc2FnZXMuaW4KaW5kZXggYTRlNzc1YmQ1NWJhOWUzZjk4ZDJmMzhkNGU5ZWJjMmVhYzc2 YzZmOS4uOTRlZmUyMGIyYjAwMjIzMmRkOTE5YzBjMTAxOWZmMjY0MjY1NTQ3NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgpAQCAtNzQs NyArNzQsNyBAQCBtZXNzYWdlcyAtPiBXZWJQcm9jZXNzIExlZ2FjeVJlY2VpdmVyIHsKICAgICBT ZXRKYXZhU2NyaXB0R2FyYmFnZUNvbGxlY3RvclRpbWVyRW5hYmxlZChib29sIGVuYWJsZSkKIAog ICAgIFNldEluamVjdGVkQnVuZGxlUGFyYW1ldGVyKFN0cmluZyBwYXJhbWV0ZXIsIElQQzo6RGF0 YVJlZmVyZW5jZSB2YWx1ZSk7Ci0gICAgUG9zdEluamVjdGVkQnVuZGxlTWVzc2FnZShJUEM6OkRh dGFSZWZlcmVuY2UgbWVzc2FnZURhdGEpOworICAgIEhhbmRsZUluamVjdGVkQnVuZGxlTWVzc2Fn ZShTdHJpbmcgbWVzc2FnZU5hbWUsIFdlYktpdDo6VXNlckRhdGEgbWVzc2FnZUJvZHkpOwogCiAg ICAgUmVsZWFzZVBhZ2VDYWNoZSgpCiAK