22619 2008-12-02 23:59:04 -0800 XMLHttpRequest needs to use scriptExecutionContext() instead of document() where possible. 2008-12-03 23:22:15 -0800 1 1 1 Unclassified WebKit XML 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 levin webkit-unassigned levin oldest_to_newest 101155 0 levin 2008-12-02 23:59:04 -0800 XMLHttpRequest should avoid using document() when a worker is being used. The change should tackle the straightforward modifications to enable this. 101156 1 25701 levin 2008-12-03 00:07:32 -0800 Created attachment 25701 Patch for bug. It doesn't yet remove all references to document() in XMLHttpRequest. It will take some more changes to do that (to add in the wiring to send things back through the Worker's owner document). 101232 2 25717 levin 2008-12-03 12:05:44 -0800 Created attachment 25717 Removed the change to reportUnsafeUsage. "reportException is for reporting exceptions, not arbitrary errors", so I removed its usage in reportUnsafeUsage. 101253 3 25717 ap 2008-12-03 13:34:10 -0800 Comment on attachment 25717 Removed the change to reportUnsafeUsage. Code changes all look right, but the ChangeLog may be a little too expressive :). I think that the full history should go to bug comments, not into ChangeLog. Also, the description of responseXML changes is a bit misleading - the purpose is not to zero out m_responseXML, but to return null without executing code that is not thread safe. I'm going to say r- for now, because ChangeLog takes the biggest part of this patch, and it needs to be significantly modified. 101295 4 25735 levin 2008-12-03 21:53:49 -0800 Created attachment 25735 Addressed comments. 101297 5 25735 ap 2008-12-03 22:56:41 -0800 Comment on attachment 25735 Addressed comments. r=me 101303 6 ap 2008-12-03 23:22:15 -0800 Committed revision 38987. 25701 2008-12-03 00:07:32 -0800 2008-12-03 12:05:44 -0800 Patch for bug. patch-for-bug22619.txt text/plain 5518 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODkyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDEgQEAKKzIwMDgtMTItMDIgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSB1c2VzIG9mIGRvY3VtZW50KCkgaW4gWE1MSHR0cFJlcXVlc3Qgd2hlcmUgc2ltcGxlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkKKwor ICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxI dHRwUmVxdWVzdDo6cmVzcG9uc2VYTUwpOgorICAgICAgICAwIG91dCB0aGUgbV9yZXNwb25zZVhN TCBpZiB0aGUgZXhlY3V0aW9uIGNvbnRleHQgaXMgYSB3b3JrZXIsIHdoaWNoIGlzIGFjY29yZGlu ZyB0byBzcGVjLgorCisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y2FsbFJlYWR5 U3RhdGVDaGFuZ2VMaXN0ZW5lcik6CisgICAgICAgIFRoaXMgd2FzIGNoZWNraW5nIGRvY3VtZW50 KCkgYW5kIGRvY3VtZW50KCktPmZyYW1lKCkgZm9yIE5VTEwuICBIZXJlJ3MgdGhlIGhpc3Rvcnkg b2YgdGhpcyBjaGVjay4KKworICAgICAgICBUaGUgY2hlY2sgZm9yIGRvY3VtZW50KCktPmZyYW1l KCkgY29tZXMgZnJvbSB3aGVuIHRoaXMgZnVuY3Rpb24gd2FzIGludHJvZHVjdGVkIGluCisgICAg ICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nlci90cnVuay9XZWJDb3JlL2todG1sL2Vj bWEveG1saHR0cHJlcXVlc3QuY3BwP3Jldj01NzA5CisgICAgICAgIEF0IHRoYXQgdGltZSwgdGhl IGZ1bmN0aW9uIHdhcyBjYWxsZWQgWG1sUmVxdWVzdDo6Y2hhbmdlU3RhdGUgYW5kIGl0IHVzZWQg ZG9jLT5wYXJ0KCkgKHdoaWNoCisgICAgICAgIGxhdGVyIGJlY2FtZSBkb2N1bWVudCgpLT5mcmFt ZSgpKSB0byBjcmVhdGUgdGhlIGV2ZW50LgorICAgICAgICAgICBpZiAob25SZWFkeVN0YXRlQ2hh bmdlTGlzdGVuZXIgIT0gMCAmJiBkb2MtPnBhcnQoKSkgeyAKKyAgICAgICAgICAgICAgRE9NOjpF dmVudCBldiA9IGRvYy0+cGFydCgpLT5kb2N1bWVudCgpLmNyZWF0ZUV2ZW50KCJIVE1MRXZlbnRz Iik7IAorCisgICAgICAgIFRoZSBjaGVjayBmb3IgZG9jdW1lbnQoKSB3YXMgaW50cm9kdWNlZCB3 aXRoIGluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEwMTI3CisgICAgICAgIEl0 IHdhcyBhbiBhdHRlbXB0IHRvIGZpeCBhIG5vbi1yZXBybyBidWcgb24gZnJpZW5kc3Rlci5jb20g YW5kIGF0IHRoZSB0aW1lIHRoZSBjb2RlCisgICAgICAgIHN0aWxsIHVzZWQgZG9jLT5mcmFtZSgp LgorICAgICAgICAKKyAgICAgICAgTm93LCB0aGUgY29kZSBwYXRoIG5vIGxvbmdlciB1c2VzIGRv Y3VtZW50KCkgKG9yIHRoZSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpIGRpcmVjdGx5LCBzbyBu ZWl0aGVyCisgICAgICAgIGNoZWNrIHNlZW1zIG5lY2Vzc2FyeSBhbnltb3JlLiAgSG93ZXZlciwg aXQgc2VlbWVkIGVhc3kgZW5vdWdoIHRvIGtlZXAgYSBjaGVjayBzaW1pbGFyIHRvIGRvY3VtZW50 KCkKKyAgICAgICAganVzdCBpbiBjYXNlIHRoZXJlIGlzIHNvbWUgbm9uLW9idmlvdXMgcmVsaWFu Y2Ugb24gdGhpcy4KKworICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmluaXRTZW5k KToKKyAgICAgICAgU2ltcGxlIGNoYW5nZSB0byB1c2Ugc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp IGluc3RlYWQgb2YgZG9jdW1lbnQoKS4KKworICAgICAgICAoV2ViQ29yZTo6cmVwb3J0VW5zYWZl VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OnNldFJlcXVlc3RIZWFk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmdldFJlc3BvbnNlSGVhZGVy KToKKyAgICAgICAgQ2hhbmdlIHJlcG9ydFVuc2FmZVVzYWdlIHRvIHVzZSB0aGUgYXBwcm9wcmlh dGUgbWV0aG9kIG9uIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSB3aGljaCBzZW5kcyB0aGUKKyAg ICAgICAgY29uc29sZSBtZXNzYWdlIHRvIHRoZSBkb2N1bWVudCBpbiB0aGUgY2FzZSBvZiBhIHdv cmtlciAoYW5kIGRvZXMgdGhlIHNhbWUgdGhpbmcgaW4gdGhlIGNhc2Ugb2YgYSBXb3JrZXIpLgor CiAyMDA4LTEyLTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQKSW5kZXg6IFdlYkNvcmUveG1sL1hNTEh0dHBS ZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJ KHJldmlzaW9uIDM4OTI2KQorKysgV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNjUsNyArMzY1LDcgQEAgRG9jdW1lbnQqIFhNTEh0dHBSZXF1ZXN0Ojpy ZXNwb25zZVhNTCgpIAogICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmICghbV9jcmVhdGVkRG9j dW1lbnQpIHsKLSAgICAgICAgaWYgKG1fcmVzcG9uc2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNlSXNY TUwoKSkgeworICAgICAgICBpZiAoKG1fcmVzcG9uc2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNlSXNY TUwoKSkgfHwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5pc1dvcmtlckNvbnRleHQoKSkgewog ICAgICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJlcXVpcmVzIHRoaXMuCiAgICAgICAgICAgICBt X3Jlc3BvbnNlWE1MID0gMDsKICAgICAgICAgfSBlbHNlIHsKQEAgLTQ1Myw3ICs0NTMsNyBAQCB2 b2lkIFhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0ZShTdGF0ZSBuCiAKIHZvaWQgWE1MSHR0cFJl cXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIoKQogewotICAgIGlmICghZG9jdW1l bnQoKSB8fCAhZG9jdW1lbnQoKS0+ZnJhbWUoKSkKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZGlzcGF0Y2hSZWFkeVN0YXRlQ2hhbmdl RXZlbnQoKTsKQEAgLTUzMSw3ICs1MzEsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpvcGVuKGNv bnN0IFN0cmluZyYgCiAKIGJvb2wgWE1MSHR0cFJlcXVlc3Q6OmluaXRTZW5kKEV4Y2VwdGlvbkNv ZGUmIGVjKQogewotICAgIGlmICghZG9jdW1lbnQoKSkKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKG1fc3RhdGUgIT0g T1BFTkVEIHx8IG1fbG9hZGVyKSB7CkBAIC05NjQsMTYgKzk2NCwxMyBAQCB2b2lkIFhNTEh0dHBS ZXF1ZXN0OjpvdmVycmlkZU1pbWVUeXBlKGNvCiAgICAgbV9taW1lVHlwZU92ZXJyaWRlID0gb3Zl cnJpZGU7CiB9CiAKLXN0YXRpYyB2b2lkIHJlcG9ydFVuc2FmZVVzYWdlKERvY3VtZW50KiBkb2N1 bWVudCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQorc3RhdGljIHZvaWQgcmVwb3J0VW5zYWZlVXNh Z2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJiBtZXNzYWdl KQogewotICAgIGlmICghZG9jdW1lbnQpCi0gICAgICAgIHJldHVybjsKLSAgICBGcmFtZSogZnJh bWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKLSAgICBpZiAoIWZyYW1lKQorICAgIGlmICghY29udGV4 dCkKICAgICAgICAgcmV0dXJuOwogICAgIC8vIEl0J3Mgbm90IGdvb2QgdG8gcmVwb3J0IHRoZSBi YWQgdXNhZ2Ugd2l0aG91dCBpbmRpY2F0aW5nIHdoYXQgc291cmNlIGxpbmUgaXQgY2FtZSBmcm9t LgogICAgIC8vIFdlIHNob3VsZCBwYXNzIGFkZGl0aW9uYWwgcGFyYW1ldGVycyBzbyB3ZSBjYW4g dGVsbCB0aGUgY29uc29sZSB3aGVyZSB0aGUgbWlzdGFrZSBvY2N1cnJlZC4KLSAgICBmcmFtZS0+ ZG9tV2luZG93KCktPmNvbnNvbGUoKS0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIEVycm9y TWVzc2FnZUxldmVsLCBtZXNzYWdlLCAxLCBTdHJpbmcoKSk7CisgICAgY29udGV4dC0+cmVwb3J0 RXhjZXB0aW9uKG1lc3NhZ2UsIDEsIFN0cmluZygpKTsKIH0KIAogdm9pZCBYTUxIdHRwUmVxdWVz dDo6c2V0UmVxdWVzdEhlYWRlcihjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFs dWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQpAQCAtOTk2LDcgKzk5Myw3IEBAIHZvaWQgWE1MSHR0cFJl cXVlc3Q6OnNldFJlcXVlc3RIZWFkZXIoY28KIAogICAgIC8vIEEgcHJpdmlsZWdlZCBzY3JpcHQg KGUuZy4gYSBEYXNoYm9hcmQgd2lkZ2V0KSBjYW4gc2V0IGFueSBoZWFkZXJzLgogICAgIGlmICgh c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5Mb2FkTG9jYWxS ZXNvdXJjZXMoKSAmJiAhaXNTYWZlUmVxdWVzdEhlYWRlcihuYW1lKSkgewotICAgICAgICByZXBv cnRVbnNhZmVVc2FnZShkb2N1bWVudCgpLCAiUmVmdXNlZCB0byBzZXQgdW5zYWZlIGhlYWRlciBc IiIgKyBuYW1lICsgIlwiIik7CisgICAgICAgIHJlcG9ydFVuc2FmZVVzYWdlKHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSwgIlJlZnVzZWQgdG8gc2V0IHVuc2FmZSBoZWFkZXIgXCIiICsgbmFtZSAr ICJcIiIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xMDY3LDEyICsxMDY0LDEyIEBA IFN0cmluZyBYTUxIdHRwUmVxdWVzdDo6Z2V0UmVzcG9uc2VIZWFkZXIKIAogICAgIC8vIFNlZSBj b21tZW50IGluIGdldEFsbFJlc3BvbnNlSGVhZGVycyBhYm92ZS4KICAgICBpZiAoaXNTZXRDb29r aWVIZWFkZXIobmFtZSkgJiYgIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2VjdXJpdHlPcmln aW4oKS0+Y2FuTG9hZExvY2FsUmVzb3VyY2VzKCkpIHsKLSAgICAgICAgcmVwb3J0VW5zYWZlVXNh Z2UoZG9jdW1lbnQoKSwgIlJlZnVzZWQgdG8gZ2V0IHVuc2FmZSBoZWFkZXIgXCIiICsgbmFtZSAr ICJcIiIpOworICAgICAgICByZXBvcnRVbnNhZmVVc2FnZShzY3JpcHRFeGVjdXRpb25Db250ZXh0 KCksICJSZWZ1c2VkIHRvIGdldCB1bnNhZmUgaGVhZGVyIFwiIiArIG5hbWUgKyAiXCIiKTsKICAg ICAgICAgcmV0dXJuICIiOwogICAgIH0KIAogICAgIGlmICghbV9zYW1lT3JpZ2luUmVxdWVzdCAm JiAhaXNPbkFjY2Vzc0NvbnRyb2xSZXNwb25zZUhlYWRlcldoaXRlbGlzdChuYW1lKSkgewotICAg ICAgICByZXBvcnRVbnNhZmVVc2FnZShkb2N1bWVudCgpLCAiUmVmdXNlZCB0byBnZXQgdW5zYWZl IGhlYWRlciBcIiIgKyBuYW1lICsgIlwiIik7CisgICAgICAgIHJlcG9ydFVuc2FmZVVzYWdlKHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgIlJlZnVzZWQgdG8gZ2V0IHVuc2FmZSBoZWFkZXIgXCIi ICsgbmFtZSArICJcIiIpOwogICAgICAgICByZXR1cm4gIiI7CiAgICAgfQogCg== 25717 2008-12-03 12:05:44 -0800 2008-12-03 21:53:49 -0800 Removed the change to reportUnsafeUsage. patch-for-bug22619-rev2.txt text/plain 3070 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODk1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMDgtMTItMDMgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSB1c2VzIG9mIGRvY3VtZW50KCkgaW4gWE1MSHR0cFJlcXVlc3Qgd2hlcmUgc2ltcGxlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkKKwor ICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxI dHRwUmVxdWVzdDo6cmVzcG9uc2VYTUwpOgorICAgICAgICAwIG91dCB0aGUgbV9yZXNwb25zZVhN TCBpZiB0aGUgZXhlY3V0aW9uIGNvbnRleHQgaXMgYSB3b3JrZXIsIHdoaWNoIGlzIGFjY29yZGlu ZyB0byBzcGVjLgorCisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Y2FsbFJlYWR5 U3RhdGVDaGFuZ2VMaXN0ZW5lcik6CisgICAgICAgIFRoaXMgd2FzIGNoZWNraW5nIGRvY3VtZW50 KCkgYW5kIGRvY3VtZW50KCktPmZyYW1lKCkgZm9yIE5VTEwuICBIZXJlJ3MgdGhlIGhpc3Rvcnkg b2YgdGhpcyBjaGVjay4KKworICAgICAgICBUaGUgY2hlY2sgZm9yIGRvY3VtZW50KCktPmZyYW1l KCkgY29tZXMgZnJvbSB3aGVuIHRoaXMgZnVuY3Rpb24gd2FzIGludHJvZHVjdGVkIGluCisgICAg ICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nlci90cnVuay9XZWJDb3JlL2todG1sL2Vj bWEveG1saHR0cHJlcXVlc3QuY3BwP3Jldj01NzA5CisgICAgICAgIEF0IHRoYXQgdGltZSwgdGhl IGZ1bmN0aW9uIHdhcyBjYWxsZWQgWG1sUmVxdWVzdDo6Y2hhbmdlU3RhdGUgYW5kIGl0IHVzZWQg ZG9jLT5wYXJ0KCkgKHdoaWNoCisgICAgICAgIGxhdGVyIGJlY2FtZSBkb2N1bWVudCgpLT5mcmFt ZSgpKSB0byBjcmVhdGUgdGhlIGV2ZW50LgorICAgICAgICAgICBpZiAob25SZWFkeVN0YXRlQ2hh bmdlTGlzdGVuZXIgIT0gMCAmJiBkb2MtPnBhcnQoKSkgeyAKKyAgICAgICAgICAgICAgRE9NOjpF dmVudCBldiA9IGRvYy0+cGFydCgpLT5kb2N1bWVudCgpLmNyZWF0ZUV2ZW50KCJIVE1MRXZlbnRz Iik7IAorCisgICAgICAgIFRoZSBjaGVjayBmb3IgZG9jdW1lbnQoKSB3YXMgaW50cm9kdWNlZCB3 aXRoIGluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEwMTI3CisgICAgICAgIEl0 IHdhcyBhbiBhdHRlbXB0IHRvIGZpeCBhIG5vbi1yZXBybyBidWcgb24gZnJpZW5kc3Rlci5jb20g YW5kIGF0IHRoZSB0aW1lIHRoZSBjb2RlCisgICAgICAgIHN0aWxsIHVzZWQgZG9jLT5mcmFtZSgp LgorICAgICAgICAKKyAgICAgICAgTm93LCB0aGUgY29kZSBwYXRoIG5vIGxvbmdlciB1c2VzIGRv Y3VtZW50KCkgKG9yIHRoZSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpIGRpcmVjdGx5LCBzbyBu ZWl0aGVyCisgICAgICAgIGNoZWNrIHNlZW1zIG5lY2Vzc2FyeSBhbnltb3JlLiAgSG93ZXZlciwg aXQgc2VlbWVkIGVhc3kgZW5vdWdoIHRvIGtlZXAgYSBjaGVjayBzaW1pbGFyIHRvIGRvY3VtZW50 KCkKKyAgICAgICAganVzdCBpbiBjYXNlIHRoZXJlIGlzIHNvbWUgbm9uLW9idmlvdXMgcmVsaWFu Y2Ugb24gdGhpcy4KKworICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmluaXRTZW5k KToKKyAgICAgICAgU2ltcGxlIGNoYW5nZSB0byB1c2Ugc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp IGluc3RlYWQgb2YgZG9jdW1lbnQoKS4KKwogMjAwOC0xMi0wMyAgRGlyayBTY2h1bHplICA8a3Jp dEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4K SW5kZXg6IFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJKHJldmlzaW9uIDM4OTUyKQorKysgV2ViQ29yZS94 bWwvWE1MSHR0cFJlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjUsNyArMzY1LDcgQEAg RG9jdW1lbnQqIFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpIAogICAgICAgICByZXR1cm4g MDsKIAogICAgIGlmICghbV9jcmVhdGVkRG9jdW1lbnQpIHsKLSAgICAgICAgaWYgKG1fcmVzcG9u c2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNlSXNYTUwoKSkgeworICAgICAgICBpZiAoKG1fcmVzcG9u c2UuaXNIVFRQKCkgJiYgIXJlc3BvbnNlSXNYTUwoKSkgfHwgc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCgpLT5pc1dvcmtlckNvbnRleHQoKSkgewogICAgICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJl cXVpcmVzIHRoaXMuCiAgICAgICAgICAgICBtX3Jlc3BvbnNlWE1MID0gMDsKICAgICAgICAgfSBl bHNlIHsKQEAgLTQ1Myw3ICs0NTMsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0 ZShTdGF0ZSBuCiAKIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlz dGVuZXIoKQogewotICAgIGlmICghZG9jdW1lbnQoKSB8fCAhZG9jdW1lbnQoKS0+ZnJhbWUoKSkK KyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgZGlzcGF0Y2hSZWFkeVN0YXRlQ2hhbmdlRXZlbnQoKTsKQEAgLTUzMSw3ICs1MzEsNyBAQCB2 b2lkIFhNTEh0dHBSZXF1ZXN0OjpvcGVuKGNvbnN0IFN0cmluZyYgCiAKIGJvb2wgWE1MSHR0cFJl cXVlc3Q6OmluaXRTZW5kKEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIGlmICghZG9jdW1lbnQo KSkKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgaWYgKG1fc3RhdGUgIT0gT1BFTkVEIHx8IG1fbG9hZGVyKSB7Cg== 25735 2008-12-03 21:53:49 -0800 2008-12-03 22:56:41 -0800 Addressed comments. patch-for-bug22619-rev3.txt text/plain 1921 levin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODk4MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMTItMDMgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSB1c2VzIG9mIGRvY3VtZW50KCkgaW4gWE1MSHR0cFJlcXVlc3Qgd2hlcmUgc2ltcGxlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MTkKKwor ICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxI dHRwUmVxdWVzdDo6cmVzcG9uc2VYTUwpOgorICAgICAgICBSZXR1cm4gTlVMTCBpbiB0aGUgd29y a2VyIGNhc2Ugd2hpY2ggaXMgYWNjb3JkaW5nIHRvIHNwZWMgKGFuZCBhdm9pZHMgdXNpbmcgZG9j dW1lbnQoKSkuCisKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlT dGF0ZUNoYW5nZUxpc3RlbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0Ojpp bml0U2VuZCk6CisgICAgICAgIFVzZSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkgaW5zdGVhZCBv ZiBkb2N1bWVudCgpLgorCiAyMDA4LTEyLTAzICBKdXN0aW4gR2FyY2lhICA8anVzdGluLmdhcmNp YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4KSW5kZXg6IFdl YkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3htbC9Y TUxIdHRwUmVxdWVzdC5jcHAJKHJldmlzaW9uIDM4OTgzKQorKysgV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjUsNyArMzY1LDcgQEAgRG9jdW1lbnQq IFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpIAogICAgICAgICByZXR1cm4gMDsKIAogICAg IGlmICghbV9jcmVhdGVkRG9jdW1lbnQpIHsKLSAgICAgICAgaWYgKG1fcmVzcG9uc2UuaXNIVFRQ KCkgJiYgIXJlc3BvbnNlSXNYTUwoKSkgeworICAgICAgICBpZiAoKG1fcmVzcG9uc2UuaXNIVFRQ KCkgJiYgIXJlc3BvbnNlSXNYTUwoKSkgfHwgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5pc1dv cmtlckNvbnRleHQoKSkgewogICAgICAgICAgICAgLy8gVGhlIFczQyBzcGVjIHJlcXVpcmVzIHRo aXMuCiAgICAgICAgICAgICBtX3Jlc3BvbnNlWE1MID0gMDsKICAgICAgICAgfSBlbHNlIHsKQEAg LTQ1Myw3ICs0NTMsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0ZShTdGF0ZSBu CiAKIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIoKQog ewotICAgIGlmICghZG9jdW1lbnQoKSB8fCAhZG9jdW1lbnQoKS0+ZnJhbWUoKSkKKyAgICBpZiAo IXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZGlzcGF0 Y2hSZWFkeVN0YXRlQ2hhbmdlRXZlbnQoKTsKQEAgLTUzMSw3ICs1MzEsNyBAQCB2b2lkIFhNTEh0 dHBSZXF1ZXN0OjpvcGVuKGNvbnN0IFN0cmluZyYgCiAKIGJvb2wgWE1MSHR0cFJlcXVlc3Q6Omlu aXRTZW5kKEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIGlmICghZG9jdW1lbnQoKSkKKyAgICBp ZiAoIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgaWYgKG1fc3RhdGUgIT0gT1BFTkVEIHx8IG1fbG9hZGVyKSB7Cg==