70896 2011-10-26 02:45:32 -0700 MediaStreamRegistry should hold references to MediaStreamDescriptor rather than MediaStream 2011-11-02 12:12:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 adam.bergkvist tommyw abarth donggwan.kim per-erik.brodin tommyw webkit.review.bot oldest_to_newest 490702 0 adam.bergkvist 2011-10-26 02:45:32 -0700 Update the MediaStreamRegistry to use MediaStreamDescriptor instead of MediaStream. 494697 1 113327 tommyw 2011-11-02 10:18:10 -0700 Created attachment 113327 Patch 494698 2 tommyw 2011-11-02 10:19:08 -0700 Adam, hope you don't mind me taking over this bug... 494706 3 113327 abarth 2011-11-02 10:27:58 -0700 Comment on attachment 113327 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113327&action=review > Source/WebCore/mediastream/MediaStreamRegistry.cpp:50 > + m_streamDescriptors.set(url.string(), streamDescriptor); streamDescriptor.release(), presumably. > Source/WebCore/mediastream/MediaStreamRegistry.cpp:59 > -MediaStream* MediaStreamRegistry::mediaStream(const KURL& url) const > +PassRefPtr<MediaStreamDescriptor> MediaStreamRegistry::lookupMediaStreamDescriptor(const String& key) The key isn't a URL? Also, this should just return a raw pointer. The function doesn't transfer ownership. If you haven't read <http://www.webkit.org/coding/RefPtr.html>, it might help you with this sort of thing. > Source/WebCore/mediastream/MediaStreamRegistry.h:49 > + PassRefPtr<MediaStreamDescriptor> lookupMediaStreamDescriptor(const String& key); I don't see any callers of this function in this patch. I'm not sure whether it should take a KURL or whether it should take a String named url, but the keys do seem to be URLs. Maybe we should wait to add this until its needed? 494717 4 113327 tommyw 2011-11-02 10:35:54 -0700 Comment on attachment 113327 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113327&action=review >> Source/WebCore/mediastream/MediaStreamRegistry.cpp:50 >> + m_streamDescriptors.set(url.string(), streamDescriptor); > > streamDescriptor.release(), presumably. Fixed. >> Source/WebCore/mediastream/MediaStreamRegistry.cpp:59 >> +PassRefPtr<MediaStreamDescriptor> MediaStreamRegistry::lookupMediaStreamDescriptor(const String& key) > > The key isn't a URL? > > Also, this should just return a raw pointer. The function doesn't transfer ownership. If you haven't read <http://www.webkit.org/coding/RefPtr.html>, it might help you with this sort of thing. Sorry, i do this misstake now and then :/ This class will be extended to index MediaStream IDs as well as URLs in the next step, but I have changed the parameter name to url for now. >> Source/WebCore/mediastream/MediaStreamRegistry.h:49 >> + PassRefPtr<MediaStreamDescriptor> lookupMediaStreamDescriptor(const String& key); > > I don't see any callers of this function in this patch. I'm not sure whether it should take a KURL or whether it should take a String named url, but the keys do seem to be URLs. Maybe we should wait to add this until its needed? This will be called from the WebKit API that I will (re)add as soon as this patch goes in. 494719 5 113330 tommyw 2011-11-02 10:40:23 -0700 Created attachment 113330 Patch 494723 6 113330 abarth 2011-11-02 10:47:07 -0700 Comment on attachment 113330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113330&action=review > Source/WebCore/ChangeLog:14 > + Tests for the Media Stream API will be provided by the bug 56587, pending enough landed code. Usually we put this information above the list of files/function names. > Source/WebCore/mediastream/MediaStreamRegistry.cpp:46 > - m_streams.add(url.string(), stream); > + m_streamDescriptors.set(url.string(), stream->descriptor()); You wrote "fixed", but this doesn't appear to have changed. :) 494729 7 113330 tommyw 2011-11-02 10:51:33 -0700 Comment on attachment 113330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113330&action=review >> Source/WebCore/ChangeLog:14 >> + Tests for the Media Stream API will be provided by the bug 56587, pending enough landed code. > > Usually we put this information above the list of files/function names. OK >> Source/WebCore/mediastream/MediaStreamRegistry.cpp:46 >> + m_streamDescriptors.set(url.string(), stream->descriptor()); > > You wrote "fixed", but this doesn't appear to have changed. :) But I don't store the descriptor in a RefPtr any more... Just passing a raw pointer. Realized that a stream always have a descriptor. 494732 8 113334 tommyw 2011-11-02 10:54:11 -0700 Created attachment 113334 Patch 494740 9 113334 abarth 2011-11-02 11:03:11 -0700 Comment on attachment 113334 Patch Ah, you're right. 494791 10 113334 webkit.review.bot 2011-11-02 12:12:11 -0700 Comment on attachment 113334 Patch Clearing flags on attachment: 113334 Committed r99087: <http://trac.webkit.org/changeset/99087> 494792 11 webkit.review.bot 2011-11-02 12:12:16 -0700 All reviewed patches have been landed. Closing bug. 113327 2011-11-02 10:18:10 -0700 2011-11-02 10:40:16 -0700 Patch bug-70896-20111102181808.patch text/plain 3749 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogOTkwNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4OWQ2ZDg0MjJiY2Y0MWI3 ZTY4MDJmODRmNjU5ODA3Nzg3MDE4ZWJmLi4zODM0OGYyNzkzYjBmM2NmMjE0MDIxMGIyZjVkZjcw NDAzZTRiNDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTEtMDIgIFRvbW15 IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CisKKyAgICAgICAgTWVkaWFTdHJlYW1S ZWdpc3RyeSBzaG91bGQgaG9sZCByZWZlcmVuY2VzIHRvIE1lZGlhU3RyZWFtRGVzY3JpcHRvciBy YXRoZXIgdGhhbiBNZWRpYVN0cmVhbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzA4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIG1lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVS TCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyTWVk aWFTdHJlYW1VUkwpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6bG9v a3VwTWVkaWFTdHJlYW1EZXNjcmlwdG9yKToKKyAgICAgICAgKiBtZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbVJlZ2lzdHJ5Lmg6CisKKyAgICAgICAgVGVzdHMgZm9yIHRoZSBNZWRpYSBTdHJlYW0gQVBJ IHdpbGwgYmUgcHJvdmlkZWQgYnkgdGhlIGJ1ZyA1NjU4NywgcGVuZGluZyBlbm91Z2ggbGFuZGVk IGNvZGUuCisKIDIwMTEtMTEtMDIgIEJlbiBXZWxscyAgPGJlbndlbGxzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBDYW52YXMgZmlsbGluZyBwYXRocyBvciByZWN0cyBuZWVkIHRvIGJlIGludmFs aWRhdGUgbGFyZ2VyIHJlY3RzIGZvciBzb21lIGNvbXBvc2l0aW5nIG1vZGVzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAppbmRleCA5 NTkxNTU1NzAxZDRjYzI3YmZiNDhhZWU1M2M4ZGZmY2U2NGE5MWQ5Li5lM2Y4MDYwYjgxYmY1M2Y2 N2Y3ZDRiOTNkZTVhZDg5ODQzZjA1MjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcApAQCAtNDMsMjIgKzQzLDIzIEBAIE1lZGlh U3RyZWFtUmVnaXN0cnkmIE1lZGlhU3RyZWFtUmVnaXN0cnk6OnJlZ2lzdHJ5KCkKIHZvaWQgTWVk aWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVSTChjb25zdCBLVVJMJiB1cmws IFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0+IHN0cmVhbSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwotICAgIG1fc3RyZWFtcy5hZGQodXJsLnN0cmluZygpLCBzdHJlYW0pOworICAgIFJl ZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IHN0cmVhbURlc2NyaXB0b3IgPSBzdHJlYW0tPmRl c2NyaXB0b3IoKTsKKyAgICBpZiAoIXN0cmVhbURlc2NyaXB0b3IpCisgICAgICAgIHJldHVybjsK KworICAgIG1fc3RyZWFtRGVzY3JpcHRvcnMuc2V0KHVybC5zdHJpbmcoKSwgc3RyZWFtRGVzY3Jp cHRvcik7CiB9CiAKIHZvaWQgTWVkaWFTdHJlYW1SZWdpc3RyeTo6dW5yZWdpc3Rlck1lZGlhU3Ry ZWFtVVJMKGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwot ICAgIG1fc3RyZWFtcy5yZW1vdmUodXJsLnN0cmluZygpKTsKKyAgICBtX3N0cmVhbURlc2NyaXB0 b3JzLnJlbW92ZSh1cmwuc3RyaW5nKCkpOwogfQogCi1NZWRpYVN0cmVhbSogTWVkaWFTdHJlYW1S ZWdpc3RyeTo6bWVkaWFTdHJlYW0oY29uc3QgS1VSTCYgdXJsKSBjb25zdAorUGFzc1JlZlB0cjxN ZWRpYVN0cmVhbURlc2NyaXB0b3I+IE1lZGlhU3RyZWFtUmVnaXN0cnk6Omxvb2t1cE1lZGlhU3Ry ZWFtRGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIGtleSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwotICAgIFVSTFN0cmVhbU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3N0cmVhbXMu ZmluZCh1cmwuc3RyaW5nKCkpOwotICAgIGlmIChpdCAhPSBtX3N0cmVhbXMuZW5kKCkpCi0gICAg ICAgIHJldHVybiBpdC0+c2Vjb25kLmdldCgpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBt X3N0cmVhbURlc2NyaXB0b3JzLmdldChrZXkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lz dHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmgK aW5kZXggMWU5Y2QyYTE1YmUzYTUyNjZjNTMwYjYwODBhOGI3ZTlmYmFmZmRlYy4uMzAyZDZhYjEw NzM1YjlkYmUxOGJkYjgzNDA1OWY1NjNmNDZhNTg2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaApAQCAtMjUsNiArMjUsOCBAQAogI2lm bmRlZiBNZWRpYVN0cmVhbVJlZ2lzdHJ5X2gKICNkZWZpbmUgTWVkaWFTdHJlYW1SZWdpc3RyeV9o CiAKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorCiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4K ICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hh c2guaD4KQEAgLTMzLDYgKzM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBLVVJM OwogY2xhc3MgTWVkaWFTdHJlYW07CitjbGFzcyBNZWRpYVN0cmVhbURlc2NyaXB0b3I7CiAKIGNs YXNzIE1lZGlhU3RyZWFtUmVnaXN0cnkgewogcHVibGljOgpAQCAtNDIsMTMgKzQ1LDE1IEBAIHB1 YmxpYzoKICAgICAvLyBSZWdpc3RlcnMgYSBibG9iIFVSTCByZWZlcnJpbmcgdG8gdGhlIHNwZWNp ZmllZCBzdHJlYW0gZGF0YS4KICAgICB2b2lkIHJlZ2lzdGVyTWVkaWFTdHJlYW1VUkwoY29uc3Qg S1VSTCYsIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0+KTsKICAgICB2b2lkIHVucmVnaXN0ZXJNZWRp YVN0cmVhbVVSTChjb25zdCBLVVJMJik7Ci0gICAgTWVkaWFTdHJlYW0qIG1lZGlhU3RyZWFtKGNv bnN0IEtVUkwmKSBjb25zdDsKKworICAgIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9y PiBsb29rdXBNZWRpYVN0cmVhbURlc2NyaXB0b3IoY29uc3QgU3RyaW5nJiBrZXkpOwogCiBwcml2 YXRlOgotICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxNZWRpYVN0cmVhbT4gPiBV UkxTdHJlYW1NYXA7Ci0gICAgVVJMU3RyZWFtTWFwIG1fc3RyZWFtczsKKyAgICBIYXNoTWFwPFN0 cmluZywgUmVmUHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gPiBtX3N0cmVhbURlc2NyaXB0b3Jz OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCisjZW5kaWYgLy8gRU5BQkxFKE1FRElB X1NUUkVBTSkKKwogI2VuZGlmIC8vIE1lZGlhU3RyZWFtUmVnaXN0cnlfaAo= 113330 2011-11-02 10:40:23 -0700 2011-11-02 10:54:04 -0700 Patch bug-70896-20111102184021.patch text/plain 3614 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogOTkwNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4OWQ2ZDg0MjJiY2Y0MWI3 ZTY4MDJmODRmNjU5ODA3Nzg3MDE4ZWJmLi4zODM0OGYyNzkzYjBmM2NmMjE0MDIxMGIyZjVkZjcw NDAzZTRiNDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTEtMDIgIFRvbW15 IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CisKKyAgICAgICAgTWVkaWFTdHJlYW1S ZWdpc3RyeSBzaG91bGQgaG9sZCByZWZlcmVuY2VzIHRvIE1lZGlhU3RyZWFtRGVzY3JpcHRvciBy YXRoZXIgdGhhbiBNZWRpYVN0cmVhbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzA4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIG1lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVS TCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyTWVk aWFTdHJlYW1VUkwpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6bG9v a3VwTWVkaWFTdHJlYW1EZXNjcmlwdG9yKToKKyAgICAgICAgKiBtZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbVJlZ2lzdHJ5Lmg6CisKKyAgICAgICAgVGVzdHMgZm9yIHRoZSBNZWRpYSBTdHJlYW0gQVBJ IHdpbGwgYmUgcHJvdmlkZWQgYnkgdGhlIGJ1ZyA1NjU4NywgcGVuZGluZyBlbm91Z2ggbGFuZGVk IGNvZGUuCisKIDIwMTEtMTEtMDIgIEJlbiBXZWxscyAgPGJlbndlbGxzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBDYW52YXMgZmlsbGluZyBwYXRocyBvciByZWN0cyBuZWVkIHRvIGJlIGludmFs aWRhdGUgbGFyZ2VyIHJlY3RzIGZvciBzb21lIGNvbXBvc2l0aW5nIG1vZGVzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAppbmRleCA5 NTkxNTU1NzAxZDRjYzI3YmZiNDhhZWU1M2M4ZGZmY2U2NGE5MWQ5Li5lYjlmZGJiYjNiNGJiYTkw NjRhYzBjMjIyYWQ0ZGY0YzNhMTM1MzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcApAQCAtNDMsMjIgKzQzLDE5IEBAIE1lZGlh U3RyZWFtUmVnaXN0cnkmIE1lZGlhU3RyZWFtUmVnaXN0cnk6OnJlZ2lzdHJ5KCkKIHZvaWQgTWVk aWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVSTChjb25zdCBLVVJMJiB1cmws IFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0+IHN0cmVhbSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwotICAgIG1fc3RyZWFtcy5hZGQodXJsLnN0cmluZygpLCBzdHJlYW0pOworICAgIG1f c3RyZWFtRGVzY3JpcHRvcnMuc2V0KHVybC5zdHJpbmcoKSwgc3RyZWFtLT5kZXNjcmlwdG9yKCkp OwogfQogCiB2b2lkIE1lZGlhU3RyZWFtUmVnaXN0cnk6OnVucmVnaXN0ZXJNZWRpYVN0cmVhbVVS TChjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBt X3N0cmVhbXMucmVtb3ZlKHVybC5zdHJpbmcoKSk7CisgICAgbV9zdHJlYW1EZXNjcmlwdG9ycy5y ZW1vdmUodXJsLnN0cmluZygpKTsKIH0KIAotTWVkaWFTdHJlYW0qIE1lZGlhU3RyZWFtUmVnaXN0 cnk6Om1lZGlhU3RyZWFtKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK01lZGlhU3RyZWFtRGVzY3Jp cHRvciogTWVkaWFTdHJlYW1SZWdpc3RyeTo6bG9va3VwTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGNv bnN0IFN0cmluZyYgdXJsKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgVVJM U3RyZWFtTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fc3RyZWFtcy5maW5kKHVybC5zdHJpbmco KSk7Ci0gICAgaWYgKGl0ICE9IG1fc3RyZWFtcy5lbmQoKSkKLSAgICAgICAgcmV0dXJuIGl0LT5z ZWNvbmQuZ2V0KCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG1fc3RyZWFtRGVzY3JpcHRv cnMuZ2V0KHVybCkuZ2V0KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaCBiL1Nv dXJjZS9XZWJDb3JlL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaAppbmRleCAxZTlj ZDJhMTViZTNhNTI2NmM1MzBiNjA4MGE4YjdlOWZiYWZmZGVjLi4xZjkyNzQ1MDk1ZTk0ZmU3MzQy MDlhYzhjZTAzODcyOTdiMDA4YjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5oCkBAIC0yNSw2ICsyNSw4IEBACiAjaWZuZGVmIE1lZGlh U3RyZWFtUmVnaXN0cnlfaAogI2RlZmluZSBNZWRpYVN0cmVhbVJlZ2lzdHJ5X2gKIAorI2lmIEVO QUJMRShNRURJQV9TVFJFQU0pCisKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUg PHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgpAQCAt MzMsNiArMzUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEtVUkw7CiBjbGFzcyBN ZWRpYVN0cmVhbTsKK2NsYXNzIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjsKIAogY2xhc3MgTWVkaWFT dHJlYW1SZWdpc3RyeSB7CiBwdWJsaWM6CkBAIC00MiwxMyArNDUsMTUgQEAgcHVibGljOgogICAg IC8vIFJlZ2lzdGVycyBhIGJsb2IgVVJMIHJlZmVycmluZyB0byB0aGUgc3BlY2lmaWVkIHN0cmVh bSBkYXRhLgogICAgIHZvaWQgcmVnaXN0ZXJNZWRpYVN0cmVhbVVSTChjb25zdCBLVVJMJiwgUGFz c1JlZlB0cjxNZWRpYVN0cmVhbT4pOwogICAgIHZvaWQgdW5yZWdpc3Rlck1lZGlhU3RyZWFtVVJM KGNvbnN0IEtVUkwmKTsKLSAgICBNZWRpYVN0cmVhbSogbWVkaWFTdHJlYW0oY29uc3QgS1VSTCYp IGNvbnN0OworCisgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBsb29rdXBNZWRpYVN0cmVhbURl c2NyaXB0b3IoY29uc3QgU3RyaW5nJiB1cmwpOwogCiBwcml2YXRlOgotICAgIHR5cGVkZWYgSGFz aE1hcDxTdHJpbmcsIFJlZlB0cjxNZWRpYVN0cmVhbT4gPiBVUkxTdHJlYW1NYXA7Ci0gICAgVVJM U3RyZWFtTWFwIG1fc3RyZWFtczsKKyAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPE1lZGlhU3Ry ZWFtRGVzY3JpcHRvcj4gPiBtX3N0cmVhbURlc2NyaXB0b3JzOwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCisjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkKKwogI2VuZGlmIC8v IE1lZGlhU3RyZWFtUmVnaXN0cnlfaAo= 113334 2011-11-02 10:54:11 -0700 2011-11-02 12:12:11 -0700 Patch bug-70896-20111102185409.patch text/plain 3614 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogOTkwNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4OWQ2ZDg0MjJiY2Y0MWI3 ZTY4MDJmODRmNjU5ODA3Nzg3MDE4ZWJmLi45YjRmZDFlNDU5MDlhM2ZjOWI1YTZiM2I0ZGVjMjQw YjcyYzI5MGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTEtMDIgIFRvbW15 IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CisKKyAgICAgICAgTWVkaWFTdHJlYW1S ZWdpc3RyeSBzaG91bGQgaG9sZCByZWZlcmVuY2VzIHRvIE1lZGlhU3RyZWFtRGVzY3JpcHRvciBy YXRoZXIgdGhhbiBNZWRpYVN0cmVhbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzA4OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0cyBmb3IgdGhlIE1lZGlhIFN0cmVhbSBBUEkgd2lsbCBiZSBwcm92 aWRlZCBieSB0aGUgYnVnIDU2NTg3LCBwZW5kaW5nIGVub3VnaCBsYW5kZWQgY29kZS4KKworICAg ICAgICAqIG1lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVSTCk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyTWVkaWFTdHJlYW1V UkwpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6bG9va3VwTWVkaWFT dHJlYW1EZXNjcmlwdG9yKToKKyAgICAgICAgKiBtZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lz dHJ5Lmg6CisKIDIwMTEtMTEtMDIgIEJlbiBXZWxscyAgPGJlbndlbGxzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBDYW52YXMgZmlsbGluZyBwYXRocyBvciByZWN0cyBuZWVkIHRvIGJlIGludmFs aWRhdGUgbGFyZ2VyIHJlY3RzIGZvciBzb21lIGNvbXBvc2l0aW5nIG1vZGVzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAppbmRleCA5 NTkxNTU1NzAxZDRjYzI3YmZiNDhhZWU1M2M4ZGZmY2U2NGE5MWQ5Li5lYjlmZGJiYjNiNGJiYTkw NjRhYzBjMjIyYWQ0ZGY0YzNhMTM1MzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcApAQCAtNDMsMjIgKzQzLDE5IEBAIE1lZGlh U3RyZWFtUmVnaXN0cnkmIE1lZGlhU3RyZWFtUmVnaXN0cnk6OnJlZ2lzdHJ5KCkKIHZvaWQgTWVk aWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJNZWRpYVN0cmVhbVVSTChjb25zdCBLVVJMJiB1cmws IFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0+IHN0cmVhbSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwotICAgIG1fc3RyZWFtcy5hZGQodXJsLnN0cmluZygpLCBzdHJlYW0pOworICAgIG1f c3RyZWFtRGVzY3JpcHRvcnMuc2V0KHVybC5zdHJpbmcoKSwgc3RyZWFtLT5kZXNjcmlwdG9yKCkp OwogfQogCiB2b2lkIE1lZGlhU3RyZWFtUmVnaXN0cnk6OnVucmVnaXN0ZXJNZWRpYVN0cmVhbVVS TChjb25zdCBLVVJMJiB1cmwpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBt X3N0cmVhbXMucmVtb3ZlKHVybC5zdHJpbmcoKSk7CisgICAgbV9zdHJlYW1EZXNjcmlwdG9ycy5y ZW1vdmUodXJsLnN0cmluZygpKTsKIH0KIAotTWVkaWFTdHJlYW0qIE1lZGlhU3RyZWFtUmVnaXN0 cnk6Om1lZGlhU3RyZWFtKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK01lZGlhU3RyZWFtRGVzY3Jp cHRvciogTWVkaWFTdHJlYW1SZWdpc3RyeTo6bG9va3VwTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGNv bnN0IFN0cmluZyYgdXJsKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgVVJM U3RyZWFtTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fc3RyZWFtcy5maW5kKHVybC5zdHJpbmco KSk7Ci0gICAgaWYgKGl0ICE9IG1fc3RyZWFtcy5lbmQoKSkKLSAgICAgICAgcmV0dXJuIGl0LT5z ZWNvbmQuZ2V0KCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG1fc3RyZWFtRGVzY3JpcHRv cnMuZ2V0KHVybCkuZ2V0KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaCBiL1Nv dXJjZS9XZWJDb3JlL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaAppbmRleCAxZTlj ZDJhMTViZTNhNTI2NmM1MzBiNjA4MGE4YjdlOWZiYWZmZGVjLi4xZjkyNzQ1MDk1ZTk0ZmU3MzQy MDlhYzhjZTAzODcyOTdiMDA4YjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5oCkBAIC0yNSw2ICsyNSw4IEBACiAjaWZuZGVmIE1lZGlh U3RyZWFtUmVnaXN0cnlfaAogI2RlZmluZSBNZWRpYVN0cmVhbVJlZ2lzdHJ5X2gKIAorI2lmIEVO QUJMRShNRURJQV9TVFJFQU0pCisKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUg PHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgpAQCAt MzMsNiArMzUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEtVUkw7CiBjbGFzcyBN ZWRpYVN0cmVhbTsKK2NsYXNzIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjsKIAogY2xhc3MgTWVkaWFT dHJlYW1SZWdpc3RyeSB7CiBwdWJsaWM6CkBAIC00MiwxMyArNDUsMTUgQEAgcHVibGljOgogICAg IC8vIFJlZ2lzdGVycyBhIGJsb2IgVVJMIHJlZmVycmluZyB0byB0aGUgc3BlY2lmaWVkIHN0cmVh bSBkYXRhLgogICAgIHZvaWQgcmVnaXN0ZXJNZWRpYVN0cmVhbVVSTChjb25zdCBLVVJMJiwgUGFz c1JlZlB0cjxNZWRpYVN0cmVhbT4pOwogICAgIHZvaWQgdW5yZWdpc3Rlck1lZGlhU3RyZWFtVVJM KGNvbnN0IEtVUkwmKTsKLSAgICBNZWRpYVN0cmVhbSogbWVkaWFTdHJlYW0oY29uc3QgS1VSTCYp IGNvbnN0OworCisgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBsb29rdXBNZWRpYVN0cmVhbURl c2NyaXB0b3IoY29uc3QgU3RyaW5nJiB1cmwpOwogCiBwcml2YXRlOgotICAgIHR5cGVkZWYgSGFz aE1hcDxTdHJpbmcsIFJlZlB0cjxNZWRpYVN0cmVhbT4gPiBVUkxTdHJlYW1NYXA7Ci0gICAgVVJM U3RyZWFtTWFwIG1fc3RyZWFtczsKKyAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPE1lZGlhU3Ry ZWFtRGVzY3JpcHRvcj4gPiBtX3N0cmVhbURlc2NyaXB0b3JzOwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCisjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkKKwogI2VuZGlmIC8v IE1lZGlhU3RyZWFtUmVnaXN0cnlfaAo=