100223 2012-10-24 03:38:02 -0700 [Qt] Make the context injected bundle client static 2012-10-25 03:43:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte abecsi cmarcelo menard webkit.review.bot oldest_to_newest 749504 0 jturcotte 2012-10-24 03:38:02 -0700 [Qt] Make the context injected bundle client static 749505 1 170355 jturcotte 2012-10-24 03:38:51 -0700 Created attachment 170355 Patch 750625 2 170355 webkit.review.bot 2012-10-25 03:43:48 -0700 Comment on attachment 170355 Patch Clearing flags on attachment: 170355 Committed r132465: <http://trac.webkit.org/changeset/132465> 750626 3 webkit.review.bot 2012-10-25 03:43:51 -0700 All reviewed patches have been landed. Closing bug. 170355 2012-10-24 03:38:51 -0700 2012-10-25 03:43:47 -0700 Patch bug-100223-20121024123726.patch text/plain 6595 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxODg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDY1OWU3YTA1MTEwMmM4 ODY2Njc2NTFkZmVlYmMzZTlkOWQxN2MyYy4uZmU1Y2Q2ZWZjY2QzMjRkZTEzNjk4N2IxM2RhYTRi Mzg2OTk0MzRlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEwLTI0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0 XSBNYWtlIHRoZSBjb250ZXh0IGluamVjdGVkIGJ1bmRsZSBjbGllbnQgc3RhdGljCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAyMjMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBkb2Vzbid0IG5lZWQg YW55IGRhdGEgZnJvbSBRdFdlYkNvbnRleHQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRX ZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5q ZWN0ZWRCdW5kbGUpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6aW5pdGlh bGl6ZUNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OlF0V2Vi Q29udGV4dDo6ZGVmYXVsdENvbnRleHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYkNv bnRleHQuaDoKKyAgICAgICAgKFF0V2ViQ29udGV4dCk6CisKIDIwMTItMTAtMTkgIENzYWJhIE9z enRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMzE4 NDQpOiBJdCBicm9rZSB0aGUgYnVpbGQgb24gIUVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSBw bGF0Zm9ybXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNv bnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAK aW5kZXggZjhkMzg0Y2MyZGE5MDg0YmY0ZmI4YzUyYzZkOWZiMjRhNmIxNzU3Zi4uOGVkM2E1YWJi OGI5MTMzMTA3MmIyYjdjY2U4MWM2YzE2NGNmYjI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAKQEAgLTg3LDYgKzg3LDM0IEBAIHN0YXRpYyB2b2lk IGdsb2JhbEluaXRpYWxpemF0aW9uKCkKICAgICBpbml0aWFsaXplZCA9IHRydWU7CiB9CiAKK3N0 YXRpYyB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKFdLQ29udGV4dFJl ZiwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgY29uc3Qg dm9pZCopCit7CisgICAgaWYgKCFXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKG1lc3NhZ2VO YW1lLCAiTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdCIpKQorICAgICAgICByZXR1cm47CisK KyAgICBBU1NFUlQobWVzc2FnZUJvZHkpOworICAgIEFTU0VSVChXS0dldFR5cGVJRChtZXNzYWdl Qm9keSkgPT0gV0tBcnJheUdldFR5cGVJRCgpKTsKKworICAgIFdLQXJyYXlSZWYgYm9keSA9IHN0 YXRpY19jYXN0PFdLQXJyYXlSZWY+KG1lc3NhZ2VCb2R5KTsKKyAgICBBU1NFUlQoV0tBcnJheUdl dFNpemUoYm9keSkgPT0gMik7CisgICAgQVNTRVJUKFdLR2V0VHlwZUlEKFdLQXJyYXlHZXRJdGVt QXRJbmRleChib2R5LCAwKSkgPT0gV0tQYWdlR2V0VHlwZUlEKCkpOworICAgIEFTU0VSVChXS0dl dFR5cGVJRChXS0FycmF5R2V0SXRlbUF0SW5kZXgoYm9keSwgMSkpID09IFdLU3RyaW5nR2V0VHlw ZUlEKCkpOworCisgICAgV0tQYWdlUmVmIHBhZ2UgPSBzdGF0aWNfY2FzdDxXS1BhZ2VSZWY+KFdL QXJyYXlHZXRJdGVtQXRJbmRleChib2R5LCAwKSk7CisgICAgV0tTdHJpbmdSZWYgc3RyID0gc3Rh dGljX2Nhc3Q8V0tTdHJpbmdSZWY+KFdLQXJyYXlHZXRJdGVtQXRJbmRleChib2R5LCAxKSk7CisK KyAgICB0b0ltcGwocGFnZSktPmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0 KHRvSW1wbChzdHIpLT5zdHJpbmcoKSk7Cit9CisKK3N0YXRpYyB2b2lkIGluaXRpYWxpemVDb250 ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQoV2ViQ29udGV4dCogY29udGV4dCkKK3sKKyAgICBXS0Nv bnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCBpbmplY3RlZEJ1bmRsZUNsaWVudDsKKyAgICBtZW1z ZXQoJmluamVjdGVkQnVuZGxlQ2xpZW50LCAwLCBzaXplb2YoV0tDb250ZXh0SW5qZWN0ZWRCdW5k bGVDbGllbnQpKTsKKyAgICBpbmplY3RlZEJ1bmRsZUNsaWVudC52ZXJzaW9uID0ga1dLQ29udGV4 dEluamVjdGVkQnVuZGxlQ2xpZW50Q3VycmVudFZlcnNpb247CisgICAgaW5qZWN0ZWRCdW5kbGVD bGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUgPSBkaWRSZWNlaXZlTWVz c2FnZUZyb21JbmplY3RlZEJ1bmRsZTsKKyAgICBXS0NvbnRleHRTZXRJbmplY3RlZEJ1bmRsZUNs aWVudCh0b0FQSShjb250ZXh0KSwgJmluamVjdGVkQnVuZGxlQ2xpZW50KTsKK30KKwogUXRXZWJD b250ZXh0OjpRdFdlYkNvbnRleHQoV2ViQ29udGV4dCogY29udGV4dCkKICAgICA6IG1fY29udGV4 dElEKGdlbmVyYXRlQ29udGV4dElEKCkpCiAgICAgLCBtX2NvbnRleHQoY29udGV4dCkKQEAgLTEw Myw3ICsxMzEsNyBAQCBRdFdlYkNvbnRleHQ6On5RdFdlYkNvbnRleHQoKQogICAgIGNvbnRleHRN YXAucmVtb3ZlKG1fY29udGV4dElEKTsKIH0KIAotLy8gVXNlZCBvbmx5IGJ5IFdlYktpdFRlc3RS dW5uZXIuIEl0IGF2b2lkcyBjYWxsaW5nIGluaXRpYWxpemUoKSwgc28gdGhhdCB3ZSBkb24ndCBy ZWdpc3RlciBhbnkgY2xpZW50cy4KKy8vIFVzZWQgZGlyZWN0bHkgb25seSBieSBXZWJLaXRUZXN0 UnVubmVyLgogUGFzc1JlZlB0cjxRdFdlYkNvbnRleHQ+IFF0V2ViQ29udGV4dDo6Y3JlYXRlKFdl YkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgZ2xvYmFsSW5pdGlhbGl6YXRpb24oKTsKQEAgLTEx NiwxMyArMTQ0LDE0IEBAIFBhc3NSZWZQdHI8UXRXZWJDb250ZXh0PiBRdFdlYkNvbnRleHQ6OmRl ZmF1bHRDb250ZXh0KCkKICAgICAgICAgcmV0dXJuIFBhc3NSZWZQdHI8UXRXZWJDb250ZXh0Pihz X2RlZmF1bHRDb250ZXh0KTsKIAogICAgIFJlZlB0cjxXZWJDb250ZXh0PiBjb250ZXh0ID0gV2Vi Q29udGV4dDo6Y3JlYXRlKFN0cmluZygpKTsKKyAgICAvLyBNYWtlIHN1cmUgZm9yIFdlYktpdFRl c3RSdW5uZXIgdGhhdCB0aGUgaW5qZWN0ZWQgYnVuZGxlIGNsaWVudCBpc24ndCBpbml0aWFsaXpl ZAorICAgIC8vIGFuZCB0aGF0IHRoZSBwYWdlIGNhY2hlIGlzbid0IGVuYWJsZWQgKGRlZmF1bHRD b250ZXh0IGlzbid0IHVzZWQgdGhlcmUpLgorICAgIGluaXRpYWxpemVDb250ZXh0SW5qZWN0ZWRC dW5kbGVDbGllbnQoY29udGV4dC5nZXQoKSk7CiAgICAgLy8gQSBnb29kIGFsbC1hcm91bmQgZGVm YXVsdC4KICAgICBjb250ZXh0LT5zZXRDYWNoZU1vZGVsKENhY2hlTW9kZWxEb2N1bWVudEJyb3dz ZXIpOwogCiAgICAgUmVmUHRyPFF0V2ViQ29udGV4dD4gZGVmYXVsdENvbnRleHQgPSBRdFdlYkNv bnRleHQ6OmNyZWF0ZShjb250ZXh0LmdldCgpKTsKICAgICBzX2RlZmF1bHRDb250ZXh0ID0gZGVm YXVsdENvbnRleHQuZ2V0KCk7Ci0gICAgLy8gTWFrZSBzdXJlIHRoYXQgdGhpcyBkb2Vzbid0IGdl dCBjYWxsZWQgaW4gV2ViS2l0VGVzdFJ1bm5lciAoZGVmYXVsdENvbnRleHQgaXNuJ3QgdXNlZCB0 aGVyZSkuCi0gICAgZGVmYXVsdENvbnRleHQtPmluaXRpYWxpemVDb250ZXh0SW5qZWN0ZWRCdW5k bGVDbGllbnQoKTsKIAogICAgIHJldHVybiBkZWZhdWx0Q29udGV4dC5yZWxlYXNlKCk7CiB9CkBA IC0xNTcsNDUgKzE4Niw1IEBAIFF0V2ViQ29udGV4dCogUXRXZWJDb250ZXh0Ojpjb250ZXh0QnlJ RCh1aW50NjRfdCBpZCkKICAgICByZXR1cm4gY29udGV4dE1hcC5nZXQoaWQpOwogfQogCi12b2lk IFF0V2ViQ29udGV4dDo6aW5pdGlhbGl6ZUNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCgpCi17 Ci0gICAgV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQgaW5qZWN0ZWRCdW5kbGVDbGllbnQ7 Ci0gICAgbWVtc2V0KCZpbmplY3RlZEJ1bmRsZUNsaWVudCwgMCwgc2l6ZW9mKFdLQ29udGV4dElu amVjdGVkQnVuZGxlQ2xpZW50KSk7Ci0gICAgaW5qZWN0ZWRCdW5kbGVDbGllbnQudmVyc2lvbiA9 IGtXS0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudEN1cnJlbnRWZXJzaW9uOwotICAgIGluamVj dGVkQnVuZGxlQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOwotICAgIGluamVjdGVkQnVuZGxlQ2xp ZW50LmRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlID0gZGlkUmVjZWl2ZU1lc3Nh Z2VGcm9tSW5qZWN0ZWRCdW5kbGU7Ci0gICAgV0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5kbGVDbGll bnQodG9BUEkobV9jb250ZXh0LmdldCgpKSwgJmluamVjdGVkQnVuZGxlQ2xpZW50KTsKLX0KLQot c3RhdGljIFF0V2ViQ29udGV4dCogdG9RdFdlYkNvbnRleHQoY29uc3Qgdm9pZCogY2xpZW50SW5m bykKLXsKLSAgICBBU1NFUlQoY2xpZW50SW5mbyk7Ci0gICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nh c3Q8UXRXZWJDb250ZXh0Kj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpOwotfQotCi12 b2lkIFF0V2ViQ29udGV4dDo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tD b250ZXh0UmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVmIG1lc3NhZ2VCb2R5 LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQotewotICAgIHRvUXRXZWJDb250ZXh0KGNsaWVudElu Zm8pLT5kaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShtZXNzYWdlTmFtZSwgbWVz c2FnZUJvZHkpOwotfQotCi12b2lkIFF0V2ViQ29udGV4dDo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9t SW5qZWN0ZWRCdW5kbGUoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdl Qm9keSkKLXsKLSAgICBpZiAoIVdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcobWVzc2FnZU5h bWUsICJNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0IikpCi0gICAgICAgIHJldHVybjsKLQot ICAgIEFTU0VSVChtZXNzYWdlQm9keSk7Ci0gICAgQVNTRVJUKFdLR2V0VHlwZUlEKG1lc3NhZ2VC b2R5KSA9PSBXS0FycmF5R2V0VHlwZUlEKCkpOwotCi0gICAgV0tBcnJheVJlZiBib2R5ID0gc3Rh dGljX2Nhc3Q8V0tBcnJheVJlZj4obWVzc2FnZUJvZHkpOwotICAgIEFTU0VSVChXS0FycmF5R2V0 U2l6ZShib2R5KSA9PSAyKTsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQoV0tBcnJheUdldEl0ZW1B dEluZGV4KGJvZHksIDApKSA9PSBXS1BhZ2VHZXRUeXBlSUQoKSk7Ci0gICAgQVNTRVJUKFdLR2V0 VHlwZUlEKFdLQXJyYXlHZXRJdGVtQXRJbmRleChib2R5LCAxKSkgPT0gV0tTdHJpbmdHZXRUeXBl SUQoKSk7Ci0KLSAgICBXS1BhZ2VSZWYgcGFnZSA9IHN0YXRpY19jYXN0PFdLUGFnZVJlZj4oV0tB cnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDApKTsKLSAgICBXS1N0cmluZ1JlZiBzdHIgPSBzdGF0 aWNfY2FzdDxXS1N0cmluZ1JlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDEpKTsKLQot ICAgIHRvSW1wbChwYWdlKS0+ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3Qo dG9JbXBsKHN0ciktPnN0cmluZygpKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuaAppbmRleCBhMWUxMmZmMGY4 ZTIwYTlkYjliOWUwZThlZWU3MmYzNWQ1ZDgzMjdmLi4xNjhiNjA5Y2VmNDMxNzQ0ZTBmMjE0MjFl MzA3ZjhlMDNlYWU5OTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5oCkBAIC02NCwxMSArNjQsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0 IFF0V2ViQ29udGV4dChXZWJDb250ZXh0Kik7CiAKLSAgICB2b2lkIGluaXRpYWxpemVDb250ZXh0 SW5qZWN0ZWRCdW5kbGVDbGllbnQoKTsKLQotICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVNZXNz YWdlRnJvbUluamVjdGVkQnVuZGxlKFdLQ29udGV4dFJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZU5h bWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgY29uc3Qgdm9pZCopOwotICAgIHZvaWQgZGlkUmVj ZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdL VHlwZVJlZiBtZXNzYWdlQm9keSk7Ci0KICAgICBzdGF0aWMgUXRXZWJDb250ZXh0KiBzX2RlZmF1 bHRDb250ZXh0OwogCiAgICAgdWludDY0X3QgbV9jb250ZXh0SUQ7Cg==