94591 2012-08-21 05:35:41 -0700 [BlackBerry] Add support for getUserMedia 2012-08-21 16:21:50 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 robin.webkit webkit-unassigned eric.carlson feature-media-reviews mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 700654 0 robin.webkit 2012-08-21 05:35:41 -0700 Add support for getUserMedia 700673 1 159670 robin.webkit 2012-08-21 05:55:50 -0700 Created attachment 159670 patch 701262 2 159670 webkit.review.bot 2012-08-21 16:21:47 -0700 Comment on attachment 159670 patch Clearing flags on attachment: 159670 Committed r126211: <http://trac.webkit.org/changeset/126211> 701263 3 webkit.review.bot 2012-08-21 16:21:50 -0700 All reviewed patches have been landed. Closing bug. 159670 2012-08-21 05:55:50 -0700 2012-08-21 16:21:46 -0700 patch bug-94591-20120821205508.patch text/plain 10678 robin.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg1MGFkOWI3YTE0NDUx ZDU0NDE5NzBlMTBkNmJlOGQwNTQ1OTkyNS4uZDdkMmMwN2NiNWI3YzQ1MmYyY2RjODU2MTc3OGU5 YmI0M2U4OWVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA4LTIxICBSb2Jp biBDYW8gIDxyb2Jpbi5jYW9AdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBBZGQgc3VwcG9ydCBmb3IgZ2V0VXNlck1lZGlhCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBnZXRVc2VyTWVkaWEgZmVhdHVyZSB1 c2luZyB0aGUgcGxhdGZvcm0gQVBJLgorCisgICAgICAgIFRlc3RzIGluIGZhc3QvbWVkaWFzdHJl YW0gY292ZXIgdGhpcy4KKworICAgICAgICBQUiAjMTUzNTcxCisKKyAgICAgICAgUmV2aWV3ZWQg aW50ZXJuYWxseSBieSBHZW9yZ2UgU3RhaWtvcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2JsYWNrYmVycnkvTWVkaWFQbGF5ZXJQcml2YXRlQmxhY2tCZXJyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjp0b1dlYk1lZGlhU3RyZWFtU291cmNlKToKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6dG9XZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpsb29rdXBNZWRpYVN0cmVhbSk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9NZWRpYVBsYXllclByaXZhdGVCbGFja0Jl cnJ5Lmg6CisgICAgICAgIChNZWRpYVBsYXllclByaXZhdGUpOgorCiAyMDEyLTA4LTIwICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIE1vdmUgU3Ry aW5nIHJlbGF0ZWQgY29kZSBpbiBWOEJpbmRpbmcgdG8gYSBzZXBhcmF0ZSBmaWxlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAyNTNmMTM5NjRjNjNkYmIyZDNlYjRiYTYxMGZiMzUw OWMxZWIyY2NhLi4wNTQzYWIyODA1ZDhhZjE0YjkyMjg1OTUzNTdjZTI5MzMyOTc5N2IxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMi0wOC0yMSAg Um9iaW4gQ2FvICA8cm9iaW4uY2FvQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gQWRkIHN1cHBvcnQgZm9yIGdldFVzZXJNZWRpYQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ1OTEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZ2V0VXNlck1lZGlhIGZlYXR1 cmUgdXNpbmcgdGhlIHBsYXRmb3JtIEFQSS4KKworICAgICAgICBQUiAjMTUzNTcxCisKKyAgICAg ICAgUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBHZW9yZ2UgU3RhaWtvcy4KKworICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L1VzZXJNZWRpYUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChXZWJDb3JlOjp1c2VyTWVkaWFSZXF1ZXN0c01hcCk6CisgICAgICAgIChXZWJD b3JlOjp0b01lZGlhU3RyZWFtU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OnRvTWVkaWFTdHJl YW1EZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYlVzZXJNZWRpYVJlcXVlc3RDbGllbnRJbXBsKToK KyAgICAgICAgKFdlYkNvcmU6OldlYlVzZXJNZWRpYVJlcXVlc3RDbGllbnRJbXBsOjpXZWJVc2Vy TWVkaWFSZXF1ZXN0Q2xpZW50SW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJVc2VyTWVkaWFS ZXF1ZXN0Q2xpZW50SW1wbDo6cmVxdWVzdFN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpX ZWJVc2VyTWVkaWFSZXF1ZXN0Q2xpZW50SW1wbDo6cmVxdWVzdEZhaWxlZCk6CisgICAgICAgIChX ZWJDb3JlOjpVc2VyTWVkaWFDbGllbnRJbXBsOjpVc2VyTWVkaWFDbGllbnRJbXBsKToKKyAgICAg ICAgKFdlYkNvcmU6OlVzZXJNZWRpYUNsaWVudEltcGw6On5Vc2VyTWVkaWFDbGllbnRJbXBsKToK KyAgICAgICAgKFdlYkNvcmU6OlVzZXJNZWRpYUNsaWVudEltcGw6OnJlcXVlc3RVc2VyTWVkaWEp OgorICAgICAgICAoV2ViQ29yZTo6VXNlck1lZGlhQ2xpZW50SW1wbDo6Y2FuY2VsVXNlck1lZGlh UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyTWVkaWFDbGllbnRJbXBsOjp3ZWJVc2Vy TWVkaWEpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1VzZXJNZWRpYUNsaWVudEltcGwuaDoK KyAgICAgICAgKEJsYWNrQmVycnkpOgorICAgICAgICAoUGxhdGZvcm0pOgorICAgICAgICAoVXNl ck1lZGlhQ2xpZW50SW1wbCk6CisKIDIwMTItMDgtMjAgIFNlYW4gV2FuZyAgPFh1ZXdlbi5XYW5n QHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gU2VsZWN0IHBvcHVw IHNob3dzIGJsYW5rIGNvbnRlbnQgd2hlbiBpdHMgb3B0aW9uIHRhZ3MgY29udGFpbiAnXCcgY2hh cmFjdGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9NZWRpYVBsYXllclByaXZhdGVCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTWVkaWFQbGF5ZXJQcml2YXRlQmxhY2tCZXJy eS5jcHAKaW5kZXggZGM0NDVhNTFhM2RhYmJkMTIzOWVhOWM0NDg4MzhhZWJlNjAzYTJjNS4uNDI1 NjgxODA1YWQxYjlmYWIyZTg3OGYxZTY4NTg3MzcyNGMyNTkxOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9NZWRpYVBsYXllclByaXZhdGVC bGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L01lZGlhUGxheWVyUHJpdmF0ZUJsYWNrQmVycnkuY3BwCkBAIC0zMCw2ICszMCw4IEBA CiAjaW5jbHVkZSAiSFRNTE1lZGlhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgog I2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKKyNpbmNsdWRlICJNZWRpYVN0cmVhbURlc2NyaXB0b3Iu aCIKKyNpbmNsdWRlICJNZWRpYVN0cmVhbVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVt ZW50ZWQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiUHJv dGVjdGlvblNwYWNlLmgiCkBAIC03ODMsNiArNzg1LDMzIEBAIGludCBNZWRpYVBsYXllclByaXZh dGU6OnNob3dFcnJvckRpYWxvZyhQbGF0Zm9ybVBsYXllcjo6RXJyb3IgdHlwZSkKICAgICByZXR1 cm4gcmM7CiB9CiAKK3N0YXRpYyBXZWJNZWRpYVN0cmVhbVNvdXJjZSB0b1dlYk1lZGlhU3RyZWFt U291cmNlKE1lZGlhU3RyZWFtU291cmNlKiBzcmMpCit7CisgICAgcmV0dXJuIFdlYk1lZGlhU3Ry ZWFtU291cmNlKHNyYy0+aWQoKS51dGY4KCkuZGF0YSgpLCBzdGF0aWNfY2FzdDxXZWJNZWRpYVN0 cmVhbVNvdXJjZTo6VHlwZT4oc3JjLT50eXBlKCkpLCBzcmMtPm5hbWUoKS51dGY4KCkuZGF0YSgp KTsKK30KKworc3RhdGljIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvciB0b1dlYk1lZGlhU3RyZWFt RGVzY3JpcHRvcihNZWRpYVN0cmVhbURlc2NyaXB0b3IqIGQpCit7CisgICAgdmVjdG9yPFdlYk1l ZGlhU3RyZWFtU291cmNlPiBhdWRpb1NvdXJjZXM7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBkLT5udW1iZXJPZkF1ZGlvQ29tcG9uZW50cygpOyBpKyspCisgICAgICAgIGF1ZGlvU291cmNl cy5wdXNoX2JhY2sodG9XZWJNZWRpYVN0cmVhbVNvdXJjZShkLT5hdWRpb0NvbXBvbmVudChpKS0+ c291cmNlKCkpKTsKKworICAgIHZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4gdmlkZW9Tb3Vy Y2VzOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZC0+bnVtYmVyT2ZWaWRlb0NvbXBvbmVu dHMoKTsgaSsrKQorICAgICAgICB2aWRlb1NvdXJjZXMucHVzaF9iYWNrKHRvV2ViTWVkaWFTdHJl YW1Tb3VyY2UoZC0+dmlkZW9Db21wb25lbnQoaSktPnNvdXJjZSgpKSk7CisKKyAgICByZXR1cm4g V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGQtPmxhYmVsKCkudXRmOCgpLmRhdGEoKSwgYXVkaW9T b3VyY2VzLCB2aWRlb1NvdXJjZXMpOworfQorCitXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3IgTWVk aWFQbGF5ZXJQcml2YXRlOjpsb29rdXBNZWRpYVN0cmVhbShjb25zdCBzdHJpbmcmIHVybCkKK3sK KyAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3IqIGRlc2NyaXB0b3IgPSBNZWRpYVN0cmVhbVJlZ2lz dHJ5OjpyZWdpc3RyeSgpLmxvb2t1cE1lZGlhU3RyZWFtRGVzY3JpcHRvcihTdHJpbmc6OmZyb21V VEY4KHVybC5jX3N0cigpKSk7CisgICAgaWYgKCFkZXNjcmlwdG9yKQorICAgICAgICByZXR1cm4g V2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yKCk7CisKKyAgICByZXR1cm4gdG9XZWJNZWRpYVN0cmVh bURlc2NyaXB0b3IoZGVzY3JpcHRvcik7Cit9CisKIEZyYW1lVmlldyogTWVkaWFQbGF5ZXJQcml2 YXRlOjpmcmFtZVZpZXcoKSBjb25zdAogewogICAgIC8vIFdlIHByZXZpb3VzbHkgdXNlZCBtX3dl YkNvcmVQbGF5ZXItPmZyYW1lVmlldygpLCBidXQgdGhpcyBtZXRob2QgcmV0dXJucwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9NZWRpYVBs YXllclByaXZhdGVCbGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L01lZGlhUGxheWVyUHJpdmF0ZUJsYWNrQmVycnkuaAppbmRleCA2M2JmZGQ0 ODExMzYxN2JhZDNmZjYwNGNlZDNkNGVhNDFjYzNjMDkzLi5jMzc4YmY2OGFmZTkwZjBhNmI2Y2Zk ZjFkN2M2N2RmNzFhYzIzODljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L01lZGlhUGxheWVyUHJpdmF0ZUJsYWNrQmVycnkuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L01lZGlhUGxheWVyUHJp dmF0ZUJsYWNrQmVycnkuaApAQCAtMTM4LDYgKzEzOCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IGJvb2wgaXNUYWJWaXNpYmxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBpbnQgc2hvd0Vycm9yRGlh bG9nKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpQbGF0Zm9ybVBsYXllcjo6RXJyb3IpOwogICAgIHZp cnR1YWwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpXaW5kb3cqIHBsYXRmb3JtV2lu ZG93KCk7CisgICAgdmlydHVhbCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6V2ViTWVkaWFTdHJlYW1E ZXNjcmlwdG9yIGxvb2t1cE1lZGlhU3RyZWFtKGNvbnN0IHN0ZDo6c3RyaW5nJiB1cmwpOwogCiBw cml2YXRlOgogICAgIE1lZGlhUGxheWVyUHJpdmF0ZShNZWRpYVBsYXllciopOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1VzZXJNZWRpYUNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1VzZXJN ZWRpYUNsaWVudEltcGwuY3BwCmluZGV4IDU3ZjBmZTc5ZTk4ZjgwNjExZmVjNjU4MTQ2OGI0OWZl NGY1ZDNlNjEuLmE0ZTQ1YzJlNTUyZDg1ZTlmYWE1MjY2NDlkYTRjYjJiMjcwMzlkZTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9Vc2VyTWVkaWFD bGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBv cnQvVXNlck1lZGlhQ2xpZW50SW1wbC5jcHAKQEAgLTIwLDE4ICsyMCw4OSBAQAogI2luY2x1ZGUg IlVzZXJNZWRpYUNsaWVudEltcGwuaCIKIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisjaW5j bHVkZSAiTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgiCiAjaW5jbHVkZSAiV2ViUGFnZS5oIgogCisj aW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmg+Cisj aW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtV2ViVXNlck1lZGlhLmg+CisjaW5jbHVkZSA8d3Rm L0hhc2hNYXAuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NP d25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKK3VzaW5nIG5hbWVzcGFjZSBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTsKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBXZWJVc2Vy TWVkaWFSZXF1ZXN0Q2xpZW50SW1wbDsKKwordHlwZWRlZiBIYXNoTWFwPFVzZXJNZWRpYVJlcXVl c3QqLCBPd25QdHI8V2ViVXNlck1lZGlhUmVxdWVzdENsaWVudEltcGw+ID4gVXNlck1lZGlhUmVx dWVzdHNNYXA7CisKK3N0YXRpYyBVc2VyTWVkaWFSZXF1ZXN0c01hcCYgdXNlck1lZGlhUmVxdWVz dHNNYXAoKQoreworICAgIERFRklORV9TVEFUSUNfTE9DQUwoVXNlck1lZGlhUmVxdWVzdHNNYXAs IHJlcXVlc3RzLCAoKSk7CisgICAgcmV0dXJuIHJlcXVlc3RzOworfQorCitzdGF0aWMgUGFzc1Jl ZlB0cjxNZWRpYVN0cmVhbVNvdXJjZT4gdG9NZWRpYVN0cmVhbVNvdXJjZShjb25zdCBXZWJNZWRp YVN0cmVhbVNvdXJjZSYgc3JjKQoreworICAgIHJldHVybiBNZWRpYVN0cmVhbVNvdXJjZTo6Y3Jl YXRlKFN0cmluZzo6ZnJvbVVURjgoc3JjLmlkKCkuY19zdHIoKSksIHN0YXRpY19jYXN0PE1lZGlh U3RyZWFtU291cmNlOjpUeXBlPihzcmMudHlwZSgpKSwgU3RyaW5nOjpmcm9tVVRGOChzcmMubmFt ZSgpLmNfc3RyKCkpKTsKK30KKworc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlw dG9yPiB0b01lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0 b3ImIGQpCit7CisgICAgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgYXVkaW9Tb3VyY2VzOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZC5hdWRpb3MoKS5zaXplKCk7IGkrKykgeworICAgICAg ICBSZWZQdHI8TWVkaWFTdHJlYW1Tb3VyY2U+IHNyYyA9IHRvTWVkaWFTdHJlYW1Tb3VyY2UoZC5h dWRpb3MoKVtpXSk7CisgICAgICAgIGF1ZGlvU291cmNlcy5hcHBlbmQoc3JjLnJlbGVhc2UoKSk7 CisgICAgfQorCisgICAgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgdmlkZW9Tb3VyY2VzOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZC52aWRlb3MoKS5zaXplKCk7IGkrKykgeworICAgICAg ICBSZWZQdHI8TWVkaWFTdHJlYW1Tb3VyY2U+IHNyYyA9IHRvTWVkaWFTdHJlYW1Tb3VyY2UoZC52 aWRlb3MoKVtpXSk7CisgICAgICAgIHZpZGVvU291cmNlcy5hcHBlbmQoc3JjLnJlbGVhc2UoKSk7 CisgICAgfQorCisgICAgcmV0dXJuIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y3JlYXRlKFN0cmlu Zzo6ZnJvbVVURjgoZC5sYWJlbCgpLmNfc3RyKCkpLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNl cyk7Cit9CisKK2NsYXNzIFdlYlVzZXJNZWRpYVJlcXVlc3RDbGllbnRJbXBsIDogcHVibGljIFdl YlVzZXJNZWRpYVJlcXVlc3RDbGllbnQgeworcHVibGljOgorICAgIFdlYlVzZXJNZWRpYVJlcXVl c3RDbGllbnRJbXBsKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gcHJwUmVxdWVzdCkKKyAg ICAgICAgOiBtX3JlcXVlc3QocHJwUmVxdWVzdCkKKyAgICB7CisgICAgfQorCisgICAgdm9pZCBy ZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvciYgZCkKKyAgICB7 CisgICAgICAgIGlmIChtX3JlcXVlc3QpIHsKKyAgICAgICAgICAgIFJlZlB0cjxNZWRpYVN0cmVh bURlc2NyaXB0b3I+IGRlc2NyaXB0b3IgPSB0b01lZGlhU3RyZWFtRGVzY3JpcHRvcihkKTsKKyAg ICAgICAgICAgIG1fcmVxdWVzdC0+c3VjY2VlZChkZXNjcmlwdG9yKTsKKworICAgICAgICAgICAg dXNlck1lZGlhUmVxdWVzdHNNYXAoKS5yZW1vdmUobV9yZXF1ZXN0LmdldCgpKTsKKyAgICAgICAg fQorICAgIH0KKworICAgIHZvaWQgcmVxdWVzdEZhaWxlZCgpCisgICAgeworICAgICAgICBpZiAo bV9yZXF1ZXN0KSB7CisgICAgICAgICAgICBtX3JlcXVlc3QtPmZhaWwoKTsKKyAgICAgICAgICAg IHVzZXJNZWRpYVJlcXVlc3RzTWFwKCkucmVtb3ZlKG1fcmVxdWVzdC5nZXQoKSk7CisgICAgICAg IH0KKyAgICB9CisKK3ByaXZhdGU6CisgICAgUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+IG1fcmVx dWVzdDsKK307CisKIFVzZXJNZWRpYUNsaWVudEltcGw6OlVzZXJNZWRpYUNsaWVudEltcGwoQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlKikKKyAgICA6IG1fd2ViVXNlck1lZGlhKDApCiB7CiB9 CiAKIFVzZXJNZWRpYUNsaWVudEltcGw6On5Vc2VyTWVkaWFDbGllbnRJbXBsKCkKIHsKKyAgICBC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6ZGVsZXRlR3VhcmRlZE9iamVjdChtX3dlYlVzZXJNZWRpYSk7 CiB9CiAKIHZvaWQgVXNlck1lZGlhQ2xpZW50SW1wbDo6cGFnZURlc3Ryb3llZCgpCkBAIC00MCwx MiArMTExLDI5IEBAIHZvaWQgVXNlck1lZGlhQ2xpZW50SW1wbDo6cGFnZURlc3Ryb3llZCgpCiAK IHZvaWQgVXNlck1lZGlhQ2xpZW50SW1wbDo6cmVxdWVzdFVzZXJNZWRpYShQYXNzUmVmUHRyPFVz ZXJNZWRpYVJlcXVlc3Q+IHBycFJlcXVlc3QsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9y JiBhdWRpb1NvdXJjZXMsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiB2aWRlb1NvdXJj ZXMpCiB7CisgICAgVXNlck1lZGlhUmVxdWVzdCogcmVxdWVzdCA9IHBycFJlcXVlc3QuZ2V0KCk7 CisgICAgT3duUHRyPFdlYlVzZXJNZWRpYVJlcXVlc3RDbGllbnRJbXBsPiByZXF1ZXN0Q2xpZW50 ID0gYWRvcHRQdHIobmV3IFdlYlVzZXJNZWRpYVJlcXVlc3RDbGllbnRJbXBsKHBycFJlcXVlc3Qp KTsKKworICAgIHdlYlVzZXJNZWRpYSgpLT5yZXF1ZXN0VXNlck1lZGlhKFdlYlVzZXJNZWRpYVJl cXVlc3QocmVxdWVzdC0+YXVkaW8oKSwgcmVxdWVzdC0+dmlkZW8oKSwgcmVxdWVzdENsaWVudC5n ZXQoKSkpOworICAgIHVzZXJNZWRpYVJlcXVlc3RzTWFwKCkuYWRkKHJlcXVlc3QsIHJlcXVlc3RD bGllbnQucmVsZWFzZSgpKTsKIH0KIAotdm9pZCBVc2VyTWVkaWFDbGllbnRJbXBsOjpjYW5jZWxV c2VyTWVkaWFSZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QqKQordm9pZCBVc2VyTWVkaWFDbGllbnRJ bXBsOjpjYW5jZWxVc2VyTWVkaWFSZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QqIHJlcXVlc3QpCiB7 CisgICAgVXNlck1lZGlhUmVxdWVzdHNNYXA6Oml0ZXJhdG9yIGl0ID0gdXNlck1lZGlhUmVxdWVz dHNNYXAoKS5maW5kKHJlcXVlc3QpOworICAgIGlmIChpdCA9PSB1c2VyTWVkaWFSZXF1ZXN0c01h cCgpLmVuZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICB3ZWJVc2VyTWVkaWEoKS0+Y2FuY2Vs VXNlck1lZGlhUmVxdWVzdChXZWJVc2VyTWVkaWFSZXF1ZXN0KHJlcXVlc3QtPmF1ZGlvKCksIHJl cXVlc3QtPnZpZGVvKCksIGl0LT5zZWNvbmQuZ2V0KCkpKTsKKyAgICB1c2VyTWVkaWFSZXF1ZXN0 c01hcCgpLnJlbW92ZShpdCk7CiB9CiAKK0JsYWNrQmVycnk6OlBsYXRmb3JtOjpXZWJVc2VyTWVk aWEqIFVzZXJNZWRpYUNsaWVudEltcGw6OndlYlVzZXJNZWRpYSgpCit7CisgICAgaWYgKCFtX3dl YlVzZXJNZWRpYSkKKyAgICAgICAgbV93ZWJVc2VyTWVkaWEgPSBuZXcgV2ViVXNlck1lZGlhOwor ICAgIHJldHVybiBtX3dlYlVzZXJNZWRpYTsKIH0KIAorfQogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvVXNlck1lZGlhQ2xpZW50SW1w bC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1VzZXJNZWRpYUNs aWVudEltcGwuaAppbmRleCA2YTlhMDE3MDgzNDMxMGI0NDQxYTc4MjM0MzZiZTMxZDBjZDI2ZTY3 Li5hMzEyMzNiODYzNDBiYjBlZDJjZTVhMDUzYmNiMTlhNmNlZDQ4MDllIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvVXNlck1lZGlhQ2xpZW50SW1w bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9Vc2VyTWVk aWFDbGllbnRJbXBsLmgKQEAgLTMwLDYgKzMwLDEwIEBAIG5hbWVzcGFjZSBCbGFja0JlcnJ5IHsK IG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViUGFnZTsKIH0KKworbmFtZXNwYWNlIFBsYXRm b3JtIHsKK2NsYXNzIFdlYlVzZXJNZWRpYTsKK30KIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpA QCAtNDcsNiArNTEsOSBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgVXNlck1lZGlhQ2xpZW50 SW1wbCgpOworICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpXZWJVc2VyTWVkaWEqIHdlYlVzZXJN ZWRpYSgpOworCisgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OldlYlVzZXJNZWRpYSogbV93ZWJV c2VyTWVkaWE7CiB9OwogCiB9Cg==