160694 2016-08-09 09:35:39 -0700 Move plug-in enumeration from WebPlatformStrategies to WebPluginInfoProvider 2016-08-09 09:59:09 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1218744 0 andersca 2016-08-09 09:35:39 -0700 Move Plug-in enumeration from WebPlatformStrategies to WebPluginInfoProvider 1218746 1 285643 andersca 2016-08-09 09:36:45 -0700 Created attachment 285643 Patch 1218748 2 285643 mitz 2016-08-09 09:57:26 -0700 Comment on attachment 285643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=285643&action=review > Source/WebKit/mac/WebCoreSupport/WebPluginInfoProvider.mm:65 > + NSArray* pluginsArray = [[WebPluginDatabase sharedDatabase] plugins]; Star on the wrong side of the space. Use .plugins. > Source/WebKit/mac/WebCoreSupport/WebPluginInfoProvider.mm:66 > + for (unsigned i = 0; i < [pluginsArray count]; ++i) { Use fast enumeration. > Source/WebKit/mac/WebCoreSupport/WebPluginInfoProvider.mm:69 > + plugins.append([plugin pluginInfo]); Use .pluginInfo. 1218750 3 andersca 2016-08-09 09:59:09 -0700 Committed r204282: <http://trac.webkit.org/changeset/204282> 285643 2016-08-09 09:36:45 -0700 2016-08-09 09:57:26 -0700 Patch bug-160694-20160809093512.patch text/plain 14575 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0MjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMmYxYTU0NWEy M2FkMzkxYzVkZWFkMDNhMDlmNWFiYWU3ZmNkOTRhZS4uNWExODc0ODE5ODMyMjhiZTYwMjljNjll Y2U1OTMxZWU4ZTk0ODVjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2 LTA4LTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg TW92ZSBwbHVnLWluIGVudW1lcmF0aW9uIGZyb20gV2ViUGxhdGZvcm1TdHJhdGVnaWVzIHRvIFdl YlBsdWdpbkluZm9Qcm92aWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTYwNjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaDoKKyAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW06CisgICAgICAg IChXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmNyZWF0ZVBsdWdpblN0cmF0ZWd5KToKKyAgICAgICAg KFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6cmVmcmVzaFBsdWdpbnMpOiBEZWxldGVkLgorICAgICAg ICAoV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpnZXRQbHVnaW5JbmZvKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Z2V0V2ViVmlzaWJsZVBsdWdpbkluZm8pOiBEZWxl dGVkLgorICAgICAgICAoV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpzZXRQbHVnaW5Mb2FkQ2xpZW50 UG9saWN5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y2xlYXJQ bHVnaW5DbGllbnRQb2xpY2llcyk6IERlbGV0ZWQuCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv V2ViUGx1Z2luSW5mb1Byb3ZpZGVyLm1tOgorICAgICAgICAoV2ViUGx1Z2luSW5mb1Byb3ZpZGVy OjpyZWZyZXNoUGx1Z2lucyk6CisgICAgICAgIChXZWJQbHVnaW5JbmZvUHJvdmlkZXI6OmdldFBs dWdpbkluZm8pOgorICAgICAgICAoV2ViUGx1Z2luSW5mb1Byb3ZpZGVyOjpnZXRXZWJWaXNpYmxl UGx1Z2luSW5mbyk6CisKIDIwMTYtMDgtMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgYSBuZXcgUGx1Z2luSW5mb1Byb3ZpZGVyIGNsYXNzLCB0 byByZXBsYWNlIFBsdWdpblN0cmF0ZWd5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYjllMGZmZDEyYzYy YWFiZDMxYWI1MzViMWIyOGJjYjllZDdhZGFhNS4uMDJlMDRjYTYzZDllY2U4NTYzYjA4ZTU3ZGJm ZjNmYjljYTI1NGQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA4 LTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92 ZSBwbHVnLWluIGVudW1lcmF0aW9uIGZyb20gV2ViUGxhdGZvcm1TdHJhdGVnaWVzIHRvIFdlYlBs dWdpbkluZm9Qcm92aWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTYwNjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuY3BwOgorICAg ICAgICAoV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpjcmVhdGVQbHVnaW5TdHJhdGVneSk6CisgICAg ICAgIChXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnJlZnJlc2hQbHVnaW5zKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Z2V0UGx1Z2luSW5mbyk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmdldFdlYlZpc2libGVQbHVnaW5JbmZvKTog RGVsZXRlZC4KKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMu aDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJQbHVnaW5JbmZvUHJvdmlkZXIuY3BwOgor ICAgICAgICAoV2ViUGx1Z2luSW5mb1Byb3ZpZGVyOjpyZWZyZXNoUGx1Z2lucyk6CisgICAgICAg IChXZWJQbHVnaW5JbmZvUHJvdmlkZXI6OmdldFBsdWdpbkluZm8pOgorICAgICAgICAoV2ViUGx1 Z2luSW5mb1Byb3ZpZGVyOjpnZXRXZWJWaXNpYmxlUGx1Z2luSW5mbyk6CisKIDIwMTYtMDgtMDgg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYSBu ZXcgUGx1Z2luSW5mb1Byb3ZpZGVyIGNsYXNzLCB0byByZXBsYWNlIFBsdWdpblN0cmF0ZWd5CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0 cmF0ZWdpZXMuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3Jt U3RyYXRlZ2llcy5oCmluZGV4IDM3Y2Y4ZGZmZWE4OTMwNWQ4NDA4Y2M4ZmU1YjJmYWUxOTUwMTU4 OTMuLjU5NGJkZjVmOTk3MTljZWRmMjE0N2NiYWI0ZmViNWUwNWM2OTE3MjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5o CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRl Z2llcy5oCkBAIC0zNSw3ICszNSw3IEBACiBzdHJ1Y3QgUGFzdGVib2FyZEltYWdlOwogc3RydWN0 IFBhc3RlYm9hcmRXZWJDb250ZW50OwogCi1jbGFzcyBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMgOiBw dWJsaWMgV2ViQ29yZTo6UGxhdGZvcm1TdHJhdGVnaWVzLCBwcml2YXRlIFdlYkNvcmU6OkNvb2tp ZXNTdHJhdGVneSwgcHJpdmF0ZSBXZWJDb3JlOjpQYXN0ZWJvYXJkU3RyYXRlZ3ksIHByaXZhdGUg V2ViQ29yZTo6UGx1Z2luU3RyYXRlZ3kgeworY2xhc3MgV2ViUGxhdGZvcm1TdHJhdGVnaWVzIDog cHVibGljIFdlYkNvcmU6OlBsYXRmb3JtU3RyYXRlZ2llcywgcHJpdmF0ZSBXZWJDb3JlOjpDb29r aWVzU3RyYXRlZ3ksIHByaXZhdGUgV2ViQ29yZTo6UGFzdGVib2FyZFN0cmF0ZWd5IHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgdm9pZCBpbml0aWFsaXplSWZOZWNlc3NhcnkoKTsKICAgICAKQEAgLTU5 LDE1ICs1OSw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkZWxldGVDb29raWUoY29uc3QgV2ViQ29y ZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uJiwgY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3Ry aW5nJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBhZGRDb29raWUoY29uc3QgV2ViQ29yZTo6TmV0d29y a1N0b3JhZ2VTZXNzaW9uJiwgY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgV2ViQ29yZTo6Q29v a2llJikgb3ZlcnJpZGU7CiAKLSAgICAvLyBXZWJDb3JlOjpQbHVnaW5TdHJhdGVneQotICAgIHZv aWQgcmVmcmVzaFBsdWdpbnMoKSBvdmVycmlkZTsKLSAgICB2b2lkIGdldFBsdWdpbkluZm8oY29u c3QgV2ViQ29yZTo6UGFnZSosIFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiYpIG92ZXJyaWRl OwotICAgIHZvaWQgZ2V0V2ViVmlzaWJsZVBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6UGFnZSos IFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiYpIG92ZXJyaWRlOwotI2lmIFBMQVRGT1JNKE1B QykKLSAgICB2b2lkIHNldFBsdWdpbkxvYWRDbGllbnRQb2xpY3koV2ViQ29yZTo6UGx1Z2luTG9h ZENsaWVudFBvbGljeSwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5n Jikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBjbGVhclBsdWdpbkNsaWVudFBvbGljaWVzKCkgb3ZlcnJp ZGU7Ci0jZW5kaWYKLQogICAgIC8vIFdlYkNvcmU6OlBhc3RlYm9hcmRTdHJhdGVneQogI2lmIFBM QVRGT1JNKElPUykKICAgICB2b2lkIHdyaXRlVG9QYXN0ZWJvYXJkKGNvbnN0IFdlYkNvcmU6OlBh c3RlYm9hcmRXZWJDb250ZW50Jikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW0gYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW0KaW5kZXggNmFi NWU4NjljNjY2NGFlMTAwNDYxOWVmOTVlZjVkOGNkNGYyNjEwNC4uZmEwYWMyYWU3NWY3NThlMGYw ZGMwYWMxODJkNTE4Mjk4YWRlMzdkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5tbQpAQCAtMjYsNyArMjYs NiBAQAogI2ltcG9ydCAiV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgiCiAKICNpbXBvcnQgIldlYkZy YW1lTmV0d29ya2luZ0NvbnRleHQuaCIKLSNpbXBvcnQgIldlYlBsdWdpbkRhdGFiYXNlLmgiCiAj aW1wb3J0ICJXZWJQbHVnaW5QYWNrYWdlLmgiCiAjaW1wb3J0ICJXZWJSZXNvdXJjZUxvYWRTY2hl ZHVsZXIuaCIKICNpbXBvcnQgPFdlYkNvcmUvQmxvYlJlZ2lzdHJ5SW1wbC5oPgpAQCAtNzQsNyAr NzMsNyBAQCBQYXN0ZWJvYXJkU3RyYXRlZ3kqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRl UGFzdGVib2FyZFN0cmF0ZWd5KCkKIAogUGx1Z2luU3RyYXRlZ3kqIFdlYlBsYXRmb3JtU3RyYXRl Z2llczo6Y3JlYXRlUGx1Z2luU3RyYXRlZ3koKQogewotICAgIHJldHVybiB0aGlzOworICAgIHJl dHVybiBudWxscHRyOwogfQogCiBCbG9iUmVnaXN0cnkqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6 Y3JlYXRlQmxvYlJlZ2lzdHJ5KCkKQEAgLTEyMyw0NCArMTIyLDYgQEAgdm9pZCBXZWJQbGF0Zm9y bVN0cmF0ZWdpZXM6OmFkZENvb2tpZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Np b24sIGNvbnMKICAgICBXZWJDb3JlOjphZGRDb29raWUoc2Vzc2lvbiwgdXJsLCBjb29raWUpOwog fQogCi12b2lkIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6cmVmcmVzaFBsdWdpbnMoKQotewotICAg IFtbV2ViUGx1Z2luRGF0YWJhc2Ugc2hhcmVkRGF0YWJhc2VJZkV4aXN0c10gcmVmcmVzaF07Ci19 Ci0KLXZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpnZXRQbHVnaW5JbmZvKGNvbnN0IFBhZ2Uq IHBhZ2UsIFZlY3RvcjxQbHVnaW5JbmZvPiYgcGx1Z2lucykKLXsKLSAgICBCRUdJTl9CTE9DS19P QkpDX0VYQ0VQVElPTlM7Ci0KLSAgICAvLyBXZWJLaXQxIGhhcyBubyBhcHBsaWNhdGlvbiBwbHVn LWlucywgc28gd2UgZG9uJ3QgbmVlZCB0byBhZGQgdGhlbSBoZXJlLgotICAgIGlmICghcGFnZS0+ bWFpbkZyYW1lKCkubG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5hbGxvd1BsdWdpbnMoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgTlNBcnJheSogcGx1Z2luc0FycmF5ID0gW1tXZWJQbHVnaW5E YXRhYmFzZSBzaGFyZWREYXRhYmFzZV0gcGx1Z2luc107Ci0gICAgZm9yICh1bnNpZ25lZCBpbnQg aSA9IDA7IGkgPCBbcGx1Z2luc0FycmF5IGNvdW50XTsgKytpKSB7Ci0gICAgICAgIFdlYlBsdWdp blBhY2thZ2UgKnBsdWdpbiA9IFtwbHVnaW5zQXJyYXkgb2JqZWN0QXRJbmRleDppXTsKLQotICAg ICAgICBwbHVnaW5zLmFwcGVuZChbcGx1Z2luIHBsdWdpbkluZm9dKTsKLSAgICB9Ci0gICAgCi0g ICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLX0KLQotdm9pZCBXZWJQbGF0Zm9ybVN0cmF0 ZWdpZXM6OmdldFdlYlZpc2libGVQbHVnaW5JbmZvKGNvbnN0IFBhZ2UqIHBhZ2UsIFZlY3RvcjxQ bHVnaW5JbmZvPiYgcGx1Z2lucykKLXsKLSAgICBnZXRQbHVnaW5JbmZvKHBhZ2UsIHBsdWdpbnMp OwotfQotCi0jaWYgUExBVEZPUk0oTUFDKQotdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnNl dFBsdWdpbkxvYWRDbGllbnRQb2xpY3koUGx1Z2luTG9hZENsaWVudFBvbGljeSwgY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikKLXsKLX0KLQotdm9pZCBXZWJQbGF0 Zm9ybVN0cmF0ZWdpZXM6OmNsZWFyUGx1Z2luQ2xpZW50UG9saWNpZXMoKQotewotfQotI2VuZGlm Ci0KIHZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpnZXRUeXBlcyhWZWN0b3I8U3RyaW5nPiYg dHlwZXMsIGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpCiB7CiAgICAgUGxhdGZvcm1QYXN0 ZWJvYXJkKHBhc3RlYm9hcmROYW1lKS5nZXRUeXBlcyh0eXBlcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbHVnaW5JbmZvUHJvdmlkZXIubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbHVnaW5JbmZvUHJvdmlkZXIubW0K aW5kZXggOThkODA1YTFlNWVjNDlmYWE3MGM4Yzk5YzBhOWQwMGNjNzBhNzAzMi4uMTExMGZkYWFi ZDkyMmQzMmYzNzIyMzE4Zjk1YjcwZDBkNzk4OTE1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGx1Z2luSW5mb1Byb3ZpZGVyLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsdWdpbkluZm9Qcm92aWRlci5tbQpAQCAt MjUsOSArMjUsMTIgQEAKIAogI2ltcG9ydCAiV2ViUGx1Z2luSW5mb1Byb3ZpZGVyLmgiCiAKLS8v IEZJWE1FOiBXZSBzaG91bGRuJ3QgY2FsbCBvdXQgdG8gdGhlIHBsYXRmb3JtIHN0cmF0ZWd5IGZv ciB0aGlzLgotI2ltcG9ydCAiV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgiCi0jaW1wb3J0IDxXZWJD b3JlL1BsdWdpblN0cmF0ZWd5Lmg+CisjaW1wb3J0ICJXZWJQbHVnaW5EYXRhYmFzZS5oIgorI2lt cG9ydCAiV2ViUGx1Z2luUGFja2FnZS5oIgorI2ltcG9ydCA8V2ViQ29yZS9NYWluRnJhbWUuaD4K KyNpbXBvcnQgPFdlYkNvcmUvUGFnZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9TdWJmcmFtZUxvYWRl ci5oPgorI2ltcG9ydCA8d3RmL0Jsb2NrT2JqQ0V4Y2VwdGlvbnMuaD4KIAogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiAKQEAgLTQ4LDE3ICs1MSwzMCBAQCBXZWJQbHVnaW5JbmZvUHJvdmlkZXI6 On5XZWJQbHVnaW5JbmZvUHJvdmlkZXIoKQogCiB2b2lkIFdlYlBsdWdpbkluZm9Qcm92aWRlcjo6 cmVmcmVzaFBsdWdpbnMoKQogewotICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wbHVnaW5TdHJh dGVneSgpLT5yZWZyZXNoUGx1Z2lucygpOworICAgIFtbV2ViUGx1Z2luRGF0YWJhc2Ugc2hhcmVk RGF0YWJhc2VJZkV4aXN0c10gcmVmcmVzaF07CiB9CiAKIHZvaWQgV2ViUGx1Z2luSW5mb1Byb3Zp ZGVyOjpnZXRQbHVnaW5JbmZvKFdlYkNvcmU6OlBhZ2UmIHBhZ2UsIFZlY3RvcjxXZWJDb3JlOjpQ bHVnaW5JbmZvPiYgcGx1Z2lucykKIHsKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGx1Z2lu U3RyYXRlZ3koKS0+Z2V0UGx1Z2luSW5mbygmcGFnZSwgcGx1Z2lucyk7CisgICAgQkVHSU5fQkxP Q0tfT0JKQ19FWENFUFRJT05TOworCisgICAgLy8gV2ViS2l0MSBoYXMgbm8gYXBwbGljYXRpb24g cGx1Zy1pbnMsIHNvIHdlIGRvbid0IG5lZWQgdG8gYWRkIHRoZW0gaGVyZS4KKyAgICBpZiAoIXBh Z2UubWFpbkZyYW1lKCkubG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS5hbGxvd1BsdWdpbnMoKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgTlNBcnJheSogcGx1Z2luc0FycmF5ID0gW1tXZWJQbHVn aW5EYXRhYmFzZSBzaGFyZWREYXRhYmFzZV0gcGx1Z2luc107CisgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IFtwbHVnaW5zQXJyYXkgY291bnRdOyArK2kpIHsKKyAgICAgICAgV2ViUGx1Z2lu UGFja2FnZSAqcGx1Z2luID0gW3BsdWdpbnNBcnJheSBvYmplY3RBdEluZGV4OmldOworCisgICAg ICAgIHBsdWdpbnMuYXBwZW5kKFtwbHVnaW4gcGx1Z2luSW5mb10pOworICAgIH0KKworICAgIEVO RF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiB9CiAKIHZvaWQgV2ViUGx1Z2luSW5mb1Byb3ZpZGVy OjpnZXRXZWJWaXNpYmxlUGx1Z2luSW5mbyhXZWJDb3JlOjpQYWdlJiBwYWdlLCBWZWN0b3I8V2Vi Q29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMpCiB7Ci0gICAgcGxhdGZvcm1TdHJhdGVnaWVzKCkt PnBsdWdpblN0cmF0ZWd5KCktPmdldFdlYlZpc2libGVQbHVnaW5JbmZvKCZwYWdlLCBwbHVnaW5z KTsKKyAgICBnZXRQbHVnaW5JbmZvKHBhZ2UsIHBsdWdpbnMpOwogfQogCiAjaWYgUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViUGxh dGZvcm1TdHJhdGVnaWVzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dl YlBsYXRmb3JtU3RyYXRlZ2llcy5jcHAKaW5kZXggNmI3OWY5NDVmMzYxOTdkMzNhNmYyZWE1NTU1 ODczYTA1NTRhYzc3Zi4uMTJhM2M0Y2NmNjc1Y2NkNTQwOTdiYzU4YjkxMDUyOTdhMjljM2EwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1T dHJhdGVnaWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJQ bGF0Zm9ybVN0cmF0ZWdpZXMuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiV2ViUGxh dGZvcm1TdHJhdGVnaWVzLmgiCiAKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgotI2luY2x1ZGUg IlBsdWdpbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5o IgogI2luY2x1ZGUgIldlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oIgogI2luY2x1ZGUgPFdlYkNv cmUvQmxvYlJlZ2lzdHJ5SW1wbC5oPgpAQCAtNjYsNyArNjUsNyBAQCBQYXN0ZWJvYXJkU3RyYXRl Z3kqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRlUGFzdGVib2FyZFN0cmF0ZWd5KCkKIAog UGx1Z2luU3RyYXRlZ3kqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRlUGx1Z2luU3RyYXRl Z3koKQogewotICAgIHJldHVybiB0aGlzOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBCbG9i UmVnaXN0cnkqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRlQmxvYlJlZ2lzdHJ5KCkKQEAg LTExNCw0NiArMTEzLDMgQEAgdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OmFkZENvb2tpZShj b25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnMKIHsKICAgICBXZWJDb3Jl OjphZGRDb29raWUoc2Vzc2lvbiwgdXJsLCBjb29raWUpOwogfQotCi12b2lkIFdlYlBsYXRmb3Jt U3RyYXRlZ2llczo6cmVmcmVzaFBsdWdpbnMoKQotewotICAgIFBsdWdpbkRhdGFiYXNlOjppbnN0 YWxsZWRQbHVnaW5zKCktPnJlZnJlc2goKTsKLX0KLQotdm9pZCBXZWJQbGF0Zm9ybVN0cmF0ZWdp ZXM6OmdldFBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6UGFnZSosIFZlY3RvcjxXZWJDb3JlOjpQ bHVnaW5JbmZvPiYgb3V0UGx1Z2lucykKLXsKLSAgICBjb25zdCBWZWN0b3I8UGx1Z2luUGFja2Fn ZSo+JiBwbHVnaW5zID0gUGx1Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+cGx1Z2lu cygpOwotCi0gICAgb3V0UGx1Z2lucy5yZXNpemUocGx1Z2lucy5zaXplKCkpOwotCi0gICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBwbHVnaW5zLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIFBsdWdp blBhY2thZ2UqIHBhY2thZ2UgPSBwbHVnaW5zW2ldOwotCi0gICAgICAgIFBsdWdpbkluZm8gaW5m bzsKLSAgICAgICAgaW5mby5uYW1lID0gcGFja2FnZS0+bmFtZSgpOwotICAgICAgICBpbmZvLmZp bGUgPSBwYWNrYWdlLT5maWxlTmFtZSgpOwotICAgICAgICBpbmZvLmRlc2MgPSBwYWNrYWdlLT5k ZXNjcmlwdGlvbigpOwotCi0gICAgICAgIGNvbnN0IE1JTUVUb0Rlc2NyaXB0aW9uc01hcCYgbWlt ZVRvRGVzY3JpcHRpb25zID0gcGFja2FnZS0+bWltZVRvRGVzY3JpcHRpb25zKCk7Ci0KLSAgICAg ICAgaW5mby5taW1lcy5yZXNlcnZlQ2FwYWNpdHkobWltZVRvRGVzY3JpcHRpb25zLnNpemUoKSk7 Ci0KLSAgICAgICAgTUlNRVRvRGVzY3JpcHRpb25zTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBt aW1lVG9EZXNjcmlwdGlvbnMuZW5kKCk7Ci0gICAgICAgIGZvciAoTUlNRVRvRGVzY3JpcHRpb25z TWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1pbWVUb0Rlc2NyaXB0aW9ucy5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKLSAgICAgICAgICAgIE1pbWVDbGFzc0luZm8gbWltZTsKLQotICAgICAg ICAgICAgbWltZS50eXBlID0gaXQtPmtleTsKLSAgICAgICAgICAgIG1pbWUuZGVzYyA9IGl0LT52 YWx1ZTsKLSAgICAgICAgICAgIG1pbWUuZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1pbWVUb0V4dGVu c2lvbnMoKS5nZXQobWltZS50eXBlKTsKLQotICAgICAgICAgICAgaW5mby5taW1lcy5hcHBlbmQo bWltZSk7Ci0gICAgICAgIH0KLQotICAgICAgICBvdXRQbHVnaW5zW2ldID0gaW5mbzsKLSAgICB9 Ci19Ci0KLXZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpnZXRXZWJWaXNpYmxlUGx1Z2luSW5m byhjb25zdCBQYWdlKiBwYWdlLCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMpCi17Ci0gICAg Z2V0UGx1Z2luSW5mbyhwYWdlLCBwbHVnaW5zKTsKLX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5oIGIvU291cmNlL1dl YktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgKaW5kZXggNzcy NzA1MDIwYmJiNWU3MjliZTRhN2U5ZDQxY2JkNDNiZTQ3NDBiYS4uMTJhODhkZTFmNmEyYTE0Nzk0 MzAwMDFmODVhZTJhYTE0MmNiZDU3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgKKysrIGIvU291cmNlL1dlYktpdC93 aW4vV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgKQEAgLTI5LDkgKzI5LDgg QEAKICNpbmNsdWRlIDxXZWJDb3JlL0Nvb2tpZXNTdHJhdGVneS5oPgogI2luY2x1ZGUgPFdlYkNv cmUvTG9hZGVyU3RyYXRlZ3kuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtU3RyYXRlZ2ll cy5oPgotI2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2luU3RyYXRlZ3kuaD4KIAotY2xhc3MgV2ViUGxh dGZvcm1TdHJhdGVnaWVzIDogcHVibGljIFdlYkNvcmU6OlBsYXRmb3JtU3RyYXRlZ2llcywgcHJp dmF0ZSBXZWJDb3JlOjpDb29raWVzU3RyYXRlZ3ksIHByaXZhdGUgV2ViQ29yZTo6UGx1Z2luU3Ry YXRlZ3kgeworY2xhc3MgV2ViUGxhdGZvcm1TdHJhdGVnaWVzIDogcHVibGljIFdlYkNvcmU6OlBs YXRmb3JtU3RyYXRlZ2llcywgcHJpdmF0ZSBXZWJDb3JlOjpDb29raWVzU3RyYXRlZ3kgewogcHVi bGljOgogICAgIHN0YXRpYyB2b2lkIGluaXRpYWxpemUoKTsKICAgICAKQEAgLTU0LDExICs1Myw2 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGdldFJhd0Nvb2tpZXMoY29uc3QgV2ViQ29y ZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uJiwgY29uc3QgV2ViQ29yZTo6VVJMJiBmaXJzdFBhcnR5 LCBjb25zdCBXZWJDb3JlOjpVUkwmLCBWZWN0b3I8V2ViQ29yZTo6Q29va2llPiYpOwogICAgIHZp cnR1YWwgdm9pZCBkZWxldGVDb29raWUoY29uc3QgV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNz aW9uJiwgY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3RyaW5nJik7CiAgICAgdmlydHVhbCB2 b2lkIGFkZENvb2tpZShjb25zdCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mLCBjb25z dCBXZWJDb3JlOjpVUkwmLCBjb25zdCBXZWJDb3JlOjpDb29raWUmKTsKLQotICAgIC8vIFdlYkNv cmU6OlBsdWdpblN0cmF0ZWd5Ci0gICAgdmlydHVhbCB2b2lkIHJlZnJlc2hQbHVnaW5zKCk7Ci0g ICAgdmlydHVhbCB2b2lkIGdldFBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6UGFnZSosIFZlY3Rv cjxXZWJDb3JlOjpQbHVnaW5JbmZvPiYpOwotICAgIHZpcnR1YWwgdm9pZCBnZXRXZWJWaXNpYmxl UGx1Z2luSW5mbyhjb25zdCBXZWJDb3JlOjpQYWdlKiwgVmVjdG9yPFdlYkNvcmU6OlBsdWdpbklu Zm8+Jik7CiB9OwogCiAjZW5kaWYgLy8gV2ViUGxhdGZvcm1TdHJhdGVnaWVzX2gKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYlBsdWdpbkluZm9Qcm92aWRl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJQbHVnaW5JbmZvUHJv dmlkZXIuY3BwCmluZGV4IGE3ZjcyZGI0NWNhOGU0NGE2NzhlZjlhYzM1OGQ4NzE3NGNlNTBiOTAu LjJmNmU5YTcwMjk4M2QyZTcyMjQ3NmE1MDc3MzI2ZGY1ZDc2YzI2ZTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYlBsdWdpbkluZm9Qcm92aWRlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViUGx1Z2luSW5mb1Byb3Zp ZGVyLmNwcApAQCAtMjUsOSArMjUsNyBAQAogCiAjaW5jbHVkZSAiV2ViUGx1Z2luSW5mb1Byb3Zp ZGVyLmgiCiAKLS8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgY2FsbCBvdXQgdG8gdGhlIHBsYXRmb3Jt IHN0cmF0ZWd5IGZvciB0aGlzLgotI2luY2x1ZGUgIldlYlBsYXRmb3JtU3RyYXRlZ2llcy5oIgot I2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2luU3RyYXRlZ3kuaD4KKyNpbmNsdWRlICJQbHVnaW5EYXRh YmFzZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNDgsMTUgKzQ2LDQzIEBA IFdlYlBsdWdpbkluZm9Qcm92aWRlcjo6fldlYlBsdWdpbkluZm9Qcm92aWRlcigpCiAKIHZvaWQg V2ViUGx1Z2luSW5mb1Byb3ZpZGVyOjpyZWZyZXNoUGx1Z2lucygpCiB7Ci0gICAgcGxhdGZvcm1T dHJhdGVnaWVzKCktPnBsdWdpblN0cmF0ZWd5KCktPnJlZnJlc2hQbHVnaW5zKCk7CisgICAgUGx1 Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+cmVmcmVzaCgpOwogfQogCi12b2lkIFdl YlBsdWdpbkluZm9Qcm92aWRlcjo6Z2V0UGx1Z2luSW5mbyhXZWJDb3JlOjpQYWdlJiBwYWdlLCBW ZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMpCit2b2lkIFdlYlBsdWdpbkluZm9Q cm92aWRlcjo6Z2V0UGx1Z2luSW5mbyhXZWJDb3JlOjpQYWdlJiBwYWdlLCBWZWN0b3I8V2ViQ29y ZTo6UGx1Z2luSW5mbz4mIG91dFBsdWdpbnMpCiB7Ci0gICAgcGxhdGZvcm1TdHJhdGVnaWVzKCkt PnBsdWdpblN0cmF0ZWd5KCktPmdldFBsdWdpbkluZm8oJnBhZ2UsIHBsdWdpbnMpOworICAgIGNv bnN0IFZlY3RvcjxQbHVnaW5QYWNrYWdlKj4mIHBsdWdpbnMgPSBQbHVnaW5EYXRhYmFzZTo6aW5z dGFsbGVkUGx1Z2lucygpLT5wbHVnaW5zKCk7CisKKyAgICBvdXRQbHVnaW5zLnJlc2l6ZShwbHVn aW5zLnNpemUoKSk7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBsdWdpbnMuc2l6ZSgp OyArK2kpIHsKKyAgICAgICAgUGx1Z2luUGFja2FnZSogcGFja2FnZSA9IHBsdWdpbnNbaV07CisK KyAgICAgICAgUGx1Z2luSW5mbyBpbmZvOworICAgICAgICBpbmZvLm5hbWUgPSBwYWNrYWdlLT5u YW1lKCk7CisgICAgICAgIGluZm8uZmlsZSA9IHBhY2thZ2UtPmZpbGVOYW1lKCk7CisgICAgICAg IGluZm8uZGVzYyA9IHBhY2thZ2UtPmRlc2NyaXB0aW9uKCk7CisKKyAgICAgICAgY29uc3QgTUlN RVRvRGVzY3JpcHRpb25zTWFwJiBtaW1lVG9EZXNjcmlwdGlvbnMgPSBwYWNrYWdlLT5taW1lVG9E ZXNjcmlwdGlvbnMoKTsKKworICAgICAgICBpbmZvLm1pbWVzLnJlc2VydmVDYXBhY2l0eShtaW1l VG9EZXNjcmlwdGlvbnMuc2l6ZSgpKTsKKworICAgICAgICBNSU1FVG9EZXNjcmlwdGlvbnNNYXA6 OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1pbWVUb0Rlc2NyaXB0aW9ucy5lbmQoKTsKKyAgICAgICAg Zm9yIChNSU1FVG9EZXNjcmlwdGlvbnNNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbWltZVRvRGVz Y3JpcHRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICAgICAgTWltZUNs YXNzSW5mbyBtaW1lOworCisgICAgICAgICAgICBtaW1lLnR5cGUgPSBpdC0+a2V5OworICAgICAg ICAgICAgbWltZS5kZXNjID0gaXQtPnZhbHVlOworICAgICAgICAgICAgbWltZS5leHRlbnNpb25z ID0gcGFja2FnZS0+bWltZVRvRXh0ZW5zaW9ucygpLmdldChtaW1lLnR5cGUpOworCisgICAgICAg ICAgICBpbmZvLm1pbWVzLmFwcGVuZChtaW1lKTsKKyAgICAgICAgfQorCisgICAgICAgIG91dFBs dWdpbnNbaV0gPSBpbmZvOworICAgIH0KIH0KIAogdm9pZCBXZWJQbHVnaW5JbmZvUHJvdmlkZXI6 OmdldFdlYlZpc2libGVQbHVnaW5JbmZvKFdlYkNvcmU6OlBhZ2UmIHBhZ2UsIFZlY3RvcjxXZWJD b3JlOjpQbHVnaW5JbmZvPiYgcGx1Z2lucykKIHsKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+ cGx1Z2luU3RyYXRlZ3koKS0+Z2V0V2ViVmlzaWJsZVBsdWdpbkluZm8oJnBhZ2UsIHBsdWdpbnMp OworICAgIGdldFBsdWdpbkluZm8ocGFnZSwgcGx1Z2lucyk7CiB9Cg==