189288 2018-09-04 17:14:52 -0700 Post review Weinig fix-ups 2018-09-04 17:56:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino sam webkit-bug-importer oldest_to_newest 1456544 0 dino 2018-09-04 17:14:52 -0700 Post review Weinig fix-ups 1456547 1 348876 dino 2018-09-04 17:16:28 -0700 Created attachment 348876 Patch 1456549 2 348876 sam 2018-09-04 17:22:52 -0700 Comment on attachment 348876 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348876&action=review > Source/WebCore/platform/MIMETypeRegistry.cpp:710 > + static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> systemPreviewMIMETypes = std::initializer_list<String> { I think you want to remove the global static above as well. > Source/WebCore/rendering/RenderThemeIOS.mm:1866 > static NSBundle *arKitBundle; > - static dispatch_once_t onceToken; > - dispatch_once(&onceToken, ^{ > + if (!arKitBundle) { > #if PLATFORM(IOS_SIMULATOR) > dlopen("/System/Library/PrivateFrameworks/AssetViewer.framework/AssetViewer", RTLD_NOW); > arKitBundle = [NSBundle bundleForClass:NSClassFromString(@"ASVThumbnailView")]; > #else > arKitBundle = [NSBundle bundleWithURL:[NSURL fileURLWithPath:@"/System/Library/PrivateFrameworks/AssetViewer.framework"]]; > #endif > - }); > + } If you wanted to, you could do this with a lamba, removing the if-statement, but I am not sure it is any better. static NSBundle *arKitBundle = []() { ... return [NSBundle ... }(); > Source/WebCore/rendering/RenderThemeIOS.mm:-1895 > static CGPDFPageRef logoPage; > - static dispatch_once_t onceToken; > - dispatch_once(&onceToken, ^{ > + if (!logoPage) > logoPage = loadARKitPDFPage(@"ARKitBadge").leakRef(); > - }); This could all be one line. 1456568 3 dino 2018-09-04 17:55:53 -0700 Committed r235651: <https://trac.webkit.org/changeset/235651> 1456569 4 webkit-bug-importer 2018-09-04 17:56:14 -0700 <rdar://problem/44121295> 348876 2018-09-04 17:16:28 -0700 2018-09-04 17:22:52 -0700 Patch bug-189288-20180905101627.patch text/plain 8630 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUyNjc2NmRkMGFmMGYz M2JkMGMwMTA2NWQ4N2QxZTBhOTM3NGEwNi4uYTE1Yzk1YTk4ZWExYTNhMDQzN2U5MTc4MTk0YWEx MjdlMTIxMjBjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTA0ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBQb3N0IHJldmlldyBXZWluaWcg Zml4LXVwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTg5Mjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Rml4LXVwcyBmcm9tIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODky NTIKKworICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0U3lzdGVtUHJldmlld01JTUVUeXBlcyk6Cisg ICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3lzdGVtUHJldmlld01JTUVUeXBlcyk6IERlbGV0 ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2Vi Q29yZTo6YXJLaXRCdW5kbGUpOgorICAgICAgICAoV2ViQ29yZTo6bG9hZEFSS2l0UERGUGFnZSk6 CisgICAgICAgIChXZWJDb3JlOjpzeXN0ZW1QcmV2aWV3TG9nbyk6CisKIDIwMTgtMDktMDQgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUgV2ViUlRD IHVuaWZpZWQgcGxhbiBydW50aW1lIGZsYWcgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBiOTI0NjMw NDYzYTVhYzY4MWNhNTRjOTc0MmQ3NTkxMWZmYzFiYmEwLi5hNzJkNWYzZjBjZjNhZWRlYzg2MTU4 MGU1ZjM2YzI2ZjFjMzdjNDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTA0 ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBQb3N0IHJldmlldyBX ZWluaWcgZml4LXVwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg5Mjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4LXVwcyBmcm9tIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODkyNTIKKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9TeXN0ZW1QcmV2aWV3Q29udHJv bGxlckNvY29hLm1tOgorICAgICAgICAoLVtfV0tQcmV2aWV3Q29udHJvbGxlckRhdGFTb3VyY2Ug cHJldmlld0NvbnRyb2xsZXI6cHJldmlld0l0ZW1BdEluZGV4Ol0pOgorICAgICAgICAoZ2V0VVRJ Rm9yTUlNRVR5cGUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tTeXN0ZW1Q cmV2aWV3Vmlldy5tbToKKyAgICAgICAgKGdldFVUSUZvclN5c3RlbVByZXZpZXdNSU1FVHlwZSk6 CisgICAgICAgICgtW1dLU3lzdGVtUHJldmlld1ZpZXcgd2ViX3NldENvbnRlbnRQcm92aWRlckRh dGE6c3VnZ2VzdGVkRmlsZW5hbWU6XSk6CisgICAgICAgIChnZXRVVElGb3JNSU1FVHlwZSk6IERl bGV0ZWQuCisKIDIwMTgtMDktMDQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIERpc2FibGUgV2ViUlRDIHVuaWZpZWQgcGxhbiBydW50aW1lIGZsYWcgYnkgZGVm YXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3Ry eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRl eCA4MjliZjBkZTMxZjJmZGQ5OGU2MDk4NjhjZWRiNDQzZWQzZDczOTkzLi5lNmMzM2M1ZWUwZjZj Y2RiMjBhYjY4NzA2MzAzZDM3NzI4ODRlZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcApAQCAtNzA1LDI2ICs3MDUsMTYgQEAgY29uc3QgU3RyaW5n JiBkZWZhdWx0TUlNRVR5cGUoKQogfQogCiAjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQotc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZVN5c3RlbVByZXZpZXdNSU1FVHlwZXMoKQorY29uc3QgSGFzaFNldDxT dHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mIE1JTUVUeXBlUmVnaXN0cnk6OmdldFN5 c3RlbVByZXZpZXdNSU1FVHlwZXMoKQogewotICAgIGNvbnN0IGNoYXIqIGNvbnN0IHR5cGVzW10g PSB7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJ bnNlbnNpdGl2ZUhhc2g+PiBzeXN0ZW1QcmV2aWV3TUlNRVR5cGVzID0gc3RkOjppbml0aWFsaXpl cl9saXN0PFN0cmluZz4gewogICAgICAgICAvLyBUaGUgb2ZmaWNpYWwgdHlwZTogaHR0cHM6Ly93 d3cuaWFuYS5vcmcvYXNzaWdubWVudHMvbWVkaWEtdHlwZXMvbW9kZWwvdm5kLnVzZHoremlwCiAg ICAgICAgICJtb2RlbC92bmQudXNkeit6aXAiLAogICAgICAgICAvLyBVbm9mZmljaWFsLCBidXQg c3VwcG9ydGVkIGJlY2F1c2Ugd2UgZG9jdW1lbnRlZCB0aGVtLgogICAgICAgICAibW9kZWwvdXNk IiwKICAgICAgICAgIm1vZGVsL3ZuZC5waXhhci51c2QiCiAgICAgfTsKLQotICAgIHN5c3RlbVBy ZXZpZXdNSU1FVHlwZXMgPSBuZXcgSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZl SGFzaD47Ci0gICAgZm9yIChhdXRvJiB0eXBlIDogdHlwZXMpCi0gICAgICAgIHN5c3RlbVByZXZp ZXdNSU1FVHlwZXMtPmFkZCh0eXBlKTsKLX0KLQotY29uc3QgSGFzaFNldDxTdHJpbmcsIEFTQ0lJ Q2FzZUluc2Vuc2l0aXZlSGFzaD4mIE1JTUVUeXBlUmVnaXN0cnk6OmdldFN5c3RlbVByZXZpZXdN SU1FVHlwZXMoKQotewotICAgIGlmICghc3lzdGVtUHJldmlld01JTUVUeXBlcykKLSAgICAgICAg aW5pdGlhbGl6ZVN5c3RlbVByZXZpZXdNSU1FVHlwZXMoKTsKLSAgICByZXR1cm4gKnN5c3RlbVBy ZXZpZXdNSU1FVHlwZXM7CisgICAgcmV0dXJuIHN5c3RlbVByZXZpZXdNSU1FVHlwZXM7CiB9CiAK IGJvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNTeXN0ZW1QcmV2aWV3TUlNRVR5cGUoY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5t bQppbmRleCAyNzM3ODgyMWU2Njk3MGZiYmI0OTQ0MTM5NWFkYWE1MzQ4OTViMzhhLi4xMWQyMzAy NTRmZDIxMjZlOGZmYWE2ZGI1MmZkMjViYTA2M2U4ZWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCkBAIC0xODU2LDE1ICsxODU2LDE0IEBAIFN0cmluZyBS ZW5kZXJUaGVtZUlPUzo6ZXh0cmFEZWZhdWx0U3R5bGVTaGVldCgpCiBzdGF0aWMgTlNCdW5kbGUg KmFyS2l0QnVuZGxlKCkKIHsKICAgICBzdGF0aWMgTlNCdW5kbGUgKmFyS2l0QnVuZGxlOwotICAg IHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOwotICAgIGRpc3BhdGNoX29uY2UoJm9u Y2VUb2tlbiwgXnsKKyAgICBpZiAoIWFyS2l0QnVuZGxlKSB7CiAjaWYgUExBVEZPUk0oSU9TX1NJ TVVMQVRPUikKICAgICAgICAgZGxvcGVuKCIvU3lzdGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29y a3MvQXNzZXRWaWV3ZXIuZnJhbWV3b3JrL0Fzc2V0Vmlld2VyIiwgUlRMRF9OT1cpOwogICAgICAg ICBhcktpdEJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpOU0NsYXNzRnJvbVN0cmlu ZyhAIkFTVlRodW1ibmFpbFZpZXciKV07CiAjZWxzZQogICAgICAgICBhcktpdEJ1bmRsZSA9IFtO U0J1bmRsZSBidW5kbGVXaXRoVVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6QCIvU3lzdGVtL0xp YnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MvQXNzZXRWaWV3ZXIuZnJhbWV3b3JrIl1dOwogI2VuZGlm Ci0gICAgfSk7CisgICAgfQogCiAgICAgcmV0dXJuIGFyS2l0QnVuZGxlOwogfQpAQCAtMTg4NCwx OCArMTg4MywxNiBAQCBzdGF0aWMgUmV0YWluUHRyPENHUERGUGFnZVJlZj4gbG9hZEFSS2l0UERG UGFnZShOU1N0cmluZyAqaW1hZ2VOYW1lKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAg IHJldHVybiBDR1BERkRvY3VtZW50R2V0UGFnZShkb2N1bWVudC5nZXQoKSwgMSk7Ci19OworfQog CiBzdGF0aWMgQ0dQREZQYWdlUmVmIHN5c3RlbVByZXZpZXdMb2dvKCkKIHsKICAgICBzdGF0aWMg Q0dQREZQYWdlUmVmIGxvZ29QYWdlOwotICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRv a2VuOwotICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKKyAgICBpZiAoIWxvZ29QYWdl KQogICAgICAgICBsb2dvUGFnZSA9IGxvYWRBUktpdFBERlBhZ2UoQCJBUktpdEJhZGdlIikubGVh a1JlZigpOwotICAgIH0pOwogCiAgICAgcmV0dXJuIGxvZ29QYWdlOwotfTsKK30KIAogdm9pZCBS ZW5kZXJUaGVtZUlPUzo6cGFpbnRTeXN0ZW1QcmV2aWV3QmFkZ2UoSW1hZ2UmIGltYWdlLCBjb25z dCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvU3lzdGVtUHJldmlld0NvbnRyb2xs ZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1N5c3RlbVByZXZpZXdD b250cm9sbGVyQ29jb2EubW0KaW5kZXggZWI0YWYxZGYzZmVlZjBlZDI3NWQwOTJlYjhhZGJlMzI0 NmE4YjM3ZC4uYTdkYWQ0ODE1MjYxYTk4YzZjMTFkMzQ0OGYzZGIyMTgxMzFhNjJkYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvU3lzdGVtUHJldmlld0NvbnRyb2xs ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9TeXN0ZW1QcmV2 aWV3Q29udHJvbGxlckNvY29hLm1tCkBAIC00MiwxOCArNDIsNiBAQCBTT0ZUX0xJTktfRlJBTUVX T1JLKFF1aWNrTG9vaykKIFNPRlRfTElOS19DTEFTUyhRdWlja0xvb2ssIFFMUHJldmlld0NvbnRy b2xsZXIpOwogU09GVF9MSU5LX0NMQVNTKFF1aWNrTG9vaywgUUxJdGVtKTsKIAotLy8gRklYTUU6 IEF0IHRoZSBtb21lbnQgd2Ugb25seSBoYXZlIG9uZSBzdXBwb3J0ZWQgVVRJLCBidXQKLS8vIGlm IHdlIHN0YXJ0IHN1cHBvcnRpbmcgbW9yZSB0eXBlcywgdGhlbiB3ZSdsbCBuZWVkIGEgdGFibGUu Ci1zdGF0aWMgU3RyaW5nIGdldFVUSUZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUp Ci17Ci0gICAgc3RhdGljIGNvbnN0IE5ldmVyRGVzdHJveWVkPFN0cmluZz4gdXRpID0gYWRvcHRD RihVVFR5cGVDcmVhdGVQcmVmZXJyZWRJZGVudGlmaWVyRm9yVGFnKGtVVFRhZ0NsYXNzRmlsZW5h bWVFeHRlbnNpb24sIENGU1RSKCJ1c2R6IiksIG5pbCkpLmdldCgpOwotCi0gICAgaWYgKCFXZWJD b3JlOjpNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N5c3RlbVByZXZpZXdNSU1FVHlwZShtaW1lVHlwZSkp Ci0gICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwotCi0gICAgcmV0dXJuIHV0aTsKLX0KLQog QGludGVyZmFjZSBfV0tQcmV2aWV3Q29udHJvbGxlckRhdGFTb3VyY2UgOiBOU09iamVjdCA8UUxQ cmV2aWV3Q29udHJvbGxlckRhdGFTb3VyY2U+IHsKICAgICBSZXRhaW5QdHI8TlNJdGVtUHJvdmlk ZXI+IF9pdGVtUHJvdmlkZXI7CiAgICAgUmV0YWluUHRyPFFMSXRlbT4gX2l0ZW07CkBAIC05NSw4 ICs4MywxMCBAQCBzdGF0aWMgU3RyaW5nIGdldFVUSUZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYg bWltZVR5cGUpCiAKICAgICBfaXRlbVByb3ZpZGVyID0gYWRvcHROUyhbW05TSXRlbVByb3ZpZGVy IGFsbG9jXSBpbml0XSk7CiAgICAgLy8gRklYTUU6IFdlIGFyZSBsYXVuY2hpbmcgdGhlIHByZXZp ZXcgY29udHJvbGxlciBiZWZvcmUgZ2V0dGluZyBhIHJlc3BvbnNlIGZyb20gdGhlIHJlc291cmNl LCB3aGljaAotICAgIC8vIG1lYW5zIHdlIGRvbid0IGFjdHVhbGx5IGtub3cgdGhlIHJlYWwgTUlN RSB0eXBlIHlldC4gQXNzdW1lIGl0IGlzIG9uZSBvZiB0aG9zZSB0aGF0IHdlIHJlZ2lzdGVyZWQu Ci0gICAgTlNTdHJpbmcgKmNvbnRlbnRUeXBlID0gZ2V0VVRJRm9yTUlNRVR5cGUoKldlYkNvcmU6 Ok1JTUVUeXBlUmVnaXN0cnk6OmdldFN5c3RlbVByZXZpZXdNSU1FVHlwZXMoKS5iZWdpbigpKTsK KyAgICAvLyBtZWFucyB3ZSBkb24ndCBhY3R1YWxseSBrbm93IHRoZSByZWFsIE1JTUUgdHlwZSB5 ZXQuCisgICAgLy8gRklYTUU6IEF0IHRoZSBtb21lbnQgd2Ugb25seSBoYXZlIG9uZSBzdXBwb3J0 ZWQgVVRJLCBidXQgaWYgd2Ugc3RhcnQgc3VwcG9ydGluZyBtb3JlIHR5cGVzLAorICAgIC8vIHRo ZW4gd2UnbGwgbmVlZCBhIHRhYmxlLgorICAgIHN0YXRpYyBOU1N0cmluZyAqY29udGVudFR5cGUg PSAoX19icmlkZ2UgTlNTdHJpbmcgKikgVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZv clRhZyhrVVRUYWdDbGFzc0ZpbGVuYW1lRXh0ZW5zaW9uLCBDRlNUUigidXNkeiIpLCBuaWwpOwog CiAgICAgX2l0ZW0gPSBhZG9wdE5TKFthbGxvY1FMSXRlbUluc3RhbmNlKCkgaW5pdFdpdGhQcmV2 aWV3SXRlbVByb3ZpZGVyOl9pdGVtUHJvdmlkZXIuZ2V0KCkgY29udGVudFR5cGU6Y29udGVudFR5 cGUgcHJldmlld1RpdGxlOkAiUHJldmlldyIgZmlsZVNpemU6QCgwKV0pOwogICAgIFtfaXRlbSBz ZXRVc2VMb2FkaW5nVGltZW91dDpOT107CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tTeXN0ZW1QcmV2aWV3Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS1N5c3RlbVByZXZpZXdWaWV3Lm1tCmluZGV4IGI4YTU0MDU0NDg2OGJkYjQyZDA5M2Y4 M2IyZTMzMDg1ZjAwZDI3Y2YuLjdkNmM4MWUzMWJiZWU2NTVlOGY3ZjUxNTJjZmY3MTE0YmM4NDRl OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1N5c3RlbVByZXZp ZXdWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1N5c3RlbVByZXZp ZXdWaWV3Lm1tCkBAIC01MCwxMiArNTAsMTIgQEAgU09GVF9MSU5LX0NMQVNTKEFzc2V0Vmlld2Vy LCBBU1ZUaHVtYm5haWxWaWV3KTsKIAogLy8gRklYTUU6IEF0IHRoZSBtb21lbnQgd2Ugb25seSBo YXZlIG9uZSBzdXBwb3J0ZWQgVVRJLCBidXQKIC8vIGlmIHdlIHN0YXJ0IHN1cHBvcnRpbmcgbW9y ZSB0eXBlcywgdGhlbiB3ZSdsbCBuZWVkIGEgdGFibGUuCi1zdGF0aWMgU3RyaW5nIGdldFVUSUZv ck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCitzdGF0aWMgTlNTdHJpbmcgKmdldFVU SUZvclN5c3RlbVByZXZpZXdNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogewotICAg IHN0YXRpYyBjb25zdCBOZXZlckRlc3Ryb3llZDxTdHJpbmc+IHV0aSA9IGFkb3B0Q0YoVVRUeXBl Q3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRhZyhrVVRUYWdDbGFzc0ZpbGVuYW1lRXh0ZW5z aW9uLCBDRlNUUigidXNkeiIpLCBuaWwpKS5nZXQoKTsKKyAgICBzdGF0aWMgTlNTdHJpbmcgKnV0 aSA9IChfX2JyaWRnZSBOU1N0cmluZyAqKSBVVFR5cGVDcmVhdGVQcmVmZXJyZWRJZGVudGlmaWVy Rm9yVGFnKGtVVFRhZ0NsYXNzRmlsZW5hbWVFeHRlbnNpb24sIENGU1RSKCJ1c2R6IiksIG5pbCk7 CiAKICAgICBpZiAoIVdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmlzU3lzdGVtUHJldmlld01J TUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisgICAgICAg IHJldHVybiBuaWw7CiAKICAgICByZXR1cm4gdXRpOwogfQpAQCAtMTAzLDggKzEwMyw3IEBAIHN0 YXRpYyBTdHJpbmcgZ2V0VVRJRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKICAg ICBfc3VnZ2VzdGVkRmlsZW5hbWUgPSBhZG9wdE5TKFtmaWxlbmFtZSBjb3B5XSk7CiAgICAgX2Rh dGEgPSBhZG9wdE5TKFtkYXRhIGNvcHldKTsKIAotICAgIE5TU3RyaW5nICpjb250ZW50VHlwZTsK LSAgICBjb250ZW50VHlwZSA9IGdldFVUSUZvck1JTUVUeXBlKF9taW1lVHlwZS5nZXQoKSk7Cisg ICAgTlNTdHJpbmcgKmNvbnRlbnRUeXBlID0gZ2V0VVRJRm9yU3lzdGVtUHJldmlld01JTUVUeXBl KF9taW1lVHlwZS5nZXQoKSk7CiAKICAgICBfaXRlbSA9IGFkb3B0TlMoW2FsbG9jUUxJdGVtSW5z dGFuY2UoKSBpbml0V2l0aERhdGFQcm92aWRlcjpzZWxmIGNvbnRlbnRUeXBlOmNvbnRlbnRUeXBl IHByZXZpZXdUaXRsZTpfc3VnZ2VzdGVkRmlsZW5hbWUuZ2V0KCldKTsKICAgICBbX2l0ZW0gc2V0 VXNlTG9hZGluZ1RpbWVvdXQ6Tk9dOwo=