85794 2012-05-07 05:20:36 -0700 MediaStream API: Adding the possibility of port specific information in MediaStreamDescriptor 2012-05-09 08:48:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 56459 1 tommyw tommyw abarth dglazkov eric.carlson feature-media-reviews fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 617534 0 tommyw 2012-05-07 05:20:36 -0700 To facilitate for ports I have added two fields to MediaStreamDescriptor: 1) A id (string) field where ports can give MSD an unique id. Needed because the label field is usable for this purpose. 2) An userData field (uint64_t) that can be used for whatever purpose is needed. 617536 1 140513 tommyw 2012-05-07 05:27:55 -0700 Created attachment 140513 Patch 617539 2 webkit.review.bot 2012-05-07 05:31:11 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 617671 3 140513 abarth 2012-05-07 10:14:15 -0700 Comment on attachment 140513 Patch The approach we usually use here is to create an ExtraData object that the client can subclass and use to store extra data on these objects. Take a look at WebURLRequest::ExtraData for an example of how this works. 618485 4 140710 tommyw 2012-05-08 06:59:25 -0700 Created attachment 140710 Patch 618491 5 tommyw 2012-05-08 07:01:16 -0700 Fixed. (In reply to comment #3) > (From update of attachment 140513 [details]) > The approach we usually use here is to create an ExtraData object that the client can subclass and use to store extra data on these objects. Take a look at WebURLRequest::ExtraData for an example of how this works. 618567 6 140710 abarth 2012-05-08 09:29:00 -0700 Comment on attachment 140710 Patch This looks fine, but please remove the m_id property. It doesn't seem to serve any purpose in WebKit. If the embedder wants to use an ID, it can put one in ExtraData. 619257 7 140883 tommyw 2012-05-09 01:07:02 -0700 Created attachment 140883 Patch 619258 8 tommyw 2012-05-09 01:07:40 -0700 (In reply to comment #6) > (From update of attachment 140710 [details]) > This looks fine, but please remove the m_id property. It doesn't seem to serve any purpose in WebKit. If the embedder wants to use an ID, it can put one in ExtraData. Fixed. 619524 9 140883 webkit.review.bot 2012-05-09 08:48:20 -0700 Comment on attachment 140883 Patch Clearing flags on attachment: 140883 Committed r116529: <http://trac.webkit.org/changeset/116529> 619525 10 webkit.review.bot 2012-05-09 08:48:26 -0700 All reviewed patches have been landed. Closing bug. 140513 2012-05-07 05:27:55 -0700 2012-05-08 06:59:13 -0700 Patch bug-85794-20120507142753.patch text/plain 9294 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBiYjIxYzljODYzMzU3 ZjI2NDljNDYzOTVhODNkNTQ3NDg0NjRkMjc3Li4wMTQxMTJjZjQ3ZWI3ODg3ZTM0OTFiZGM1OWNi Mjk0ZDE5OWE1OGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFkZGluZyB0aGUgcG9zc2liaWxpdHkgb2YgcG9ydCBzcGVjaWZpYyBpbmZvcm1h dGlvbiBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVG8gZmFjaWxpdGF0ZSBmb3IgcG9ydHMgSSBoYXZlIGFkZGVk IHR3byBmaWVsZHMgdG8gTWVkaWFTdHJlYW1EZXNjcmlwdG9yOgorICAgICAgICAxKSBBIGlkIChz dHJpbmcpIGZpZWxkIHdoZXJlIHBvcnRzIGNhbiBnaXZlIE1TRCBhbiB1bmlxdWUgaWQuIE5lZWRl ZCBiZWNhdXNlIHRoZSBsYWJlbAorICAgICAgICAgICBmaWVsZCBpcyB1c2FibGUgZm9yIHRoaXMg cHVycG9zZS4KKyAgICAgICAgMikgQW4gdXNlckRhdGEgZmllbGQgKHVpbnQ2NF90KSB0aGF0IGNh biBiZSB1c2VkIGZvciB3aGF0ZXZlciBwdXJwb3NlIGlzIG5lZWRlZC4KKworICAgICAgICAqIGNo cm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaDoKKyAgICAgICAgKFdlYk1l ZGlhU3RyZWFtRGVzY3JpcHRvcik6CisKIDIwMTItMDUtMDQgIFRvbW15IFdpZGVuZmx5Y2h0ICA8 dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAgTWVkaWFTdHJlYW0gQVBJOiBNYWtlIFBlZXJD b25uZWN0aW9uMDAncyBBUEkgZnVsbHkgY29tcGxpYW50IHdpdGggdGhlIGRyYWZ0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggZDU5NjA5MTRlNmRjNzI5YWFjYWFmNThhMDA2MGJmMzBmZTZhMWJjNS4uNTUwNTlkM2Nk NWQxYjIzMzA3NzYwMGE5MzJiZTA1OGZkODQzZDgwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDEyLTA1LTA3ICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgor CisgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogQWRkaW5nIHRoZSBwb3NzaWJpbGl0eSBvZiBwb3J0 IHNwZWNpZmljIGluZm9ybWF0aW9uIGluIE1lZGlhU3RyZWFtRGVzY3JpcHRvcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODU3OTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBmYWNpbGl0YXRlIGZvciBw b3J0cyBJIGhhdmUgYWRkZWQgdHdvIGZpZWxkcyB0byBNZWRpYVN0cmVhbURlc2NyaXB0b3I6Cisg ICAgICAgIDEpIEEgaWQgKHN0cmluZykgZmllbGQgd2hlcmUgcG9ydHMgY2FuIGdpdmUgTVNEIGFu IHVuaXF1ZSBpZC4gTmVlZGVkIGJlY2F1c2UgdGhlIGxhYmVsCisgICAgICAgICAgIGZpZWxkIGlz IHVzYWJsZSBmb3IgdGhpcyBwdXJwb3NlLgorICAgICAgICAyKSBBbiB1c2VyRGF0YSBmaWVsZCAo dWludDY0X3QpIHRoYXQgY2FuIGJlIHVzZWQgZm9yIHdoYXRldmVyIHB1cnBvc2UgaXMgbmVlZGVk LgorCisgICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppZCk6CisgICAgICAgIChXZWJLaXQp OgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldElkKToKKyAg ICAgICAgKFdlYktpdDo6V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjp1c2VyRGF0YSk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0VXNlckRhdGEpOgorICAg ICAgICAoV2ViS2l0OjpXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmluaXRpYWxpemUpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpjcmVhdGUpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppZCk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldElkKToKKyAgICAgICAgKE1lZGlhU3RyZWFtRGVzY3Jp cHRvcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnVzZXJEYXRh KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0VXNlckRhdGEp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpNZWRpYVN0cmVhbURl c2NyaXB0b3IpOgorCiAyMDEyLTA1LTA2ICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBDbGVhbnVwOiBNb3ZlIEZpbGVTeXN0ZW0gQVBJIHR5cGUgZGVmaW5p dGlvbnMgaW50byBhIHNlcGFyYXRlIGhlYWRlciBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291cmNl L1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaAppbmRl eCA0OTIzYzk3YjUwMTdlNzExNzRjZWU4YzEwMjQwNmU4N2Y4NjA5NmNlLi4yYmY5OTY5MmYyZTFi NzdmYTI4MmJlNDIyZDdlZWZmZTlhODAyY2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oCisrKyBiL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTU3 LDYgKzU3LDcgQEAgcHVibGljOgogICAgIC8vIERFUFJFQ0FURUQKICAgICBXRUJLSVRfRVhQT1JU IHZvaWQgaW5pdGlhbGl6ZShjb25zdCBXZWJTdHJpbmcmIGxhYmVsLCBjb25zdCBXZWJWZWN0b3I8 V2ViTWVkaWFTdHJlYW1Tb3VyY2U+Jik7CiAKKyAgICBXRUJLSVRfRVhQT1JUIHZvaWQgaW5pdGlh bGl6ZShjb25zdCBXZWJTdHJpbmcmIGxhYmVsLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJl YW1Tb3VyY2U+JiBhdWRpb1NvdXJjZXMsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNv dXJjZT4mIHZpZGVvU291cmNlcywgY29uc3QgV2ViU3RyaW5nJiBpZCwgdWludDY0X3QgdXNlckRh dGEpOwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBpbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYg bGFiZWwsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNl cywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKTsK ICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVzZXQoKTsKICAgICBib29sIGlzTnVsbCgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJpdmF0ZS5pc051bGwoKTsgfQpAQCAtNjksNiArNzAsMTEgQEAgcHVibGlj OgogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBhdWRpb1NvdXJjZXMoV2ViVmVjdG9yPFdlYk1lZGlh U3RyZWFtQ29tcG9uZW50PiYpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCB2aWRlb1Nv dXJjZXMoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtQ29tcG9uZW50PiYpIGNvbnN0OwogCisgICAg V0VCS0lUX0VYUE9SVCBXZWJTdHJpbmcgaWQoKSBjb25zdDsKKyAgICBXRUJLSVRfRVhQT1JUIHZv aWQgc2V0SWQoY29uc3QgV2ViU3RyaW5nJik7CisgICAgV0VCS0lUX0VYUE9SVCB1aW50NjRfdCB1 c2VyRGF0YSgpIGNvbnN0OworICAgIFdFQktJVF9FWFBPUlQgdm9pZCBzZXRVc2VyRGF0YShjb25z dCB1aW50NjRfdCk7CisKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KICAgICBXZWJNZWRpYVN0 cmVhbURlc2NyaXB0b3IoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yKik7CiAgICAgV2Vi TWVkaWFTdHJlYW1EZXNjcmlwdG9yKGNvbnN0IFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpNZWRp YVN0cmVhbURlc2NyaXB0b3I+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRv ci5jcHAKaW5kZXggZjdlM2M2YjFhZTgyZWE2ODdhMmZjNGFiYzFkZjYyZTlmOGFjZGZmYS4uZDhj YThlNTJjMWUxZmE2NjBmNWFmMzk2YzkzZTk5ODQ1ZTcwNDg0NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbURlc2NyaXB0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2Vi TWVkaWFTdHJlYW1EZXNjcmlwdG9yLmNwcApAQCAtNjYsNiArNjYsMjYgQEAgV2ViU3RyaW5nIFdl Yk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6bGFiZWwoKSBjb25zdAogICAgIHJldHVybiBtX3ByaXZh dGUtPmxhYmVsKCk7CiB9CiAKK1dlYlN0cmluZyBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6Omlk KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5pZCgpOworfQorCit2b2lkIFdlYk1l ZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0SWQoY29uc3QgV2ViU3RyaW5nJiBpZCkKK3sKKyAgICBt X3ByaXZhdGUtPnNldElkKGlkKTsKK30KKwordWludDY0X3QgV2ViTWVkaWFTdHJlYW1EZXNjcmlw dG9yOjp1c2VyRGF0YSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+dXNlckRhdGEo KTsKK30KKwordm9pZCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldFVzZXJEYXRhKGNvbnN0 IHVpbnQ2NF90IHVzZXJEYXRhKQoreworICAgIG1fcHJpdmF0ZS0+c2V0VXNlckRhdGEodXNlckRh dGEpOworfQorCiAvLyBGSVhNRTogQ2xlYW51cCB3aGVuIHRoZSBjaHJvbWl1bSBjb2RlIGhhcyBz d2l0Y2hlZCB0byB0aGUgc3BsaXQgc291cmNlcyBpbXBsZW1lbnRhdGlvbi4KIHZvaWQgV2ViTWVk aWFTdHJlYW1EZXNjcmlwdG9yOjpzb3VyY2VzKFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mIHdlYlNvdXJjZXMpIGNvbnN0CiB7CkBAIC0xMzAsNiArMTUwLDExIEBAIHZvaWQgV2ViTWVk aWFTdHJlYW1EZXNjcmlwdG9yOjppbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsIGNv bnN0IFdlYlZlY3RvCiAKIHZvaWQgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppbml0aWFsaXpl KGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNv dXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNl PiYgdmlkZW9Tb3VyY2VzKQogeworICAgIGluaXRpYWxpemUobGFiZWwsIGF1ZGlvU291cmNlcywg dmlkZW9Tb3VyY2VzLCAiIiwgMCk7Cit9CisKK3ZvaWQgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9y Ojppbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsIGNvbnN0IFdlYlZlY3RvcjxXZWJN ZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlh U3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzLCBjb25zdCBXZWJTdHJpbmcmIGlkLCB1aW50NjRf dCB1c2VyRGF0YSkKK3sKICAgICBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciBhdWRpbywgdmlkZW87 CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhdWRpb1NvdXJjZXMuc2l6ZSgpOyArK2kpIHsK ICAgICAgICAgTWVkaWFTdHJlYW1Tb3VyY2UqIGN1cnIgPSBhdWRpb1NvdXJjZXNbaV07CkBAIC0x MzksNyArMTY0LDcgQEAgdm9pZCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmluaXRpYWxpemUo Y29uc3QgV2ViU3RyaW5nJiBsYWJlbCwgY29uc3QgV2ViVmVjdG8KICAgICAgICAgTWVkaWFTdHJl YW1Tb3VyY2UqIGN1cnIgPSB2aWRlb1NvdXJjZXNbaV07CiAgICAgICAgIHZpZGVvLmFwcGVuZChj dXJyKTsKICAgICB9Ci0gICAgbV9wcml2YXRlID0gTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpjcmVh dGUobGFiZWwsIGF1ZGlvLCB2aWRlbyk7CisgICAgbV9wcml2YXRlID0gTWVkaWFTdHJlYW1EZXNj cmlwdG9yOjpjcmVhdGUobGFiZWwsIGF1ZGlvLCB2aWRlbywgaWQsIHVzZXJEYXRhKTsKIH0KIAog dm9pZCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmFzc2lnbihjb25zdCBXZWJNZWRpYVN0cmVh bURlc2NyaXB0b3ImIG90aGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAppbmRleCBiM2IyNzNmYTc3 N2RmMjdlZDZjMGY4NWU2NTRkMzMyODAxNWZlNDE5Li4zMDE3ZTY5NTVkMGNhYTJjNWRhZDBmYzQ3 NmU0NDBkM2E3ZmQ3YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaApAQCAtMSw1ICsxLDYgQEAK IC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNTAsNyArNTEsMTEgQEAgY2xh c3MgTWVkaWFTdHJlYW1EZXNjcmlwdG9yIDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFTdHJlYW1E ZXNjcmlwdG9yPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1E ZXNjcmlwdG9yPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgTWVkaWFTdHJlYW1T b3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3Im IHZpZGVvU291cmNlcykKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWVkaWFT dHJlYW1EZXNjcmlwdG9yKGxhYmVsLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcykpOworICAg ICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtRGVzY3JpcHRvcihsYWJlbCwgYXVk aW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMsICIiLCAwKSk7CisgICAgfQorICAgIHN0YXRpYyBQYXNz UmVmUHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gY3JlYXRlKGNvbnN0IFN0cmluZyYgbGFiZWws IGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiBhdWRpb1NvdXJjZXMsIGNvbnN0IE1lZGlh U3RyZWFtU291cmNlVmVjdG9yJiB2aWRlb1NvdXJjZXMsIGNvbnN0IFN0cmluZyYgaWQsIHVpbnQ2 NF90IHVzZXJEYXRhKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0 cmVhbURlc2NyaXB0b3IobGFiZWwsIGF1ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzLCBpZCwgdXNl ckRhdGEpKTsKICAgICB9CiAKICAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lciogb3duZXIo KSBjb25zdCB7IHJldHVybiBtX293bmVyOyB9CkBAIC02NywxMSArNzIsMTkgQEAgcHVibGljOgog ICAgIGJvb2wgZW5kZWQoKSBjb25zdCB7IHJldHVybiBtX2VuZGVkOyB9CiAgICAgdm9pZCBzZXRF bmRlZCgpIHsgbV9lbmRlZCA9IHRydWU7IH0KIAorICAgIFN0cmluZyBpZCgpIGNvbnN0IHsgcmV0 dXJuIG1faWQ7IH0KKyAgICB2b2lkIHNldElkKGNvbnN0IFN0cmluZyYgaWQpIHsgbV9pZCA9IGlk OyB9CisKKyAgICB1aW50NjRfdCB1c2VyRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlckRhdGE7 IH0KKyAgICB2b2lkIHNldFVzZXJEYXRhKHVpbnQ2NF90IHVzZXJEYXRhKSB7IG1fdXNlckRhdGEg PSB1c2VyRGF0YTsgfQorCiBwcml2YXRlOgotICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25z dCBTdHJpbmcmIGxhYmVsLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3Vy Y2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKQorICAgIE1l ZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIGxhYmVsLCBjb25zdCBNZWRpYVN0cmVh bVNvdXJjZVZlY3RvciYgYXVkaW9Tb3VyY2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3Rv ciYgdmlkZW9Tb3VyY2VzLCBjb25zdCBTdHJpbmcmIGlkLCB1aW50NjRfdCB1c2VyRGF0YSkKICAg ICAgICAgOiBtX293bmVyKDApCiAgICAgICAgICwgbV9sYWJlbChsYWJlbCkKICAgICAgICAgLCBt X2VuZGVkKGZhbHNlKQorICAgICAgICAsIG1faWQoaWQpCisgICAgICAgICwgbV91c2VyRGF0YSh1 c2VyRGF0YSkKICAgICB7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXVkaW9Tb3Vy Y2VzLnNpemUoKTsgaSsrKQogICAgICAgICAgICAgbV9hdWRpb0NvbXBvbmVudHMuYXBwZW5kKE1l ZGlhU3RyZWFtQ29tcG9uZW50OjpjcmVhdGUoYXVkaW9Tb3VyY2VzW2ldKSk7CkBAIC04NSw2ICs5 OCw5IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbUNvbXBvbmVudD4g PiBtX2F1ZGlvQ29tcG9uZW50czsKICAgICBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9u ZW50PiA+IG1fdmlkZW9Db21wb25lbnRzOwogICAgIGJvb2wgbV9lbmRlZDsKKworICAgIFN0cmlu ZyBtX2lkOworICAgIHVpbnQ2NF90IG1fdXNlckRhdGE7CiB9OwogCiB0eXBlZGVmIFZlY3RvcjxS ZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiA+IE1lZGlhU3RyZWFtRGVzY3JpcHRvclZlY3Rv cjsK 140710 2012-05-08 06:59:25 -0700 2012-05-09 01:06:54 -0700 Patch bug-85794-20120508155924.patch text/plain 11021 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAwMGRjNjA3Njk0YjE4 MDhmMjU3NDYzM2QzMTA1NDc4MTNiNzU2YzYyLi45ZjlmZGY3MjhjNGU0YzBhYTI3NTQxN2Q3MmY2 ZTA5ZTI3NmZhNjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFkZGluZyB0aGUgcG9zc2liaWxpdHkgb2YgcG9ydCBzcGVjaWZpYyBpbmZvcm1h dGlvbiBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVG8gZmFjaWxpdGF0ZSBmb3IgcG9ydHMgSSBoYXZlIGFkZGVk IHR3byBmaWVsZHMgdG8gTWVkaWFTdHJlYW1EZXNjcmlwdG9yOgorICAgICAgICAxKSBBIGlkIChz dHJpbmcpIGZpZWxkIHdoZXJlIHBvcnRzIGNhbiBnaXZlIE1TRCBhbiB1bmlxdWUgaWQuIE5lZWRl ZCBiZWNhdXNlIHRoZSBsYWJlbAorICAgICAgICAgICBmaWVsZCBpcyB1c2FibGUgZm9yIHRoaXMg cHVycG9zZS4KKyAgICAgICAgMikgQW4gRXh0cmFEYXRhIGZpZWxkIHRoYXQgY2FuIGJlIHVzZWQg Zm9yIHdoYXRldmVyIHB1cnBvc2UgaXMgbmVlZGVkLgorCisgICAgICAgICogY2hyb21pdW0vcHVi bGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oOgorICAgICAgICAoRXh0cmFEYXRhKToKKyAg ICAgICAgKFdlYktpdDo6V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpFeHRyYURhdGE6On5FeHRy YURhdGEpOgorICAgICAgICAoV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yKToKKwogMjAxMi0wNS0w NyAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9t aXVtXSBNb3ZlIGZpbGVTeXN0ZW0gdG8gUGxhdGZvcm0uaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdmZTliOWE5 NzU3MmQ2YWQ1NmJkNDM5ZDViNmYyY2Q1NzA5ZmFmMTAuLmIyNDllNWIyMWY4Yjc0MzNjNmM2Yzgw OTFhOTIzZDg0NzczNGM2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMi0wNS0w NyAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRp YVN0cmVhbSBBUEk6IEFkZGluZyB0aGUgcG9zc2liaWxpdHkgb2YgcG9ydCBzcGVjaWZpYyBpbmZv cm1hdGlvbiBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gZmFjaWxpdGF0ZSBmb3IgcG9ydHMgSSBoYXZlIGFk ZGVkIHR3byBmaWVsZHMgdG8gTWVkaWFTdHJlYW1EZXNjcmlwdG9yOgorICAgICAgICAxKSBBIGlk IChzdHJpbmcpIGZpZWxkIHdoZXJlIHBvcnRzIGNhbiBnaXZlIE1TRCBhbiB1bmlxdWUgaWQuIE5l ZWRlZCBiZWNhdXNlIHRoZSBsYWJlbAorICAgICAgICAgICBmaWVsZCBpcyB1c2FibGUgZm9yIHRo aXMgcHVycG9zZS4KKyAgICAgICAgMikgQW4gRXh0cmFEYXRhIGZpZWxkIHRoYXQgY2FuIGJlIHVz ZWQgZm9yIHdoYXRldmVyIHB1cnBvc2UgaXMgbmVlZGVkLgorCisgICAgICAgIE5vIGJlaGF2aW9y YWwgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVk aWFTdHJlYW1EZXNjcmlwdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFTdHJlYW1E ZXNjcmlwdG9yOjppZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJN ZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldElkKToKKyAgICAgICAgKEV4dHJhRGF0YUNvbnRhaW5l cik6CisgICAgICAgIChXZWJLaXQ6OkV4dHJhRGF0YUNvbnRhaW5lcjo6RXh0cmFEYXRhQ29udGFp bmVyKToKKyAgICAgICAgKFdlYktpdDo6RXh0cmFEYXRhQ29udGFpbmVyOjpleHRyYURhdGEpOgor ICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmV4dHJhRGF0YSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0RXh0cmFEYXRhKToK KyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppbml0aWFsaXplKToK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaDoK KyAgICAgICAgKEV4dHJhRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2Ny aXB0b3I6OkV4dHJhRGF0YTo6fkV4dHJhRGF0YSk6CisgICAgICAgIChNZWRpYVN0cmVhbURlc2Ny aXB0b3IpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpjcmVhdGUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppZCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldElkKToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6ZXh0cmFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0RXh0cmFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yKToKKwogMjAxMi0w NS0wNSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBtYWtlIEphdmFTY3JpcHRTb3VyY2VGcmFtZSB1c2UgYnJlYWtwb2ludCBt YW5hZ2VyJ3MgYnJlYWtwb2ludHMgc3RvcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291cmNlL1BsYXRm b3JtL2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaAppbmRleCA0OTIz Yzk3YjUwMTdlNzExNzRjZWU4YzEwMjQwNmU4N2Y4NjA5NmNlLi5kMjRmZDY1MTg0YmNhMzIyMGUy NGMzZDUxZmVjMGQyMmYxNGIyNzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21p dW0vcHVibGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oCisrKyBiL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTQyLDYgKzQy LDExIEBAIGNsYXNzIFdlYlN0cmluZzsKIAogY2xhc3MgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9y IHsKIHB1YmxpYzoKKyAgICBjbGFzcyBFeHRyYURhdGEgeworICAgIHB1YmxpYzoKKyAgICAgICAg dmlydHVhbCB+RXh0cmFEYXRhKCkgeyB9CisgICAgfTsKKwogICAgIFdlYk1lZGlhU3RyZWFtRGVz Y3JpcHRvcigpIHsgfQogICAgIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBXZWJNZWRp YVN0cmVhbURlc2NyaXB0b3ImIG90aGVyKSB7IGFzc2lnbihvdGhlcik7IH0KICAgICB+V2ViTWVk aWFTdHJlYW1EZXNjcmlwdG9yKCkgeyByZXNldCgpOyB9CkBAIC01Nyw2ICs2Miw3IEBAIHB1Ymxp YzoKICAgICAvLyBERVBSRUNBVEVECiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUo Y29uc3QgV2ViU3RyaW5nJiBsYWJlbCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291 cmNlPiYpOwogCisgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUoY29uc3QgV2ViU3Ry aW5nJiBsYWJlbCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9T b3VyY2VzLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJj ZXMsIGNvbnN0IFdlYlN0cmluZyYgaWQpOwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBpbml0aWFs aXplKGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVh bVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291 cmNlPiYgdmlkZW9Tb3VyY2VzKTsKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVzZXQoKTsKICAg ICBib29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJpdmF0ZS5pc051bGwoKTsgfQpAQCAt NjksNiArNzUsMTYgQEAgcHVibGljOgogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBhdWRpb1NvdXJj ZXMoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtQ29tcG9uZW50PiYpIGNvbnN0OwogICAgIFdFQktJ VF9FWFBPUlQgdm9pZCB2aWRlb1NvdXJjZXMoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtQ29tcG9u ZW50PiYpIGNvbnN0OwogCisgICAgV0VCS0lUX0VYUE9SVCBXZWJTdHJpbmcgaWQoKSBjb25zdDsK KyAgICBXRUJLSVRfRVhQT1JUIHZvaWQgc2V0SWQoY29uc3QgV2ViU3RyaW5nJik7CisKKyAgICAv LyBFeHRyYSBkYXRhIGFzc29jaWF0ZWQgd2l0aCB0aGlzIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRv ci4KKyAgICAvLyBJZiBub24tbnVsbCwgdGhlIGV4dHJhIGRhdGEgcG9pbnRlciB3aWxsIGJlIGRl bGV0ZWQgd2hlbiB0aGUgb2JqZWN0IGlzIGRlc3Ryb3llZC4KKyAgICAvLyBTZXR0aW5nIHRoZSBl eHRyYSBkYXRhIHBvaW50ZXIgd2lsbCBjYXVzZSBhbnkgZXhpc3Rpbmcgbm9uLW51bGwKKyAgICAv LyBleHRyYSBkYXRhIHBvaW50ZXIgdG8gYmUgZGVsZXRlZC4KKyAgICBXRUJLSVRfRVhQT1JUIEV4 dHJhRGF0YSogZXh0cmFEYXRhKCkgY29uc3Q7CisgICAgV0VCS0lUX0VYUE9SVCB2b2lkIHNldEV4 dHJhRGF0YShFeHRyYURhdGEqKTsKKwogI2lmIFdFQktJVF9JTVBMRU1FTlRBVElPTgogICAgIFdl Yk1lZGlhU3RyZWFtRGVzY3JpcHRvcihXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3IqKTsK ICAgICBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IoY29uc3QgV1RGOjpQYXNzUmVmUHRyPFdlYkNv cmU6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcj4mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW1E ZXNjcmlwdG9yLmNwcAppbmRleCBmN2UzYzZiMWFlODJlYTY4N2EyZmM0YWJjMWRmNjJlOWY4YWNk ZmZhLi4yYzYxNjFjNzc4OTVkZDA5NzU4NjJjYjIxMzNhZWY0Yjk1NmNjOTE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFt RGVzY3JpcHRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3Vw cG9ydC9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuY3BwCkBAIC00MCw2ICs0MCw4IEBACiAjaW5j bHVkZSA8cHVibGljL1dlYk1lZGlhU3RyZWFtQ29tcG9uZW50Lmg+CiAjaW5jbHVkZSA8cHVibGlj L1dlYk1lZGlhU3RyZWFtU291cmNlLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYlN0cmluZy5oPgor I2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogI2lu Y2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC02Niw2 ICs2OCwzOSBAQCBXZWJTdHJpbmcgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpsYWJlbCgpIGNv bnN0CiAgICAgcmV0dXJuIG1fcHJpdmF0ZS0+bGFiZWwoKTsKIH0KIAorV2ViU3RyaW5nIFdlYk1l ZGlhU3RyZWFtRGVzY3JpcHRvcjo6aWQoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByaXZhdGUt PmlkKCk7Cit9CisKK3ZvaWQgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpzZXRJZChjb25zdCBX ZWJTdHJpbmcmIGlkKQoreworICAgIG1fcHJpdmF0ZS0+c2V0SWQoaWQpOworfQorCitjbGFzcyBF eHRyYURhdGFDb250YWluZXIgOiBwdWJsaWMgV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9y OjpFeHRyYURhdGEgeworcHVibGljOgorICAgIEV4dHJhRGF0YUNvbnRhaW5lcihXZWJNZWRpYVN0 cmVhbURlc2NyaXB0b3I6OkV4dHJhRGF0YSogZXh0cmFEYXRhKSA6IG1fZXh0cmFEYXRhKFdURjo6 YWRvcHRQdHIoZXh0cmFEYXRhKSkgeyB9CisKKyAgICBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6 OkV4dHJhRGF0YSogZXh0cmFEYXRhKCkgeyByZXR1cm4gbV9leHRyYURhdGEuZ2V0KCk7IH0KKwor cHJpdmF0ZToKKyAgICBPd25QdHI8V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpFeHRyYURhdGE+ IG1fZXh0cmFEYXRhOworfTsKKworV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpFeHRyYURhdGEq IFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6ZXh0cmFEYXRhKCkgY29uc3QKK3sKKyAgICBSZWZQ dHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpFeHRyYURhdGE+IGRhdGEgPSBtX3ByaXZhdGUtPmV4 dHJhRGF0YSgpOworICAgIGlmICghZGF0YSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJu IHN0YXRpY19jYXN0PEV4dHJhRGF0YUNvbnRhaW5lcio+KGRhdGEuZ2V0KCkpLT5leHRyYURhdGEo KTsKK30KKwordm9pZCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNldEV4dHJhRGF0YShFeHRy YURhdGEqIGV4dHJhRGF0YSkKK3sKKyAgICBtX3ByaXZhdGUtPnNldEV4dHJhRGF0YShuZXcgRXh0 cmFEYXRhQ29udGFpbmVyKGV4dHJhRGF0YSkpOworfQorCiAvLyBGSVhNRTogQ2xlYW51cCB3aGVu IHRoZSBjaHJvbWl1bSBjb2RlIGhhcyBzd2l0Y2hlZCB0byB0aGUgc3BsaXQgc291cmNlcyBpbXBs ZW1lbnRhdGlvbi4KIHZvaWQgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpzb3VyY2VzKFdlYlZl Y3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHdlYlNvdXJjZXMpIGNvbnN0CiB7CkBAIC0xMzAs NiArMTY1LDExIEBAIHZvaWQgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppbml0aWFsaXplKGNv bnN0IFdlYlN0cmluZyYgbGFiZWwsIGNvbnN0IFdlYlZlY3RvCiAKIHZvaWQgV2ViTWVkaWFTdHJl YW1EZXNjcmlwdG9yOjppbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsIGNvbnN0IFdl YlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVj dG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKQogeworICAgIGluaXRpYWxp emUobGFiZWwsIGF1ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzLCAiIik7Cit9CisKK3ZvaWQgV2Vi TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjppbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYgbGFiZWws IGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29u c3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzLCBjb25zdCBX ZWJTdHJpbmcmIGlkKQorewogICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGF1ZGlvLCB2aWRl bzsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1ZGlvU291cmNlcy5zaXplKCk7ICsraSkg ewogICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3VyciA9IGF1ZGlvU291cmNlc1tpXTsKQEAg LTEzOSw3ICsxNzksNyBAQCB2b2lkIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6aW5pdGlhbGl6 ZShjb25zdCBXZWJTdHJpbmcmIGxhYmVsLCBjb25zdCBXZWJWZWN0bwogICAgICAgICBNZWRpYVN0 cmVhbVNvdXJjZSogY3VyciA9IHZpZGVvU291cmNlc1tpXTsKICAgICAgICAgdmlkZW8uYXBwZW5k KGN1cnIpOwogICAgIH0KLSAgICBtX3ByaXZhdGUgPSBNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmNy ZWF0ZShsYWJlbCwgYXVkaW8sIHZpZGVvKTsKKyAgICBtX3ByaXZhdGUgPSBNZWRpYVN0cmVhbURl c2NyaXB0b3I6OmNyZWF0ZShsYWJlbCwgYXVkaW8sIHZpZGVvLCBpZCk7CiB9CiAKIHZvaWQgV2Vi TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjphc3NpZ24oY29uc3QgV2ViTWVkaWFTdHJlYW1EZXNjcmlw dG9yJiBvdGhlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKaW5kZXggYjNiMjczZmE3NzdkZjI3ZWQ2 YzBmODVlNjU0ZDMzMjgwMTVmZTQxOS4uZDdlOGI0YmE2YjE0YjE2MWI5NWQxMDkwNTcxZWM4MTcw NmYzZDQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTEsNSArMSw2IEBACiAvKgogICog Q29weXJpZ2h0IChDKSAyMDExIEVyaWNzc29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICog Q29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ4LDkgKzQ5LDE4IEBAIHB1YmxpYzoKIAog Y2xhc3MgTWVkaWFTdHJlYW1EZXNjcmlwdG9yIDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFTdHJl YW1EZXNjcmlwdG9yPiB7CiBwdWJsaWM6CisgICAgY2xhc3MgRXh0cmFEYXRhIDogcHVibGljIFJl ZkNvdW50ZWQ8RXh0cmFEYXRhPiB7CisgICAgcHVibGljOgorICAgICAgICB2aXJ0dWFsIH5FeHRy YURhdGEoKSB7IH0KKyAgICB9OworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1E ZXNjcmlwdG9yPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgTWVkaWFTdHJlYW1T b3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3Im IHZpZGVvU291cmNlcykKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWVkaWFT dHJlYW1EZXNjcmlwdG9yKGxhYmVsLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcykpOworICAg ICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtRGVzY3JpcHRvcihsYWJlbCwgYXVk aW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMsICIiKSk7CisgICAgfQorICAgIHN0YXRpYyBQYXNzUmVm UHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gY3JlYXRlKGNvbnN0IFN0cmluZyYgbGFiZWwsIGNv bnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiBhdWRpb1NvdXJjZXMsIGNvbnN0IE1lZGlhU3Ry ZWFtU291cmNlVmVjdG9yJiB2aWRlb1NvdXJjZXMsIGNvbnN0IFN0cmluZyYgaWQpCisgICAgewor ICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtRGVzY3JpcHRvcihsYWJlbCwg YXVkaW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMsIGlkKSk7CiAgICAgfQogCiAgICAgTWVkaWFTdHJl YW1EZXNjcmlwdG9yT3duZXIqIG93bmVyKCkgY29uc3QgeyByZXR1cm4gbV9vd25lcjsgfQpAQCAt NjcsMTEgKzc3LDE4IEBAIHB1YmxpYzoKICAgICBib29sIGVuZGVkKCkgY29uc3QgeyByZXR1cm4g bV9lbmRlZDsgfQogICAgIHZvaWQgc2V0RW5kZWQoKSB7IG1fZW5kZWQgPSB0cnVlOyB9CiAKKyAg ICBTdHJpbmcgaWQoKSBjb25zdCB7IHJldHVybiBtX2lkOyB9CisgICAgdm9pZCBzZXRJZChjb25z dCBTdHJpbmcmIGlkKSB7IG1faWQgPSBpZDsgfQorCisgICAgUGFzc1JlZlB0cjxFeHRyYURhdGE+ IGV4dHJhRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZXh0cmFEYXRhOyB9CisgICAgdm9pZCBzZXRF eHRyYURhdGEoUGFzc1JlZlB0cjxFeHRyYURhdGE+IGV4dHJhRGF0YSkgeyBtX2V4dHJhRGF0YSA9 IGV4dHJhRGF0YTsgfQorCiBwcml2YXRlOgotICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25z dCBTdHJpbmcmIGxhYmVsLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3Vy Y2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKQorICAgIE1l ZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIGxhYmVsLCBjb25zdCBNZWRpYVN0cmVh bVNvdXJjZVZlY3RvciYgYXVkaW9Tb3VyY2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3Rv ciYgdmlkZW9Tb3VyY2VzLCBjb25zdCBTdHJpbmcmIGlkKQogICAgICAgICA6IG1fb3duZXIoMCkK ICAgICAgICAgLCBtX2xhYmVsKGxhYmVsKQogICAgICAgICAsIG1fZW5kZWQoZmFsc2UpCisgICAg ICAgICwgbV9pZChpZCkKICAgICB7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXVk aW9Tb3VyY2VzLnNpemUoKTsgaSsrKQogICAgICAgICAgICAgbV9hdWRpb0NvbXBvbmVudHMuYXBw ZW5kKE1lZGlhU3RyZWFtQ29tcG9uZW50OjpjcmVhdGUoYXVkaW9Tb3VyY2VzW2ldKSk7CkBAIC04 NSw2ICsxMDIsOSBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1Db21w b25lbnQ+ID4gbV9hdWRpb0NvbXBvbmVudHM7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVh bUNvbXBvbmVudD4gPiBtX3ZpZGVvQ29tcG9uZW50czsKICAgICBib29sIG1fZW5kZWQ7CisKKyAg ICBTdHJpbmcgbV9pZDsKKyAgICBSZWZQdHI8RXh0cmFEYXRhPiBtX2V4dHJhRGF0YTsKIH07CiAK IHR5cGVkZWYgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+ID4gTWVkaWFTdHJl YW1EZXNjcmlwdG9yVmVjdG9yOwo= 140883 2012-05-09 01:07:02 -0700 2012-05-09 08:48:20 -0700 Patch bug-85794-20120509100700.patch text/plain 7314 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAwMGRjNjA3Njk0YjE4 MDhmMjU3NDYzM2QzMTA1NDc4MTNiNzU2YzYyLi4wMDc5MzE3ODc5OTVkN2RkM2QzNjNlMDdjNGE3 YTdiYzY2OWY0MGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNS0wOSAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFkZGluZyB0aGUgcG9zc2liaWxpdHkgb2YgcG9ydCBzcGVjaWZpYyBpbmZvcm1h dGlvbiBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVG8gZmFjaWxpdGF0ZSBmb3IgcG9ydHMgSSBoYXZlIGFkZGVk IGFuIEV4dHJhRGF0YSBmaWVsZCB0aGF0IGNhbiBiZSB1c2VkIGZvciB3aGF0ZXZlciBwdXJwb3Nl IGlzIG5lZWRlZC4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURl c2NyaXB0b3IuaDoKKyAgICAgICAgKEV4dHJhRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1l ZGlhU3RyZWFtRGVzY3JpcHRvcjo6RXh0cmFEYXRhOjp+RXh0cmFEYXRhKToKKyAgICAgICAgKFdl Yk1lZGlhU3RyZWFtRGVzY3JpcHRvcik6CisKIDIwMTItMDUtMDcgIE1hcmsgUGlsZ3JpbSAgPHBp bGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gTW92ZSBmaWxlU3lzdGVt IHRvIFBsYXRmb3JtLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNmRiOWE5ZDk0ZTg5MjI2YThkYzg2ZTZhNTM3 MTAxNGRhMzkwMjg2Li5mZGVhZThhYzM0MGQ1NDY4OTA2NzNkNzJkMzFhNTUxOTQ0Zjg0N2M5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDUtMDkgIFRvbW15IFdpZGVuZmx5Y2h0 ICA8dG9tbXl3QGdvb2dsZS5jb20+CisKKyAgICAgICAgTWVkaWFTdHJlYW0gQVBJOiBBZGRpbmcg dGhlIHBvc3NpYmlsaXR5IG9mIHBvcnQgc3BlY2lmaWMgaW5mb3JtYXRpb24gaW4gTWVkaWFTdHJl YW1EZXNjcmlwdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NTc5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRvIGZhY2lsaXRhdGUgZm9yIHBvcnRzIEkgaGF2ZSBhZGRlZCBhbiBFeHRyYURhdGEgZmll bGQgdGhhdCBjYW4gYmUgdXNlZCBmb3Igd2hhdGV2ZXIgcHVycG9zZSBpcyBuZWVkZWQuCisKKyAg ICAgICAgTm8gYmVoYXZpb3JhbCBjaGFuZ2VzLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21p dW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuY3BwOgorICAgICAgICAoRXh0cmFE YXRhQ29udGFpbmVyKToKKyAgICAgICAgKFdlYktpdDo6RXh0cmFEYXRhQ29udGFpbmVyOjpFeHRy YURhdGFDb250YWluZXIpOgorICAgICAgICAoV2ViS2l0OjpFeHRyYURhdGFDb250YWluZXI6OmV4 dHJhRGF0YSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVN0 cmVhbURlc2NyaXB0b3I6OmV4dHJhRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3Ry ZWFtRGVzY3JpcHRvcjo6c2V0RXh0cmFEYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaDoKKyAgICAgICAgKEV4dHJhRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6OkV4dHJhRGF0YTo6fkV4dHJhRGF0 YSk6CisgICAgICAgIChNZWRpYVN0cmVhbURlc2NyaXB0b3IpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpleHRyYURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFTdHJlYW1EZXNjcmlwdG9yOjpzZXRFeHRyYURhdGEpOgorCiAyMDEyLTA1LTA5ICBPbGkgTGFu ICA8b2xpbGFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgaWRlbnRpZnlpbmcgbWV0aG9k cyBmb3IgZGF0ZS90aW1lIGlucHV0IHR5cGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3Jt L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaCBiL1NvdXJjZS9QbGF0 Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKaW5kZXggNDky M2M5N2I1MDE3ZTcxMTc0Y2VlOGMxMDI0MDZlODdmODYwOTZjZS4uYzI1ZjQyZTFiODg5MTQyMjA2 MTliODQ4MzYyMzUzZDljZDQ5OWUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaAorKysgYi9Tb3VyY2UvUGxhdGZv cm0vY2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oCkBAIC00Miw2ICs0 MiwxMSBAQCBjbGFzcyBXZWJTdHJpbmc7CiAKIGNsYXNzIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRv ciB7CiBwdWJsaWM6CisgICAgY2xhc3MgRXh0cmFEYXRhIHsKKyAgICBwdWJsaWM6CisgICAgICAg IHZpcnR1YWwgfkV4dHJhRGF0YSgpIHsgfQorICAgIH07CisKICAgICBXZWJNZWRpYVN0cmVhbURl c2NyaXB0b3IoKSB7IH0KICAgICBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IoY29uc3QgV2ViTWVk aWFTdHJlYW1EZXNjcmlwdG9yJiBvdGhlcikgeyBhc3NpZ24ob3RoZXIpOyB9CiAgICAgfldlYk1l ZGlhU3RyZWFtRGVzY3JpcHRvcigpIHsgcmVzZXQoKTsgfQpAQCAtNjksNiArNzQsMTMgQEAgcHVi bGljOgogICAgIFdFQktJVF9FWFBPUlQgdm9pZCBhdWRpb1NvdXJjZXMoV2ViVmVjdG9yPFdlYk1l ZGlhU3RyZWFtQ29tcG9uZW50PiYpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCB2aWRl b1NvdXJjZXMoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtQ29tcG9uZW50PiYpIGNvbnN0OwogCisg ICAgLy8gRXh0cmEgZGF0YSBhc3NvY2lhdGVkIHdpdGggdGhpcyBXZWJNZWRpYVN0cmVhbURlc2Ny aXB0b3IuCisgICAgLy8gSWYgbm9uLW51bGwsIHRoZSBleHRyYSBkYXRhIHBvaW50ZXIgd2lsbCBi ZSBkZWxldGVkIHdoZW4gdGhlIG9iamVjdCBpcyBkZXN0cm95ZWQuCisgICAgLy8gU2V0dGluZyB0 aGUgZXh0cmEgZGF0YSBwb2ludGVyIHdpbGwgY2F1c2UgYW55IGV4aXN0aW5nIG5vbi1udWxsCisg ICAgLy8gZXh0cmEgZGF0YSBwb2ludGVyIHRvIGJlIGRlbGV0ZWQuCisgICAgV0VCS0lUX0VYUE9S VCBFeHRyYURhdGEqIGV4dHJhRGF0YSgpIGNvbnN0OworICAgIFdFQktJVF9FWFBPUlQgdm9pZCBz ZXRFeHRyYURhdGEoRXh0cmFEYXRhKik7CisKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KICAg ICBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9y Kik7CiAgICAgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGNvbnN0IFdURjo6UGFzc1JlZlB0cjxX ZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3Ry ZWFtRGVzY3JpcHRvci5jcHAKaW5kZXggZjdlM2M2YjFhZTgyZWE2ODdhMmZjNGFiYzFkZjYyZTlm OGFjZGZmYS4uYzdlOWZkYTE5NzI0MWIyODEwOTQ1MmY0OGRkMjhkMGRhYzgyY2M5NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0 cmVhbURlc2NyaXB0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L3N1cHBvcnQvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmNwcApAQCAtNDAsNiArNDAsOCBAQAog I2luY2x1ZGUgPHB1YmxpYy9XZWJNZWRpYVN0cmVhbUNvbXBvbmVudC5oPgogI2luY2x1ZGUgPHB1 YmxpYy9XZWJNZWRpYVN0cmVhbVNvdXJjZS5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJTdHJpbmcu aD4KKyNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAt NjYsNiArNjgsMjkgQEAgV2ViU3RyaW5nIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6bGFiZWwo KSBjb25zdAogICAgIHJldHVybiBtX3ByaXZhdGUtPmxhYmVsKCk7CiB9CiAKK2NsYXNzIEV4dHJh RGF0YUNvbnRhaW5lciA6IHB1YmxpYyBXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6OkV4 dHJhRGF0YSB7CitwdWJsaWM6CisgICAgRXh0cmFEYXRhQ29udGFpbmVyKFdlYk1lZGlhU3RyZWFt RGVzY3JpcHRvcjo6RXh0cmFEYXRhKiBleHRyYURhdGEpIDogbV9leHRyYURhdGEoV1RGOjphZG9w dFB0cihleHRyYURhdGEpKSB7IH0KKworICAgIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6RXh0 cmFEYXRhKiBleHRyYURhdGEoKSB7IHJldHVybiBtX2V4dHJhRGF0YS5nZXQoKTsgfQorCitwcml2 YXRlOgorICAgIE93blB0cjxXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OkV4dHJhRGF0YT4gbV9l eHRyYURhdGE7Cit9OworCitXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OkV4dHJhRGF0YSogV2Vi TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpleHRyYURhdGEoKSBjb25zdAoreworICAgIFJlZlB0cjxN ZWRpYVN0cmVhbURlc2NyaXB0b3I6OkV4dHJhRGF0YT4gZGF0YSA9IG1fcHJpdmF0ZS0+ZXh0cmFE YXRhKCk7CisgICAgaWYgKCFkYXRhKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gc3Rh dGljX2Nhc3Q8RXh0cmFEYXRhQ29udGFpbmVyKj4oZGF0YS5nZXQoKSktPmV4dHJhRGF0YSgpOwor fQorCit2b2lkIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6c2V0RXh0cmFEYXRhKEV4dHJhRGF0 YSogZXh0cmFEYXRhKQoreworICAgIG1fcHJpdmF0ZS0+c2V0RXh0cmFEYXRhKG5ldyBFeHRyYURh dGFDb250YWluZXIoZXh0cmFEYXRhKSk7Cit9CisKIC8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhl IGNocm9taXVtIGNvZGUgaGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVu dGF0aW9uLgogdm9pZCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnNvdXJjZXMoV2ViVmVjdG9y PFdlYk1lZGlhU3RyZWFtU291cmNlPiYgd2ViU291cmNlcykgY29uc3QKIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRv ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNj cmlwdG9yLmgKaW5kZXggYjNiMjczZmE3NzdkZjI3ZWQ2YzBmODVlNjU0ZDMzMjgwMTVmZTQxOS4u NDYzMzJhZjMxMjhjOTVmMDdmMTYwZTczOTYwNTg4ZWIxNzllZDczNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNj cmlwdG9yLmgKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDExIEVyaWNz c29uIEFCLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2ds ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKQEAgLTQ4LDYgKzQ5LDExIEBAIHB1YmxpYzoKIAogY2xhc3MgTWVkaWFTdHJlYW1EZXNjcmlw dG9yIDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiB7CiBwdWJsaWM6 CisgICAgY2xhc3MgRXh0cmFEYXRhIDogcHVibGljIFJlZkNvdW50ZWQ8RXh0cmFEYXRhPiB7Cisg ICAgcHVibGljOgorICAgICAgICB2aXJ0dWFsIH5FeHRyYURhdGEoKSB7IH0KKyAgICB9OworCiAg ICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBjcmVhdGUoY29uc3Qg U3RyaW5nJiBsYWJlbCwgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIGF1ZGlvU291cmNl cywgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIHZpZGVvU291cmNlcykKICAgICB7CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGxhYmVsLCBh dWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcykpOwpAQCAtNjcsNiArNzMsOSBAQCBwdWJsaWM6CiAg ICAgYm9vbCBlbmRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fZW5kZWQ7IH0KICAgICB2b2lkIHNldEVu ZGVkKCkgeyBtX2VuZGVkID0gdHJ1ZTsgfQogCisgICAgUGFzc1JlZlB0cjxFeHRyYURhdGE+IGV4 dHJhRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZXh0cmFEYXRhOyB9CisgICAgdm9pZCBzZXRFeHRy YURhdGEoUGFzc1JlZlB0cjxFeHRyYURhdGE+IGV4dHJhRGF0YSkgeyBtX2V4dHJhRGF0YSA9IGV4 dHJhRGF0YTsgfQorCiBwcml2YXRlOgogICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBT dHJpbmcmIGxhYmVsLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3VyY2Vz LCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKQogICAgICAgICA6 IG1fb3duZXIoMCkKQEAgLTg1LDYgKzk0LDggQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8UmVmUHRy PE1lZGlhU3RyZWFtQ29tcG9uZW50PiA+IG1fYXVkaW9Db21wb25lbnRzOwogICAgIFZlY3RvcjxS ZWZQdHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+ID4gbV92aWRlb0NvbXBvbmVudHM7CiAgICAgYm9v bCBtX2VuZGVkOworCisgICAgUmVmUHRyPEV4dHJhRGF0YT4gbV9leHRyYURhdGE7CiB9OwogCiB0 eXBlZGVmIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiA+IE1lZGlhU3RyZWFt RGVzY3JpcHRvclZlY3RvcjsK