187546 2018-07-10 21:37:12 -0700 Shrink CachedResource and subclasses 2018-07-14 19:14:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser achristensen cdumez commit-queue dbates ews-watchlist japhet mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1441092 0 simon.fraser 2018-07-10 21:37:12 -0700 Shrink CachedResource and subclasses 1441093 1 344749 simon.fraser 2018-07-10 21:40:41 -0700 Created attachment 344749 Patch 1441094 2 ews-watchlist 2018-07-10 21:42:13 -0700 Attachment 344749 did not pass style-queue: ERROR: Source/WebCore/platform/network/ResourceRequestBase.h:167: enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums. [readability/enum_casing] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 1442158 3 simon.fraser 2018-07-13 20:42:04 -0700 I can haz review? 1442205 4 344749 dbates 2018-07-14 05:42:40 -0700 Comment on attachment 344749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344749&action=review > Source/WebCore/loader/cache/CachedResource.h:335 > + CachedResourceLoader* m_owningCachedResourceLoader { nullptr }; // only non-null for resources that are not in the cache Please make the comment a proper sentence. > Source/WebCore/platform/network/NetworkLoadMetrics.h:42 > +enum class NetworkLoadPriority : uint8_t { I take it the compiler is not smart enough to store these in a uint8_t without the annotation. Is this a bug in clang? > Source/WebCore/platform/network/ResourceRequestBase.h:86 > + enum class SameSiteDisposition : uint8_t { Unspecified, SameSite, CrossSite }; Ditto. > Source/WebCore/platform/network/ResourceRequestBase.h:167 > + enum class Requester : uint8_t { Unspecified, Main, XHR, Fetch, Media, ImportScripts }; Ditto. 1442210 5 344749 cdumez 2018-07-14 08:21:42 -0700 Comment on attachment 344749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344749&action=review >> Source/WebCore/platform/network/NetworkLoadMetrics.h:42 >> +enum class NetworkLoadPriority : uint8_t { > > I take it the compiler is not smart enough to store these in a uint8_t without the annotation. Is this a bug in clang? Not a bug, default underlying type is int as per https://isocpp.org/wiki/faq/cpp11-language-types#enum-class 1442265 6 344749 commit-queue 2018-07-14 19:13:47 -0700 Comment on attachment 344749 Patch Clearing flags on attachment: 344749 Committed r233839: <https://trac.webkit.org/changeset/233839> 1442266 7 commit-queue 2018-07-14 19:13:48 -0700 All reviewed patches have been landed. Closing bug. 1442267 8 webkit-bug-importer 2018-07-14 19:14:20 -0700 <rdar://problem/42208702> 344749 2018-07-10 21:40:41 -0700 2018-07-14 19:13:47 -0700 Patch bug-187546-20180710214040.patch text/plain 18079 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M3MWQ5ZTFkYjkwNjZm ZjQ4OGE3N2VlYmRmMjlmYjczMzJiNzUxMi4uYjQ5ZmE5ZjQxMzMzZmRjYjI3Mzc4NDQzYWM5OWFj M2QzYmQwYTg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA3LTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNocmluayBDYWNo ZWRSZXNvdXJjZSBhbmQgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2hyaW5rIENhY2hlZFJlc291cmNlIGRvd24gZnJvbSAxMzg0IHRv IDEzMzYgYnl0ZXMsIENhY2hlZEltYWdlIGZyb20gMTQ4MCB0bworICAgICAgICAxNDI0IGJ5dGVz LCBhbmQgQ2FjaGVkRm9udCBhIGxpdHRsZS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgc2F2ZXMg YWJvdXQgMjNLQiBvbiBjbm4uY29tLgorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVy T3B0aW9ucy5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAg ICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpDYWNo ZWRSZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9DYWNoZVZhbGlkYXRpb24uaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlZGlyZWN0Q2hhaW5DYWNoZVN0YXR1czo6UmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVz KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkTWV0cmljcy5oOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUGFyc2VkQ29udGVudFJhbmdlLmg6CisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmg6CisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oOgorCiAyMDE4LTA3LTA5ICBBbnRvaW5l IFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBD b3JyZWN0IGhhbmRsZSByZXBldGl0aW9uIG9mIGNvbXBvc2l0ZSBhbmQgZWFzaW5nIHZhbHVlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5oCmluZGV4IGMy YTljOTViOTBmZTNjN2ZkMTJlYjU2MDE5MzQwYzU2Njc5MTA3YzAuLmYyYmI2ZDFmOThmMWRhNTY0 ZDg2YmJkNWJlMWUzM2RlZTQ2OWVlNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkZXJPcHRpb25zLmgKQEAgLTEzOSw2ICsxMzksMTQgQEAgc3RydWN0IFJlc291cmNl TG9hZGVyT3B0aW9ucyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgICAgICB0aGlzLT5tb2Rl ID0gbW9kZTsKICAgICB9CiAKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgc3RkOjpv cHRpb25hbDxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcj4gc2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbklkZW50aWZpZXI7CisjZW5kaWYKKyAgICBIYXNoU2V0PEhUVFBIZWFkZXJO YW1lLCBXVEY6OkludEhhc2g8SFRUUEhlYWRlck5hbWU+LCBXVEY6OlN0cm9uZ0VudW1IYXNoVHJh aXRzPEhUVFBIZWFkZXJOYW1lPj4gaHR0cEhlYWRlcnNUb0tlZXA7CisgICAgVmVjdG9yPFN0cmlu Zz4gZGVyaXZlZENhY2hlZERhdGFUeXBlc1RvUmV0cmlldmU7CisgICAgc3RkOjpvcHRpb25hbDxD b250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnM+IGNzcFJlc3BvbnNlSGVhZGVyczsK KyAgICB1bnNpZ25lZCBtYXhSZWRpcmVjdENvdW50IHsgMjAgfTsKKwogICAgIFNlbmRDYWxsYmFj a1BvbGljeSBzZW5kTG9hZENhbGxiYWNrcyB7IFNlbmRDYWxsYmFja1BvbGljeTo6RG9Ob3RTZW5k Q2FsbGJhY2tzIH07CiAgICAgQ29udGVudFNuaWZmaW5nUG9saWN5IHNuaWZmQ29udGVudCB7IENv bnRlbnRTbmlmZmluZ1BvbGljeTo6RG9Ob3RTbmlmZkNvbnRlbnQgfTsKICAgICBDb250ZW50RW5j b2RpbmdTbmlmZmluZ1BvbGljeSBzbmlmZkNvbnRlbnRFbmNvZGluZyB7IENvbnRlbnRFbmNvZGlu Z1NuaWZmaW5nUG9saWN5OjpTbmlmZiB9OwpAQCAtMTUzLDE4ICsxNjEsOCBAQCBzdHJ1Y3QgUmVz b3VyY2VMb2FkZXJPcHRpb25zIDogcHVibGljIEZldGNoT3B0aW9ucyB7CiAgICAgSW5pdGlhdG9y Q29udGV4dCBpbml0aWF0b3JDb250ZXh0IHsgSW5pdGlhdG9yQ29udGV4dDo6RG9jdW1lbnQgfTsK ICAgICBTZXJ2aWNlV29ya2Vyc01vZGUgc2VydmljZVdvcmtlcnNNb2RlIHsgU2VydmljZVdvcmtl cnNNb2RlOjpBbGwgfTsKICAgICBBcHBsaWNhdGlvbkNhY2hlTW9kZSBhcHBsaWNhdGlvbkNhY2hl TW9kZSB7IEFwcGxpY2F0aW9uQ2FjaGVNb2RlOjpVc2UgfTsKLSNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCi0gICAgc3RkOjpvcHRpb25hbDxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRp Zmllcj4gc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXI7Ci0jZW5kaWYKLSAgICBI YXNoU2V0PEhUVFBIZWFkZXJOYW1lLCBXVEY6OkludEhhc2g8SFRUUEhlYWRlck5hbWU+LCBXVEY6 OlN0cm9uZ0VudW1IYXNoVHJhaXRzPEhUVFBIZWFkZXJOYW1lPj4gaHR0cEhlYWRlcnNUb0tlZXA7 Ci0KICAgICBDbGllbnRDcmVkZW50aWFsUG9saWN5IGNsaWVudENyZWRlbnRpYWxQb2xpY3kgeyBD bGllbnRDcmVkZW50aWFsUG9saWN5OjpDYW5ub3RBc2tDbGllbnRGb3JDcmVkZW50aWFscyB9Owot ICAgIHVuc2lnbmVkIG1heFJlZGlyZWN0Q291bnQgeyAyMCB9OwotCi0gICAgVmVjdG9yPFN0cmlu Zz4gZGVyaXZlZENhY2hlZERhdGFUeXBlc1RvUmV0cmlldmU7Ci0KICAgICBQcmVmbGlnaHRQb2xp Y3kgcHJlZmxpZ2h0UG9saWN5IHsgUHJlZmxpZ2h0UG9saWN5OjpDb25zaWRlciB9OwotICAgIHN0 ZDo6b3B0aW9uYWw8Q29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzPiBjc3BSZXNw b25zZUhlYWRlcnM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5oIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaAppbmRleCA4MWY2OGRmNDQ4MzgzZDViNzQ4Mjk2MWE0 NGU5YTJkYTZmZGY0ZmIxLi45NjUyYTAxMmYxMzkyZmI3ZGM2MWU5OTA2YzU4OTQxNWUxZjUwYWIw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgKQEAgLTc2LDEwICs3 NiwxMSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBhbGxDbGllbnRzUmVtb3ZlZCgpIG92ZXJyaWRl OwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IG1fZm9udEN1 c3RvbVBsYXRmb3JtRGF0YTsKICAgICBib29sIG1fbG9hZEluaXRpYXRlZDsKICAgICBib29sIG1f aGFzQ3JlYXRlZEZvbnREYXRhV3JhcHBpbmdSZXNvdXJjZTsKIAorICAgIHN0ZDo6dW5pcXVlX3B0 cjxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPiBtX2ZvbnRDdXN0b21QbGF0Zm9ybURhdGE7CisKICAg ICBmcmllbmQgY2xhc3MgTWVtb3J5Q2FjaGU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRJbWFnZS5oCmluZGV4IDY1M2JkNzI5ZWE0MDZiYThmYWQzZDdmZTRhNTExZWE5 Mzk4ZjkzOWQuLmMzOTYwM2Y1ZjdiZGViNjM3YzE3Y2I3NWI1ZWE0ZmNjZjg0MzRhYTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCkBAIC0xNzQsMTAgKzE3NCwx MSBAQCBwcml2YXRlOgogCiAgICAgUmVmUHRyPENhY2hlZEltYWdlT2JzZXJ2ZXI+IG1faW1hZ2VP YnNlcnZlcjsKICAgICBSZWZQdHI8SW1hZ2U+IG1faW1hZ2U7CisgICAgc3RkOjp1bmlxdWVfcHRy PFNWR0ltYWdlQ2FjaGU+IG1fc3ZnSW1hZ2VDYWNoZTsKKwogICAgIE1vbm90b25pY1RpbWUgbV9s YXN0VXBkYXRlSW1hZ2VEYXRhVGltZTsKLSAgICB1bnNpZ25lZCBtX3VwZGF0ZUltYWdlRGF0YUNv dW50IHsgMCB9OwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPFNWR0ltYWdlQ2FjaGU+IG1fc3ZnSW1h Z2VDYWNoZTsKKyAgICB1bnNpZ25lZCBtX3VwZGF0ZUltYWdlRGF0YUNvdW50IHsgMCB9OwogICAg IGJvb2wgbV9pc01hbnVhbGx5Q2FjaGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fc2hvdWxkUGFp bnRCcm9rZW5JbWFnZSB7IHRydWUgfTsKICAgICBib29sIG1fZm9yY2VVcGRhdGVJbWFnZURhdGFF bmFibGVkRm9yVGVzdGluZyB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlLmNwcAppbmRleCA1MjE5Zjk0NmM0YTFmMjE1ZDcwYzY2ZjFmMDky NzQwM2I4MzU5MDRmLi5iZWI3NGYwZmI1N2I0OGZjZDg0MjJmMTRjNGY2OWI3OGM0ZTM4MWIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKQEAg LTExNywxOCArMTE3LDE4IEBAIHN0YXRpYyBTZWNvbmRzIGRlYWREZWNvZGVkRGF0YURlbGV0aW9u SW50ZXJ2YWxGb3JSZXNvdXJjZVR5cGUoQ2FjaGVkUmVzb3VyY2U6OlR5CiBERUZJTkVfREVCVUdf T05MWV9HTE9CQUwoUmVmQ291bnRlZExlYWtDb3VudGVyLCBjYWNoZWRSZXNvdXJjZUxlYWtDb3Vu dGVyLCAoIkNhY2hlZFJlc291cmNlIikpOwogCiBDYWNoZWRSZXNvdXJjZTo6Q2FjaGVkUmVzb3Vy Y2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgVHlwZSB0eXBlLCBQQUw6OlNlc3Np b25JRCBzZXNzaW9uSUQpCi0gICAgOiBtX3Jlc291cmNlUmVxdWVzdChyZXF1ZXN0LnJlbGVhc2VS ZXNvdXJjZVJlcXVlc3QoKSkKLSAgICAsIG1fb3B0aW9ucyhyZXF1ZXN0Lm9wdGlvbnMoKSkKKyAg ICA6IG1fb3B0aW9ucyhyZXF1ZXN0Lm9wdGlvbnMoKSkKKyAgICAsIG1fcmVzb3VyY2VSZXF1ZXN0 KHJlcXVlc3QucmVsZWFzZVJlc291cmNlUmVxdWVzdCgpKQogICAgICwgbV9kZWNvZGVkRGF0YURl bGV0aW9uVGltZXIoKnRoaXMsICZDYWNoZWRSZXNvdXJjZTo6ZGVzdHJveURlY29kZWREYXRhLCBk ZWFkRGVjb2RlZERhdGFEZWxldGlvbkludGVydmFsRm9yUmVzb3VyY2VUeXBlKHR5cGUpKQogICAg ICwgbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQotICAgICwgbV9sb2FkUHJpb3JpdHkoZGVmYXVsdFBy aW9yaXR5Rm9yUmVzb3VyY2VUeXBlKHR5cGUpKQogICAgICwgbV9yZXNwb25zZVRpbWVzdGFtcChX YWxsVGltZTo6bm93KCkpCiAgICAgLCBtX2ZyYWdtZW50SWRlbnRpZmllckZvclJlcXVlc3QocmVx dWVzdC5yZWxlYXNlRnJhZ21lbnRJZGVudGlmaWVyKCkpCiAgICAgLCBtX29yaWdpbihyZXF1ZXN0 LnJlbGVhc2VPcmlnaW4oKSkKICAgICAsIG1faW5pdGlhdG9yTmFtZShyZXF1ZXN0LmluaXRpYXRv ck5hbWUoKSkKKyAgICAsIG1fbG9hZFByaW9yaXR5KGRlZmF1bHRQcmlvcml0eUZvclJlc291cmNl VHlwZSh0eXBlKSkKKyAgICAsIG1fdHlwZSh0eXBlKQogICAgICwgbV9pc0xpbmtQcmVsb2FkKHJl cXVlc3QuaXNMaW5rUHJlbG9hZCgpKQogICAgICwgbV9oYXNVbmtub3duRW5jb2RpbmcocmVxdWVz dC5pc0xpbmtQcmVsb2FkKCkpCi0gICAgLCBtX3R5cGUodHlwZSkKICAgICAsIG1faWdub3JlRm9y UmVxdWVzdENvdW50KHJlcXVlc3QuaWdub3JlRm9yUmVxdWVzdENvdW50KCkpCiB7CiAgICAgQVNT RVJUKHNlc3Npb25JRC5pc1ZhbGlkKCkpOwpAQCAtMTUyLDggKzE1Miw4IEBAIENhY2hlZFJlc291 cmNlOjpDYWNoZWRSZXNvdXJjZShjb25zdCBVUkwmIHVybCwgVHlwZSB0eXBlLCBQQUw6OlNlc3Np b25JRCBzZXNzaW9uCiAgICAgLCBtX3Nlc3Npb25JRChzZXNzaW9uSUQpCiAgICAgLCBtX3Jlc3Bv bnNlVGltZXN0YW1wKFdhbGxUaW1lOjpub3coKSkKICAgICAsIG1fZnJhZ21lbnRJZGVudGlmaWVy Rm9yUmVxdWVzdChDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnNwbGl0RnJhZ21lbnRJZGVudGlmaWVy RnJvbVJlcXVlc3RVUkwobV9yZXNvdXJjZVJlcXVlc3QpKQotICAgICwgbV90eXBlKHR5cGUpCiAg ICAgLCBtX3N0YXR1cyhDYWNoZWQpCisgICAgLCBtX3R5cGUodHlwZSkKIHsKICAgICBBU1NFUlQo c2Vzc2lvbklELmlzVmFsaWQoKSk7CiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAppbmRleCA1ZWU4MTJjZWMyNjllM2IzZjI3Yjcx YzdkMzI0NDNlNTY3NDdiYjcyLi5lZjIyOTU1MGY0MTFkYzU2NTA1MjYxYmM1MjVjN2RiY2RlN2Q0 M2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaApA QCAtMjkxLDE3ICsyOTEsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Qm9k eURhdGFGcm9tKGNvbnN0IENhY2hlZFJlc291cmNlJik7CiAKLSAgICAvLyBGSVhNRTogTWFrZSB0 aGUgcmVzdCBvZiB0aGVzZSBkYXRhIG1lbWJlcnMgcHJpdmF0ZSBhbmQgdXNlIGZ1bmN0aW9ucyBp biBkZXJpdmVkIGNsYXNzZXMgaW5zdGVhZC4KLSAgICBIYXNoQ291bnRlZFNldDxDYWNoZWRSZXNv dXJjZUNsaWVudCo+IG1fY2xpZW50czsKLSAgICBSZXNvdXJjZVJlcXVlc3QgbV9yZXNvdXJjZVJl cXVlc3Q7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJlc291cmNlUmVxdWVzdD4gbV9vcmlnaW5hbFJl cXVlc3Q7IC8vIE5lZWRlZCBieSBQaW5nIGxvYWRzLgotICAgIFJlZlB0cjxTdWJyZXNvdXJjZUxv YWRlcj4gbV9sb2FkZXI7Ci0gICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zIG1fb3B0aW9uczsKLSAg ICBSZXNvdXJjZVJlc3BvbnNlIG1fcmVzcG9uc2U7Ci0gICAgUmVzb3VyY2VSZXNwb25zZTo6VGFp bnRpbmcgbV9yZXNwb25zZVRhaW50aW5nIHsgUmVzb3VyY2VSZXNwb25zZTo6VGFpbnRpbmc6OkJh c2ljIH07Ci0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbV9kYXRhOwotICAgIERlZmVycmFibGVP bmVTaG90VGltZXIgbV9kZWNvZGVkRGF0YURlbGV0aW9uVGltZXI7Ci0KIHByaXZhdGU6CiAgICAg Y2xhc3MgQ2FsbGJhY2s7CiAKQEAgLTMxNywxMCArMzA2LDQyIEBAIHByaXZhdGU6CiAgICAgdm9p ZCBhZGRBZGRpdGlvbmFsUmVxdWVzdEhlYWRlcnMoQ2FjaGVkUmVzb3VyY2VMb2FkZXImKTsKICAg ICB2b2lkIGZhaWxCZWZvcmVTdGFydGluZygpOwogCi0gICAgSGFzaE1hcDxDYWNoZWRSZXNvdXJj ZUNsaWVudCosIHN0ZDo6dW5pcXVlX3B0cjxDYWxsYmFjaz4+IG1fY2xpZW50c0F3YWl0aW5nQ2Fs bGJhY2s7Citwcm90ZWN0ZWQ6CisgICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zIG1fb3B0aW9uczsK KyAgICBSZXNvdXJjZVJlcXVlc3QgbV9yZXNvdXJjZVJlcXVlc3Q7CisgICAgUmVzb3VyY2VSZXNw b25zZSBtX3Jlc3BvbnNlOworCisgICAgRGVmZXJyYWJsZU9uZVNob3RUaW1lciBtX2RlY29kZWRE YXRhRGVsZXRpb25UaW1lcjsKKworICAgIC8vIEZJWE1FOiBNYWtlIHRoZSByZXN0IG9mIHRoZXNl IGRhdGEgbWVtYmVycyBwcml2YXRlIGFuZCB1c2UgZnVuY3Rpb25zIGluIGRlcml2ZWQgY2xhc3Nl cyBpbnN0ZWFkLgorICAgIEhhc2hDb3VudGVkU2V0PENhY2hlZFJlc291cmNlQ2xpZW50Kj4gbV9j bGllbnRzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxSZXNvdXJjZVJlcXVlc3Q+IG1fb3JpZ2luYWxS ZXF1ZXN0OyAvLyBOZWVkZWQgYnkgUGluZyBsb2Fkcy4KKyAgICBSZWZQdHI8U3VicmVzb3VyY2VM b2FkZXI+IG1fbG9hZGVyOworICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fZGF0YTsKKworcHJp dmF0ZToKKyAgICBNb25vdG9uaWNUaW1lIG1fbGFzdERlY29kZWRBY2Nlc3NUaW1lOyAvLyBVc2Vk IGFzIGEgInRocmFzaCBndWFyZCIgaW4gdGhlIGNhY2hlCiAgICAgUEFMOjpTZXNzaW9uSUQgbV9z ZXNzaW9uSUQ7Ci0gICAgUmVzb3VyY2VMb2FkUHJpb3JpdHkgbV9sb2FkUHJpb3JpdHk7CiAgICAg V2FsbFRpbWUgbV9yZXNwb25zZVRpbWVzdGFtcDsKKyAgICB1bnNpZ25lZCBsb25nIG1faWRlbnRp ZmllckZvckxvYWRXaXRob3V0UmVzb3VyY2VMb2FkZXIgeyAwIH07CisKKyAgICBIYXNoTWFwPENh Y2hlZFJlc291cmNlQ2xpZW50Kiwgc3RkOjp1bmlxdWVfcHRyPENhbGxiYWNrPj4gbV9jbGllbnRz QXdhaXRpbmdDYWxsYmFjazsKKworICAgIC8vIFRoZXNlIGhhbmRsZXMgd2lsbCBuZWVkIHRvIGJl IHVwZGF0ZWQgdG8gcG9pbnQgdG8gdGhlIG1fcmVzb3VyY2VUb1JldmFsaWRhdGUgaW4gY2FzZSB3 ZSBnZXQgMzA0IHJlc3BvbnNlLgorICAgIEhhc2hTZXQ8Q2FjaGVkUmVzb3VyY2VIYW5kbGVCYXNl Kj4gbV9oYW5kbGVzVG9SZXZhbGlkYXRlOworCisgICAgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcs IFN0cmluZz4+IG1fdmFyeWluZ0hlYWRlclZhbHVlczsKKworICAgIENhY2hlZFJlc291cmNlTG9h ZGVyKiBtX293bmluZ0NhY2hlZFJlc291cmNlTG9hZGVyIHsgbnVsbHB0ciB9OyAvLyBvbmx5IG5v bi1udWxsIGZvciByZXNvdXJjZXMgdGhhdCBhcmUgbm90IGluIHRoZSBjYWNoZQorCisgICAgLy8g SWYgdGhpcyBmaWVsZCBpcyBub24tbnVsbCB3ZSBhcmUgdXNpbmcgdGhlIHJlc291cmNlIGFzIGEg cHJveHkgZm9yIGNoZWNraW5nIHdoZXRoZXIgYW4gZXhpc3RpbmcgcmVzb3VyY2UgaXMgc3RpbGwg dXAgdG8gZGF0ZQorICAgIC8vIHVzaW5nIEhUVFAgSWYtTW9kaWZpZWQtU2luY2UvSWYtTm9uZS1N YXRjaCBoZWFkZXJzLiBJZiB0aGUgcmVzcG9uc2UgaXMgMzA0IGFsbCBjbGllbnRzIG9mIHRoaXMg cmVzb3VyY2UgYXJlIG1vdmVkCisgICAgLy8gdG8gdG8gYmUgY2xpZW50cyBvZiBtX3Jlc291cmNl VG9SZXZhbGlkYXRlIGFuZCB0aGUgcmVzb3VyY2UgaXMgZGVsZXRlZC4gSWYgbm90LCB0aGUgZmll bGQgaXMgemVyb2VkIGFuZCB0aGlzCisgICAgLy8gcmVzb3VyY2VzIGJlY29tZXMgbm9ybWFsIHJl c291cmNlIGxvYWQuCisgICAgQ2FjaGVkUmVzb3VyY2UqIG1fcmVzb3VyY2VUb1JldmFsaWRhdGUg eyBudWxscHRyIH07CisKKyAgICAvLyBJZiB0aGlzIGZpZWxkIGlzIG5vbi1udWxsLCB0aGUgcmVz b3VyY2UgaGFzIGEgcHJveHkgZm9yIGNoZWNraW5nIHdoZXRoZXIgaXQgaXMgc3RpbGwgdXAgdG8g ZGF0ZSAoc2VlIG1fcmVzb3VyY2VUb1JldmFsaWRhdGUpLgorICAgIENhY2hlZFJlc291cmNlKiBt X3Byb3h5UmVzb3VyY2UgeyBudWxscHRyIH07CiAKICAgICBTdHJpbmcgbV9mcmFnbWVudElkZW50 aWZpZXJGb3JSZXF1ZXN0OwogCkBAIC0zMjgsNyArMzQ5LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+IG1fb3JpZ2luOwogICAgIEF0b21pY1N0cmluZyBtX2luaXRpYXRv ck5hbWU7CiAKLSAgICBNb25vdG9uaWNUaW1lIG1fbGFzdERlY29kZWRBY2Nlc3NUaW1lOyAvLyBV c2VkIGFzIGEgInRocmFzaCBndWFyZCIgaW4gdGhlIGNhY2hlCisgICAgUmVkaXJlY3RDaGFpbkNh Y2hlU3RhdHVzIG1fcmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVzOwogCiAgICAgdW5zaWduZWQgbV9l bmNvZGVkU2l6ZSB7IDAgfTsKICAgICB1bnNpZ25lZCBtX2RlY29kZWRTaXplIHsgMCB9OwpAQCAt MzM2LDQ1ICszNTcsMjcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2hhbmRsZUNvdW50IHsg MCB9OwogICAgIHVuc2lnbmVkIG1fcHJlbG9hZENvdW50IHsgMCB9OwogCisgICAgdW5zaWduZWQg bV9zdGF0dXMgeyBQZW5kaW5nIH07IC8vIFN0YXR1cworCiAgICAgUHJlbG9hZFJlc3VsdCBtX3By ZWxvYWRSZXN1bHQgeyBQcmVsb2FkUmVzdWx0OjpQcmVsb2FkTm90UmVmZXJlbmNlZCB9OwogCi0g ICAgYm9vbCBtX3JlcXVlc3RlZEZyb21OZXR3b3JraW5nTGF5ZXIgeyBmYWxzZSB9OworICAgIFJl c291cmNlUmVzcG9uc2U6OlRhaW50aW5nIG1fcmVzcG9uc2VUYWludGluZyB7IFJlc291cmNlUmVz cG9uc2U6OlRhaW50aW5nOjpCYXNpYyB9OworICAgIFJlc291cmNlTG9hZFByaW9yaXR5IG1fbG9h ZFByaW9yaXR5OworCisgICAgVHlwZSBtX3R5cGU7IC8vIFR5cGUKIAorICAgIGJvb2wgbV9yZXF1 ZXN0ZWRGcm9tTmV0d29ya2luZ0xheWVyIHsgZmFsc2UgfTsKICAgICBib29sIG1faW5DYWNoZSB7 IGZhbHNlIH07CiAgICAgYm9vbCBtX2xvYWRpbmcgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc0xp bmtQcmVsb2FkIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzVW5rbm93bkVuY29kaW5nIHsgZmFs c2UgfTsKLQogICAgIGJvb2wgbV9zd2l0Y2hpbmdDbGllbnRzVG9SZXZhbGlkYXRlZFJlc291cmNl IHsgZmFsc2UgfTsKLQotICAgIFR5cGUgbV90eXBlOyAvLyBUeXBlCi0gICAgdW5zaWduZWQgbV9z dGF0dXMgeyBQZW5kaW5nIH07IC8vIFN0YXR1cworICAgIGJvb2wgbV9pZ25vcmVGb3JSZXF1ZXN0 Q291bnQgeyBmYWxzZSB9OwogCiAjaWZuZGVmIE5ERUJVRwogICAgIGJvb2wgbV9kZWxldGVkIHsg ZmFsc2UgfTsKICAgICB1bnNpZ25lZCBtX2xydUluZGV4IHsgMCB9OwogI2VuZGlmCi0KLSAgICBD YWNoZWRSZXNvdXJjZUxvYWRlciogbV9vd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlciB7IG51bGxw dHIgfTsgLy8gb25seSBub24tbnVsbCBmb3IgcmVzb3VyY2VzIHRoYXQgYXJlIG5vdCBpbiB0aGUg Y2FjaGUKLQotICAgIC8vIElmIHRoaXMgZmllbGQgaXMgbm9uLW51bGwgd2UgYXJlIHVzaW5nIHRo ZSByZXNvdXJjZSBhcyBhIHByb3h5IGZvciBjaGVja2luZyB3aGV0aGVyIGFuIGV4aXN0aW5nIHJl c291cmNlIGlzIHN0aWxsIHVwIHRvIGRhdGUKLSAgICAvLyB1c2luZyBIVFRQIElmLU1vZGlmaWVk LVNpbmNlL0lmLU5vbmUtTWF0Y2ggaGVhZGVycy4gSWYgdGhlIHJlc3BvbnNlIGlzIDMwNCBhbGwg Y2xpZW50cyBvZiB0aGlzIHJlc291cmNlIGFyZSBtb3ZlZAotICAgIC8vIHRvIHRvIGJlIGNsaWVu dHMgb2YgbV9yZXNvdXJjZVRvUmV2YWxpZGF0ZSBhbmQgdGhlIHJlc291cmNlIGlzIGRlbGV0ZWQu IElmIG5vdCwgdGhlIGZpZWxkIGlzIHplcm9lZCBhbmQgdGhpcwotICAgIC8vIHJlc291cmNlcyBi ZWNvbWVzIG5vcm1hbCByZXNvdXJjZSBsb2FkLgotICAgIENhY2hlZFJlc291cmNlKiBtX3Jlc291 cmNlVG9SZXZhbGlkYXRlIHsgbnVsbHB0ciB9OwotCi0gICAgLy8gSWYgdGhpcyBmaWVsZCBpcyBu b24tbnVsbCwgdGhlIHJlc291cmNlIGhhcyBhIHByb3h5IGZvciBjaGVja2luZyB3aGV0aGVyIGl0 IGlzIHN0aWxsIHVwIHRvIGRhdGUgKHNlZSBtX3Jlc291cmNlVG9SZXZhbGlkYXRlKS4KLSAgICBD YWNoZWRSZXNvdXJjZSogbV9wcm94eVJlc291cmNlIHsgbnVsbHB0ciB9OwotCi0gICAgLy8gVGhl c2UgaGFuZGxlcyB3aWxsIG5lZWQgdG8gYmUgdXBkYXRlZCB0byBwb2ludCB0byB0aGUgbV9yZXNv dXJjZVRvUmV2YWxpZGF0ZSBpbiBjYXNlIHdlIGdldCAzMDQgcmVzcG9uc2UuCi0gICAgSGFzaFNl dDxDYWNoZWRSZXNvdXJjZUhhbmRsZUJhc2UqPiBtX2hhbmRsZXNUb1JldmFsaWRhdGU7Ci0KLSAg ICBSZWRpcmVjdENoYWluQ2FjaGVTdGF0dXMgbV9yZWRpcmVjdENoYWluQ2FjaGVTdGF0dXM7Ci0K LSAgICBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4gbV92YXJ5aW5nSGVhZGVyVmFs dWVzOwotCi0gICAgdW5zaWduZWQgbG9uZyBtX2lkZW50aWZpZXJGb3JMb2FkV2l0aG91dFJlc291 cmNlTG9hZGVyIHsgMCB9OwotICAgIGJvb2wgbV9pZ25vcmVGb3JSZXF1ZXN0Q291bnQgeyBmYWxz ZSB9OwogfTsKIAogY2xhc3MgQ2FjaGVkUmVzb3VyY2U6OkNhbGxiYWNrIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9uLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0NhY2hlVmFsaWRhdGlvbi5oCmluZGV4IDgxYzQw ZjM2N2YwYzgxMTVkZDFjZWJlMzk3OTcyNTBhYTAzNTVkODYuLmY0MTVjYThiMmUxMzU3NmRkM2Ni MTA3Mjc0M2Q2MjViZTFjM2U4ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvQ2FjaGVWYWxpZGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9DYWNoZVZhbGlkYXRpb24uaApAQCAtNDQsMTEgKzQ0LDExIEBAIHN0cnVjdCBSZWRp cmVjdENoYWluQ2FjaGVTdGF0dXMgewogICAgICAgICBDYWNoZWRSZWRpcmVjdGlvbgogICAgIH07 CiAgICAgUmVkaXJlY3RDaGFpbkNhY2hlU3RhdHVzKCkKLSAgICAgICAgOiBzdGF0dXMoU3RhdHVz OjpOb1JlZGlyZWN0aW9uKQotICAgICAgICAsIGVuZE9mVmFsaWRpdHkoV2FsbFRpbWU6OmluZmlu aXR5KCkpCisgICAgICAgIDogZW5kT2ZWYWxpZGl0eShXYWxsVGltZTo6aW5maW5pdHkoKSkKKyAg ICAgICAgLCBzdGF0dXMoU3RhdHVzOjpOb1JlZGlyZWN0aW9uKQogICAgIHsgfQotICAgIFN0YXR1 cyBzdGF0dXM7CiAgICAgV2FsbFRpbWUgZW5kT2ZWYWxpZGl0eTsKKyAgICBTdGF0dXMgc3RhdHVz OwogfTsKIAogV0VCQ09SRV9FWFBPUlQgU2Vjb25kcyBjb21wdXRlQ3VycmVudEFnZShjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiwgV2FsbFRpbWUgcmVzcG9uc2VUaW1lc3RhbXApOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3MuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKaW5k ZXggMTUzNTk1YzI5ZmNhYTg2NjQ2ZTg3NDk5OGY1MzcxNWQzMzU4OGFkMy4uZTg5NjBiOTAwMzli OTU4OGFkMWUxNjBkNDQwNDk1Nzc0MTA2MzY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3MuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkTWV0cmljcy5oCkBAIC0zOSw3ICszOSw3IEBA IE9CSkNfQ0xBU1MgTlNEaWN0aW9uYXJ5OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWVudW0g Y2xhc3MgTmV0d29ya0xvYWRQcmlvcml0eSB7CitlbnVtIGNsYXNzIE5ldHdvcmtMb2FkUHJpb3Jp dHkgOiB1aW50OF90IHsKICAgICBMb3csCiAgICAgTWVkaXVtLAogICAgIEhpZ2gsCkBAIC0xNjYs MTUgKzE2NiwxNiBAQCBwdWJsaWM6CiAgICAgU2Vjb25kcyByZXNwb25zZVN0YXJ0OwogICAgIFNl Y29uZHMgcmVzcG9uc2VFbmQ7CiAKLSAgICAvLyBXaGV0aGVyIG9yIG5vdCBhbGwgb2YgdGhlIHBy b3BlcnRpZXMgKDAgb3Igb3RoZXJ3aXNlKSBoYXZlIGJlZW4gc2V0LgotICAgIGJvb2wgY29tcGxl dGUgeyBmYWxzZSB9OwotCiAgICAgLy8gQUxQTiBQcm90b2NvbCBJRDogaHR0cHM6Ly93M2MuZ2l0 aHViLmlvL3Jlc291cmNlLXRpbWluZy8jYmliLVJGQzczMDEKICAgICBTdHJpbmcgcHJvdG9jb2w7 CiAKICAgICBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gcmVtb3RlQWRkcmVzczsKICAgICBzdGQ6Om9w dGlvbmFsPFN0cmluZz4gY29ubmVjdGlvbklkZW50aWZpZXI7CiAgICAgc3RkOjpvcHRpb25hbDxO ZXR3b3JrTG9hZFByaW9yaXR5PiBwcmlvcml0eTsKKworICAgIC8vIFdoZXRoZXIgb3Igbm90IGFs bCBvZiB0aGUgcHJvcGVydGllcyAoMCBvciBvdGhlcndpc2UpIGhhdmUgYmVlbiBzZXQuCisgICAg Ym9vbCBjb21wbGV0ZSB7IGZhbHNlIH07CisKICAgICBzdGQ6Om9wdGlvbmFsPEhUVFBIZWFkZXJN YXA+IHJlcXVlc3RIZWFkZXJzOwogCiAgICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gcmVxdWVz dEhlYWRlckJ5dGVzU2VudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvUGFyc2VkQ29udGVudFJhbmdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1BhcnNlZENvbnRlbnRSYW5nZS5oCmluZGV4IDI4MWI4MDNhYTM1Yzg0ZTM3YjBiMDY0NTdk ZmMzNWU2NDYxYjE5YzYuLjVhMDcwNGJkNGI5NmZkY2JhOTBkYzE0Y2E0NjZjYjhlZmQ3ZGU1YzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUGFyc2VkQ29udGVu dFJhbmdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9QYXJzZWRDb250 ZW50UmFuZ2UuaApAQCAtNDgsMTAgKzQ4LDEwIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGJvb2wgaXNQb3NpdGl2ZShUKTsKIAotICAgIGJvb2wg bV9pc1ZhbGlkIHsgZmFsc2UgfTsKICAgICBpbnQ2NF90IG1fZmlyc3RCeXRlUG9zaXRpb24geyAw IH07CiAgICAgaW50NjRfdCBtX2xhc3RCeXRlUG9zaXRpb24geyAwIH07CiAgICAgaW50NjRfdCBt X2luc3RhbmNlTGVuZ3RoIHsgVW5rbm93bkxlbmd0aCB9OworICAgIGJvb2wgbV9pc1ZhbGlkIHsg ZmFsc2UgfTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgKaW5kZXggNmY3MmFhOGMwYzI5MTQ3YTExNjMyZjRj YWYyNzRhNmFlZGI2MDgwZS4uMzI4MTY5YzZkOGYxNDcwN2ZlODMxNWViYjIxZmIxYWRmM2E2MzYz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJl cXVlc3RCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJj ZVJlcXVlc3RCYXNlLmgKQEAgLTgzLDcgKzgzLDcgQEAgcHVibGljOgogICAgIC8vIGFuZCA8aHR0 cHM6Ly90b29scy5pZXRmLm9yZy9odG1sL2RyYWZ0LWlldGYtaHR0cGJpcy1jb29raWUtc2FtZS1z aXRlLTAwI3NlY3Rpb24tNS4yPi4KICAgICAvLyBGSVhNRTogRm9yIHNvbWUgcmVhc29uIHRoZSBt YWluIHJlc291cmNlIHJlcXVlc3QgbWF5IGJlIHVwZGF0ZWQgbW9yZSB0aGFuIG9uY2UuIFdlIHN0 YXJ0IG9mZiBhcyBVbnNwZWNpZmllZAogICAgIC8vIHRvIGRldGVjdCBpZiB3ZSBuZWVkIHRvIGNv bXB1dGUgdGhlIHNhbWUtc2l0ZSBhbmQgdG9wLXNpdGUgc3RhdGUgb3Igbm90LiBTZWUgRklYTUUg aW4gRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpLgotICAgIGVudW0g Y2xhc3MgU2FtZVNpdGVEaXNwb3NpdGlvbiB7IFVuc3BlY2lmaWVkLCBTYW1lU2l0ZSwgQ3Jvc3NT aXRlIH07CisgICAgZW51bSBjbGFzcyBTYW1lU2l0ZURpc3Bvc2l0aW9uIDogdWludDhfdCB7IFVu c3BlY2lmaWVkLCBTYW1lU2l0ZSwgQ3Jvc3NTaXRlIH07CiAgICAgYm9vbCBpc1NhbWVTaXRlVW5z cGVjaWZpZWQoKSBjb25zdCB7IHJldHVybiBtX3NhbWVTaXRlRGlzcG9zaXRpb24gPT0gU2FtZVNp dGVEaXNwb3NpdGlvbjo6VW5zcGVjaWZpZWQ7IH0KICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlz U2FtZVNpdGUoKSBjb25zdDsgLy8gV2hldGhlciB0aGlzIHJlcXVlc3QncyByZWdpc3RyYWJsZSBk b21haW4gbWF0Y2hlcyB0aGUgcmVxdWVzdCdzIGluaXRpYXRvcidzICJzaXRlIGZvciBjb29raWVz Ii4KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldElzU2FtZVNpdGUoYm9vbCk7CkBAIC0xNjQs NyArMTY0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaGlkZGVuRnJvbUluc3BlY3RvcigpIGNvbnN0 IHsgcmV0dXJuIG1faGlkZGVuRnJvbUluc3BlY3RvcjsgfQogICAgIHZvaWQgc2V0SGlkZGVuRnJv bUluc3BlY3Rvcihib29sIGhpZGRlbkZyb21JbnNwZWN0b3IpIHsgbV9oaWRkZW5Gcm9tSW5zcGVj dG9yID0gaGlkZGVuRnJvbUluc3BlY3RvcjsgfQogCi0gICAgZW51bSBjbGFzcyBSZXF1ZXN0ZXIg eyBVbnNwZWNpZmllZCwgTWFpbiwgWEhSLCBGZXRjaCwgTWVkaWEsIEltcG9ydFNjcmlwdHMgfTsK KyAgICBlbnVtIGNsYXNzIFJlcXVlc3RlciA6IHVpbnQ4X3QgeyBVbnNwZWNpZmllZCwgTWFpbiwg WEhSLCBGZXRjaCwgTWVkaWEsIEltcG9ydFNjcmlwdHMgfTsKICAgICBSZXF1ZXN0ZXIgcmVxdWVz dGVyKCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0ZXI7IH0KICAgICB2b2lkIHNldFJlcXVlc3Rl cihSZXF1ZXN0ZXIgcmVxdWVzdGVyKSB7IG1fcmVxdWVzdGVyID0gcmVxdWVzdGVyOyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25z ZUJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25z ZUJhc2UuaAppbmRleCBjMDViOWU4MDQ1YWVhMzA5MmIyZGQ4Zjk1MDAzODczMjNlNGI5OGM0Li4z ZmRlZTVlY2RlZjVmOTlhMTM5MjNmNjg3ZmVjMWM0ZDI0NGQyNTY1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCkBA IC0yMjYsMTUgKzIyNiw2IEBAIHByaXZhdGU6CiAgICAgbXV0YWJsZSBDYWNoZUNvbnRyb2xEaXJl Y3RpdmVzIG1fY2FjaGVDb250cm9sRGlyZWN0aXZlczsKICAgICBzdGQ6Om9wdGlvbmFsPFNIQTE6 OkRpZ2VzdD4gbV9jYWNoZUJvZHlLZXk7CiAKLSAgICBTb3VyY2UgbV9zb3VyY2UgeyBTb3VyY2U6 OlVua25vd24gfTsKLSAgICBUeXBlIG1fdHlwZSB7IFR5cGU6OkRlZmF1bHQgfTsKLSAgICBUYWlu dGluZyBtX3RhaW50aW5nIHsgVGFpbnRpbmc6OkJhc2ljIH07Ci0KLXByb3RlY3RlZDoKLSAgICBp bnQgbV9odHRwU3RhdHVzQ29kZSB7IDAgfTsKLSAgICBib29sIG1faXNOdWxsIHsgdHJ1ZSB9Owot Ci1wcml2YXRlOgogICAgIG11dGFibGUgYm9vbCBtX2hhdmVQYXJzZWRDYWNoZUNvbnRyb2xIZWFk ZXIgeyBmYWxzZSB9OwogICAgIG11dGFibGUgYm9vbCBtX2hhdmVQYXJzZWRBZ2VIZWFkZXIgeyBm YWxzZSB9OwogICAgIG11dGFibGUgYm9vbCBtX2hhdmVQYXJzZWREYXRlSGVhZGVyIHsgZmFsc2Ug fTsKQEAgLTI0Miw2ICsyMzMsMTQgQEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIGJvb2wgbV9oYXZl UGFyc2VkTGFzdE1vZGlmaWVkSGVhZGVyIHsgZmFsc2UgfTsKICAgICBtdXRhYmxlIGJvb2wgbV9o YXZlUGFyc2VkQ29udGVudFJhbmdlSGVhZGVyIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNSZWRp cmVjdGVkIHsgZmFsc2UgfTsKKworICAgIFNvdXJjZSBtX3NvdXJjZSB7IFNvdXJjZTo6VW5rbm93 biB9OworICAgIFR5cGUgbV90eXBlIHsgVHlwZTo6RGVmYXVsdCB9OworICAgIFRhaW50aW5nIG1f dGFpbnRpbmcgeyBUYWludGluZzo6QmFzaWMgfTsKKworcHJvdGVjdGVkOgorICAgIGJvb2wgbV9p c051bGwgeyB0cnVlIH07CisgICAgaW50IG1faHR0cFN0YXR1c0NvZGUgeyAwIH07CiB9OwogCiBp bmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGEsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIGIpIHsgcmV0dXJuIFJlc291cmNlUmVzcG9uc2VCYXNlOjpjb21wYXJl KGEsIGIpOyB9Cg==