210460 2020-04-13 15:29:00 -0700 Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for non-Cocoa platforms 2020-04-13 22:32:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 210479 210438 1 simon.fraser simon.fraser benjamin cdumez cmarcelo darin esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan mifenton mmaxfield pdr simon.fraser thorton webkit-bug-importer oldest_to_newest 1641139 0 simon.fraser 2020-04-13 15:29:00 -0700 Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for non-Cocoa platforms 1641142 1 396343 simon.fraser 2020-04-13 15:30:20 -0700 Created attachment 396343 Patch 1641198 2 simon.fraser 2020-04-13 17:47:34 -0700 https://trac.webkit.org/changeset/260052/webkit 1641199 3 webkit-bug-importer 2020-04-13 17:48:15 -0700 <rdar://problem/61748309> 1641228 4 simon.fraser 2020-04-13 20:13:53 -0700 This fix wasn't complete. 1641229 5 396374 simon.fraser 2020-04-13 20:15:25 -0700 Created attachment 396374 Patch 1641238 6 396374 darin 2020-04-13 20:45:44 -0700 Comment on attachment 396374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396374&action=review > Source/WTF/wtf/PlatformEnable.h:840 > -#if !defined(ENABLE_CUSTOM_SCROLLBARS) > +#if !defined(ENABLE_CUSTOM_SCROLLBARS) && !PLATFORM(COCOA) > #define ENABLE_CUSTOM_SCROLLBARS 1 > #endif This should be fixed in PlatformEnableCocoa.h instead, like this: #if !defined(ENABLE_CUSTOM_SCROLLBARS) && !PLATFORM(MAC) #define ENABLE_CUSTOM_SCROLLBARS 0 #endif PlatformEnableCocoa.h doesn't ever have to set it to 1. 1641241 7 396378 simon.fraser 2020-04-13 21:02:36 -0700 Created attachment 396378 Patch 1641257 8 simon.fraser 2020-04-13 22:32:05 -0700 Rolling out the first patch via bug 210479. I don't have time to address the iOS WK2 failures at present, will postpone this. 396343 2020-04-13 15:30:20 -0700 2020-04-13 20:15:23 -0700 Patch bug-210460-20200413153019.patch text/plain 20244 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIwNmI4ZjkyNzVhNmQ0ZDdiYmNkY2M4 ODE4ZGNkMWQwZTE3ZWMwNzEuLjhlODFmNGY3NmQxZWZiMDYyYzRkODFiYTUzZGNmY2E0ZmFhMGYw MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDQtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEVOQUJMRV9DVVNUT01fU0NST0xMQkFS UyBhbmQgZGVmaW5lIGl0IGZvciBtYWNPUyBhbmQgZm9yIG5vbi1Db2NvYSBwbGF0Zm9ybXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDQ2MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlZmluZSBFTkFC TEVfQ1VTVE9NX1NDUk9MTEJBUlMgZm9yIFBMQVRGT1JNKE1BQykgYW5kIG90aGVyIG5vbi1Db2Nv YSBwbGF0Zm9ybXMuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1FbmFibGUuaDoKKyAgICAgICAg KiB3dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oOgorCiAyMDIwLTA0LTEyICBNYXJrIExhbSAgPG1h cmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgdGhlIGFiaWxpdHkgdG8gYnVpbGQg dGhlIEFTTSBMTEludCBmb3IgQVJNdjdrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDI1ZTM1ZTA4YjQwNDQ2NGM2 ZjkyNDY5MDNkZWEwZDEzODQ4ZDRmYzguLjM5YjhmOGVkNmE4ZjhjNmIyY2QxNzk5Zjc5YzAxMjk0 NmRkZWEwMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAyMC0wNC0xMyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgRU5BQkxFX0NV U1RPTV9TQ1JPTExCQVJTIGFuZCBkZWZpbmUgaXQgZm9yIG1hY09TIGFuZCBmb3Igbm9uLUNvY29h IHBsYXRmb3JtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEwNDYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV3JhcCBhbGwgY3VzdG9tIHNjcm9sbGJhciBhbmQgY3VzdG9tIHNjcm9sbCBjb3JuZXIgY29k ZSBpbiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpLgorCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpjcmVhdGVTY3JvbGxiYXIpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVTY3JvbGxDb3JuZXIpOgorICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjcmVhdGVTY3JvbGxiYXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyBjb25zdCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFy KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwOgorICAgICAgICAoUmVu ZGVyTWVudUxpc3Q6OmNyZWF0ZVNjcm9sbGJhcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbnRhaW5pbmdC bG9jayBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJTY3JvbGxiYXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyUGFy dC5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclBhcnQuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyVGhlbWUuY3BwOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJTY3JvbGxiYXJUaGVtZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJT ZWFyY2hGaWVsZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTZWFyY2hGaWVsZDo6Y3Jl YXRlU2Nyb2xsYmFyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lLmNwcDoKKyAgICAgICAgKiBzdHlsZS9TdHlsZVJlc29sdmVyLmNwcDoKKwogMjAyMC0w NC0xMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEs0XSBGaXggdXNhZ2Ugb2YgR0RLIGV2ZW50IGZ1bmN0aW9ucyBpbiBQbGF0Zm9ybVdo ZWVsRXZlbnRHdGsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5oCmluZGV4IDA2YTE3NTdmNmVjNjc1ZjA5 NjhiNGYwZGYxYzAwZDNjYWY5OWU2MzcuLmU5ZjcwYWVmNjBiODRmOTQwNmIyM2Y3NmMzMDE0YTlk ZDZlNmFiOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgKKysr IGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGUuaApAQCAtODM1LDYgKzgzNSwxMCBAQAog I2VuZGlmCiAjZW5kaWYKIAorI2lmICFkZWZpbmVkKEVOQUJMRV9DVVNUT01fU0NST0xMQkFSUykK KyNkZWZpbmUgRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTIDEKKyNlbmRpZgorCiAvKiBUaGlzIGZl YXR1cmUgd29ya3MgYnkgZW1iZWRkaW5nIHRoZSBPcGNvZGVJRCBpbiB0aGUgMzIgYml0IGp1c3Qg YmVmb3JlIHRoZSBnZW5lcmF0ZWQgTExpbnQgY29kZQogICAgdGhhdCBleGVjdXRlcyBlYWNoIG9w Y29kZS4gSXQgY2Fubm90IGJlIHN1cHBvcnRlZCBieSB0aGUgQ0xvb3Agc2luY2UgdGhlcmUncyBu byB3YXkgdG8gZW1iZWQgdGhlCiAgICBPcGNvZGVJRCB3b3JkIGluIHRoZSBDTG9vcCdzIHN3aXRj aCBzdGF0ZW1lbnQgY2FzZXMuIEl0IGlzIGFsc28gY3VycmVudGx5IG5vdCBpbXBsZW1lbnRlZCBm b3IgTVNWQy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2Eu aCBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCA2YTNhNTE3NDQw NjdmYzJiODBmZDQ5ZGJlMTM5M2YzMjg1YjBiNGNjLi4wMTI4NDI5N2VlMjk3MzVhMGQyMjVhODY2 M2VmMGZkZGViNjhlYmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJs ZUNvY29hLmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0y MTEsNiArMjExLDEwIEBACiAjZGVmaW5lIEVOQUJMRV9BU1lOQ19TQ1JPTExJTkcgMQogI2VuZGlm CiAKKyNpZiAhZGVmaW5lZChFTkFCTEVfQ1VTVE9NX1NDUk9MTEJBUlMpICYmIFBMQVRGT1JNKE1B QykKKyNkZWZpbmUgRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTIDEKKyNlbmRpZgorCiAjaWYgIWRl ZmluZWQoRU5BQkxFX1NDUk9MTElOR19USFJFQUQpICYmIFBMQVRGT1JNKE1BQykKICNkZWZpbmUg RU5BQkxFX1NDUk9MTElOR19USFJFQUQgMQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKaW5kZXggZDU0NjRhMzdlYzUyZDQ2NjcxM2RkZDA4M2EyY2FhMDQwMmEwZDJiMS4uZDM3YmY5 Y2NhOWQxYjllOGM4YzQxZWVkNzM0NzE4YjA3YTk4MmU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcApAQCAtNTU0LDYgKzU1NCw3IEBAIFJlZlB0cjxFbGVtZW50PiBGcmFtZVZpZXc6OnJv b3RFbGVtZW50Rm9yQ3VzdG9tU2Nyb2xsYmFyUGFydFN0eWxlKFBzZXVkb0lkIHBhcnRQCiAKIFJl ZjxTY3JvbGxiYXI+IEZyYW1lVmlldzo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0 aW9uIG9yaWVudGF0aW9uKQogeworI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICBp ZiAoYXV0byBlbGVtZW50ID0gcm9vdEVsZW1lbnRGb3JDdXN0b21TY3JvbGxiYXJQYXJ0U3R5bGUo UHNldWRvSWQ6OlNjcm9sbGJhcikpCiAgICAgICAgIHJldHVybiBSZW5kZXJTY3JvbGxiYXI6OmNy ZWF0ZUN1c3RvbVNjcm9sbGJhcigqdGhpcywgb3JpZW50YXRpb24sIGVsZW1lbnQuZ2V0KCkpOwog ICAgIApAQCAtNTYyLDYgKzU2Myw3IEBAIFJlZjxTY3JvbGxiYXI+IEZyYW1lVmlldzo6Y3JlYXRl U2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogICAgIFJlbmRlcldp ZGdldCogZnJhbWVSZW5kZXJlciA9IGZyYW1lKCkub3duZXJSZW5kZXJlcigpOwogICAgIGlmIChm cmFtZVJlbmRlcmVyICYmIGZyYW1lUmVuZGVyZXItPnN0eWxlKCkuaGFzUHNldWRvU3R5bGUoUHNl dWRvSWQ6OlNjcm9sbGJhcikpCiAgICAgICAgIHJldHVybiBSZW5kZXJTY3JvbGxiYXI6OmNyZWF0 ZUN1c3RvbVNjcm9sbGJhcigqdGhpcywgb3JpZW50YXRpb24sIG51bGxwdHIsICZmcmFtZSgpKTsK KyNlbmRpZgogCiAgICAgLy8gTm9ib2R5IHNldCBhIGN1c3RvbSBzdHlsZSwgc28gd2UganVzdCB1 c2UgYSBuYXRpdmUgc2Nyb2xsYmFyLgogICAgIHJldHVybiBTY3JvbGxWaWV3OjpjcmVhdGVTY3Jv bGxiYXIob3JpZW50YXRpb24pOwpAQCAtMzk0OSw2ICszOTUxLDcgQEAgYm9vbCBGcmFtZVZpZXc6 OnNjcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0CiAKIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVT Y3JvbGxDb3JuZXIoKQogeworI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICBSZW5k ZXJFbGVtZW50KiByZW5kZXJlciA9IG51bGxwdHI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRl clN0eWxlPiBjb3JuZXJTdHlsZTsKICAgICBJbnRSZWN0IGNvcm5lclJlY3QgPSBzY3JvbGxDb3Ju ZXJSZWN0KCk7CkBAIC0zOTg5LDYgKzM5OTIsNyBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlU2Ny b2xsQ29ybmVyKCkKICAgICAgICAgICAgIG1fc2Nyb2xsQ29ybmVyLT5zZXRTdHlsZShXVEZNb3Zl KCpjb3JuZXJTdHlsZSkpOwogICAgICAgICBpbnZhbGlkYXRlU2Nyb2xsQ29ybmVyKGNvcm5lclJl Y3QpOwogICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIEZyYW1lVmlldzo6cGFpbnRTY3JvbGxDb3Ju ZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBjb3JuZXJSZWN0KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMGEwZDBhMjAzYWRmZjJhZTJiZTU2ZDI0ZDBiYmY0 ZTExZDdmMzI3My4uMjQ2ZTA1MzU4ZjRkOTY2YWRmYzNlZDAwMWViOTAzYjM5NDAwMjJkZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC01MDIsNyArNTAyLDkgQEAgcHVibGljOgogICAgIFdF QkNPUkVfRVhQT1JUIEZsb2F0UmVjdCBjbGllbnRUb0xheW91dFZpZXdwb3J0UmVjdChGbG9hdFJl Y3QpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIEZsb2F0UG9pbnQgY2xpZW50VG9MYXlvdXRW aWV3cG9ydFBvaW50KEZsb2F0UG9pbnQpIGNvbnN0OwogCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JP TExCQVJTKQogICAgIGJvb2wgaXNGcmFtZVZpZXdTY3JvbGxDb3JuZXIoY29uc3QgUmVuZGVyU2Ny b2xsYmFyUGFydCYgc2Nyb2xsQ29ybmVyKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbENvcm5lci5n ZXQoKSA9PSAmc2Nyb2xsQ29ybmVyOyB9CisjZW5kaWYKIAogICAgIC8vIGlzU2Nyb2xsYWJsZSgp IHRha2VzIGFuIG9wdGlvbmFsIFNjcm9sbGFiaWxpdHkgcGFyYW1ldGVyIHRoYXQgYWxsb3dzIHRo ZSBjYWxsZXIgdG8gZGVmaW5lIHdoYXQgdGhleSBtZWFuIGJ5ICdzY3JvbGxhYmxlLicKICAgICAv LyBNb3N0IGNhbGxlcnMgYXJlIGludGVyZXN0ZWQgaW4gdGhlIGRlZmF1bHQgdmFsdWUsIFNjcm9s bGFiaWxpdHk6OlNjcm9sbGFibGUsIHdoaWNoIG1lYW5zIHRoYXQgdGhlcmUgaXMgYWN0dWFsbHkg Y29udGVudApAQCAtODQxLDggKzg0MywxMCBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxDb250YWlu ZXJOb2RlPiBtX21haW50YWluU2Nyb2xsUG9zaXRpb25BbmNob3I7CiAgICAgUmVmUHRyPE5vZGU+ IG1fbm9kZVRvRHJhdzsKIAorI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICAvLyBS ZW5kZXJlciB0byBob2xkIG91ciBjdXN0b20gc2Nyb2xsIGNvcm5lci4KICAgICBSZW5kZXJQdHI8 UmVuZGVyU2Nyb2xsYmFyUGFydD4gbV9zY3JvbGxDb3JuZXI7CisjZW5kaWYKIAogICAgIFRpbWVy IG1fdXBkYXRlRW1iZWRkZWRPYmplY3RzVGltZXI7CiAgICAgVGltZXIgbV91cGRhdGVXaWRnZXRQ b3NpdGlvbnNUaW1lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmlu ZGV4IDg0YTI5YTRiYTY2MzIwZGY4MjI5YTY0Y2QzZTIxMDQzNmQzNjE2ZGEuLjE1ZTgxMDUzMjEz Njc4NWJjNTVhODBmYWZjOGNjYmI1MmUwNzk2OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcApAQCAtMzQ4OSwxMSArMzQ4OSwxNCBAQCBSZWY8U2Nyb2xsYmFyPiBS ZW5kZXJMYXllcjo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0 aW9uKQogewogICAgIFJlZlB0cjxTY3JvbGxiYXI+IHdpZGdldDsKICAgICBBU1NFUlQocmVuZGVy ZXJGb3JTY3JvbGxiYXIocmVuZGVyZXIoKSkpOworI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFS UykKICAgICBhdXRvJiBhY3R1YWxSZW5kZXJlciA9ICpyZW5kZXJlckZvclNjcm9sbGJhcihyZW5k ZXJlcigpKTsKICAgICBib29sIGhhc0N1c3RvbVNjcm9sbGJhclN0eWxlID0gaXM8UmVuZGVyQm94 PihhY3R1YWxSZW5kZXJlcikgJiYgZG93bmNhc3Q8UmVuZGVyQm94PihhY3R1YWxSZW5kZXJlciku c3R5bGUoKS5oYXNQc2V1ZG9TdHlsZShQc2V1ZG9JZDo6U2Nyb2xsYmFyKTsKICAgICBpZiAoaGFz Q3VzdG9tU2Nyb2xsYmFyU3R5bGUpCiAgICAgICAgIHdpZGdldCA9IFJlbmRlclNjcm9sbGJhcjo6 Y3JlYXRlQ3VzdG9tU2Nyb2xsYmFyKCp0aGlzLCBvcmllbnRhdGlvbiwgZG93bmNhc3Q8UmVuZGVy Qm94PihhY3R1YWxSZW5kZXJlcikuZWxlbWVudCgpKTsKLSAgICBlbHNlIHsKKyAgICBlbHNlCisj ZW5kaWYKKyAgICB7CiAgICAgICAgIHdpZGdldCA9IFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Ny b2xsYmFyKCp0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9sbGJhcik7CiAgICAgICAgIGRp ZEFkZFNjcm9sbGJhcih3aWRnZXQuZ2V0KCksIG9yaWVudGF0aW9uKTsKICAgICAgICAgaWYgKHBh Z2UoKS5pc01vbml0b3JpbmdXaGVlbEV2ZW50cygpKQpAQCAtNjgxMSw2ICs2ODE0LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQoYm9vbCBoYXNPdmVyZmxvdykK IAogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsQ29ybmVyU3R5bGUoKQogeworI2lmIEVO QUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICBSZW5kZXJFbGVtZW50KiBhY3R1YWxSZW5kZXJl ciA9IHJlbmRlcmVyRm9yU2Nyb2xsYmFyKHJlbmRlcmVyKCkpOwogICAgIGF1dG8gY29ybmVyID0g cmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSA/IGFjdHVhbFJlbmRlcmVyLT5nZXRVbmNhY2hl ZFBzZXVkb1N0eWxlKHsgUHNldWRvSWQ6OlNjcm9sbGJhckNvcm5lciB9LCAmYWN0dWFsUmVuZGVy ZXItPnN0eWxlKCkpIDogbnVsbHB0cjsKIApAQCAtNjgyNiwxOCArNjgzMCwyMyBAQCB2b2lkIFJl bmRlckxheWVyOjp1cGRhdGVTY3JvbGxDb3JuZXJTdHlsZSgpCiAgICAgICAgIG1fc2Nyb2xsQ29y bmVyLT5pbml0aWFsaXplU3R5bGUoKTsKICAgICB9IGVsc2UKICAgICAgICAgbV9zY3JvbGxDb3Ju ZXItPnNldFN0eWxlKFdURk1vdmUoKmNvcm5lcikpOworI2VuZGlmCiB9CiAKIHZvaWQgUmVuZGVy TGF5ZXI6OmNsZWFyU2Nyb2xsQ29ybmVyKCkKIHsKKyNpZiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJB UlMpCiAgICAgaWYgKCFtX3Njcm9sbENvcm5lcikKICAgICAgICAgcmV0dXJuOwogICAgIG1fc2Ny b2xsQ29ybmVyLT5zZXRQYXJlbnQobnVsbHB0cik7CiAgICAgbV9zY3JvbGxDb3JuZXIgPSBudWxs cHRyOworI2VuZGlmCisKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUmVzaXplclN0eWxl KCkKIHsKKyNpZiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCiAgICAgUmVuZGVyRWxlbWVudCog YWN0dWFsUmVuZGVyZXIgPSByZW5kZXJlckZvclNjcm9sbGJhcihyZW5kZXJlcigpKTsKICAgICBh dXRvIHJlc2l6ZXIgPSByZW5kZXJlcigpLmhhc092ZXJmbG93Q2xpcCgpID8gYWN0dWFsUmVuZGVy ZXItPmdldFVuY2FjaGVkUHNldWRvU3R5bGUoeyBQc2V1ZG9JZDo6UmVzaXplciB9LCAmYWN0dWFs UmVuZGVyZXItPnN0eWxlKCkpIDogbnVsbHB0cjsKIApAQCAtNjg1MywxNCArNjg2MiwxNyBAQCB2 b2lkIFJlbmRlckxheWVyOjp1cGRhdGVSZXNpemVyU3R5bGUoKQogICAgICAgICBtX3Jlc2l6ZXIt PmluaXRpYWxpemVTdHlsZSgpOwogICAgIH0gZWxzZQogICAgICAgICBtX3Jlc2l6ZXItPnNldFN0 eWxlKFdURk1vdmUoKnJlc2l6ZXIpKTsKKyNlbmRpZgogfQogCiB2b2lkIFJlbmRlckxheWVyOjpj bGVhclJlc2l6ZXIoKQogeworI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICBpZiAo IW1fcmVzaXplcikKICAgICAgICAgcmV0dXJuOwogICAgIG1fcmVzaXplci0+c2V0UGFyZW50KG51 bGxwdHIpOwogICAgIG1fcmVzaXplciA9IG51bGxwdHI7CisjZW5kaWYKIH0KIAogUmVuZGVyTGF5 ZXIqIFJlbmRlckxheWVyOjpyZWZsZWN0aW9uTGF5ZXIoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCA3ZWYwMjk3MGFiOThiZTE5NTAzNGU2MjBjMDkyM2Zm YzA2ZThiZjJjLi4xZWI4M2YxMzI0ODE5ZjFhM2RlNWE0YWNhMzA2NzZmOGIwNjhhNTI5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNzcsMTIgKzc3LDE1IEBAIGNs YXNzIFJlbmRlckxheWVyQ29tcG9zaXRvcjsKIGNsYXNzIFJlbmRlckxheWVyRmlsdGVyczsKIGNs YXNzIFJlbmRlck1hcnF1ZWU7CiBjbGFzcyBSZW5kZXJSZXBsaWNhOwotY2xhc3MgUmVuZGVyU2Ny b2xsYmFyUGFydDsKIGNsYXNzIFJlbmRlclN0eWxlOwogY2xhc3MgUmVuZGVyVmlldzsKIGNsYXNz IFNjcm9sbGJhcjsKIGNsYXNzIFRyYW5zZm9ybWF0aW9uTWF0cml4OwogCisjaWYgRU5BQkxFKENV U1RPTV9TQ1JPTExCQVJTKQorY2xhc3MgUmVuZGVyU2Nyb2xsYmFyUGFydDsKKyNlbmRpZgorCiBl bnVtIEJvcmRlclJhZGl1c0NsaXBwaW5nUnVsZSB7IEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVz LCBEb05vdEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzIH07CiBlbnVtIEluY2x1ZGVTZWxmT3JO b3QgeyBJbmNsdWRlU2VsZiwgRXhjbHVkZVNlbGYgfTsKIGVudW0gQ3Jvc3NGcmFtZUJvdW5kYXJp ZXMgeyBObywgWWVzIH07CkBAIC0xMzUwLDkgKzEzNTMsMTEgQEAgcHJpdmF0ZToKICAgICAvLyBN YXkgdWx0aW1hdGVseSBiZSBleHRlbmRlZCB0byBtYW55IHJlcGxpY2FzICh3aXRoIHRoZWlyIG93 biBwYWludCBvcmRlcikuCiAgICAgUmVuZGVyUHRyPFJlbmRlclJlcGxpY2E+IG1fcmVmbGVjdGlv bjsKIAorI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICAvLyBSZW5kZXJlcnMgdG8g aG9sZCBvdXIgY3VzdG9tIHNjcm9sbCBjb3JuZXIgYW5kIHJlc2l6ZXIuCiAgICAgUmVuZGVyUHRy PFJlbmRlclNjcm9sbGJhclBhcnQ+IG1fc2Nyb2xsQ29ybmVyOwogICAgIFJlbmRlclB0cjxSZW5k ZXJTY3JvbGxiYXJQYXJ0PiBtX3Jlc2l6ZXI7CisjZW5kaWYKIAogICAgIC8vIFBvaW50ZXIgdG8g dGhlIGVuY2xvc2luZyBSZW5kZXJMYXllciB0aGF0IGNhdXNlZCB1cyB0byBiZSBwYWdpbmF0ZWQu IEl0IGlzIDAgaWYgd2UgYXJlIG5vdCBwYWdpbmF0ZWQuCiAgICAgV2Vha1B0cjxSZW5kZXJMYXll cj4gbV9lbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDJkM2I3NTMxMjJlNmMxZWM3 ZTc4MjJkNWUxNzBiNmNjOTY3OWY2OTQuLjZkYTQ4NDJhYTQwNmFlMjQ1NGM0OGZkMTM4NDhkZWM3 ZDFmNDkxMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCkBAIC03Niw3ICs3Niw2IEBACiAKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogI2luY2x1ZGUgIkxlZ2FjeVRpbGVDYWNoZS5oIgotI2luY2x1ZGUgIlJlbmRlclNjcm9s bGJhci5oIgogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKaW5kZXggMzQxZTg4MWQyYmNjYzE0Mzk3NDNjNzA5MDc4 YTY5OWI2NWYzNDUyYy4uOTUyZTExM2IyNzk2ZjQ0NmNkOGUwNDEwYjIxMzg4NDBjNTFkMzdlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcApAQCAtOTE4LDEw ICs5MTgsMTMgQEAgU3RyaW5nIFJlbmRlckxpc3RCb3g6OmRlYnVnRGVzY3JpcHRpb24oKSBjb25z dAogUmVmPFNjcm9sbGJhcj4gUmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKCkKIHsKICAg ICBSZWZQdHI8U2Nyb2xsYmFyPiB3aWRnZXQ7CisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJT KQogICAgIGJvb2wgaGFzQ3VzdG9tU2Nyb2xsYmFyU3R5bGUgPSBzdHlsZSgpLmhhc1BzZXVkb1N0 eWxlKFBzZXVkb0lkOjpTY3JvbGxiYXIpOwogICAgIGlmIChoYXNDdXN0b21TY3JvbGxiYXJTdHls ZSkKICAgICAgICAgd2lkZ2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxi YXIoKnRoaXMsIFZlcnRpY2FsU2Nyb2xsYmFyLCAmc2VsZWN0RWxlbWVudCgpKTsKLSAgICBlbHNl IHsKKyAgICBlbHNlCisjZW5kaWYKKyAgICB7CiAgICAgICAgIHdpZGdldCA9IFNjcm9sbGJhcjo6 Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKCp0aGlzLCBWZXJ0aWNhbFNjcm9sbGJhciwgdGhlbWUoKS5z Y3JvbGxiYXJDb250cm9sU2l6ZUZvclBhcnQoTGlzdGJveFBhcnQpKTsKICAgICAgICAgZGlkQWRk U2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICBpZiAo cGFnZSgpLmlzTW9uaXRvcmluZ1doZWVsRXZlbnRzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lbnVMaXN0LmNwcAppbmRleCA4ZTA5ZWE1YTQ1OWM5NjVhMmNkMzc1MWZhYTcx ZDliY2Q0OGFlZDA5Li40M2E2OGZhOWI1NmNjNzM5ZjRiMTE1M2QzMTZkODk2ZGQzOTc1NjYyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKQEAgLTU2MCw5 ICs1NjAsMTEgQEAgSG9zdFdpbmRvdyogUmVuZGVyTWVudUxpc3Q6Omhvc3RXaW5kb3coKSBjb25z dAogCiBSZWY8U2Nyb2xsYmFyPiBSZW5kZXJNZW51TGlzdDo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9s bGFibGVBcmVhJiBzY3JvbGxhYmxlQXJlYSwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRp b24sIFNjcm9sbGJhckNvbnRyb2xTaXplIGNvbnRyb2xTaXplKQogeworI2lmIEVOQUJMRShDVVNU T01fU0NST0xMQkFSUykKICAgICBib29sIGhhc0N1c3RvbVNjcm9sbGJhclN0eWxlID0gc3R5bGUo KS5oYXNQc2V1ZG9TdHlsZShQc2V1ZG9JZDo6U2Nyb2xsYmFyKTsKICAgICBpZiAoaGFzQ3VzdG9t U2Nyb2xsYmFyU3R5bGUpCiAgICAgICAgIHJldHVybiBSZW5kZXJTY3JvbGxiYXI6OmNyZWF0ZUN1 c3RvbVNjcm9sbGJhcihzY3JvbGxhYmxlQXJlYSwgb3JpZW50YXRpb24sICZzZWxlY3RFbGVtZW50 KCkpOworI2VuZGlmCiAgICAgcmV0dXJuIFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFy KHNjcm9sbGFibGVBcmVhLCBvcmllbnRhdGlvbiwgY29udHJvbFNpemUpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGNkMmI4NGNlNjFhZDNmNWIy YzU2NTQ0NTRiODgzOTg4OWQ4NGI4YTMuLjk4YWU2YmMzOTQwMjIyZDVkODE4MTE3MTA5NmRlNWRh YTdlMmM2NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBA IC02MzIsMTEgKzYzMiwxMyBAQCBSZW5kZXJCbG9jayogUmVuZGVyT2JqZWN0Ojpjb250YWluaW5n QmxvY2soKSBjb25zdAogICAgIGlmIChpczxSZW5kZXJUZXh0PigqdGhpcykpCiAgICAgICAgIHJl dHVybiBjb250YWluaW5nQmxvY2tGb3JPYmplY3RJbkZsb3coKTsKIAorI2lmIEVOQUJMRShDVVNU T01fU0NST0xMQkFSUykKICAgICBpZiAoIXBhcmVudCgpICYmIGlzPFJlbmRlclNjcm9sbGJhclBh cnQ+KCp0aGlzKSkgewogICAgICAgICBpZiAoYXV0byogc2Nyb2xsYmFyUGFydCA9IGRvd25jYXN0 PFJlbmRlclNjcm9sbGJhclBhcnQ+KCp0aGlzKS5yZW5kZXJlck93bmluZ1Njcm9sbGJhcigpKQog ICAgICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9ja0ZvclJlbmRlcmVyKCpzY3JvbGxiYXJQ YXJ0KTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQorI2VuZGlmCiAgICAgcmV0dXJu IGNvbnRhaW5pbmdCbG9ja0ZvclJlbmRlcmVyKGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KCp0aGlz KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCBlYjhi NDJjY2ViNWZlNDRjOGQ0MDA4OWE3MDBkNzgzODYyYzBmOTM2Li5iOTY3ODk1ZTdkYjI0ODY0MDQw ZjI3NmU1ZjVmNDY0MzEyYzY4ODNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oCkBAIC0yNjUsNyArMjY1LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1Jl bmRlck11bHRpQ29sdW1uRmxvdygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVh bCBib29sIGlzUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIoKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfQogCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQogICAgIHZpcnR1 YWwgYm9vbCBpc1JlbmRlclNjcm9sbGJhclBhcnQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQor I2VuZGlmCiAKICAgICBib29sIGlzRG9jdW1lbnRFbGVtZW50UmVuZGVyZXIoKSBjb25zdCB7IHJl dHVybiBkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09ICZtX25vZGU7IH0KICAgICBib29s IGlzQm9keSgpIGNvbnN0IHsgcmV0dXJuIG5vZGUoKSAmJiBub2RlKCktPmhhc1RhZ05hbWUoSFRN TE5hbWVzOjpib2R5VGFnKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclNjcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Ny b2xsYmFyLmNwcAppbmRleCA1ZTM2ZDFhNzYyODlhMWRmN2IwZDJhNDNmMjU2NTc0Mjg1M2EzNmQ2 Li43YzM4NzQ3ZGI2MjQ4NmVlOTY1N2E5MDNjNjdlZGI2NzcyMzAxZGE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcApAQCAtMjYsNiArMjYsOCBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlbmRlclNjcm9sbGJhci5oIgogCisjaWYg RU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQorCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJQYXJ0LmgiCkBAIC0zNjcs MyArMzY5LDYgQEAgYm9vbCBSZW5kZXJTY3JvbGxiYXI6OmlzSGlkZGVuQnlTdHlsZSgpIGNvbnN0 CiB9CiAKIH0KKworI2VuZGlmIC8vIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKKwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5oCmluZGV4IGJhMTcyMzViMTdjNGJm NTU1MTNiNDhhYjE0YTQxZmFjYzczMDk3ZjYuLmE0NjA3MjAwZjQ4NmQ5MzM0OWNkNWQ3Mzg3OTU5 ZmE3NTQ2N2MzMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJT Y3JvbGxiYXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFy LmgKQEAgLTMwLDYgKzMwLDggQEAKICNpbmNsdWRlICJTY3JvbGxiYXIuaCIKICNpbmNsdWRlIDx3 dGYvSGFzaE1hcC5oPgogCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIEZyYW1lOwpAQCAtOTQsMyArOTYsNSBAQCBwcml2YXRlOgog U1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CRUdJTihXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXIpCiAg ICAgc3RhdGljIGJvb2wgaXNUeXBlKGNvbnN0IFdlYkNvcmU6OlNjcm9sbGJhciYgc2Nyb2xsYmFy KSB7IHJldHVybiBzY3JvbGxiYXIuaXNDdXN0b21TY3JvbGxiYXIoKTsgfQogU1BFQ0lBTElaRV9U WVBFX1RSQUlUU19FTkQoKQorCisjZW5kaWYgLy8gRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclBhcnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclBhcnQuY3BwCmlu ZGV4IDkwOTNhZWRhMDg3NDE1ODE3ZTIxMjVhNjIyYjY1YzlmMTNkYzUxNDguLjA2YjdjMGEyMDAy YmU5MjdkODY2YjUzOWRiZTI3NDhkN2M4ZWMwYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXJQYXJ0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyUGFydC5jcHAKQEAgLTI2LDYgKzI2LDggQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJQYXJ0LmgiCiAKKyNpZiBF TkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCisKICNpbmNsdWRlICJQYWludEluZm8uaCIKICNpbmNs dWRlICJSZW5kZXJTY3JvbGxiYXIuaCIKICNpbmNsdWRlICJSZW5kZXJTY3JvbGxiYXJUaGVtZS5o IgpAQCAtMjAxLDMgKzIwMyw0IEBAIFJlbmRlckJveCogUmVuZGVyU2Nyb2xsYmFyUGFydDo6cmVu ZGVyZXJPd25pbmdTY3JvbGxiYXIoKSBjb25zdAogfQogCiB9CisjZW5kaWYgLy8gRU5BQkxFKENV U1RPTV9TQ1JPTExCQVJTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclNjcm9sbGJhclBhcnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3Jv bGxiYXJQYXJ0LmgKaW5kZXggOGY4YjllOTFiNjdiZmY3YTllOTNkMGExMzQ1YWI4YTM4N2MxNmQ1 OC4uNGVmZDljM2E5ZjUyZjUxZTJiNGQ0MzkzZGViM2QzYmY3N2FiOTc3YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclBhcnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyUGFydC5oCkBAIC0yOCw2ICsyOCw4 IEBACiAjaW5jbHVkZSAiUmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJTY3JvbGxUeXBlcy5oIgog CisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IGNsYXNzIFJlbmRlclNjcm9sbGJhcjsKQEAgLTc2LDMgKzc4LDUgQEAgcHJpdmF0ZToKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKIAogU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19SRU5ERVJfT0JKRUNU KFJlbmRlclNjcm9sbGJhclBhcnQsIGlzUmVuZGVyU2Nyb2xsYmFyUGFydCgpKQorCisjZW5kaWYg Ly8gRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJTY3JvbGxiYXJUaGVtZS5jcHAKaW5kZXggMzZiNzFlMzY0YTI0NTdkYWM3NWIz ODA4MDFiZjRkOWM2ZGNkYjAxZS4uM2ZhZjBkMzQ3ZTMyNjkzYjZiMzllYWUwYTc5ZjEyNWE2MWYx NWQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJh clRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFy VGhlbWUuY3BwCkBAIC0yNSw2ICsyNSw5IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJSZW5kZXJTY3JvbGxiYXJUaGVtZS5oIgorCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExC QVJTKQorCiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSA8d3RmL05ldmVy RGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgpAQCAtMTYyLDMgKzE2 NSw1IEBAIHZvaWQgUmVuZGVyU2Nyb2xsYmFyVGhlbWU6OnBhaW50VGlja21hcmtzKEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCwgU2Nyb2xsYmFyJiBzCiB9CiAKIH0KKworI2VuZGlmIC8vIEVOQUJM RShDVVNUT01fU0NST0xMQkFSUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJTY3JvbGxiYXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clNjcm9sbGJhclRoZW1lLmgKaW5kZXggNjFjNzZmODVhMjJjMGUzNTA3NmY2NGFiYzA2ZjExYmYw Y2FmN2I4Yi4uYmJkMWFjOWE5MjYxNGIyMDdhMzkzYjNhMWRjN2NmZDJjYWExOWZlMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclRoZW1lLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhclRoZW1lLmgKQEAgLTI3 LDYgKzI3LDggQEAKIAogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lQ29tcG9zaXRlLmgiCiAKKyNp ZiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xh c3MgUGxhdGZvcm1Nb3VzZUV2ZW50OwpAQCAtODEsMyArODMsNSBAQCBwcm90ZWN0ZWQ6CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBFTkFCTEUoQ1VTVE9NX1NDUk9M TEJBUlMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2VhcmNo RmllbGQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNlYXJjaEZpZWxkLmNw cAppbmRleCA4ZTJkY2IwMzUzZWQ5NGY2MGJkNGM0YWRjZWIzNTNjNjNjNzc3OTQwLi5hNGYwNzlj NjlhN2Q4MGQxOWRkYTVmNjZhZTAwZGE0ZjMyM2U4NDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2VhcmNoRmllbGQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJTZWFyY2hGaWVsZC5jcHAKQEAgLTM1OSw5ICszNTksMTEgQEAgSG9z dFdpbmRvdyogUmVuZGVyU2VhcmNoRmllbGQ6Omhvc3RXaW5kb3coKSBjb25zdAogCiBSZWY8U2Ny b2xsYmFyPiBSZW5kZXJTZWFyY2hGaWVsZDo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVh JiBzY3JvbGxhYmxlQXJlYSwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9s bGJhckNvbnRyb2xTaXplIGNvbnRyb2xTaXplKQogeworI2lmIEVOQUJMRShDVVNUT01fU0NST0xM QkFSUykKICAgICBib29sIGhhc0N1c3RvbVNjcm9sbGJhclN0eWxlID0gc3R5bGUoKS5oYXNQc2V1 ZG9TdHlsZShQc2V1ZG9JZDo6U2Nyb2xsYmFyKTsKICAgICBpZiAoaGFzQ3VzdG9tU2Nyb2xsYmFy U3R5bGUpCiAgICAgICAgIHJldHVybiBSZW5kZXJTY3JvbGxiYXI6OmNyZWF0ZUN1c3RvbVNjcm9s bGJhcihzY3JvbGxhYmxlQXJlYSwgb3JpZW50YXRpb24sICZpbnB1dEVsZW1lbnQoKSk7CisjZW5k aWYKICAgICByZXR1cm4gU2Nyb2xsYmFyOjpjcmVhdGVOYXRpdmVTY3JvbGxiYXIoc2Nyb2xsYWJs ZUFyZWEsIG9yaWVudGF0aW9uLCBjb250cm9sU2l6ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKaW5k ZXggMTY2MDIxNzMwOTU0M2JhYmI1NmFlNjhlZTI4MWE3MzNmZTlkNzVlNi4uZjdlMTFhNWVjZjUx Yjg3ZmY5NDc4MjIxODI0NWE5NTQ4ZDk1ZjNlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKQEAgLTM0LDcg KzM0LDYgQEAKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCiAjaW5jbHVkZSAiTG9jYWxpemVk U3RyaW5ncy5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCi0jaW5jbHVkZSAiUmVuZGVyU2Ny b2xsYmFyLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3 LmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlci5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJl c29sdmVyLmNwcAppbmRleCA2NTFmOGYxZTJkNzg5MjE5OTA2NTZhZmE0ZmQ5ZTY5ZWRjYWMzYzI0 Li4zOGZkYzRmMGI2YTEzY2Q2NDMxMTEyNGY1NzYwNmQxN2MwNjgyMTQ4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZVJlc29sdmVyLmNwcApAQCAtNTIsNyArNTIsNiBAQAogI2luY2x1ZGUgIk5v ZGVSZW5kZXJTdHlsZS5oIgogI2luY2x1ZGUgIlBhZ2VSdWxlQ29sbGVjdG9yLmgiCiAjaW5jbHVk ZSAiUGFpci5oIgotI2luY2x1ZGUgIlJlbmRlclNjcm9sbGJhci5oIgogI2luY2x1ZGUgIlJlbmRl clN0eWxlQ29uc3RhbnRzLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlJ1 bGVTZXQuaCIK 396374 2020-04-13 20:15:25 -0700 2020-04-13 20:45:44 -0700 Patch bug-210460-20200413201524.patch text/plain 3836 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGJhZWY2ZTY3YThlYWE3OTBmNjBlZDM5 ZDdmNmIzMDIwYjMxNzUzZjkuLjQ4NjI2MmE0NDBkNjdkZTYzNjVkZjFjMTZmYzY5NjNhNThlNTVh OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDQtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEVOQUJMRV9DVVNUT01fU0NST0xMQkFS UyBhbmQgZGVmaW5lIGl0IGZvciBtYWNPUyBhbmQgZm9yIG5vbi1Db2NvYSBwbGF0Zm9ybXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDQ2MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBsYXRmb3JtRW5h YmxlLmggd2FzIHdyb25nIGFuZCB3b3VsZCBhbHdheXMgbGVhdmUgRU5BQkxFX0NVU1RPTV9TQ1JP TExCQVJTIGRlZmluZWQuCisgICAgICAgIFJlYWxseSB0dXJuIGl0IG9mZiBmb3Igbm9uLW1hY09T IENvY29hIHBsYXRmb3Jtcy4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZS5oOgorCiAy MDIwLTA0LTEzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBFTkFCTEVfQ1VTVE9NX1NDUk9MTEJBUlMgYW5kIGRlZmluZSBpdCBmb3IgbWFjT1Mg YW5kIGZvciBub24tQ29jb2EgcGxhdGZvcm1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjU0YTJjNzA3MGMyMGMy NGI3MDM1NWZlNjhkODcwMTM2MGFiMjBiMC4uYTA2OTI2MzAzNDAwMTFiZjJiYmIxZDg0OTgyNDgw MDc4YTIwMjY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0LTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBFTkFCTEVf Q1VTVE9NX1NDUk9MTEJBUlMgYW5kIGRlZmluZSBpdCBmb3IgbWFjT1MgYW5kIGZvciBub24tQ29j b2EgcGxhdGZvcm1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTA0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQbGF0Zm9ybUVuYWJsZS5oIHdhcyB3cm9uZyBhbmQgd291bGQgYWx3YXlzIGxlYXZlIEVO QUJMRV9DVVNUT01fU0NST0xMQkFSUyBkZWZpbmVkLgorICAgICAgICBSZWFsbHkgdHVybiBpdCBv ZmYgZm9yIG5vbi1tYWNPUyBDb2NvYSBwbGF0Zm9ybXMuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1l Vmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6On5GcmFtZVZpZXcpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpkZXRhY2hDdXN0b21TY3JvbGxiYXJzKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGFpbnRTY3JvbGxDb3JuZXIpOgorCiAyMDIwLTA0LTEz ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBF TkFCTEVfQ1VTVE9NX1NDUk9MTEJBUlMgYW5kIGRlZmluZSBpdCBmb3IgbWFjT1MgYW5kIGZvciBu b24tQ29jb2EgcGxhdGZvcm1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVu YWJsZS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGUuaAppbmRleCBlOWY3MGFlZjYw Yjg0Zjk0MDZiMjNmNzZjMzAxNGE5ZGQ2ZTZhYjkwLi5lZDQxODM1ODg3NjUzZjU1Y2M1MTRjZWU3 ZDU0MDllZGNiMDg4MzQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJs ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgKQEAgLTgzNSw3ICs4MzUs NyBAQAogI2VuZGlmCiAjZW5kaWYKIAotI2lmICFkZWZpbmVkKEVOQUJMRV9DVVNUT01fU0NST0xM QkFSUykKKyNpZiAhZGVmaW5lZChFTkFCTEVfQ1VTVE9NX1NDUk9MTEJBUlMpICYmICFQTEFURk9S TShDT0NPQSkKICNkZWZpbmUgRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTIDEKICNlbmRpZgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggZDM3YmY5Y2NhOWQxYjllOGM4YzQxZWVkNzM0 NzE4YjA3YTk4MmU1Ni4uYTQzNDVjYzBjNWMwYTk1MTI5ZmVlOGRiMDEyNDFjMjM0MzQzZTIwMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjM1LDcgKzIzNSw5IEBAIEZyYW1lVmll dzo6fkZyYW1lVmlldygpCiAgICAgc2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihmYWxzZSk7IC8v IFJlbW92ZSBuYXRpdmUgc2Nyb2xsYmFycyBub3cgYmVmb3JlIHdlIGxvc2UgdGhlIGNvbm5lY3Rp b24gdG8gdGhlIEhvc3RXaW5kb3cuCiAgICAgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIoZmFsc2Up OwogICAgIAorI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAgICBBU1NFUlQoIW1fc2Ny b2xsQ29ybmVyKTsKKyNlbmRpZgogCiAgICAgQVNTRVJUKGZyYW1lKCkudmlldygpICE9IHRoaXMg fHwgIWZyYW1lKCkuY29udGVudFJlbmRlcmVyKCkpOwogfQpAQCAtMzM5LDYgKzM0MSw3IEBAIHZv aWQgRnJhbWVWaWV3OjpwcmVwYXJlRm9yRGV0YWNoKCkKIAogdm9pZCBGcmFtZVZpZXc6OmRldGFj aEN1c3RvbVNjcm9sbGJhcnMoKQogeworI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKICAg ICBTY3JvbGxiYXIqIGhvcml6b250YWxCYXIgPSBob3Jpem9udGFsU2Nyb2xsYmFyKCk7CiAgICAg aWYgKGhvcml6b250YWxCYXIgJiYgaG9yaXpvbnRhbEJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkK ICAgICAgICAgc2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihmYWxzZSk7CkBAIC0zNDgsNiArMzUx LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmRldGFjaEN1c3RvbVNjcm9sbGJhcnMoKQogICAgICAgICBz ZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihmYWxzZSk7CiAKICAgICBtX3Njcm9sbENvcm5lciA9IG51 bGxwdHI7CisjZW5kaWYKIH0KIAogdm9pZCBGcmFtZVZpZXc6OnJlY2FsY3VsYXRlU2Nyb2xsYmFy T3ZlcmxheVN0eWxlKCkKQEAgLTQwMDIsMTIgKzQwMDYsMTQgQEAgdm9pZCBGcmFtZVZpZXc6OnBh aW50U2Nyb2xsQ29ybmVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgSW50UmVjdCYg Y29ybmUKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorI2lmIEVOQUJMRShDVVNUT01fU0NST0xM QkFSUykKICAgICBpZiAobV9zY3JvbGxDb3JuZXIpIHsKICAgICAgICAgaWYgKGZyYW1lKCkuaXNN YWluRnJhbWUoKSkKICAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QoY29ybmVyUmVjdCwgYmFz ZUJhY2tncm91bmRDb2xvcigpKTsKICAgICAgICAgbV9zY3JvbGxDb3JuZXItPnBhaW50SW50b1Jl Y3QoY29udGV4dCwgY29ybmVyUmVjdC5sb2NhdGlvbigpLCBjb3JuZXJSZWN0KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIC8vIEtlZXAg dGhpcyBpbiBzeW5jIHdpdGggU2Nyb2xsQW5pbWF0b3JNYWMncyBlZmZlY3RpdmVBcHBlYXJhbmNl Rm9yU2Nyb2xsZXJJbXA6Lgo= 396378 2020-04-13 21:02:36 -0700 2020-04-13 21:02:36 -0700 Patch bug-210460-20200413210236.patch text/plain 6733 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGJhZWY2ZTY3YThlYWE3OTBmNjBlZDM5 ZDdmNmIzMDIwYjMxNzUzZjkuLjk4YzVjYmEzNWUzZjA5YTlkNTJkMzFmMjg3OTMzODgwOTExZmI3 YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDQtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEVOQUJMRV9DVVNUT01fU0NST0xMQkFS UyBhbmQgZGVmaW5lIGl0IGZvciBtYWNPUyBhbmQgZm9yIG5vbi1Db2NvYSBwbGF0Zm9ybXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDQ2MAorCisg ICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFBsYXRmb3JtRW5hYmxl Lmggd2FzIHdyb25nIGFuZCB3b3VsZCBhbHdheXMgbGVhdmUgRU5BQkxFX0NVU1RPTV9TQ1JPTExC QVJTIGRlZmluZWQgdG8gMS4KKyAgICAgICAgUmVhbGx5IHR1cm4gaXQgb2ZmIGZvciBub24tbWFj T1MgQ29jb2EgcGxhdGZvcm1zLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtRW5hYmxlLmg6CisK IDIwMjAtMDQtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgQWRkIEVOQUJMRV9DVVNUT01fU0NST0xMQkFSUyBhbmQgZGVmaW5lIGl0IGZvciBtYWNP UyBhbmQgZm9yIG5vbi1Db2NvYSBwbGF0Zm9ybXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NTRhMmM3MDcwYzIw YzI0YjcwMzU1ZmU2OGQ4NzAxMzYwYWIyMGIwLi45MWE0OTQ1ZThiNzAxYzQ2NGQ1ZDI4M2QwNTli NjY0NDRiYjg5Njc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDQtMTMgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIEVOQUJM RV9DVVNUT01fU0NST0xMQkFSUyBhbmQgZGVmaW5lIGl0IGZvciBtYWNPUyBhbmQgZm9yIG5vbi1D b2NvYSBwbGF0Zm9ybXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxMDQ2MAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAg ICAgIFBsYXRmb3JtRW5hYmxlLmggd2FzIHdyb25nIGFuZCB3b3VsZCBhbHdheXMgbGVhdmUgRU5B QkxFX0NVU1RPTV9TQ1JPTExCQVJTIGRlZmluZWQgdG8gMS4KKyAgICAgICAgUmVhbGx5IHR1cm4g aXQgb2ZmIGZvciBub24tbWFjT1MgQ29jb2EgcGxhdGZvcm1zLgorCisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp+RnJhbWVWaWV3KToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6ZGV0YWNoQ3VzdG9tU2Nyb2xsYmFycyk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnBhaW50U2Nyb2xsQ29ybmVyKToKKwogMjAyMC0w NC0xMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTIGFuZCBkZWZpbmUgaXQgZm9yIG1hY09TIGFuZCBm b3Igbm9uLUNvY29hIHBsYXRmb3JtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZv cm1FbmFibGVDb2NvYS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCmlu ZGV4IDAxMjg0Mjk3ZWUyOTczNWEwZDIyNWE4NjYzZWYwZmRkZWI2OGViZWQuLjg3N2E5M2YzNjll ZDdhYTVkZjcyMjcyZGNiMDc2NWI4NjliN2QwOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L1BsYXRmb3JtRW5hYmxlQ29jb2EuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJs ZUNvY29hLmgKQEAgLTIxMSw4ICsyMTEsOCBAQAogI2RlZmluZSBFTkFCTEVfQVNZTkNfU0NST0xM SU5HIDEKICNlbmRpZgogCi0jaWYgIWRlZmluZWQoRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTKSAm JiBQTEFURk9STShNQUMpCi0jZGVmaW5lIEVOQUJMRV9DVVNUT01fU0NST0xMQkFSUyAxCisjaWYg IWRlZmluZWQoRU5BQkxFX0NVU1RPTV9TQ1JPTExCQVJTKSAmJiAhUExBVEZPUk0oTUFDKQorI2Rl ZmluZSBFTkFCTEVfQ1VTVE9NX1NDUk9MTEJBUlMgMAogI2VuZGlmCiAKICNpZiAhZGVmaW5lZChF TkFCTEVfU0NST0xMSU5HX1RIUkVBRCkgJiYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCmluZGV4IGQzN2JmOWNjYTlkMWI5ZThjOGM0MWVlZDczNDcxOGIwN2E5ODJlNTYu LmE0MzQ1Y2MwYzVjMGE5NTEyOWZlZThkYjAxMjQxYzIzNDM0M2UyMDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKQEAgLTIzNSw3ICsyMzUsOSBAQCBGcmFtZVZpZXc6On5GcmFtZVZpZXco KQogICAgIHNldEhhc0hvcml6b250YWxTY3JvbGxiYXIoZmFsc2UpOyAvLyBSZW1vdmUgbmF0aXZl IHNjcm9sbGJhcnMgbm93IGJlZm9yZSB3ZSBsb3NlIHRoZSBjb25uZWN0aW9uIHRvIHRoZSBIb3N0 V2luZG93LgogICAgIHNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKGZhbHNlKTsKICAgICAKKyNpZiBF TkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCiAgICAgQVNTRVJUKCFtX3Njcm9sbENvcm5lcik7Cisj ZW5kaWYKIAogICAgIEFTU0VSVChmcmFtZSgpLnZpZXcoKSAhPSB0aGlzIHx8ICFmcmFtZSgpLmNv bnRlbnRSZW5kZXJlcigpKTsKIH0KQEAgLTMzOSw2ICszNDEsNyBAQCB2b2lkIEZyYW1lVmlldzo6 cHJlcGFyZUZvckRldGFjaCgpCiAKIHZvaWQgRnJhbWVWaWV3OjpkZXRhY2hDdXN0b21TY3JvbGxi YXJzKCkKIHsKKyNpZiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCiAgICAgU2Nyb2xsYmFyKiBo b3Jpem9udGFsQmFyID0gaG9yaXpvbnRhbFNjcm9sbGJhcigpOwogICAgIGlmIChob3Jpem9udGFs QmFyICYmIGhvcml6b250YWxCYXItPmlzQ3VzdG9tU2Nyb2xsYmFyKCkpCiAgICAgICAgIHNldEhh c0hvcml6b250YWxTY3JvbGxiYXIoZmFsc2UpOwpAQCAtMzQ4LDYgKzM1MSw3IEBAIHZvaWQgRnJh bWVWaWV3OjpkZXRhY2hDdXN0b21TY3JvbGxiYXJzKCkKICAgICAgICAgc2V0SGFzVmVydGljYWxT Y3JvbGxiYXIoZmFsc2UpOwogCiAgICAgbV9zY3JvbGxDb3JuZXIgPSBudWxscHRyOworI2VuZGlm CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpyZWNhbGN1bGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZSgp CkBAIC00MDAyLDEyICs0MDA2LDE0IEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludFNjcm9sbENvcm5l cihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGNvcm5lCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKKyNpZiBFTkFCTEUoQ1VTVE9NX1NDUk9MTEJBUlMpCiAgICAgaWYg KG1fc2Nyb2xsQ29ybmVyKSB7CiAgICAgICAgIGlmIChmcmFtZSgpLmlzTWFpbkZyYW1lKCkpCiAg ICAgICAgICAgICBjb250ZXh0LmZpbGxSZWN0KGNvcm5lclJlY3QsIGJhc2VCYWNrZ3JvdW5kQ29s b3IoKSk7CiAgICAgICAgIG1fc2Nyb2xsQ29ybmVyLT5wYWludEludG9SZWN0KGNvbnRleHQsIGNv cm5lclJlY3QubG9jYXRpb24oKSwgY29ybmVyUmVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CisjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICAvLyBLZWVwIHRoaXMgaW4gc3luYyB3 aXRoIFNjcm9sbEFuaW1hdG9yTWFjJ3MgZWZmZWN0aXZlQXBwZWFyYW5jZUZvclNjcm9sbGVySW1w Oi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDE1ZTgxMDUz MjEzNjc4NWJjNTVhODBmYWZjOGNjYmI1MmUwNzk2OGMuLjhmOTFlMDIxZTQ1OGQ5YTk1NjcwNGU3 ZGM4ZjA5OTQ3NWUyZDMxMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcApAQCAtMzQ1MiwxMCArMzQ1MiwxMiBAQCB2b2lkIFJlbmRlckxheWVyOjppbnZhbGlkYXRl U2Nyb2xsQ29ybmVyUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAgICByZXR1cm47CiAg ICAgfQogCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQogICAgIGlmIChtX3Njcm9sbENv cm5lcikKICAgICAgICAgbV9zY3JvbGxDb3JuZXItPnJlcGFpbnRSZWN0YW5nbGUocmVjdCk7CiAg ICAgaWYgKG1fcmVzaXplcikKICAgICAgICAgbV9yZXNpemVyLT5yZXBhaW50UmVjdGFuZ2xlKHJl Y3QpOworI2VuZGlmCiB9CiAKIHN0YXRpYyBib29sIHNjcm9sbGJhckhpZGRlbkJ5U3R5bGUoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCkBAIC0zNzAyLDcgKzM3MDQsMTEgQEAgSW50U2l6ZSBSZW5kZXJM YXllcjo6b2Zmc2V0RnJvbVJlc2l6ZUNvcm5lcihjb25zdCBJbnRQb2ludCYgYWJzb2x1dGVQb2lu dCkgY29uc3QKIAogYm9vbCBSZW5kZXJMYXllcjo6aGFzT3ZlcmZsb3dDb250cm9scygpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIG1faEJhciB8fCBtX3ZCYXIgfHwgbV9zY3JvbGxDb3JuZXIgfHwgcmVu ZGVyZXIoKS5zdHlsZSgpLnJlc2l6ZSgpICE9IFJlc2l6ZTo6Tm9uZTsKKyAgICByZXR1cm4gbV9o QmFyIHx8IG1fdkJhcgorI2lmIEVOQUJMRShDVVNUT01fU0NST0xMQkFSUykKKyAgICAgICAgfHwg bV9zY3JvbGxDb3JuZXIKKyNlbmRpZgorICAgICAgICB8fCByZW5kZXJlcigpLnN0eWxlKCkucmVz aXplKCkgIT0gUmVzaXplOjpOb25lOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjpwb3NpdGlvbk92 ZXJmbG93Q29udHJvbHMoY29uc3QgSW50U2l6ZSYgb2Zmc2V0RnJvbVJvb3QpCkBAIC0zNzE1LDcg KzM3MjEsNiBAQCB2b2lkIFJlbmRlckxheWVyOjpwb3NpdGlvbk92ZXJmbG93Q29udHJvbHMoY29u c3QgSW50U2l6ZSYgb2Zmc2V0RnJvbVJvb3QpCiAgICAgICAgIHJldHVybjsKIAogICAgIGNvbnN0 IEludFJlY3QgYm9yZGVyQm94ID0gc25hcHBlZEludFJlY3QoYm94LT5ib3JkZXJCb3hSZWN0KCkp OwotICAgIGNvbnN0IEludFJlY3QmIHNjcm9sbENvcm5lciA9IHNjcm9sbENvcm5lclJlY3QoKTsK ICAgICBJbnRSZWN0IGFic0JvdW5kcyhib3JkZXJCb3gubG9jYXRpb24oKSArIG9mZnNldEZyb21S b290LCBib3JkZXJCb3guc2l6ZSgpKTsKICAgICBpZiAobV92QmFyKSB7CiAgICAgICAgIEludFJl Y3QgdkJhclJlY3QgPSByZWN0Rm9yVmVydGljYWxTY3JvbGxiYXIoYm9yZGVyQm94KTsKQEAgLTM3 MjksMTAgKzM3MzQsMTMgQEAgdm9pZCBSZW5kZXJMYXllcjo6cG9zaXRpb25PdmVyZmxvd0NvbnRy b2xzKGNvbnN0IEludFNpemUmIG9mZnNldEZyb21Sb290KQogICAgICAgICBtX2hCYXItPnNldEZy YW1lUmVjdChoQmFyUmVjdCk7CiAgICAgfQogICAgIAorI2lmIEVOQUJMRShDVVNUT01fU0NST0xM QkFSUykKKyAgICBjb25zdCBJbnRSZWN0JiBzY3JvbGxDb3JuZXIgPSBzY3JvbGxDb3JuZXJSZWN0 KCk7CiAgICAgaWYgKG1fc2Nyb2xsQ29ybmVyKQogICAgICAgICBtX3Njcm9sbENvcm5lci0+c2V0 RnJhbWVSZWN0KHNjcm9sbENvcm5lcik7CiAgICAgaWYgKG1fcmVzaXplcikKICAgICAgICAgbV9y ZXNpemVyLT5zZXRGcmFtZVJlY3QocmVzaXplckNvcm5lclJlY3QoKnRoaXMsIGJvcmRlckJveCkp OworI2VuZGlmCiB9CiAKIGludCBSZW5kZXJMYXllcjo6c2Nyb2xsV2lkdGgoKSBjb25zdApAQCAt NDA2NywxMCArNDA3NSwxMiBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludFNjcm9sbENvcm5lcihH cmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFBvaW50JiBwYQogICAgICAgICByZXR1 cm47CiAgICAgfQogCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExCQVJTKQogICAgIGlmIChtX3Nj cm9sbENvcm5lcikgewogICAgICAgICBtX3Njcm9sbENvcm5lci0+cGFpbnRJbnRvUmVjdChjb250 ZXh0LCBwYWludE9mZnNldCwgYWJzUmVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisjZW5k aWYKIAogICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gcGFpbnQgYSBjb3JuZXIgaWYgd2UgaGF2ZSBv dmVybGF5IHNjcm9sbGJhcnMsIHNpbmNlIHdlIG5lZWQKICAgICAvLyB0byBzZWUgd2hhdCBpcyBi ZWhpbmQgaXQuCkBAIC00MTI3LDEwICs0MTM3LDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 UmVzaXplcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheW91dFBvaW50JiBwYWlu CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCisjaWYgRU5BQkxFKENVU1RPTV9TQ1JPTExC QVJTKQogICAgIGlmIChtX3Jlc2l6ZXIpIHsKICAgICAgICAgbV9yZXNpemVyLT5wYWludEludG9S ZWN0KGNvbnRleHQsIHBhaW50T2Zmc2V0LCBhYnNSZWN0KTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KKyNlbmRpZgogCiAgICAgZHJhd1BsYXRmb3JtUmVzaXplckltYWdlKGNvbnRleHQsIGFic1Jl Y3QpOwogCg==