109688 2013-02-13 06:16:44 -0800 MediaStream API: Use the source id when creating new tracks 2013-02-13 12:34:21 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 56459 1 tommyw tommyw abarth dglazkov eric.carlson feature-media-reviews fishd hta jamesr jochen tkent+wkapi webkit.review.bot oldest_to_newest 831854 0 tommyw 2013-02-13 06:16:44 -0800 MediaStream API: Use the source id when creating new tracks 831862 1 188072 tommyw 2013-02-13 06:21:19 -0800 Created attachment 188072 Patch 831864 2 webkit.review.bot 2013-02-13 06:25:04 -0800 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. 831881 3 188072 webkit.review.bot 2013-02-13 07:14:22 -0800 Comment on attachment 188072 Patch Attachment 188072 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16454861 New failing tests: fast/mediastream/MediaStreamTrackList.html 831945 4 188089 tommyw 2013-02-13 08:53:35 -0800 Created attachment 188089 Patch 831947 5 tommyw 2013-02-13 08:54:52 -0800 Added the correct new API to the patch as well as the work-around so that the tests work as intended again. 832108 6 188089 abarth 2013-02-13 11:31:04 -0800 Comment on attachment 188089 Patch ok 832200 7 188089 webkit.review.bot 2013-02-13 12:34:17 -0800 Comment on attachment 188089 Patch Clearing flags on attachment: 188089 Committed r142773: <http://trac.webkit.org/changeset/142773> 832201 8 webkit.review.bot 2013-02-13 12:34:21 -0800 All reviewed patches have been landed. Closing bug. 188072 2013-02-13 06:21:19 -0800 2013-02-13 08:53:31 -0800 Patch bug-109688-20130213151748.patch text/plain 9452 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBkODVkYzNiNGNmZjgw NGJhM2Y0MmQyMmIyNDIxMGM2MTQ2MDg4NWY4Li5mZGM0MzM0MWU3MjRhZTM0NzdlOTBlNGQ5Yzgz NjRkNWJhM2E2ZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMi0xMyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IFVzZSB0aGUgc291cmNlIGlkIHdoZW4gY3JlYXRpbmcgbmV3IHRyYWNrcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5Njg4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgaWQgdG8g aW5pdGlhbGl6ZS4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbVRy YWNrLmg6CisgICAgICAgIChXZWJNZWRpYVN0cmVhbVRyYWNrKToKKwogMjAxMy0wMi0xMSAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0g QWRkIFdlYlVuaXRUZXN0U3VwcG9ydDo6Y3JlYXRlTGF5ZXJUcmVlVmlld0ZvclRlc3RpbmcgZm9y IHdlYmtpdF91bml0X3Rlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJkOGUwMWU1NGEzZWFhYWZhOGU1ZGZk NmMwMzBkOGI3MTI0NzZhOS4uY2EyNzI0OWUxNmEwYjNiOGY4ZThhYjJjNGE2NWQ1ZjI4YTQ5ZmI2 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTEzICBUb21teSBXaWRlbmZs eWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogVXNl IHRoZSBzb3VyY2UgaWQgd2hlbiBjcmVhdGluZyBuZXcgdHJhY2tzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2ODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJldXNlcyB0aGUgaWRz IGZyb20gdGhlIHNvdXJjZSB3aGVuIGNyZWF0aW5nIHRyYWNrcyBpbnN0ZWFkIG9mIGNyZWF0aW5n IGEgbmV3IG9uZS4KKyAgICAgICAgVGhpcyB3YXMgcmVxdWVzdGVkIGJ5IHRoZSBjaHJvbWl1bSBw b3J0IHRvIGdyZWF0bHkgc2ltcGxpZnkgdGhlaXIgaW1wbGVtZW50YXRpb24uCisgICAgICAgIElu IHRoZSBsb25nZXIgcnVuIHRoZSBBUEkgc2hvdWxkIGJlIHJld3JpdHRlbiB0byBvbmx5IHVzZSB0 cmFja3MgaW5zdGVhZCBvZiBzb3VyY2VzLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3Ry ZWFtLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3Ry ZWFtOjppbml0aWFsaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dl Yk1lZGlhU3RyZWFtVHJhY2suY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVN0cmVhbVRy YWNrOjppbml0aWFsaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbUNvbXBvbmVudC5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1Db21wb25lbnQ6 OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUNvbXBvbmVudDo6TWVkaWFT dHJlYW1Db21wb25lbnQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVN0cmVhbURlc2NyaXB0b3I6OmNyZWF0ZSk6CisgICAgICAgIChNZWRpYVN0cmVhbURlc2Ny aXB0b3IpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpNZWRpYVN0 cmVhbURlc2NyaXB0b3IpOgorCiAyMDEzLTAyLTEyICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIEdlbmVyYXRlIHdyYXBwZXIgbWV0aG9kcyBmb3Ig Y3VzdG9tIGdldHRlcnMvc2V0dGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbVRyYWNrLmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21p dW0vcHVibGljL1dlYk1lZGlhU3RyZWFtVHJhY2suaAppbmRleCA0OTIzYTBjZmUwMDA1OThhYzI3 ZDE5NjBhZmM4NmMyZGJlNDEwYzBmLi41OGQ2Mjg4NWUxMDFmODQ3MTYzNDkxNjJmOTQ2MGIwODRk NTNlMjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYk1l ZGlhU3RyZWFtVHJhY2suaAorKysgYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dl Yk1lZGlhU3RyZWFtVHJhY2suaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiAqdGhpczsKICAgICB9CiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGFzc2lnbihjb25zdCBX ZWJNZWRpYVN0cmVhbVRyYWNrJik7Ci0gICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUo Y29uc3QgV2ViTWVkaWFTdHJlYW1Tb3VyY2UmKTsKKyAgICBXRUJLSVRfRVhQT1JUIHZvaWQgaW5p dGlhbGl6ZShjb25zdCBXZWJTdHJpbmcmIGlkLCBjb25zdCBXZWJNZWRpYVN0cmVhbVNvdXJjZSYp OwogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXNldCgpOwogICAgIGJvb2wgaXNOdWxsKCkgY29u c3QgeyByZXR1cm4gbV9wcml2YXRlLmlzTnVsbCgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbS5jcHAK aW5kZXggNzhmNzQ4ZDgxNDM3MGIyM2IyYjVkZWIxYmQzYjZhNDRhMGE1MDY4MS4uMWJjNGU0Zjky ZDVmNzE4YThhZGQ1NjIzZjMzNTQxNThmZWJmZDA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbS5jcHAK QEAgLTEyOCwxNiArMTI4LDE4IEBAIFdlYk1lZGlhU3RyZWFtOjpvcGVyYXRvciBXZWJDb3JlOjpN ZWRpYVN0cmVhbURlc2NyaXB0b3IqKCkgY29uc3QKICAgICByZXR1cm4gbV9wcml2YXRlLmdldCgp OwogfQogCisvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgcmVmYWN0b3JlZCB0byB0YWtlIFdlYk1l ZGlhU3RyZWFtVHJhY2tzIHNvIHRoYXQgdGhlIGRlY2lzaW9uCisvLyAgICAgICAgd2hhdCB0aGUg aWQgb2YgdGhlIHRyYWNrIHNob3VsZCBiZSBpcyB0YWtlbiBieSB0aGUgZW1iZWRkZXIgaW5zdGVh ZCBvZiBoZXJlLgogdm9pZCBXZWJNZWRpYVN0cmVhbTo6aW5pdGlhbGl6ZShjb25zdCBXZWJTdHJp bmcmIGxhYmVsLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBhdWRpb1Nv dXJjZXMsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHZpZGVvU291cmNl cykKIHsKLSAgICBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciBhdWRpbywgdmlkZW87CisgICAgTWVk aWFTdHJlYW1Db21wb25lbnRWZWN0b3IgYXVkaW8sIHZpZGVvOwogICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgYXVkaW9Tb3VyY2VzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIE1lZGlhU3RyZWFt U291cmNlKiBjdXJyID0gYXVkaW9Tb3VyY2VzW2ldOwotICAgICAgICBhdWRpby5hcHBlbmQoY3Vy cik7CisgICAgICAgIE1lZGlhU3RyZWFtU291cmNlKiBzb3VyY2UgPSBhdWRpb1NvdXJjZXNbaV07 CisgICAgICAgIGF1ZGlvLmFwcGVuZChNZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKHNvdXJj ZS0+aWQoKSwgc291cmNlKSk7CiAgICAgfQogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdmlk ZW9Tb3VyY2VzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIE1lZGlhU3RyZWFtU291cmNlKiBjdXJy ID0gdmlkZW9Tb3VyY2VzW2ldOwotICAgICAgICB2aWRlby5hcHBlbmQoY3Vycik7CisgICAgICAg IE1lZGlhU3RyZWFtU291cmNlKiBzb3VyY2UgPSB2aWRlb1NvdXJjZXNbaV07CisgICAgICAgIHZp ZGVvLmFwcGVuZChNZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKHNvdXJjZS0+aWQoKSwgc291 cmNlKSk7CiAgICAgfQogICAgIG1fcHJpdmF0ZSA9IE1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y3Jl YXRlKGxhYmVsLCBhdWRpbywgdmlkZW8pOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbVRyYWNrLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW1UcmFjay5j cHAKaW5kZXggMzEzNTViYWRmOGNkYTNhZWU0NmE1ODFmOTE0NmRiNjgyNTRmNjNjNy4uZTBjZWQz ZTI0YzViMWQ5M2EwZmY0MGE0MmE2YWY3MzBjMDQzYTQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbVRyYWNrLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3Ry ZWFtVHJhY2suY3BwCkBAIC01NCw5ICs1NCw5IEBAIFdlYk1lZGlhU3RyZWFtVHJhY2smIFdlYk1l ZGlhU3RyZWFtVHJhY2s6Om9wZXJhdG9yPShXZWJDb3JlOjpNZWRpYVN0cmVhbUNvbXBvbmVuCiAg ICAgcmV0dXJuICp0aGlzOwogfQogCi12b2lkIFdlYk1lZGlhU3RyZWFtVHJhY2s6OmluaXRpYWxp emUoY29uc3QgV2ViTWVkaWFTdHJlYW1Tb3VyY2UmIHNvdXJjZSkKK3ZvaWQgV2ViTWVkaWFTdHJl YW1UcmFjazo6aW5pdGlhbGl6ZShjb25zdCBXZWJTdHJpbmcmIGlkLCBjb25zdCBXZWJNZWRpYVN0 cmVhbVNvdXJjZSYgc291cmNlKQogewotICAgIG1fcHJpdmF0ZSA9IE1lZGlhU3RyZWFtQ29tcG9u ZW50OjpjcmVhdGUoc291cmNlKTsKKyAgICBtX3ByaXZhdGUgPSBNZWRpYVN0cmVhbUNvbXBvbmVu dDo6Y3JlYXRlKGlkLCBzb3VyY2UpOwogfQogCiB2b2lkIFdlYk1lZGlhU3RyZWFtVHJhY2s6OnJl c2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtQ29tcG9uZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbUNvbXBvbmVudC5oCmluZGV4IDllZTA4ZTNiYmE5NmJhMmQ3NTljYWUxNjg0 YjMyMWRlYWVhOGMwZWQuLjJhYzhmYzRmMjgzMjMzZjlhZmI5NmNkM2JhMTNjZTQ0MzdhYmJjNmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtQ29tcG9uZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1Db21wb25lbnQuaApAQCAtNDIsMTQgKzQyLDE0IEBAIGNsYXNzIE1lZGlhU3Ry ZWFtRGVzY3JpcHRvcjsKIAogY2xhc3MgTWVkaWFTdHJlYW1Db21wb25lbnQgOiBwdWJsaWMgUmVm Q291bnRlZDxNZWRpYVN0cmVhbUNvbXBvbmVudD4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNz UmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiBjcmVhdGUoUGFzc1JlZlB0cjxNZWRpYVN0cmVh bVNvdXJjZT4gc291cmNlKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9u ZW50PiBjcmVhdGUoY29uc3QgU3RyaW5nJiBpZCwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVNvdXJj ZT4gc291cmNlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0cmVh bUNvbXBvbmVudCgwLCBzb3VyY2UpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRp YVN0cmVhbUNvbXBvbmVudChpZCwgMCwgc291cmNlKSk7CiAgICAgfQogCiAgICAgc3RhdGljIFBh c3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+IGNyZWF0ZShNZWRpYVN0cmVhbURlc2NyaXB0 b3IqIHN0cmVhbSwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVNvdXJjZT4gc291cmNlKQogICAgIHsK LSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0cmVhbUNvbXBvbmVudChzdHJlYW0s IHNvdXJjZSkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtQ29tcG9u ZW50KGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSwgc3RyZWFtLCBzb3VyY2UpKTsKICAgICB9 CiAKICAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbSgpIGNvbnN0IHsgcmV0dXJuIG1f c3RyZWFtOyB9CkBAIC02MiwxMiArNjIsMTMgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RW5hYmxl ZChib29sIGVuYWJsZWQpIHsgbV9lbmFibGVkID0gZW5hYmxlZDsgfQogCiBwcml2YXRlOgotICAg IE1lZGlhU3RyZWFtQ29tcG9uZW50KE1lZGlhU3RyZWFtRGVzY3JpcHRvciogc3RyZWFtLCBQYXNz UmVmUHRyPE1lZGlhU3RyZWFtU291cmNlPiBzb3VyY2UpCisgICAgTWVkaWFTdHJlYW1Db21wb25l bnQoY29uc3QgU3RyaW5nJiBpZCwgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBzdHJlYW0sIFBhc3NS ZWZQdHI8TWVkaWFTdHJlYW1Tb3VyY2U+IHNvdXJjZSkKICAgICAgICAgOiBtX3N0cmVhbShzdHJl YW0pCiAgICAgICAgICwgbV9zb3VyY2Uoc291cmNlKQotICAgICAgICAsIG1faWQoY3JlYXRlQ2Fu b25pY2FsVVVJRFN0cmluZygpKQorICAgICAgICAsIG1faWQoaWQpCiAgICAgICAgICwgbV9lbmFi bGVkKHRydWUpCiAgICAgeworICAgICAgICBBU1NFUlQobV9pZC5sZW5ndGgoKSk7CiAgICAgfQog CiAgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBtX3N0cmVhbTsKQEAgLTc2LDYgKzc3LDggQEAg cHJpdmF0ZToKICAgICBib29sIG1fZW5hYmxlZDsKIH07CiAKK3R5cGVkZWYgVmVjdG9yPFJlZlB0 cjxNZWRpYVN0cmVhbUNvbXBvbmVudD4gPiBNZWRpYVN0cmVhbUNvbXBvbmVudFZlY3RvcjsKKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtRGVzY3JpcHRvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1EZXNjcmlwdG9yLmgKaW5kZXggOTQ2YzZkZTdjNWQxYTEwYmVhMTQ5ZTk4YjVhYzdj ZDczMDMwNGQzNi4uYjJhMjJiNmVhYzAwZGRmZjA1MGYwNmNmZmFjMDMxZTZhMjEzZjRmZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1E ZXNjcmlwdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTYxLDYgKzYxLDExIEBAIHB1YmxpYzoKICAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0cmVhbURlc2NyaXB0b3IoaWQsIGF1ZGlvU291cmNl cywgdmlkZW9Tb3VyY2VzKSk7CiAgICAgfQogCisgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFT dHJlYW1EZXNjcmlwdG9yPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBpZCwgY29uc3QgTWVkaWFTdHJl YW1Db21wb25lbnRWZWN0b3ImIGF1ZGlvQ29tcG9uZW50cywgY29uc3QgTWVkaWFTdHJlYW1Db21w b25lbnRWZWN0b3ImIHZpZGVvQ29tcG9uZW50cykKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9w dFJlZihuZXcgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGlkLCBhdWRpb0NvbXBvbmVudHMsIHZpZGVv Q29tcG9uZW50cykpOworICAgIH0KKwogICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCog Y2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQ7IH0KICAgICB2b2lkIHNldENsaWVudChN ZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQqIGNsaWVudCkgeyBtX2NsaWVudCA9IGNsaWVudDsg fQogCkBAIC05OCw2ICsxMDMsNyBAQCBwcml2YXRlOgogICAgICAgICAsIG1faWQoaWQpCiAgICAg ICAgICwgbV9lbmRlZChmYWxzZSkKICAgICB7CisgICAgICAgIEFTU0VSVChtX2lkLmxlbmd0aCgp KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhdWRpb1NvdXJjZXMuc2l6ZSgpOyBp KyspCiAgICAgICAgICAgICBtX2F1ZGlvQ29tcG9uZW50cy5hcHBlbmQoTWVkaWFTdHJlYW1Db21w b25lbnQ6OmNyZWF0ZSh0aGlzLCBhdWRpb1NvdXJjZXNbaV0pKTsKIApAQCAtMTA1LDYgKzExMSwy MiBAQCBwcml2YXRlOgogICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMuYXBwZW5kKE1lZGlh U3RyZWFtQ29tcG9uZW50OjpjcmVhdGUodGhpcywgdmlkZW9Tb3VyY2VzW2ldKSk7CiAgICAgfQog CisgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKGNvbnN0IFN0cmluZyYgaWQsIGNvbnN0IE1lZGlh U3RyZWFtQ29tcG9uZW50VmVjdG9yJiBhdWRpb0NvbXBvbmVudHMsIGNvbnN0IE1lZGlhU3RyZWFt Q29tcG9uZW50VmVjdG9yJiB2aWRlb0NvbXBvbmVudHMpCisgICAgICAgIDogbV9jbGllbnQoMCkK KyAgICAgICAgLCBtX2lkKGlkKQorICAgICAgICAsIG1fZW5kZWQoZmFsc2UpCisgICAgeworICAg ICAgICBBU1NFUlQobV9pZC5sZW5ndGgoKSk7CisgICAgICAgIGZvciAoTWVkaWFTdHJlYW1Db21w b25lbnRWZWN0b3I6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBhdWRpb0NvbXBvbmVudHMuYmVnaW4o KTsgaXRlciAhPSBhdWRpb0NvbXBvbmVudHMuZW5kKCk7ICsraXRlcikgeworICAgICAgICAgICAg KCppdGVyKS0+c2V0U3RyZWFtKHRoaXMpOworICAgICAgICAgICAgbV9hdWRpb0NvbXBvbmVudHMu YXBwZW5kKCgqaXRlcikpOworICAgICAgICB9CisgICAgICAgIGZvciAoTWVkaWFTdHJlYW1Db21w b25lbnRWZWN0b3I6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSB2aWRlb0NvbXBvbmVudHMuYmVnaW4o KTsgaXRlciAhPSB2aWRlb0NvbXBvbmVudHMuZW5kKCk7ICsraXRlcikgeworICAgICAgICAgICAg KCppdGVyKS0+c2V0U3RyZWFtKHRoaXMpOworICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMu YXBwZW5kKCgqaXRlcikpOworICAgICAgICB9CisgICAgfQorCiAgICAgTWVkaWFTdHJlYW1EZXNj cmlwdG9yQ2xpZW50KiBtX2NsaWVudDsKICAgICBTdHJpbmcgbV9pZDsKICAgICBWZWN0b3I8UmVm UHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiA+IG1fYXVkaW9Db21wb25lbnRzOwo= 188089 2013-02-13 08:53:35 -0800 2013-02-13 12:34:17 -0800 Patch bug-109688-20130213175003.patch text/plain 16370 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBkODVkYzNiNGNmZjgw NGJhM2Y0MmQyMmIyNDIxMGM2MTQ2MDg4NWY4Li44NzliNGU3NzAyZTlhZDE5YzZiM2Y1MmY2MjQ0 NzcyNjcxODYzMmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wMi0xMyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IFVzZSB0aGUgc291cmNlIGlkIHdoZW4gY3JlYXRpbmcgbmV3IHRyYWNrcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5Njg4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgaWQgdG8g aW5pdGlhbGl6ZSBhbmQgcmVuYW1lZCBhdWRpby92aWRlb1NvdXJjZXMgdG8gYXVkaW8vdmlkZW9U cmFja3MuCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW0uaDoKKyAg ICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJNZWRpYVN0cmVhbSk6CisgICAgICAgIChXZWJL aXQ6OldlYk1lZGlhU3RyZWFtOjphdWRpb1NvdXJjZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJN ZWRpYVN0cmVhbTo6dmlkZW9Tb3VyY2VzKToKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2Vi TWVkaWFTdHJlYW1UcmFjay5oOgorICAgICAgICAoV2ViTWVkaWFTdHJlYW1UcmFjayk6CisKIDIw MTMtMDItMTEgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIEFkZCBXZWJVbml0VGVzdFN1cHBvcnQ6OmNyZWF0ZUxheWVyVHJlZVZpZXdG b3JUZXN0aW5nIGZvciB3ZWJraXRfdW5pdF90ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGViZDhlMDFlNTRh M2VhYWFmYThlNWRmZDZjMDMwZDhiNzEyNDc2YTkuLjY1ZGQ4NWUzZDM1NjZkOWJiYmE1ZmI1OGQ4 NjU5ZDI1YjkwOTcxZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMy0wMi0xMyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IFVzZSB0aGUgc291cmNlIGlkIHdoZW4gY3JlYXRpbmcgbmV3IHRyYWNrcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5Njg4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBy ZXVzZXMgdGhlIGlkcyBmcm9tIHRoZSBzb3VyY2Ugd2hlbiBjcmVhdGluZyB0cmFja3MgaW5zdGVh ZCBvZiBjcmVhdGluZyBhIG5ldyBvbmUuCisgICAgICAgIFRoaXMgd2FzIHJlcXVlc3RlZCBieSB0 aGUgY2hyb21pdW0gcG9ydCB0byBncmVhdGx5IHNpbXBsaWZ5IHRoZWlyIGltcGxlbWVudGF0aW9u LgorICAgICAgICBJbiB0aGUgbG9uZ2VyIHJ1biB0aGUgQVBJIHNob3VsZCBiZSByZXdyaXR0ZW4g dG8gb25seSB1c2UgdHJhY2tzIGluc3RlYWQgb2Ygc291cmNlcy4KKworICAgICAgICBDb3ZlcmVk IGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9y dC9XZWJNZWRpYVN0cmVhbS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtOjph dWRpb1RyYWNrcyk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtOjp2aWRlb1RyYWNr cyk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtOjppbml0aWFsaXplKToKKyAgICAg ICAgKFdlYktpdCk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRp YVN0cmVhbVRyYWNrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFTdHJlYW1UcmFjazo6 aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlh c3RyZWFtL01lZGlhU3RyZWFtQ29tcG9uZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0 cmVhbUNvbXBvbmVudDo6Y3JlYXRlKToKKyAgICAgICAgKE1lZGlhU3RyZWFtQ29tcG9uZW50KToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtQ29tcG9uZW50OjpNZWRpYVN0cmVhbUNvbXBv bmVudCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt RGVzY3JpcHRvcjo6Y3JlYXRlKToKKyAgICAgICAgKE1lZGlhU3RyZWFtRGVzY3JpcHRvcik6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6Ok1lZGlhU3RyZWFtRGVzY3Jp cHRvcik6CisKIDIwMTMtMDItMTIgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtWOF0gR2VuZXJhdGUgd3JhcHBlciBtZXRob2RzIGZvciBjdXN0b20gZ2V0 dGVycy9zZXR0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYk1lZGlhU3RyZWFtLmggYi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYk1l ZGlhU3RyZWFtLmgKaW5kZXggODY3ZjFmMzA2ZDcyNDI2ZDE3NjdkMmQ4ZmFlZmRhODk3YzFhMzRl Yi4uMjM3NTY1ZTJiZjIzMmY0YmUwN2NiZmY0NzAzZThkYTY4NTgzNjMzNCAxMDA2NDQKLS0tIGEv U291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbS5oCisrKyBiL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW0uaApAQCAtMzYsOCAr MzYsOCBAQCBjbGFzcyBNZWRpYVN0cmVhbURlc2NyaXB0b3I7CiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCi1jbGFzcyBXZWJNZWRpYVN0cmVhbVRyYWNrOwogY2xhc3MgV2ViTWVkaWFTdHJlYW1Tb3Vy Y2U7CitjbGFzcyBXZWJNZWRpYVN0cmVhbVRyYWNrOwogY2xhc3MgV2ViU3RyaW5nOwogCiBjbGFz cyBXZWJNZWRpYVN0cmVhbSB7CkBAIC01OSw3ICs1OSwxMSBAQCBwdWJsaWM6CiAKICAgICBXRUJL SVRfRVhQT1JUIHZvaWQgYXNzaWduKGNvbnN0IFdlYk1lZGlhU3RyZWFtJik7CiAKKyAgICAvLyBE RVBSRUNBVEVECiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUoY29uc3QgV2ViU3Ry aW5nJiBsYWJlbCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9T b3VyY2VzLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJj ZXMpOworCisgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUoY29uc3QgV2ViU3RyaW5n JiBsYWJlbCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+JiBhdWRpb1RyYWNr cywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+JiB2aWRlb1RyYWNrcyk7CisK ICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVzZXQoKTsKICAgICBib29sIGlzTnVsbCgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJpdmF0ZS5pc051bGwoKTsgfQogCkBAIC02OCw4ICs3MiwxMiBAQCBwdWJs aWM6CiAKICAgICBXRUJLSVRfRVhQT1JUIFdlYlN0cmluZyBpZCgpIGNvbnN0OwogCi0gICAgV0VC S0lUX0VYUE9SVCB2b2lkIGF1ZGlvU291cmNlcyhXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFj az4mKSBjb25zdDsKLSAgICBXRUJLSVRfRVhQT1JUIHZvaWQgdmlkZW9Tb3VyY2VzKFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVRyYWNrPiYpIGNvbnN0OworICAgIFdFQktJVF9FWFBPUlQgdm9pZCBh dWRpb1RyYWNrcyhXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFjaz4mKSBjb25zdDsKKyAgICBX RUJLSVRfRVhQT1JUIHZvaWQgdmlkZW9UcmFja3MoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJh Y2s+JikgY29uc3Q7CisKKyAgICAvLyBERVBSRUNBVEVECisgICAgdm9pZCBhdWRpb1NvdXJjZXMo V2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+JiB0cmFja3MpIGNvbnN0IHsgYXVkaW9UcmFj a3ModHJhY2tzKTsgfQorICAgIHZvaWQgdmlkZW9Tb3VyY2VzKFdlYlZlY3RvcjxXZWJNZWRpYVN0 cmVhbVRyYWNrPiYgdHJhY2tzKSBjb25zdCB7IHZpZGVvVHJhY2tzKHRyYWNrcyk7IH0KIAogICAg IC8vIEV4dHJhIGRhdGEgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViTWVkaWFTdHJlYW0uCiAgICAg Ly8gSWYgbm9uLW51bGwsIHRoZSBleHRyYSBkYXRhIHBvaW50ZXIgd2lsbCBiZSBkZWxldGVkIHdo ZW4gdGhlIG9iamVjdCBpcyBkZXN0cm95ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtVHJhY2suaCBiL1NvdXJjZS9QbGF0Zm9ybS9j aHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW1UcmFjay5oCmluZGV4IDQ5MjNhMGNmZTAwMDU5 OGFjMjdkMTk2MGFmYzg2YzJkYmU0MTBjMGYuLjJhYTJlNjMzNzUzNGEzYWE5MWNkNTVmODc5MWJi ZDNiZmQ4Zjk3NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMv V2ViTWVkaWFTdHJlYW1UcmFjay5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJs aWMvV2ViTWVkaWFTdHJlYW1UcmFjay5oCkBAIC01MCw3ICs1MCwxMCBAQCBwdWJsaWM6CiAgICAg ICAgIHJldHVybiAqdGhpczsKICAgICB9CiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIGFzc2lnbihj b25zdCBXZWJNZWRpYVN0cmVhbVRyYWNrJik7CisKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgaW5p dGlhbGl6ZShjb25zdCBXZWJNZWRpYVN0cmVhbVNvdXJjZSYpOworICAgIFdFQktJVF9FWFBPUlQg dm9pZCBpbml0aWFsaXplKGNvbnN0IFdlYlN0cmluZyYgaWQsIGNvbnN0IFdlYk1lZGlhU3RyZWFt U291cmNlJik7CisKICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVzZXQoKTsKICAgICBib29sIGlz TnVsbCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJpdmF0ZS5pc051bGwoKTsgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFt LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFT dHJlYW0uY3BwCmluZGV4IDc4Zjc0OGQ4MTQzNzBiMjNiMmI1ZGViMWJkM2I2YTQ0YTBhNTA2ODEu LmEzMTAzZWRlYTQzYTBjZDM2NzM4MGM3Zjk4MjZhNjJlNDA1MmExYTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFTdHJlYW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViTWVkaWFT dHJlYW0uY3BwCkBAIC05NCwyMiArOTQsMjIgQEAgdm9pZCBXZWJNZWRpYVN0cmVhbTo6c2V0RXh0 cmFEYXRhKEV4dHJhRGF0YSogZXh0cmFEYXRhKQogICAgIG1fcHJpdmF0ZS0+c2V0RXh0cmFEYXRh KGFkb3B0UmVmKG5ldyBFeHRyYURhdGFDb250YWluZXIoZXh0cmFEYXRhKSkpOwogfQogCi12b2lk IFdlYk1lZGlhU3RyZWFtOjphdWRpb1NvdXJjZXMoV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJh Y2s+JiB3ZWJTb3VyY2VzKSBjb25zdAordm9pZCBXZWJNZWRpYVN0cmVhbTo6YXVkaW9UcmFja3Mo V2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+JiB3ZWJUcmFja3MpIGNvbnN0CiB7Ci0gICAg c2l6ZV90IG51bWJlck9mU291cmNlcyA9IG1fcHJpdmF0ZS0+bnVtYmVyT2ZBdWRpb0NvbXBvbmVu dHMoKTsKLSAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFjaz4gcmVzdWx0KG51bWJlck9m U291cmNlcyk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1iZXJPZlNvdXJjZXM7ICsr aSkKKyAgICBzaXplX3QgbnVtYmVyT2ZUcmFja3MgPSBtX3ByaXZhdGUtPm51bWJlck9mQXVkaW9D b21wb25lbnRzKCk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+IHJlc3VsdChu dW1iZXJPZlRyYWNrcyk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1iZXJPZlRyYWNr czsgKytpKQogICAgICAgICByZXN1bHRbaV0gPSBtX3ByaXZhdGUtPmF1ZGlvQ29tcG9uZW50KGkp OwotICAgIHdlYlNvdXJjZXMuc3dhcChyZXN1bHQpOworICAgIHdlYlRyYWNrcy5zd2FwKHJlc3Vs dCk7CiB9CiAKLXZvaWQgV2ViTWVkaWFTdHJlYW06OnZpZGVvU291cmNlcyhXZWJWZWN0b3I8V2Vi TWVkaWFTdHJlYW1UcmFjaz4mIHdlYlNvdXJjZXMpIGNvbnN0Cit2b2lkIFdlYk1lZGlhU3RyZWFt Ojp2aWRlb1RyYWNrcyhXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFjaz4mIHdlYlRyYWNrcykg Y29uc3QKIHsKLSAgICBzaXplX3QgbnVtYmVyT2ZTb3VyY2VzID0gbV9wcml2YXRlLT5udW1iZXJP ZlZpZGVvQ29tcG9uZW50cygpOwotICAgIFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVRyYWNrPiBy ZXN1bHQobnVtYmVyT2ZTb3VyY2VzKTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG51bWJl ck9mU291cmNlczsgKytpKQorICAgIHNpemVfdCBudW1iZXJPZlRyYWNrcyA9IG1fcHJpdmF0ZS0+ bnVtYmVyT2ZWaWRlb0NvbXBvbmVudHMoKTsKKyAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1U cmFjaz4gcmVzdWx0KG51bWJlck9mVHJhY2tzKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG51bWJlck9mVHJhY2tzOyArK2kpCiAgICAgICAgIHJlc3VsdFtpXSA9IG1fcHJpdmF0ZS0+dmlk ZW9Db21wb25lbnQoaSk7Ci0gICAgd2ViU291cmNlcy5zd2FwKHJlc3VsdCk7CisgICAgd2ViVHJh Y2tzLnN3YXAocmVzdWx0KTsKIH0KIAogV2ViTWVkaWFTdHJlYW0mIFdlYk1lZGlhU3RyZWFtOjpv cGVyYXRvcj0oY29uc3QgUGFzc1JlZlB0cjxXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I+ JiBtZWRpYVN0cmVhbURlc2NyaXB0b3IpCkBAIC0xMzAsMTQgKzEzMCwyOCBAQCBXZWJNZWRpYVN0 cmVhbTo6b3BlcmF0b3IgV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yKigpIGNvbnN0CiAK IHZvaWQgV2ViTWVkaWFTdHJlYW06OmluaXRpYWxpemUoY29uc3QgV2ViU3RyaW5nJiBsYWJlbCwg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9Tb3VyY2VzLCBjb25z dCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJjZXMpCiB7Ci0gICAg TWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgYXVkaW8sIHZpZGVvOworICAgIE1lZGlhU3RyZWFtQ29t cG9uZW50VmVjdG9yIGF1ZGlvLCB2aWRlbzsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1 ZGlvU291cmNlcy5zaXplKCk7ICsraSkgewotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3Vy ciA9IGF1ZGlvU291cmNlc1tpXTsKLSAgICAgICAgYXVkaW8uYXBwZW5kKGN1cnIpOworICAgICAg ICBNZWRpYVN0cmVhbVNvdXJjZSogc291cmNlID0gYXVkaW9Tb3VyY2VzW2ldOworICAgICAgICBh dWRpby5hcHBlbmQoTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZShzb3VyY2UtPmlkKCksIHNv dXJjZSkpOwogICAgIH0KICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHZpZGVvU291cmNlcy5z aXplKCk7ICsraSkgewotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3VyciA9IHZpZGVvU291 cmNlc1tpXTsKLSAgICAgICAgdmlkZW8uYXBwZW5kKGN1cnIpOworICAgICAgICBNZWRpYVN0cmVh bVNvdXJjZSogc291cmNlID0gdmlkZW9Tb3VyY2VzW2ldOworICAgICAgICB2aWRlby5hcHBlbmQo TWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZShzb3VyY2UtPmlkKCksIHNvdXJjZSkpOworICAg IH0KKyAgICBtX3ByaXZhdGUgPSBNZWRpYVN0cmVhbURlc2NyaXB0b3I6OmNyZWF0ZShsYWJlbCwg YXVkaW8sIHZpZGVvKTsKK30KKwordm9pZCBXZWJNZWRpYVN0cmVhbTo6aW5pdGlhbGl6ZShjb25z dCBXZWJTdHJpbmcmIGxhYmVsLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFjaz4m IGF1ZGlvVHJhY2tzLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1UcmFjaz4mIHZpZGVv VHJhY2tzKQoreworICAgIE1lZGlhU3RyZWFtQ29tcG9uZW50VmVjdG9yIGF1ZGlvLCB2aWRlbzsK KyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1ZGlvVHJhY2tzLnNpemUoKTsgKytpKSB7Cisg ICAgICAgIE1lZGlhU3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQgPSBhdWRpb1RyYWNrc1tpXTsK KyAgICAgICAgYXVkaW8uYXBwZW5kKGNvbXBvbmVudCk7CisgICAgfQorICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgdmlkZW9UcmFja3Muc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgTWVkaWFTdHJl YW1Db21wb25lbnQqIGNvbXBvbmVudCA9IHZpZGVvVHJhY2tzW2ldOworICAgICAgICB2aWRlby5h cHBlbmQoY29tcG9uZW50KTsKICAgICB9CiAgICAgbV9wcml2YXRlID0gTWVkaWFTdHJlYW1EZXNj cmlwdG9yOjpjcmVhdGUobGFiZWwsIGF1ZGlvLCB2aWRlbyk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtVHJhY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJNZWRpYVN0 cmVhbVRyYWNrLmNwcAppbmRleCAzMTM1NWJhZGY4Y2RhM2FlZTQ2YTU4MWY5MTQ2ZGI2ODI1NGY2 M2M3Li5iNGJiNzE3ZWQyN2YzZDcwMjM4OTZhZDUxNTcyNzk1OTM4Y2MwNWNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFt VHJhY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQv V2ViTWVkaWFTdHJlYW1UcmFjay5jcHAKQEAgLTU5LDYgKzU5LDExIEBAIHZvaWQgV2ViTWVkaWFT dHJlYW1UcmFjazo6aW5pdGlhbGl6ZShjb25zdCBXZWJNZWRpYVN0cmVhbVNvdXJjZSYgc291cmNl KQogICAgIG1fcHJpdmF0ZSA9IE1lZGlhU3RyZWFtQ29tcG9uZW50OjpjcmVhdGUoc291cmNlKTsK IH0KIAordm9pZCBXZWJNZWRpYVN0cmVhbVRyYWNrOjppbml0aWFsaXplKGNvbnN0IFdlYlN0cmlu ZyYgaWQsIGNvbnN0IFdlYk1lZGlhU3RyZWFtU291cmNlJiBzb3VyY2UpCit7CisgICAgbV9wcml2 YXRlID0gTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZShpZCwgc291cmNlKTsKK30KKwogdm9p ZCBXZWJNZWRpYVN0cmVhbVRyYWNrOjpyZXNldCgpCiB7CiAgICAgbV9wcml2YXRlLnJlc2V0KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbUNvbXBvbmVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1Db21wb25lbnQuaAppbmRleCA5ZWUwOGUzYmJhOTZiYTJkNzU5Y2FlMTY4NGIzMjFk ZWFlYThjMGVkLi5jZjc3YzE2NTlhMmNhN2U2Mzc5NTE3ODU0ZGM0OGMzZjc5YmY3NTFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbUNv bXBvbmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlh U3RyZWFtQ29tcG9uZW50LmgKQEAgLTQ0LDEyICs0NCwxNyBAQCBjbGFzcyBNZWRpYVN0cmVhbUNv bXBvbmVudCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU3RyZWFtQ29tcG9uZW50PiB7CiBwdWJs aWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+IGNyZWF0ZShQ YXNzUmVmUHRyPE1lZGlhU3RyZWFtU291cmNlPiBzb3VyY2UpCiAgICAgewotICAgICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtQ29tcG9uZW50KDAsIHNvdXJjZSkpOworICAgICAg ICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtQ29tcG9uZW50KGNyZWF0ZUNhbm9uaWNh bFVVSURTdHJpbmcoKSwgMCwgc291cmNlKSk7CisgICAgfQorCisgICAgc3RhdGljIFBhc3NSZWZQ dHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGlkLCBQYXNzUmVm UHRyPE1lZGlhU3RyZWFtU291cmNlPiBzb3VyY2UpCisgICAgeworICAgICAgICByZXR1cm4gYWRv cHRSZWYobmV3IE1lZGlhU3RyZWFtQ29tcG9uZW50KGlkLCAwLCBzb3VyY2UpKTsKICAgICB9CiAK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbUNvbXBvbmVudD4gY3JlYXRlKE1lZGlh U3RyZWFtRGVzY3JpcHRvciogc3RyZWFtLCBQYXNzUmVmUHRyPE1lZGlhU3RyZWFtU291cmNlPiBz b3VyY2UpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtQ29t cG9uZW50KHN0cmVhbSwgc291cmNlKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgTWVk aWFTdHJlYW1Db21wb25lbnQoY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpLCBzdHJlYW0sIHNv dXJjZSkpOwogICAgIH0KIAogICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvciogc3RyZWFtKCkgY29u c3QgeyByZXR1cm4gbV9zdHJlYW07IH0KQEAgLTYyLDEyICs2NywxMyBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2VuYWJsZWQgPSBlbmFibGVkOyB9CiAK IHByaXZhdGU6Ci0gICAgTWVkaWFTdHJlYW1Db21wb25lbnQoTWVkaWFTdHJlYW1EZXNjcmlwdG9y KiBzdHJlYW0sIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Tb3VyY2U+IHNvdXJjZSkKKyAgICBNZWRp YVN0cmVhbUNvbXBvbmVudChjb25zdCBTdHJpbmcmIGlkLCBNZWRpYVN0cmVhbURlc2NyaXB0b3Iq IHN0cmVhbSwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVNvdXJjZT4gc291cmNlKQogICAgICAgICA6 IG1fc3RyZWFtKHN0cmVhbSkKICAgICAgICAgLCBtX3NvdXJjZShzb3VyY2UpCi0gICAgICAgICwg bV9pZChjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkpCisgICAgICAgICwgbV9pZChpZCkKICAg ICAgICAgLCBtX2VuYWJsZWQodHJ1ZSkKICAgICB7CisgICAgICAgIEFTU0VSVChtX2lkLmxlbmd0 aCgpKTsKICAgICB9CiAKICAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3IqIG1fc3RyZWFtOwpAQCAt NzYsNiArODIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9lbmFibGVkOwogfTsKIAordHlwZWRl ZiBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiA+IE1lZGlhU3RyZWFtQ29tcG9u ZW50VmVjdG9yOworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUo TUVESUFfU1RSRUFNKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAppbmRleCA5NDZjNmRlN2M1ZDFhMTBi ZWExNDllOThiNWFjN2NkNzMwMzA0ZDM2Li5iMmEyMmI2ZWFjMDBkZGZmMDUwZjA2Y2ZmYWMwMzFl NmEyMTNmNGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaApAQCAtNjEsNiArNjEsMTEgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtRGVzY3JpcHRvcihp ZCwgYXVkaW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMpKTsKICAgICB9CiAKKyAgICBzdGF0aWMgUGFz c1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGlkLCBj b25zdCBNZWRpYVN0cmVhbUNvbXBvbmVudFZlY3RvciYgYXVkaW9Db21wb25lbnRzLCBjb25zdCBN ZWRpYVN0cmVhbUNvbXBvbmVudFZlY3RvciYgdmlkZW9Db21wb25lbnRzKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0cmVhbURlc2NyaXB0b3IoaWQsIGF1ZGlvQ29t cG9uZW50cywgdmlkZW9Db21wb25lbnRzKSk7CisgICAgfQorCiAgICAgTWVkaWFTdHJlYW1EZXNj cmlwdG9yQ2xpZW50KiBjbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQogICAgIHZv aWQgc2V0Q2xpZW50KE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCogY2xpZW50KSB7IG1fY2xp ZW50ID0gY2xpZW50OyB9CiAKQEAgLTk4LDYgKzEwMyw3IEBAIHByaXZhdGU6CiAgICAgICAgICwg bV9pZChpZCkKICAgICAgICAgLCBtX2VuZGVkKGZhbHNlKQogICAgIHsKKyAgICAgICAgQVNTRVJU KG1faWQubGVuZ3RoKCkpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1ZGlvU291 cmNlcy5zaXplKCk7IGkrKykKICAgICAgICAgICAgIG1fYXVkaW9Db21wb25lbnRzLmFwcGVuZChN ZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKHRoaXMsIGF1ZGlvU291cmNlc1tpXSkpOwogCkBA IC0xMDUsNiArMTExLDIyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICBtX3ZpZGVvQ29tcG9uZW50 cy5hcHBlbmQoTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZSh0aGlzLCB2aWRlb1NvdXJjZXNb aV0pKTsKICAgICB9CiAKKyAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3IoY29uc3QgU3RyaW5nJiBp ZCwgY29uc3QgTWVkaWFTdHJlYW1Db21wb25lbnRWZWN0b3ImIGF1ZGlvQ29tcG9uZW50cywgY29u c3QgTWVkaWFTdHJlYW1Db21wb25lbnRWZWN0b3ImIHZpZGVvQ29tcG9uZW50cykKKyAgICAgICAg OiBtX2NsaWVudCgwKQorICAgICAgICAsIG1faWQoaWQpCisgICAgICAgICwgbV9lbmRlZChmYWxz ZSkKKyAgICB7CisgICAgICAgIEFTU0VSVChtX2lkLmxlbmd0aCgpKTsKKyAgICAgICAgZm9yIChN ZWRpYVN0cmVhbUNvbXBvbmVudFZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgaXRlciA9IGF1ZGlvQ29t cG9uZW50cy5iZWdpbigpOyBpdGVyICE9IGF1ZGlvQ29tcG9uZW50cy5lbmQoKTsgKytpdGVyKSB7 CisgICAgICAgICAgICAoKml0ZXIpLT5zZXRTdHJlYW0odGhpcyk7CisgICAgICAgICAgICBtX2F1 ZGlvQ29tcG9uZW50cy5hcHBlbmQoKCppdGVyKSk7CisgICAgICAgIH0KKyAgICAgICAgZm9yIChN ZWRpYVN0cmVhbUNvbXBvbmVudFZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgaXRlciA9IHZpZGVvQ29t cG9uZW50cy5iZWdpbigpOyBpdGVyICE9IHZpZGVvQ29tcG9uZW50cy5lbmQoKTsgKytpdGVyKSB7 CisgICAgICAgICAgICAoKml0ZXIpLT5zZXRTdHJlYW0odGhpcyk7CisgICAgICAgICAgICBtX3Zp ZGVvQ29tcG9uZW50cy5hcHBlbmQoKCppdGVyKSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBN ZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQqIG1fY2xpZW50OwogICAgIFN0cmluZyBtX2lkOwog ICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+ID4gbV9hdWRpb0NvbXBvbmVu dHM7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg OGEzOTk4OWE0ZWYwNjZlMzYyOTAxYWEwMjAwYzkwMTUwMWIzOTU0Ny4uZWJiMDcxOWM3YmMxYjk1 MzExNjIwNGIyYjU3MTlmMjYwYzlhNTY3ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTEzICBUb21teSBX aWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFtIEFQ STogVXNlIHRoZSBzb3VyY2UgaWQgd2hlbiBjcmVhdGluZyBuZXcgdHJhY2tzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2ODgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTd2l0Y2hpbmcgbW9jayB0byBu ZXcgQVBJLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9z cmMvV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHA6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpX ZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlhKToKKwogMjAxMy0wMi0xMiAg QWRlbmlsc29uIENhdmFsY2FudGkgIDxjYXZhbGNhbnRpaUBnbWFpbC5jb20+CiAKICAgICAgICAg W1dLMl0gUGFnZSByZWxvYWRpbmcgd2lsbCBjcmFzaCBVSVByb2Nlc3MgYWZ0ZXIgV2ViUHJvY2Vz cyB3YXMga2lsbGVkCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9U ZXN0UnVubmVyL3NyYy9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmNwcCBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3Bw CmluZGV4IDMyNjc5YjQ1ZjljZTc1YzQzMDE4MmFiNzk2ZjYzNmNkNzlhNWRhYzcuLmM0N2ZlMGI2 OGFlZDlhYjY4MDc3OGY1ZGFjMTExZWEyZjczYmVhZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlVzZXJNZWRpYUNsaWVudE1vY2su Y3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dl YlVzZXJNZWRpYUNsaWVudE1vY2suY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSA8cHVi bGljL1dlYk1lZGlhQ29uc3RyYWludHMuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViTWVkaWFTdHJl YW0uaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViTWVkaWFTdHJlYW1Tb3VyY2UuaD4KKyNpbmNsdWRl IDxwdWJsaWMvV2ViTWVkaWFTdHJlYW1UcmFjay5oPgogI2luY2x1ZGUgPHB1YmxpYy9XZWJWZWN0 b3IuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKQEAgLTEwMiwxNyArMTAzLDIzIEBAIHZv aWQgV2ViVXNlck1lZGlhQ2xpZW50TW9jazo6cmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2Vy TWVkaWFSZXF1ZXN0JiBzdHJlYW1SCiAKICAgICBjb25zdCBzaXplX3QgemVybyA9IDA7CiAgICAg Y29uc3Qgc2l6ZV90IG9uZSA9IDE7Ci0gICAgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNl PiBhdWRpb1NvdXJjZXMocmVxdWVzdC5hdWRpbygpID8gb25lIDogemVybyk7Ci0gICAgV2ViVmVj dG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiB2aWRlb1NvdXJjZXMocmVxdWVzdC52aWRlbygpID8g b25lIDogemVybyk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtVHJhY2s+IGF1ZGlvVHJh Y2tzKHJlcXVlc3QuYXVkaW8oKSA/IG9uZSA6IHplcm8pOworICAgIFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVRyYWNrPiB2aWRlb1RyYWNrcyhyZXF1ZXN0LnZpZGVvKCkgPyBvbmUgOiB6ZXJvKTsK IAotICAgIGlmIChyZXF1ZXN0LmF1ZGlvKCkpCi0gICAgICAgIGF1ZGlvU291cmNlc1swXS5pbml0 aWFsaXplKCJNb2NrQXVkaW9EZXZpY2UjMSIsIFdlYk1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVk aW8sICJNb2NrIGF1ZGlvIGRldmljZSIpOworICAgIGlmIChyZXF1ZXN0LmF1ZGlvKCkpIHsKKyAg ICAgICAgV2ViTWVkaWFTdHJlYW1Tb3VyY2Ugc291cmNlOworICAgICAgICBzb3VyY2UuaW5pdGlh bGl6ZSgiTW9ja0F1ZGlvRGV2aWNlIzEiLCBXZWJNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZUF1ZGlv LCAiTW9jayBhdWRpbyBkZXZpY2UiKTsKKyAgICAgICAgYXVkaW9UcmFja3NbMF0uaW5pdGlhbGl6 ZShzb3VyY2UpOworICAgIH0KIAotICAgIGlmIChyZXF1ZXN0LnZpZGVvKCkpCi0gICAgICAgIHZp ZGVvU291cmNlc1swXS5pbml0aWFsaXplKCJNb2NrVmlkZW9EZXZpY2UjMSIsIFdlYk1lZGlhU3Ry ZWFtU291cmNlOjpUeXBlVmlkZW8sICJNb2NrIHZpZGVvIGRldmljZSIpOworICAgIGlmIChyZXF1 ZXN0LnZpZGVvKCkpIHsKKyAgICAgICAgV2ViTWVkaWFTdHJlYW1Tb3VyY2Ugc291cmNlOworICAg ICAgICBzb3VyY2UuaW5pdGlhbGl6ZSgiTW9ja1ZpZGVvRGV2aWNlIzEiLCBXZWJNZWRpYVN0cmVh bVNvdXJjZTo6VHlwZVZpZGVvLCAiTW9jayB2aWRlbyBkZXZpY2UiKTsKKyAgICAgICAgdmlkZW9U cmFja3NbMF0uaW5pdGlhbGl6ZShzb3VyY2UpOworICAgIH0KIAogICAgIFdlYk1lZGlhU3RyZWFt IHN0cmVhbTsKLSAgICBzdHJlYW0uaW5pdGlhbGl6ZSgiZm9vYmFyIiwgYXVkaW9Tb3VyY2VzLCB2 aWRlb1NvdXJjZXMpOworICAgIHN0cmVhbS5pbml0aWFsaXplKCJmb29iYXIiLCBhdWRpb1RyYWNr cywgdmlkZW9UcmFja3MpOwogCiAgICAgc3RyZWFtLnNldEV4dHJhRGF0YShuZXcgTW9ja0V4dHJh RGF0YSgpKTsKIAo=