214187 2020-07-10 07:52:12 -0700 [WebXR] Retrieve supported reference spaces from actual XR systems 2020-07-31 02:01:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 208988 1 svillar svillar cgarcia svillar webkit-bug-importer youennf zan zimmermann oldest_to_newest 1670443 0 svillar 2020-07-10 07:52:12 -0700 [WebXR] Retrieve supported reference spaces from actual XR systems 1670448 1 403967 svillar 2020-07-10 08:06:16 -0700 Created attachment 403967 Patch 1671723 2 403967 cgarcia 2020-07-15 06:40:52 -0700 Comment on attachment 403967 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403967&action=review > Source/WebCore/platform/xr/openxr/PlatformXROpenXR.cpp:178 > + createInfo.enabledExtensionCount = sizeof(enabledExtensions) / sizeof(char*); WTF_ARRAY_LENGTH? 1673294 3 webkit-bug-importer 2020-07-20 16:03:51 -0700 <rdar://problem/65852973> 1675571 4 zimmermann 2020-07-28 04:34:44 -0700 What's the status here? 1676769 5 svillar 2020-07-31 01:53:26 -0700 (In reply to Nikolas Zimmermann from comment #4) > What's the status here? I just need to update the patch & land. Got reviewed during my holidays. 1676771 6 svillar 2020-07-31 02:01:02 -0700 Committed r265137: <https://trac.webkit.org/changeset/265137> 403967 2020-07-10 08:06:16 -0700 2020-07-15 06:40:52 -0700 Patch bug-214187-20200710170614.patch text/plain 15218 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FkNjM1ZTU3ZmE4Mjk1 NTc1ZTNmMzMxODllZjgyYjU5ODFiZDI2Yy4uNzk1ZjZjZDlkNWFiYjQwMTIxN2UyNTYxNmQyZmZm ZDQ1YmQzOWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIwLTA3LTEwICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXZWJYUl0g UmV0cmlldmUgc3VwcG9ydGVkIHJlZmVyZW5jZSBzcGFjZXMgZnJvbSBhY3R1YWwgWFIgc3lzdGVt cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWFjaCBY UiBzeXN0ZW0gc3VwcG9ydHMgYSBzZXQgb2YgcmVmZXJlbmNlIHNwYWNlcyB3aGljaCBhcmUgdXNl ZCBieSBXZWJYUiB0byBzdGFibGlzaAorICAgICAgICBhIHNwYXRpYWwgcmVsYXRpb25zaGlwIHdp dGggdXNlcidzIHBoeXNpY2FsIGVudmlyb25tZW50LiBUaGUgbGlzdCBvZiBzdXBwb3J0ZWQgcmVm ZXJlbmNlCisgICAgICAgIHNwYWNlcyBkZXRlcm1pbmUgd2hldGhlciBvciBub3QgYSBzZXNzaW9u IHJlcXVlc3Qgc3VjY2VlZHMgb3Igbm90LCBhcyBpdCB3aWxsIHJlZnVzZSB0bworICAgICAgICBz dGFydCBhIHNlc3Npb24gd2l0aCBhbiB1bnN1cHBvcnRlZCByZWZlcmVuY2Ugc3BhY2UuCisKKyAg ICAgICAgU28gZmFyLCBubyByZWZlcmVuY2Ugc3BhY2VzIHdlcmUgcmV0cmlldmVkIGZyb20gdGhl IGFjdHVhbCBkZXZpY2VzLiBUaGlzIHBhdGNoIGFkZHMgdGhlCisgICAgICAgIHJlcXVpcmVkIE9w ZW5YUiBtYWNoaW5lcnkgdG8gcmV0cmlldmUgdGhlbS4gSW4gcGFydGljdWxhciwgd2UgaGF2ZSB0 byBjcmVhdGUgYSBYclNlc3Npb24KKyAgICAgICAgKGFsdGhvdWdoIHdlIGRvbid0IGhhdmUgdG8g c3RhcnQgaXQpIGluIG9yZGVyIHRvIHJldHJpZXZlIHRoZSByZWZlcmVuY2Ugc3BhY2VzLiBTaW5j ZSB3ZQorICAgICAgICBkb24ndCBuZWVkIGl0IHRvIHNob3cgY29udGVudCB0byB0aGUgdXNlciB3 ZSBjYW4gY3JlYXRlIGl0IGluIGhlYWRsZXNzIG1vZGUgYW5kIHRoZW4gZGlzY2FyZAorICAgICAg ICBpdCBhZnRlcndhcmRzIHdoZW4gbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAqIE1vZHVs ZXMvd2VieHIvV2ViWFJTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlhSU2Vzc2lv bjo6V2ViWFJTZXNzaW9uKTogQ2xhcmlmeSBhIGNvbW1lbnQuIEFsc28gcy9UT0RPL0ZJWE1FL2cu CisgICAgICAgICogcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3JtWFJPcGVuWFIuY3BwOgorICAg ICAgICAoUGxhdGZvcm1YUjo6aXNFeHRlbnNpb25TdXBwb3J0ZWQpOiBOZXcgbWV0aG9kIHRvIGNo ZWNrIHdoZXRoZXIgYSBzcGVjaWZpYyBleHRlbnNpb24KKyAgICAgICAgaXMgc3VwcG9ydGVkLgor ICAgICAgICAoUGxhdGZvcm1YUjo6SW5zdGFuY2U6OkltcGw6OmNoZWNrSW5zdGFuY2VFeHRlbnNp b25Qcm9wZXJ0aWVzIGNvbnN0KTogcmVuYW1lZCBmcm9tCisgICAgICAgIGVudW1lcmF0ZUluc3Rh bmNlRXh0ZW5zaW9uUHJvcGVydGllcygpLiBSZXR1cm5zIHdoZXRoZXIgb3Igbm90IHRoZSBjYWxs IHN1Y2NlZWRlZC4KKyAgICAgICAgKFBsYXRmb3JtWFI6Okluc3RhbmNlOjpJbXBsOjpJbXBsKTog UGFzcyB0aGUgbGlzdCBvZiBlbmFibGVkIGV4dGVuc2lvbnMgdG8gdGhlIGluc3RhbmNlLgorICAg ICAgICAoUGxhdGZvcm1YUjo6SW5zdGFuY2U6OmVudW1lcmF0ZUltbWVyc2l2ZVhSRGV2aWNlcyk6 IExvZyB0aGUgc3lzdGVtcyBmb3VuZC4KKyAgICAgICAgKFBsYXRmb3JtWFI6Ok9wZW5YUkRldmlj ZTo6T3BlblhSRGV2aWNlKToKKyAgICAgICAgKFBsYXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6ZW51 bWVyYXRlUmVmZXJlbmNlU3BhY2VzIGNvbnN0KTogTmV3IG1ldGhvZCB0byBsaXN0IHRoZQorICAg ICAgICBzdXBwb3J0ZWQgcmVmZXJlbmNlIHNwYWNlcyBieSB0aGUgWFIgc3lzdGVtLgorICAgICAg ICAoUGxhdGZvcm1YUjo6T3BlblhSRGV2aWNlOjpjb2xsZWN0U3VwcG9ydGVkU2Vzc2lvbk1vZGVz KTogU3RvcmUgcmVmZXJlbmNlIHNwYWNlcyBhcworICAgICAgICBlbmFibGVkIGZlYXR1cmVzIGZv ciBzdXBwb3J0ZWQgbW9kZXMuCisgICAgICAgIChQbGF0Zm9ybVhSOjpPcGVuWFJEZXZpY2U6OmNv bGxlY3RDb25maWd1cmF0aW9uVmlld3MpOiBSZW5hbWVkIGZyb20KKyAgICAgICAgZW51bWVyYXRl Q29uZmlndXJhdGlvblZpZXdzKCkuCisgICAgICAgIChQbGF0Zm9ybVhSOjpJbnN0YW5jZTo6SW1w bDo6ZW51bWVyYXRlSW5zdGFuY2VFeHRlbnNpb25Qcm9wZXJ0aWVzIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFBsYXRmb3JtWFI6Ok9wZW5YUkRldmljZTo6ZW51bWVyYXRlQ29uZmlndXJhdGlv blZpZXdzKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1Y Uk9wZW5YUi5oOgorCiAyMDIwLTA3LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xGQ11bVHJlZUNvbnN0cnVjdGlvbl0gQ3JlYXRlIGJsb2NrIGxldmVsIGNv bnRhaW5lciBmb3IgdW5zdXBwb3J0ZWQgcmVuZGVyZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2VieHIvV2ViWFJTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2VieHIvV2ViWFJTZXNzaW9uLmNwcAppbmRleCBhMzMxMzFhMmU1ZTA3ZDVhMTU3Y2I3MWUy MjY2YTlmZGIxMGM5YTg0Li41ZjNhNjAxNDZiNmU0NDFjYzQxMDdhYzQyZDU2NTYwNGRlOWM2N2My IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnhyL1dlYlhSU2Vzc2lvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJ4ci9XZWJYUlNlc3Npb24uY3BwCkBA IC01MiwxMCArNTIsOCBAQCBXZWJYUlNlc3Npb246OldlYlhSU2Vzc2lvbihEb2N1bWVudCYgZG9j dW1lbnQsIFdlYlhSU3lzdGVtJiBzeXN0ZW0sIFhSU2Vzc2lvbk1vZAogICAgICwgbV9hY3RpdmVS ZW5kZXJTdGF0ZShXZWJYUlJlbmRlclN0YXRlOjpjcmVhdGUobW9kZSkpCiAgICAgLCBtX2FuaW1h dGlvblRpbWVyKCp0aGlzLCAmV2ViWFJTZXNzaW9uOjphbmltYXRpb25UaW1lckZpcmVkKQogewot ICAgIC8vIFRPRE86IElmIG5vIG90aGVyIGZlYXR1cmVzIG9mIHRoZSB1c2VyIGFnZW50IGhhdmUg ZG9uZSBzbyBhbHJlYWR5LAotICAgIC8vIHBlcmZvcm0gdGhlIG5lY2Vzc2FyeSBwbGF0Zm9ybS1z cGVjaWZpYyBzdGVwcyB0byBpbml0aWFsaXplIHRoZSBkZXZpY2UncwotICAgIC8vIHRyYWNraW5n IGFuZCByZW5kZXJpbmcgY2FwYWJpbGl0aWVzLCBpbmNsdWRpbmcgc2hvd2luZyBhbnkgbmVjZXNz YXJ5Ci0gICAgLy8gaW5zdHJ1Y3Rpb25zIHRvIHRoZSB1c2VyLgorICAgIC8vIEZJWE1FOiBJZiBu byBvdGhlciBmZWF0dXJlcyBvZiB0aGUgdXNlciBhZ2VudCBoYXZlIGRvbmUgc28gYWxyZWFkeSwg cGVyZm9ybSB0aGUgbmVjZXNzYXJ5IHBsYXRmb3JtLXNwZWNpZmljIHN0ZXBzIHRvCisgICAgLy8g aW5pdGlhbGl6ZSB0aGUgZGV2aWNlJ3MgdHJhY2tpbmcgYW5kIHJlbmRlcmluZyBjYXBhYmlsaXRp ZXMsIGluY2x1ZGluZyBzaG93aW5nIGFueSBuZWNlc3NhcnkgaW5zdHJ1Y3Rpb25zIHRvIHRoZSB1 c2VyLgogICAgIHN1c3BlbmRJZk5lZWRlZCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS94ci9vcGVueHIvUGxhdGZvcm1YUk9wZW5YUi5jcHAKaW5kZXggMWE3ZWZj NDhjNWY2M2I3NzRjNWY2MjhhOWJmODBjNjMxN2FjOGQzMS4uNGI4YWM3NGU4MWQ3ODU1YTY1ZmI0 ODRmMjMwMGI0NmUzNjZkMmI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v eHIvb3BlbnhyL1BsYXRmb3JtWFJPcGVuWFIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3hyL29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmNwcApAQCAtMjQsNiArMjQsNyBAQAogCiAj aW5jbHVkZSAiTG9nZ2luZy5oIgogI2lmIFVTRV9PUEVOWFIKKyNpbmNsdWRlIDxvcGVueHIvb3Bl bnhyX3BsYXRmb3JtLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvU3RyaW5nQ29uY2F0ZW5hdGVOdW1iZXJzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RG U3RyaW5nLmg+CkBAIC01NSwxMCArNTYsMTAgQEAgU3RyaW5nIHJlc3VsdFRvU3RyaW5nKFhyUmVz dWx0IHZhbHVlLCBYckluc3RhbmNlIGluc3RhbmNlKQogICAgIHJldHVybiBtYWtlU3RyaW5nKCI8 dW5rbm93biAiLCBpbnQodmFsdWUpLCAiPiIpOwogfQogCi0jZGVmaW5lIFJFVFVSTl9JRl9GQUlM RUQocmVzdWx0LCBjYWxsLCBpbnN0YW5jZSkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAorI2RlZmluZSBSRVRVUk5fSUZfRkFJTEVEKHJlc3VsdCwg Y2FsbCwgaW5zdGFuY2UsIC4uLikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKICAgICBpZiAoWFJfRkFJTEVEKHJlc3VsdCkpIHsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc Ci0gICAgICAgIExPRyhYUiwgIiVzICVzOiAlc1xuIiwgX19mdW5jX18sIGNhbGwsIHJlc3VsdFRv U3RyaW5nKHJlc3VsdCwgaW5zdGFuY2UpLnV0ZjgoKS5kYXRhKCkpOyBcCi0gICAgICAgIHJldHVy bjsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBMT0coWFIsICIlcyAlczog JXNcbiIsIF9fZnVuY19fLCBjYWxsLCByZXN1bHRUb1N0cmluZyhyZXN1bHQsIGluc3RhbmNlKS51 dGY4KCkuZGF0YSgpKTsgICAgIFwKKyAgICAgICAgcmV0dXJuIF9fVkFfQVJHU19fOyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCiAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAog CiAjZW5kaWYgLy8gVVNFX09QRU5YUgpAQCAtNzYsNyArNzcsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogI2lmIFVTRV9PUEVOWFIKICAgICB2b2lkIGVudW1lcmF0ZUFwaUxheWVyUHJvcGVydGllcygp IGNvbnN0OwotICAgIHZvaWQgZW51bWVyYXRlSW5zdGFuY2VFeHRlbnNpb25Qcm9wZXJ0aWVzKCkg Y29uc3Q7CisgICAgYm9vbCBjaGVja0luc3RhbmNlRXh0ZW5zaW9uUHJvcGVydGllcygpIGNvbnN0 OwogCiAgICAgWHJJbnN0YW5jZSBtX2luc3RhbmNlIHsgWFJfTlVMTF9IQU5ETEUgfTsKICNlbmRp ZiAvLyBVU0VfT1BFTlhSCkBAIC0xMDcsMTQgKzEwOCwyMyBAQCB2b2lkIEluc3RhbmNlOjpJbXBs OjplbnVtZXJhdGVBcGlMYXllclByb3BlcnRpZXMoKSBjb25zdAogICAgIExPRyhYUiwgInhyRW51 bWVyYXRlQXBpTGF5ZXJQcm9wZXJ0aWVzKCk6ICV6dSBwcm9wZXJ0aWVzXG4iLCBwcm9wZXJ0aWVz LnNpemUoKSk7CiB9CiAKLXZvaWQgSW5zdGFuY2U6OkltcGw6OmVudW1lcmF0ZUluc3RhbmNlRXh0 ZW5zaW9uUHJvcGVydGllcygpIGNvbnN0CitzdGF0aWMgYm9vbCBpc0V4dGVuc2lvblN1cHBvcnRl ZChjb25zdCBjaGFyKiBleHRlbnNpb25OYW1lLCBWZWN0b3I8WHJFeHRlbnNpb25Qcm9wZXJ0aWVz PiYgaW5zdGFuY2VFeHRlbnNpb25Qcm9wZXJ0aWVzKQoreworICAgIGF1dG8gcG9zaXRpb24gPSBp bnN0YW5jZUV4dGVuc2lvblByb3BlcnRpZXMuZmluZE1hdGNoaW5nKFtleHRlbnNpb25OYW1lXShh dXRvJiBwcm9wZXJ0eSkgeworICAgICAgICByZXR1cm4gIXN0cmNtcChwcm9wZXJ0eS5leHRlbnNp b25OYW1lLCBleHRlbnNpb25OYW1lKTsKKyAgICB9KTsKKyAgICByZXR1cm4gcG9zaXRpb24gIT0g bm90Rm91bmQ7Cit9CisKK2Jvb2wgSW5zdGFuY2U6OkltcGw6OmNoZWNrSW5zdGFuY2VFeHRlbnNp b25Qcm9wZXJ0aWVzKCkgY29uc3QKIHsKICAgICB1aW50MzJfdCBwcm9wZXJ0eUNvdW50T3V0cHV0 IHsgMCB9OwogICAgIFhyUmVzdWx0IHJlc3VsdCA9IHhyRW51bWVyYXRlSW5zdGFuY2VFeHRlbnNp b25Qcm9wZXJ0aWVzKG51bGxwdHIsIDAsICZwcm9wZXJ0eUNvdW50T3V0cHV0LCBudWxscHRyKTsK LSAgICBSRVRVUk5fSUZfRkFJTEVEKHJlc3VsdCwgInhyRW51bWVyYXRlSW5zdGFuY2VFeHRlbnNp b25Qcm9wZXJ0aWVzKCkiLCBtX2luc3RhbmNlKTsKKyAgICBSRVRVUk5fSUZfRkFJTEVEKHJlc3Vs dCwgInhyRW51bWVyYXRlSW5zdGFuY2VFeHRlbnNpb25Qcm9wZXJ0aWVzIiwgbV9pbnN0YW5jZSwg ZmFsc2UpOworCiAgICAgaWYgKCFwcm9wZXJ0eUNvdW50T3V0cHV0KSB7CiAgICAgICAgIExPRyhY UiwgInhyRW51bWVyYXRlSW5zdGFuY2VFeHRlbnNpb25Qcm9wZXJ0aWVzKCk6IG5vIHByb3BlcnRp ZXNcbiIpOwotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAK ICAgICBWZWN0b3I8WHJFeHRlbnNpb25Qcm9wZXJ0aWVzPiBwcm9wZXJ0aWVzKHByb3BlcnR5Q291 bnRPdXRwdXQsCkBAIC0xMjcsMTIgKzEzNywxOCBAQCB2b2lkIEluc3RhbmNlOjpJbXBsOjplbnVt ZXJhdGVJbnN0YW5jZUV4dGVuc2lvblByb3BlcnRpZXMoKSBjb25zdAogCiAgICAgdWludDMyX3Qg cHJvcGVydHlDb3VudFdyaXR0ZW4geyAwIH07CiAgICAgcmVzdWx0ID0geHJFbnVtZXJhdGVJbnN0 YW5jZUV4dGVuc2lvblByb3BlcnRpZXMobnVsbHB0ciwgcHJvcGVydHlDb3VudE91dHB1dCwgJnBy b3BlcnR5Q291bnRXcml0dGVuLCBwcm9wZXJ0aWVzLmRhdGEoKSk7Ci0gICAgUkVUVVJOX0lGX0ZB SUxFRChyZXN1bHQsICJ4ckVudW1lcmF0ZUluc3RhbmNlRXh0ZW5zaW9uUHJvcGVydGllcygpIiwg bV9pbnN0YW5jZSk7CisgICAgUkVUVVJOX0lGX0ZBSUxFRChyZXN1bHQsICJ4ckVudW1lcmF0ZUlu c3RhbmNlRXh0ZW5zaW9uUHJvcGVydGllcyIsIG1faW5zdGFuY2UsIGZhbHNlKTsKKyNpZiAhTE9H X0RJU0FCTEVECiAgICAgTE9HKFhSLCAieHJFbnVtZXJhdGVJbnN0YW5jZUV4dGVuc2lvblByb3Bl cnRpZXMoKTogJXp1IGV4dGVuc2lvbiBwcm9wZXJ0aWVzXG4iLCBwcm9wZXJ0aWVzLnNpemUoKSk7 Ci0gICAgZm9yIChhdXRvJiBwcm9wZXJ0eSA6IHByb3BlcnRpZXMpIHsKLSAgICAgICAgTE9HKFhS LCAiICBleHRlbnNpb24gJyVzJywgdmVyc2lvbiAldVxuIiwKLSAgICAgICAgICAgIHByb3BlcnR5 LmV4dGVuc2lvbk5hbWUsIHByb3BlcnR5LmV4dGVuc2lvblZlcnNpb24pOworICAgIGZvciAoYXV0 byYgcHJvcGVydHkgOiBwcm9wZXJ0aWVzKQorICAgICAgICBMT0coWFIsICIgIGV4dGVuc2lvbiAn JXMnLCB2ZXJzaW9uICV1XG4iLCBwcm9wZXJ0eS5leHRlbnNpb25OYW1lLCBwcm9wZXJ0eS5leHRl bnNpb25WZXJzaW9uKTsKKyNlbmRpZgorICAgIGlmICghaXNFeHRlbnNpb25TdXBwb3J0ZWQoWFJf TU5EX0hFQURMRVNTX0VYVEVOU0lPTl9OQU1FLCBwcm9wZXJ0aWVzKSkgeworICAgICAgICBMT0co WFIsICJSZXF1aXJlZCBleHRlbnNpb24gJXMgbm90IHN1cHBvcnRlZCIsIFhSX01ORF9IRUFETEVT U19FWFRFTlNJT05fTkFNRSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CisKKyAgICBy ZXR1cm4gdHJ1ZTsKIH0KICNlbmRpZiAvLyBVU0VfT1BFTlhSCiAKQEAgLTE0MiwxOCArMTU4LDI1 IEBAIEluc3RhbmNlOjpJbXBsOjpJbXBsKCkKICAgICBMT0coWFIsICJPcGVuWFI6IGluaXRpYWxp emluZ1xuIik7CiAKICAgICBlbnVtZXJhdGVBcGlMYXllclByb3BlcnRpZXMoKTsKLSAgICBlbnVt ZXJhdGVJbnN0YW5jZUV4dGVuc2lvblByb3BlcnRpZXMoKTsKKworICAgIGlmICghY2hlY2tJbnN0 YW5jZUV4dGVuc2lvblByb3BlcnRpZXMoKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgc3RhdGlj IGNvbnN0IGNoYXIqIHNfYXBwbGljYXRpb25OYW1lID0gIldlYlhSIChXZWJLaXQpIjsKICAgICBz dGF0aWMgY29uc3QgdWludDMyX3Qgc19hcHBsaWNhdGlvblZlcnNpb24gPSAxOwogCisgICAgY29u c3QgY2hhciogY29uc3QgZW5hYmxlZEV4dGVuc2lvbnNbXSA9IHsKKyAgICAgICAgWFJfTU5EX0hF QURMRVNTX0VYVEVOU0lPTl9OQU1FLAorICAgIH07CisKICAgICBhdXRvIGNyZWF0ZUluZm8gPSBj cmVhdGVTdHJ1Y3R1cmU8WHJJbnN0YW5jZUNyZWF0ZUluZm8sIFhSX1RZUEVfSU5TVEFOQ0VfQ1JF QVRFX0lORk8+KCk7CiAgICAgY3JlYXRlSW5mby5jcmVhdGVGbGFncyA9IDA7CiAgICAgc3RkOjpt ZW1jcHkoY3JlYXRlSW5mby5hcHBsaWNhdGlvbkluZm8uYXBwbGljYXRpb25OYW1lLCBzX2FwcGxp Y2F0aW9uTmFtZSwgWFJfTUFYX0FQUExJQ0FUSU9OX05BTUVfU0laRSk7CiAgICAgY3JlYXRlSW5m by5hcHBsaWNhdGlvbkluZm8uYXBpVmVyc2lvbiA9IFhSX0NVUlJFTlRfQVBJX1ZFUlNJT047CiAg ICAgY3JlYXRlSW5mby5hcHBsaWNhdGlvbkluZm8uYXBwbGljYXRpb25WZXJzaW9uID0gc19hcHBs aWNhdGlvblZlcnNpb247CiAgICAgY3JlYXRlSW5mby5lbmFibGVkQXBpTGF5ZXJDb3VudCA9IDA7 Ci0gICAgY3JlYXRlSW5mby5lbmFibGVkRXh0ZW5zaW9uQ291bnQgPSAwOworICAgIGNyZWF0ZUlu Zm8uZW5hYmxlZEV4dGVuc2lvbkNvdW50ID0gc2l6ZW9mKGVuYWJsZWRFeHRlbnNpb25zKSAvIHNp emVvZihjaGFyKik7CisgICAgY3JlYXRlSW5mby5lbmFibGVkRXh0ZW5zaW9uTmFtZXMgPSBlbmFi bGVkRXh0ZW5zaW9uczsKIAogICAgIFhySW5zdGFuY2UgaW5zdGFuY2U7CiAgICAgWHJSZXN1bHQg cmVzdWx0ID0geHJDcmVhdGVJbnN0YW5jZSgmY3JlYXRlSW5mbywgJmluc3RhbmNlKTsKQEAgLTIw Miw2ICsyMjUsMTMgQEAgdm9pZCBJbnN0YW5jZTo6ZW51bWVyYXRlSW1tZXJzaXZlWFJEZXZpY2Vz KCkKICAgICBYclJlc3VsdCByZXN1bHQgPSB4ckdldFN5c3RlbShtX2ltcGwtPnhySW5zdGFuY2Uo KSwgJnN5c3RlbUdldEluZm8sICZzeXN0ZW1JZCk7CiAgICAgUkVUVVJOX0lGX0ZBSUxFRChyZXN1 bHQsICJ4ckdldFN5c3RlbSIsIG1faW1wbC0+eHJJbnN0YW5jZSgpKTsKIAorI2lmICFMT0dfRElT QUJMRUQKKyAgICBhdXRvIHN5c3RlbVByb3BlcnRpZXMgPSBjcmVhdGVTdHJ1Y3R1cmU8WHJTeXN0 ZW1Qcm9wZXJ0aWVzLCBYUl9UWVBFX1NZU1RFTV9QUk9QRVJUSUVTPigpOworICAgIHJlc3VsdCA9 IHhyR2V0U3lzdGVtUHJvcGVydGllcyhtX2ltcGwtPnhySW5zdGFuY2UoKSwgc3lzdGVtSWQsICZz eXN0ZW1Qcm9wZXJ0aWVzKTsKKyAgICBpZiAocmVzdWx0ID09IFhSX1NVQ0NFU1MpCisgICAgICAg IExPRyhYUiwgIkZvdW5kIFhSU3lzdGVtICVsdTogXCIlc1wiLCB2ZW5kb3IgSUQgJWRcbiIsIHN5 c3RlbVByb3BlcnRpZXMuc3lzdGVtSWQsIHN5c3RlbVByb3BlcnRpZXMuc3lzdGVtTmFtZSwgc3lz dGVtUHJvcGVydGllcy52ZW5kb3JJZCk7CisjZW5kaWYKKwogICAgIG1faW1tZXJzaXZlWFJEZXZp Y2VzLmFwcGVuZChtYWtlVW5pcXVlPE9wZW5YUkRldmljZT4oc3lzdGVtSWQsIG1faW1wbC0+eHJJ bnN0YW5jZSgpKSk7CiAjZW5kaWYgLy8gVVNFX09QRU5YUgogfQpAQCAtMjE5LDcgKzI0OSw0NiBA QCBPcGVuWFJEZXZpY2U6Ok9wZW5YUkRldmljZShYclN5c3RlbUlkIGlkLCBYckluc3RhbmNlIGlu c3RhbmNlKQogICAgICAgICBMT0coWFIsICJ4ckdldFN5c3RlbVByb3BlcnRpZXMoKTogZXJyb3Ig JXNcbiIsIHJlc3VsdFRvU3RyaW5nKHJlc3VsdCwgbV9pbnN0YW5jZSkudXRmOCgpLmRhdGEoKSk7 CiAKICAgICBjb2xsZWN0U3VwcG9ydGVkU2Vzc2lvbk1vZGVzKCk7Ci0gICAgZW51bWVyYXRlQ29u ZmlndXJhdGlvblZpZXdzKCk7CisgICAgY29sbGVjdENvbmZpZ3VyYXRpb25WaWV3cygpOworfQor CitEZXZpY2U6Okxpc3RPZkVuYWJsZWRGZWF0dXJlcyBPcGVuWFJEZXZpY2U6OmVudW1lcmF0ZVJl ZmVyZW5jZVNwYWNlcyhYclNlc3Npb24mIHNlc3Npb24pIGNvbnN0Cit7CisgICAgdWludDMyX3Qg cmVmZXJlbmNlU3BhY2VzQ291bnQ7CisgICAgYXV0byByZXN1bHQgPSB4ckVudW1lcmF0ZVJlZmVy ZW5jZVNwYWNlcyhzZXNzaW9uLCAwLCAmcmVmZXJlbmNlU3BhY2VzQ291bnQsIG51bGxwdHIpOwor ICAgIFJFVFVSTl9JRl9GQUlMRUQocmVzdWx0LCAieHJFbnVtZXJhdGVSZWZlcmVuY2VTcGFjZXMi LCBtX2luc3RhbmNlLCB7IH0pOworCisgICAgVmVjdG9yPFhyUmVmZXJlbmNlU3BhY2VUeXBlPiBy ZWZlcmVuY2VTcGFjZXMocmVmZXJlbmNlU3BhY2VzQ291bnQpOworICAgIHJlZmVyZW5jZVNwYWNl cy5maWxsKFhSX1JFRkVSRU5DRV9TUEFDRV9UWVBFX1ZJRVcsIHJlZmVyZW5jZVNwYWNlc0NvdW50 KTsKKyAgICByZXN1bHQgPSB4ckVudW1lcmF0ZVJlZmVyZW5jZVNwYWNlcyhzZXNzaW9uLCByZWZl cmVuY2VTcGFjZXNDb3VudCwgJnJlZmVyZW5jZVNwYWNlc0NvdW50LCByZWZlcmVuY2VTcGFjZXMu ZGF0YSgpKTsKKyAgICBSRVRVUk5fSUZfRkFJTEVEKHJlc3VsdCwgInhyRW51bWVyYXRlUmVmZXJl bmNlU3BhY2VzIiwgbV9pbnN0YW5jZSwgeyB9KTsKKworICAgIExpc3RPZkVuYWJsZWRGZWF0dXJl cyBlbmFibGVkRmVhdHVyZXM7CisgICAgZm9yIChhdXRvJiByZWZlcmVuY2VTcGFjZSA6IHJlZmVy ZW5jZVNwYWNlcykgeworICAgICAgICBzd2l0Y2ggKHJlZmVyZW5jZVNwYWNlKSB7CisgICAgICAg IGNhc2UgWFJfUkVGRVJFTkNFX1NQQUNFX1RZUEVfVklFVzoKKyAgICAgICAgICAgIGVuYWJsZWRG ZWF0dXJlcy5hcHBlbmQoUmVmZXJlbmNlU3BhY2VUeXBlOjpWaWV3ZXIpOworICAgICAgICAgICAg TE9HKFhSLCAiXHREZXZpY2Ugc3VwcG9ydHMgVklFVyByZWZlcmVuY2Ugc3BhY2UiKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFhSX1JFRkVSRU5DRV9TUEFDRV9UWVBFX0xPQ0FM OgorICAgICAgICAgICAgZW5hYmxlZEZlYXR1cmVzLmFwcGVuZChSZWZlcmVuY2VTcGFjZVR5cGU6 OkxvY2FsKTsKKyAgICAgICAgICAgIExPRyhYUiwgIlx0RGV2aWNlIHN1cHBvcnRzIExPQ0FMIHJl ZmVyZW5jZSBzcGFjZSIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgWFJfUkVG RVJFTkNFX1NQQUNFX1RZUEVfU1RBR0U6CisgICAgICAgICAgICBlbmFibGVkRmVhdHVyZXMuYXBw ZW5kKFJlZmVyZW5jZVNwYWNlVHlwZTo6TG9jYWxGbG9vcik7CisgICAgICAgICAgICBlbmFibGVk RmVhdHVyZXMuYXBwZW5kKFJlZmVyZW5jZVNwYWNlVHlwZTo6Qm91bmRlZEZsb29yKTsKKyAgICAg ICAgICAgIExPRyhYUiwgIlx0RGV2aWNlIHN1cHBvcnRzIFNUQUdFIHJlZmVyZW5jZSBzcGFjZSIp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgWFJfUkVGRVJFTkNFX1NQQUNFX1RZ UEVfVU5CT1VOREVEX01TRlQ6CisgICAgICAgICAgICBlbmFibGVkRmVhdHVyZXMuYXBwZW5kKFJl ZmVyZW5jZVNwYWNlVHlwZTo6VW5ib3VuZGVkKTsKKyAgICAgICAgICAgIExPRyhYUiwgIlx0RGV2 aWNlIHN1cHBvcnRzIFVOQk9VTkRFRCByZWZlcmVuY2Ugc3BhY2UiKTsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0K KyAgICB9CisKKyAgICByZXR1cm4gZW5hYmxlZEZlYXR1cmVzOwogfQogCiB2b2lkIE9wZW5YUkRl dmljZTo6Y29sbGVjdFN1cHBvcnRlZFNlc3Npb25Nb2RlcygpCkBAIC0yMzIsNiArMzAxLDE1IEBA IHZvaWQgT3BlblhSRGV2aWNlOjpjb2xsZWN0U3VwcG9ydGVkU2Vzc2lvbk1vZGVzKCkKICAgICBy ZXN1bHQgPSB4ckVudW1lcmF0ZVZpZXdDb25maWd1cmF0aW9ucyhtX2luc3RhbmNlLCBtX3N5c3Rl bUlkLCB2aWV3Q29uZmlndXJhdGlvbkNvdW50LCAmdmlld0NvbmZpZ3VyYXRpb25Db3VudCwgdmll d0NvbmZpZ3VyYXRpb25zKTsKICAgICBSRVRVUk5fSUZfRkFJTEVEKHJlc3VsdCwgInhyRW51bWVy YXRlVmlld0NvbmZpZ3VyYXRpb25zIiwgbV9pbnN0YW5jZSk7CiAKKyAgICAvLyBSZXRyaWV2aW5n IHRoZSBzdXBwb3J0ZWQgcmVmZXJlbmNlIHNwYWNlcyByZXF1aXJlcyBhbiBpbml0aWFsaXplZCBz ZXNzaW9uLiBUaGVyZSBpcyBubyBuZWVkIHRvIGluaXRpYWxpemUgYWxsIHRoZSBncmFwaGljcwor ICAgIC8vIHN0dWZmIHNvIHdlJ2xsIHVzZSBhIGhlYWRsZXNzIHNlc3Npb24gdGhhdCB3aWxsIGJl IGRpc2NhcmRlZCBhZnRlciBnZXR0aW5nIHRoZSBpbmZvIHdlIG5lZWQuCisgICAgYXV0byBzZXNz aW9uQ3JlYXRlSW5mbyA9IGNyZWF0ZVN0cnVjdHVyZTxYclNlc3Npb25DcmVhdGVJbmZvLCBYUl9U WVBFX1NFU1NJT05fQ1JFQVRFX0lORk8+KCk7CisgICAgc2Vzc2lvbkNyZWF0ZUluZm8uc3lzdGVt SWQgPSBtX3N5c3RlbUlkOworICAgIFhyU2Vzc2lvbiBlcGhlbWVyYWxTZXNzaW9uOworICAgIHJl c3VsdCA9IHhyQ3JlYXRlU2Vzc2lvbihtX2luc3RhbmNlLCAmc2Vzc2lvbkNyZWF0ZUluZm8sICZl cGhlbWVyYWxTZXNzaW9uKTsKKyAgICBSRVRVUk5fSUZfRkFJTEVEKHJlc3VsdCwgInhyQ3JlYXRl U2Vzc2lvbiIsIG1faW5zdGFuY2UpOworCisgICAgTGlzdE9mRW5hYmxlZEZlYXR1cmVzIGZlYXR1 cmVzID0gZW51bWVyYXRlUmVmZXJlbmNlU3BhY2VzKGVwaGVtZXJhbFNlc3Npb24pOwogICAgIGZv ciAodWludDMyX3QgaSA9IDA7IGkgPCB2aWV3Q29uZmlndXJhdGlvbkNvdW50OyArK2kpIHsKICAg ICAgICAgYXV0byB2aWV3Q29uZmlndXJhdGlvblByb3BlcnRpZXMgPSBjcmVhdGVTdHJ1Y3R1cmU8 WHJWaWV3Q29uZmlndXJhdGlvblByb3BlcnRpZXMsIFhSX1RZUEVfVklFV19DT05GSUdVUkFUSU9O X1BST1BFUlRJRVM+KCk7CiAgICAgICAgIHJlc3VsdCA9IHhyR2V0Vmlld0NvbmZpZ3VyYXRpb25Q cm9wZXJ0aWVzKG1faW5zdGFuY2UsIG1fc3lzdGVtSWQsIHZpZXdDb25maWd1cmF0aW9uc1tpXSwg JnZpZXdDb25maWd1cmF0aW9uUHJvcGVydGllcyk7CkBAIC0yNDIsMTkgKzMyMCwyMCBAQCB2b2lk IE9wZW5YUkRldmljZTo6Y29sbGVjdFN1cHBvcnRlZFNlc3Npb25Nb2RlcygpCiAgICAgICAgIGF1 dG8gY29uZmlnVHlwZSA9IHZpZXdDb25maWd1cmF0aW9uUHJvcGVydGllcy52aWV3Q29uZmlndXJh dGlvblR5cGU7CiAgICAgICAgIHN3aXRjaCAoY29uZmlnVHlwZSkgewogICAgICAgICBjYXNlIFhS X1ZJRVdfQ09ORklHVVJBVElPTl9UWVBFX1BSSU1BUllfTU9OTzoKLSAgICAgICAgICAgIHNldEVu YWJsZWRGZWF0dXJlcyhTZXNzaW9uTW9kZTo6SW5saW5lLCB7IH0pOworICAgICAgICAgICAgc2V0 RW5hYmxlZEZlYXR1cmVzKFNlc3Npb25Nb2RlOjpJbmxpbmUsIGZlYXR1cmVzKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBjYXNlIFhSX1ZJRVdfQ09ORklHVVJBVElPTl9UWVBFX1BSSU1B UllfU1RFUkVPOgotICAgICAgICAgICAgc2V0RW5hYmxlZEZlYXR1cmVzKFNlc3Npb25Nb2RlOjpJ bW1lcnNpdmVWciwgeyB9KTsKKyAgICAgICAgICAgIHNldEVuYWJsZWRGZWF0dXJlcyhTZXNzaW9u TW9kZTo6SW1tZXJzaXZlVnIsIGZlYXR1cmVzKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBkZWZhdWx0OgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH07CiAgICAgICAgIG1f dmlld0NvbmZpZ3VyYXRpb25Qcm9wZXJ0aWVzLmFkZChjb25maWdUeXBlLCBXVEZNb3ZlKHZpZXdD b25maWd1cmF0aW9uUHJvcGVydGllcykpOwogICAgIH0KKyAgICB4ckRlc3Ryb3lTZXNzaW9uKGVw aGVtZXJhbFNlc3Npb24pOwogfQogCi12b2lkIE9wZW5YUkRldmljZTo6ZW51bWVyYXRlQ29uZmln dXJhdGlvblZpZXdzKCkKK3ZvaWQgT3BlblhSRGV2aWNlOjpjb2xsZWN0Q29uZmlndXJhdGlvblZp ZXdzKCkKIHsKICAgICBmb3IgKGF1dG8mIGNvbmZpZyA6IG1fdmlld0NvbmZpZ3VyYXRpb25Qcm9w ZXJ0aWVzLnZhbHVlcygpKSB7CiAgICAgICAgIHVpbnQzMl90IHZpZXdDb3VudDsKQEAgLTI4OCw3 ICszNjcsNiBAQCBXZWJDb3JlOjpJbnRTaXplIE9wZW5YUkRldmljZTo6cmVjb21tZW5kZWRSZXNv bHV0aW9uKFNlc3Npb25Nb2RlIG1vZGUpCiAgICAgcmV0dXJuIERldmljZTo6cmVjb21tZW5kZWRS ZXNvbHV0aW9uKG1vZGUpOwogfQogCi0KICNlbmRpZiAvLyBVU0VfT1BFTlhSCiAKIH0gLy8gbmFt ZXNwYWNlIFBsYXRmb3JtWFIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hy L29wZW54ci9QbGF0Zm9ybVhST3BlblhSLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS94ci9v cGVueHIvUGxhdGZvcm1YUk9wZW5YUi5oCmluZGV4IDViYWY4ODQ4NGE1ZjcwYmZkY2ExMWU2YTU3 ZGI1YWI4OWQyOTk5YTUuLmMyODE1MDIzYTI3MmEzNDJmZjJhOWFjNDgyNTY5ZDUwMzYxNTgzN2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3hyL29wZW54ci9QbGF0Zm9ybVhS T3BlblhSLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0veHIvb3BlbnhyL1BsYXRmb3Jt WFJPcGVuWFIuaApAQCAtNDcsNyArNDcsOSBAQCBwdWJsaWM6CiAgICAgWHJTeXN0ZW1JZCB4clN5 c3RlbUlkKCkgY29uc3QgeyByZXR1cm4gbV9zeXN0ZW1JZDsgfQogcHJpdmF0ZToKICAgICB2b2lk IGNvbGxlY3RTdXBwb3J0ZWRTZXNzaW9uTW9kZXMoKTsKLSAgICB2b2lkIGVudW1lcmF0ZUNvbmZp Z3VyYXRpb25WaWV3cygpOworICAgIHZvaWQgY29sbGVjdENvbmZpZ3VyYXRpb25WaWV3cygpOwor CisgICAgTGlzdE9mRW5hYmxlZEZlYXR1cmVzIGVudW1lcmF0ZVJlZmVyZW5jZVNwYWNlcyhYclNl c3Npb24mKSBjb25zdDsKIAogICAgIFdlYkNvcmU6OkludFNpemUgcmVjb21tZW5kZWRSZXNvbHV0 aW9uKFNlc3Npb25Nb2RlKSBmaW5hbDsKIApAQCAtNTgsNiArNjAsNyBAQCBwcml2YXRlOgogCiAg ICAgWHJTeXN0ZW1JZCBtX3N5c3RlbUlkOwogICAgIFhySW5zdGFuY2UgbV9pbnN0YW5jZTsKKyAg ICBYclNlc3Npb24gbV9zZXNzaW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgUGxhdGZvcm1YUgo=