218738 2020-11-09 21:09:23 -0800 Use GraphicsContext instead of CGContext in RemoteLayerBackingStore 2020-11-10 16:48:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton sabouhallawa simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1705978 0 thorton 2020-11-09 21:09:23 -0800 Use GraphicsContext instead of CGContext in RemoteLayerBackingStore 1705979 1 413660 thorton 2020-11-09 21:09:43 -0800 Created attachment 413660 Patch 1705994 2 413668 thorton 2020-11-09 22:58:18 -0800 Created attachment 413668 Patch 1705996 3 413668 wenson_hsieh 2020-11-09 23:07:13 -0800 Comment on attachment 413668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413668&action=review > Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:272 > +void RemoteLayerBackingStore::drawInContext(WebCore::GraphicsContext& context, RefPtr<WebCore::NativeImage> backImage) Nit - I think we generally RefPtr<>&& these, so that we can use move semantics from the call site if possible. 1705997 4 413670 thorton 2020-11-09 23:19:09 -0800 Created attachment 413670 Patch 1705998 5 413671 thorton 2020-11-09 23:22:00 -0800 Created attachment 413671 Patch 1706275 6 413755 thorton 2020-11-10 16:09:13 -0800 Created attachment 413755 Patch 1706290 7 ews-feeder 2020-11-10 16:47:17 -0800 Committed r269664: <https://trac.webkit.org/changeset/269664> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413755. 1706291 8 webkit-bug-importer 2020-11-10 16:48:22 -0800 <rdar://problem/71261307> 413660 2020-11-09 21:09:43 -0800 2020-11-09 22:58:16 -0800 Patch bug-218738-20201109210942.patch text/plain 5177 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y3N2I2MDEwZmU4ZWIz NWMxOWE3NDI5OTBhODkzMTYxOTJmOTUyYy4uYzc1YjZkNGNmZmU2OTE4MDFhMGUyODcxNGE5ZjUx NzFjMmM4MjQ2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBHcmFwaGlj c0NvbnRleHQgaW5zdGVhZCBvZiBDR0NvbnRleHQgaW4gUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODczOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0czsganVzdCByZWZhY3RvcmluZyBhIGhlYXZpbHktdGVzdGVkIGNvZGVwYXRoLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvUGF0aC5oOgorICAgICAgICBFeHBvcnQgc29tZSB0aGluZ3MuCisKIDIw MjAtMTEtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbmV4 cG9zZSBvYnNvbGV0ZSBIVE1MQXBwbGV0RWxlbWVudCBpbnRlcmZhY2UKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYjM4 OWIyMjkzZjc1YzMzM2Q1YWE2NDcxZGQ3ZTdlY2RmZDBiYTE4NS4uODM1OTQxNjQ1NDNjMTIzZWU2 MzkyOGI1NTVlYTBlZWNmMjQwY2QwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0x MS0wOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgR3JhcGhpY3NDb250ZXh0IGluc3RlYWQgb2YgQ0dDb250ZXh0IGluIFJlbW90ZUxheWVyQmFj a2luZ1N0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTg3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5Db250ZXh0KToK KyAgICAgICAgTWFrZSB1c2Ugb2YgdGhlIEdyYXBoaWNzQ29udGV4dCBhYnN0cmFjdGlvbiBpbnN0 ZWFkIG9mIGRyb3BwaW5nIGRvd24KKyAgICAgICAgdG8gQ0dDb250ZXh0LCBpbiBwcmVwYXJhdGlv biBmb3IgRGlzcGxheUxpc3QgcmVuZGVyaW5nLgorCiAyMDIwLTExLTA5ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5leHBvc2Ugb2Jzb2xldGUgSFRNTEFwcGxl dEVsZW1lbnQgaW50ZXJmYWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDBiMzVhYzY0ZmE4YjlmZmUwYzk0NDg1ZTk3M2Yy NGMyYWEwZjM0OTAuLmY2M2UyZmM1YjM5YWRhODUxMzc2M2JhMjU2MjE1NDI1YjRjZjc0ZjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCkBAIC00MDYsNyArNDA2LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBjbGlwT3V0KGNvbnN0 IEZsb2F0UmVjdCYpOwogICAgIHZvaWQgY2xpcE91dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91 bmRlZFJlY3QmKTsKLSAgICB2b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSA9IFdp bmRSdWxlOjpFdmVuT2RkKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNsaXBQYXRoKGNvbnN0 IFBhdGgmLCBXaW5kUnVsZSA9IFdpbmRSdWxlOjpFdmVuT2RkKTsKICAgICB2b2lkIGNsaXBUb0lt YWdlQnVmZmVyKEltYWdlQnVmZmVyJiwgY29uc3QgRmxvYXRSZWN0Jik7CiAKICAgICBlbnVtIGNs YXNzIENsaXBUb0RyYXdpbmdDb21tYW5kc1Jlc3VsdCA6IGJvb2wgeyBTdWNjZXNzLCBGYWlsZWRU b0NyZWF0ZUltYWdlQnVmZmVyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRo LmgKaW5kZXggZTVmZTc4MjE0ZmYzYjUyOGM2OTA3MTI1YzgwYjEzMWYwNDFlY2NjYS4uN2MzYWUy MWM0Zjg0ZmFiOTA1NjY2OGQ2MDRkZjE1NWM5ZDA2YzJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL1BhdGguaApAQCAtMTc1LDcgKzE3NSw3IEBAIHB1YmxpYzoKICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGNsb3NlU3VicGF0aCgpOwogCiAgICAgdm9pZCBhZGRBcmMoY29uc3Qg RmxvYXRQb2ludCYsIGZsb2F0IHJhZGl1cywgZmxvYXQgc3RhcnRBbmdsZSwgZmxvYXQgZW5kQW5n bGUsIGJvb2wgYW50aWNsb2Nrd2lzZSk7Ci0gICAgdm9pZCBhZGRSZWN0KGNvbnN0IEZsb2F0UmVj dCYpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgYWRkUmVjdChjb25zdCBGbG9hdFJlY3QmKTsK ICAgICB2b2lkIGFkZEVsbGlwc2UoRmxvYXRQb2ludCwgZmxvYXQgcmFkaXVzWCwgZmxvYXQgcmFk aXVzWSwgZmxvYXQgcm90YXRpb24sIGZsb2F0IHN0YXJ0QW5nbGUsIGZsb2F0IGVuZEFuZ2xlLCBi b29sIGFudGljbG9ja3dpc2UpOwogICAgIHZvaWQgYWRkRWxsaXBzZShjb25zdCBGbG9hdFJlY3Qm KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyQmFja2luZ1N0b3JlLm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCmluZGV4IDAxMGNhMmM1YWI1MmRhZGM5 NTMwZTU1Mjg1Y2JkZDM1YzFhMDMwYzUuLjYwNGEyNjA2N2M3MzQ2YzZjZGQzMDExNmVhOTYwMGVm YzAzNTQxNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJl ZS9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9S ZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW0KQEAgLTI5NSwyNCArMjk1 LDI0IEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBDCiAgICAgICAgIG1fcGFpbnRpbmdSZWN0cy5h cHBlbmQoc2NhbGVkUmVjdCk7CiAgICAgfQogCi0gICAgQ0dSZWN0IGNnUGFpbnRpbmdSZWN0c1tX ZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OndlYkxheWVyTWF4UmVjdHNUb1BhaW50XTsKLSAgICBm b3IgKHNpemVfdCBpID0gMCwgZGlydHlSZWN0Q291bnQgPSBtX3BhaW50aW5nUmVjdHMuc2l6ZSgp OyBpIDwgZGlydHlSZWN0Q291bnQ7ICsraSkgewotICAgICAgICBXZWJDb3JlOjpGbG9hdFJlY3Qg c2NhbGVkUGFpbnRpbmdSZWN0ID0gbV9wYWludGluZ1JlY3RzW2ldOwotICAgICAgICBzY2FsZWRQ YWludGluZ1JlY3Quc2NhbGUobV9zY2FsZSk7Ci0gICAgICAgIGNnUGFpbnRpbmdSZWN0c1tpXSA9 IHNjYWxlZFBhaW50aW5nUmVjdDsKLSAgICB9Ci0KLSAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0 ID0gY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKTsKLQogICAgIGlmIChiYWNrSW1hZ2UpIHsKLSAg ICAgICAgV2ViQ29yZTo6Q0dDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNnQ29udGV4dCk7 Ci0gICAgICAgIENHQ29udGV4dFNldEJsZW5kTW9kZShjZ0NvbnRleHQsIGtDR0JsZW5kTW9kZUNv cHkpOwotICAgICAgICBDR0NvbnRleHRUcmFuc2xhdGVDVE0oY2dDb250ZXh0LCAwLCBzY2FsZWRM YXllckJvdW5kcy5oZWlnaHQoKSk7Ci0gICAgICAgIENHQ29udGV4dFNjYWxlQ1RNKGNnQ29udGV4 dCwgMSwgLTEpOwotICAgICAgICBDR0NvbnRleHREcmF3SW1hZ2UoY2dDb250ZXh0LCBzY2FsZWRM YXllckJvdW5kcywgYmFja0ltYWdlKTsKKyAgICAgICAgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNvbnRleHQpOworICAgICAgICBjb250ZXh0LnNldENvbXBv c2l0ZU9wZXJhdGlvbihXZWJDb3JlOjpDb21wb3NpdGVPcGVyYXRvcjo6Q29weSk7CisgICAgICAg IGNvbnRleHQuZHJhd05hdGl2ZUltYWdlKGJhY2tJbWFnZSwgc2NhbGVkTGF5ZXJCb3VuZHMuc2l6 ZSgpLCBzY2FsZWRMYXllckJvdW5kcywgc2NhbGVkTGF5ZXJCb3VuZHMpOwogICAgIH0KIAotICAg IENHQ29udGV4dENsaXBUb1JlY3RzKGNnQ29udGV4dCwgY2dQYWludGluZ1JlY3RzLCBtX3BhaW50 aW5nUmVjdHMuc2l6ZSgpKTsKKyAgICBpZiAobV9wYWludGluZ1JlY3RzLnNpemUoKSA9PSAxKSB7 CisgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBzY2FsZWRQYWludGluZ1JlY3QgPSBtX3BhaW50 aW5nUmVjdHNbMF07CisgICAgICAgIHNjYWxlZFBhaW50aW5nUmVjdC5zY2FsZShtX3NjYWxlKTsK KyAgICAgICAgY29udGV4dC5jbGlwKHNjYWxlZFBhaW50aW5nUmVjdCk7CisgICAgfSBlbHNlIHsK KyAgICAgICAgV2ViQ29yZTo6UGF0aCBjbGlwUGF0aDsKKyAgICAgICAgZm9yIChhdXRvIHJlY3Qg OiBtX3BhaW50aW5nUmVjdHMpIHsKKyAgICAgICAgICAgIHJlY3Quc2NhbGUobV9zY2FsZSk7Cisg ICAgICAgICAgICBjbGlwUGF0aC5hZGRSZWN0KHJlY3QpOworICAgICAgICB9CisgICAgICAgIGNv bnRleHQuY2xpcFBhdGgoY2xpcFBhdGgpOworICAgIH0KIAogICAgIGlmICghbV9pc09wYXF1ZSkK ICAgICAgICAgY29udGV4dC5jbGVhclJlY3Qoc2NhbGVkTGF5ZXJCb3VuZHMpOwo= 413668 2020-11-09 22:58:18 -0800 2020-11-09 23:19:08 -0800 Patch bug-218738-20201109225817.patch text/plain 7950 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViM2E2YjcyYmIyYmQ1 MjA2YTRkMjRjNDljNzEyYjUwN2I3Y2Y3ZS4uMzVmMDQ5MWNmZDllZjViYWIwMmMzMWQ3Y2U5MGI2 ZGQ0OGI4MTJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBHcmFwaGlj c0NvbnRleHQgaW5zdGVhZCBvZiBDR0NvbnRleHQgaW4gUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODczOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0czsganVzdCByZWZhY3RvcmluZyBhIGhlYXZpbHktdGVzdGVkIGNvZGVwYXRoLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvUGF0aC5oOgorICAgICAgICBFeHBvcnQgc29tZSB0aGluZ3MuCisKIDIw MjAtMTEtMDkgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAg W0dQVSBQcm9jZXNzXSBDb250cm9sIHRoZSBsaWZlIGN5Y2xlIG9mIHRoZSBwbGF0Zm9ybSBpbWFn ZSBieSBhIG5ldyBjbGFzcyBuYW1lZCBOYXRpdmVJbWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA4OWRmM2NkZjZm N2Y1NzFhZDM5MjJjMjQyMzdjMDY3NGZiMTdkYzYzLi40OWUzZjMyNWU1ZTYwNDI4YjZiODJkMzkw NjU4ZTkwYTRjNDUwOTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTExLTA5ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBHcmFw aGljc0NvbnRleHQgaW5zdGVhZCBvZiBDR0NvbnRleHQgaW4gUmVtb3RlTGF5ZXJCYWNraW5nU3Rv cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODcz OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbToKKyAgICAgICAg KFdlYktpdDo6UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQpOgorICAgICAg ICBNYWtlIHVzZSBvZiB0aGUgR3JhcGhpY3NDb250ZXh0IGFic3RyYWN0aW9uIGluc3RlYWQgb2Yg ZHJvcHBpbmcgZG93bgorICAgICAgICB0byBDR0NvbnRleHQsIGluIHByZXBhcmF0aW9uIGZvciBE aXNwbGF5TGlzdCByZW5kZXJpbmcuCisKIDIwMjAtMTEtMDkgIFNhaWQgQWJvdS1IYWxsYXdhICA8 c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBDb250cm9sIHRoZSBsaWZl IGN5Y2xlIG9mIHRoZSBwbGF0Zm9ybSBpbWFnZSBieSBhIG5ldyBjbGFzcyBuYW1lZCBOYXRpdmVJ bWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQuaAppbmRleCBmY2NhZWVkN2Y3YWEwYzFkNmMwYzE3MmJiNTYwZDVmMDUzZThhM2M0Li40 ZjkyY2RhY2VlNDA1M2FhYzIwODk5NTk0M2QyNjVjODI4MDRjNWFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtNDA2LDcg KzQwNiw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY2xpcE91dChjb25zdCBGbG9hdFJlY3QmKTsK ICAgICB2b2lkIGNsaXBPdXRSb3VuZGVkUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0Jik7Ci0g ICAgdm9pZCBjbGlwUGF0aChjb25zdCBQYXRoJiwgV2luZFJ1bGUgPSBXaW5kUnVsZTo6RXZlbk9k ZCk7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjbGlwUGF0aChjb25zdCBQYXRoJiwgV2luZFJ1 bGUgPSBXaW5kUnVsZTo6RXZlbk9kZCk7CiAgICAgdm9pZCBjbGlwVG9JbWFnZUJ1ZmZlcihJbWFn ZUJ1ZmZlciYsIGNvbnN0IEZsb2F0UmVjdCYpOwogCiAgICAgZW51bSBjbGFzcyBDbGlwVG9EcmF3 aW5nQ29tbWFuZHNSZXN1bHQgOiBib29sIHsgU3VjY2VzcywgRmFpbGVkVG9DcmVhdGVJbWFnZUJ1 ZmZlciB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0 aC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCmluZGV4IGU1ZmU3 ODIxNGZmM2I1MjhjNjkwNzEyNWM4MGIxMzFmMDQxZWNjY2EuLjdjM2FlMjFjNGY4NGZhYjkwNTY2 NjhkNjA0ZGYxNTVjOWQwNmMyYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL1BhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Q YXRoLmgKQEAgLTE3NSw3ICsxNzUsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBjbG9zZVN1YnBhdGgoKTsKIAogICAgIHZvaWQgYWRkQXJjKGNvbnN0IEZsb2F0UG9pbnQmLCBm bG9hdCByYWRpdXMsIGZsb2F0IHN0YXJ0QW5nbGUsIGZsb2F0IGVuZEFuZ2xlLCBib29sIGFudGlj bG9ja3dpc2UpOwotICAgIHZvaWQgYWRkUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGFkZFJlY3QoY29uc3QgRmxvYXRSZWN0Jik7CiAgICAgdm9pZCBhZGRF bGxpcHNlKEZsb2F0UG9pbnQsIGZsb2F0IHJhZGl1c1gsIGZsb2F0IHJhZGl1c1ksIGZsb2F0IHJv dGF0aW9uLCBmbG9hdCBzdGFydEFuZ2xlLCBmbG9hdCBlbmRBbmdsZSwgYm9vbCBhbnRpY2xvY2t3 aXNlKTsKICAgICB2b2lkIGFkZEVsbGlwc2UoY29uc3QgRmxvYXRSZWN0Jik7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllckJhY2tp bmdTdG9yZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxh eWVyQmFja2luZ1N0b3JlLmgKaW5kZXggZGIxOTRlNzBhNGVmZDNiZDQ2YmNlZjhjMjUyOGQzNDVi MjFmZTNiNi4uMDc1MDRmN2Q0YmU2ZjAwYmNiNzlkMjUyNTJiYjAzZjUyMjA2NWNkMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFj a2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyQmFja2luZ1N0b3JlLmgKQEAgLTM2LDYgKzM2LDcgQEAgT0JKQ19DTEFTUyBDQUxh eWVyOwogCiAvLyBGSVhNRTogTWFrZSBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwIE9iamVjdGl2 ZS1DIHNvIHdlIGNhbiBpbmNsdWRlIFdlYkxheWVyLmggaGVyZSBhbmQgc2hhcmUgdGhlIHR5cGVk ZWYuCiBuYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBOYXRpdmVJbWFnZTsKIHR5cGVkZWYgVmVj dG9yPFdlYkNvcmU6OkZsb2F0UmVjdCwgNT4gUmVwYWludFJlY3RMaXN0OwogfQogCkBAIC05Niw3 ICs5Nyw3IEBAIHB1YmxpYzoKICAgICBNb25vdG9uaWNUaW1lIGxhc3REaXNwbGF5VGltZSgpIGNv bnN0IHsgcmV0dXJuIG1fbGFzdERpc3BsYXlUaW1lOyB9CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBk cmF3SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIENHSW1hZ2VSZWYgYmFja0lt YWdlKTsKKyAgICB2b2lkIGRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Jiwg UmVmUHRyPFdlYkNvcmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2UpOwogICAgIHZvaWQgY2xlYXJC YWNraW5nU3RvcmUoKTsKICAgICB2b2lkIHN3YXBUb1ZhbGlkRnJvbnRCdWZmZXIoKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy QmFja2luZ1N0b3JlLm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCmluZGV4IDAxMGNhMmM1YWI1MmRhZGM5NTMwZTU1Mjg1 Y2JkZDM1YzFhMDMwYzUuLmQ4YmNhZTU2ZTJlZTliYjMyNWUzNjIwZmM3ZTgyM2ZhMDg3YjUxNDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllckJhY2tpbmdTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXll clRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW0KQEAgLTIzOSw5ICsyMzksOSBAQCBib29s IFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICBzd2FwVG9WYWxpZEZyb250 QnVmZmVyKCk7CiAKICAgICBpZiAobV9hY2NlbGVyYXRlc0RyYXdpbmcpIHsKLSAgICAgICAgUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdlYkNvcmU6Ok5h dGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIuc3VyZmFjZSAm JiAhd2lsbFBhaW50RW50aXJlQmFja2luZ1N0b3JlKQotICAgICAgICAgICAgYmFja0ltYWdlID0g bV9iYWNrQnVmZmVyLnN1cmZhY2UtPmNyZWF0ZUltYWdlKCk7CisgICAgICAgICAgICBiYWNrSW1h Z2UgPSBXZWJDb3JlOjpOYXRpdmVJbWFnZTo6Y3JlYXRlKG1fYmFja0J1ZmZlci5zdXJmYWNlLT5j cmVhdGVJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAobV9mcm9udEJ1ZmZlci5zdXJmYWNl KSB7CiAgICAgICAgICAgICBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQgPSBtX2Zy b250QnVmZmVyLnN1cmZhY2UtPmVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwpAQCAtMjU2LDEyICsy NTYsMTIgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6ZGlzcGxheSgpCiAgICAgICAg IEFTU0VSVCghbV9hY2NlbGVyYXRlc0RyYXdpbmcpOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0PiBjb250ZXh0ID0gbV9mcm9udEJ1ZmZlci5iaXRtYXAt PmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwogCi0gICAgICAgIFJldGFpblB0cjxDR0ltYWdlUmVm PiBiYWNrSW1hZ2U7CisgICAgICAgIFJlZlB0cjxXZWJDb3JlOjpOYXRpdmVJbWFnZT4gYmFja0lt YWdlOwogICAgICAgICBpZiAobV9iYWNrQnVmZmVyLmJpdG1hcCAmJiAhd2lsbFBhaW50RW50aXJl QmFja2luZ1N0b3JlKQotICAgICAgICAgICAgYmFja0ltYWdlID0gbV9iYWNrQnVmZmVyLmJpdG1h cC0+bWFrZUNHSW1hZ2UoKTsKKyAgICAgICAgICAgIGJhY2tJbWFnZSA9IFdlYkNvcmU6Ok5hdGl2 ZUltYWdlOjpjcmVhdGUobV9iYWNrQnVmZmVyLmJpdG1hcC0+bWFrZUNHSW1hZ2UoKS5nZXQoKSk7 CiAKICAgICAgICAgaWYgKGNvbnRleHQpCi0gICAgICAgICAgICBkcmF3SW5Db250ZXh0KCpjb250 ZXh0LCBiYWNrSW1hZ2UuZ2V0KCkpOworICAgICAgICAgICAgZHJhd0luQ29udGV4dCgqY29udGV4 dCwgYmFja0ltYWdlKTsKICAgICB9CiAgICAgCiAgICAgbV9sYXllci0+b3duZXIoKS0+cGxhdGZv cm1DQUxheWVyTGF5ZXJEaWREaXNwbGF5KG1fbGF5ZXIpOwpAQCAtMjY5LDcgKzI2OSw3IEBAIGJv b2wgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRpc3BsYXkoKQogICAgIHJldHVybiB0cnVlOwog fQogCi12b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5Db250ZXh0KFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgQ0dJbWFnZVJlZiBiYWNrSW1hZ2UpCit2b2lkIFJl bW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dCYgY29udGV4dCwgUmVmUHRyPFdlYkNvcmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2UpCiB7 CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIHNjYWxlZFNpemUgPSBtX3NpemU7CiAgICAgc2NhbGVk U2l6ZS5zY2FsZShtX3NjYWxlKTsKQEAgLTI5NSwyNCArMjk1LDI0IEBAIHZvaWQgUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBDCiAgICAgICAgIG1fcGFpbnRpbmdSZWN0cy5hcHBlbmQoc2NhbGVkUmVjdCk7CiAg ICAgfQogCi0gICAgQ0dSZWN0IGNnUGFpbnRpbmdSZWN0c1tXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5 ZXI6OndlYkxheWVyTWF4UmVjdHNUb1BhaW50XTsKLSAgICBmb3IgKHNpemVfdCBpID0gMCwgZGly dHlSZWN0Q291bnQgPSBtX3BhaW50aW5nUmVjdHMuc2l6ZSgpOyBpIDwgZGlydHlSZWN0Q291bnQ7 ICsraSkgewotICAgICAgICBXZWJDb3JlOjpGbG9hdFJlY3Qgc2NhbGVkUGFpbnRpbmdSZWN0ID0g bV9wYWludGluZ1JlY3RzW2ldOwotICAgICAgICBzY2FsZWRQYWludGluZ1JlY3Quc2NhbGUobV9z Y2FsZSk7Ci0gICAgICAgIGNnUGFpbnRpbmdSZWN0c1tpXSA9IHNjYWxlZFBhaW50aW5nUmVjdDsK LSAgICB9Ci0KLSAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gY29udGV4dC5wbGF0Zm9ybUNv bnRleHQoKTsKLQogICAgIGlmIChiYWNrSW1hZ2UpIHsKLSAgICAgICAgV2ViQ29yZTo6Q0dDb250 ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNnQ29udGV4dCk7Ci0gICAgICAgIENHQ29udGV4dFNl dEJsZW5kTW9kZShjZ0NvbnRleHQsIGtDR0JsZW5kTW9kZUNvcHkpOwotICAgICAgICBDR0NvbnRl eHRUcmFuc2xhdGVDVE0oY2dDb250ZXh0LCAwLCBzY2FsZWRMYXllckJvdW5kcy5oZWlnaHQoKSk7 Ci0gICAgICAgIENHQ29udGV4dFNjYWxlQ1RNKGNnQ29udGV4dCwgMSwgLTEpOwotICAgICAgICBD R0NvbnRleHREcmF3SW1hZ2UoY2dDb250ZXh0LCBzY2FsZWRMYXllckJvdW5kcywgYmFja0ltYWdl KTsKKyAgICAgICAgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVy KGNvbnRleHQpOworICAgICAgICBjb250ZXh0LnNldENvbXBvc2l0ZU9wZXJhdGlvbihXZWJDb3Jl OjpDb21wb3NpdGVPcGVyYXRvcjo6Q29weSk7CisgICAgICAgIGNvbnRleHQuZHJhd05hdGl2ZUlt YWdlKCpiYWNrSW1hZ2UsIHNjYWxlZExheWVyQm91bmRzLnNpemUoKSwgc2NhbGVkTGF5ZXJCb3Vu ZHMsIHNjYWxlZExheWVyQm91bmRzKTsKICAgICB9CiAKLSAgICBDR0NvbnRleHRDbGlwVG9SZWN0 cyhjZ0NvbnRleHQsIGNnUGFpbnRpbmdSZWN0cywgbV9wYWludGluZ1JlY3RzLnNpemUoKSk7Cisg ICAgaWYgKG1fcGFpbnRpbmdSZWN0cy5zaXplKCkgPT0gMSkgeworICAgICAgICBXZWJDb3JlOjpG bG9hdFJlY3Qgc2NhbGVkUGFpbnRpbmdSZWN0ID0gbV9wYWludGluZ1JlY3RzWzBdOworICAgICAg ICBzY2FsZWRQYWludGluZ1JlY3Quc2NhbGUobV9zY2FsZSk7CisgICAgICAgIGNvbnRleHQuY2xp cChzY2FsZWRQYWludGluZ1JlY3QpOworICAgIH0gZWxzZSB7CisgICAgICAgIFdlYkNvcmU6OlBh dGggY2xpcFBhdGg7CisgICAgICAgIGZvciAoYXV0byByZWN0IDogbV9wYWludGluZ1JlY3RzKSB7 CisgICAgICAgICAgICByZWN0LnNjYWxlKG1fc2NhbGUpOworICAgICAgICAgICAgY2xpcFBhdGgu YWRkUmVjdChyZWN0KTsKKyAgICAgICAgfQorICAgICAgICBjb250ZXh0LmNsaXBQYXRoKGNsaXBQ YXRoKTsKKyAgICB9CiAKICAgICBpZiAoIW1faXNPcGFxdWUpCiAgICAgICAgIGNvbnRleHQuY2xl YXJSZWN0KHNjYWxlZExheWVyQm91bmRzKTsK 413670 2020-11-09 23:19:09 -0800 2020-11-09 23:32:47 -0800 Patch bug-218738-20201109231909.patch text/plain 5998 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg5ZGYzY2RmNmY3ZjU3MWFk MzkyMmMyNDIzN2MwNjc0ZmIxN2RjNjMuLjRiMjRjOWI3ODVkOWQwNmE3N2Y2MDU3ODc1YTYxMGUw MGMxNDIxZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMTEtMDkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEdyYXBoaWNzQ29u dGV4dCBpbnN0ZWFkIG9mIENHQ29udGV4dCBpbiBSZW1vdGVMYXllckJhY2tpbmdTdG9yZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4NzM4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogU2hhcmVkL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQpOgorICAgICAgICBNYWtlIHVz ZSBvZiB0aGUgR3JhcGhpY3NDb250ZXh0IGFic3RyYWN0aW9uIGluc3RlYWQgb2YgZHJvcHBpbmcg ZG93bgorICAgICAgICB0byBDR0NvbnRleHQsIGluIHByZXBhcmF0aW9uIGZvciBEaXNwbGF5TGlz dCByZW5kZXJpbmcuCisKIDIwMjAtMTEtMDkgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBDb250cm9sIHRoZSBsaWZlIGN5Y2xlIG9m IHRoZSBwbGF0Zm9ybSBpbWFnZSBieSBhIG5ldyBjbGFzcyBuYW1lZCBOYXRpdmVJbWFnZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy QmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVt b3RlTGF5ZXJCYWNraW5nU3RvcmUuaAppbmRleCBkYjE5NGU3MGE0ZWZkM2JkNDZiY2VmOGMyNTI4 ZDM0NWIyMWZlM2I2Li41N2IwZTMyNzY0MjcxN2I0YTQzZWYzZjZlYmY5NjAxNTgxZjM0NmJjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRy ZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUuaApAQCAtMzYsNiArMzYsNyBAQCBPQkpDX0NMQVNT IENBTGF5ZXI7CiAKIC8vIEZJWE1FOiBNYWtlIFBsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAgT2Jq ZWN0aXZlLUMgc28gd2UgY2FuIGluY2x1ZGUgV2ViTGF5ZXIuaCBoZXJlIGFuZCBzaGFyZSB0aGUg dHlwZWRlZi4KIG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIE5hdGl2ZUltYWdlOwogdHlwZWRl ZiBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0LCA1PiBSZXBhaW50UmVjdExpc3Q7CiB9CiAKQEAg LTk2LDcgKzk3LDcgQEAgcHVibGljOgogICAgIE1vbm90b25pY1RpbWUgbGFzdERpc3BsYXlUaW1l KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0RGlzcGxheVRpbWU7IH0KIAogcHJpdmF0ZToKLSAgICB2 b2lkIGRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgQ0dJbWFnZVJlZiBi YWNrSW1hZ2UpOworICAgIHZvaWQgZHJhd0luQ29udGV4dChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQmLCBSZWZQdHI8V2ViQ29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKTsKICAgICB2b2lk IGNsZWFyQmFja2luZ1N0b3JlKCk7CiAgICAgdm9pZCBzd2FwVG9WYWxpZEZyb250QnVmZmVyKCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1v dGVMYXllckJhY2tpbmdTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVy VHJlZS9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQppbmRleCAwMTBjYTJjNWFiNTJkYWRjOTUz MGU1NTI4NWNiZGQzNWMxYTAzMGM1Li5lYjhkNGY5NDAzYWE5NzI4NDM1Yjc4NGIxMjdkYzE0YjFm ZDM1MWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUv UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVt b3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC0yMzksMTYgKzIzOSwx NiBAQCBib29sIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICBzd2FwVG9W YWxpZEZyb250QnVmZmVyKCk7CiAKICAgICBpZiAobV9hY2NlbGVyYXRlc0RyYXdpbmcpIHsKLSAg ICAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdl YkNvcmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIu c3VyZmFjZSAmJiAhd2lsbFBhaW50RW50aXJlQmFja2luZ1N0b3JlKQotICAgICAgICAgICAgYmFj a0ltYWdlID0gbV9iYWNrQnVmZmVyLnN1cmZhY2UtPmNyZWF0ZUltYWdlKCk7CisgICAgICAgICAg ICBiYWNrSW1hZ2UgPSBXZWJDb3JlOjpOYXRpdmVJbWFnZTo6Y3JlYXRlKG1fYmFja0J1ZmZlci5z dXJmYWNlLT5jcmVhdGVJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAobV9mcm9udEJ1ZmZl ci5zdXJmYWNlKSB7CiAgICAgICAgICAgICBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQgPSBtX2Zyb250QnVmZmVyLnN1cmZhY2UtPmVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwogCiAg ICAgICAgICAgICBjb250ZXh0LnNjYWxlKFdlYkNvcmU6OkZsb2F0U2l6ZSgxLCAtMSkpOwogICAg ICAgICAgICAgY29udGV4dC50cmFuc2xhdGUoMCwgLWV4cGFuZGVkU2NhbGVkU2l6ZS5oZWlnaHQo KSk7Ci0gICAgICAgICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7 CisgICAgICAgICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIFdURk1vdmUoYmFja0ltYWdlKSk7 CiAKICAgICAgICAgICAgIG1fZnJvbnRCdWZmZXIuc3VyZmFjZS0+cmVsZWFzZUdyYXBoaWNzQ29u dGV4dCgpOwogICAgICAgICB9CkBAIC0yNTYsMTIgKzI1NiwxMiBAQCBib29sIFJlbW90ZUxheWVy QmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICAgICAgQVNTRVJUKCFtX2FjY2VsZXJhdGVzRHJh d2luZyk7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+ IGNvbnRleHQgPSBtX2Zyb250QnVmZmVyLmJpdG1hcC0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7 CiAKLSAgICAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVm UHRyPFdlYkNvcmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tC dWZmZXIuYml0bWFwICYmICF3aWxsUGFpbnRFbnRpcmVCYWNraW5nU3RvcmUpCi0gICAgICAgICAg ICBiYWNrSW1hZ2UgPSBtX2JhY2tCdWZmZXIuYml0bWFwLT5tYWtlQ0dJbWFnZSgpOworICAgICAg ICAgICAgYmFja0ltYWdlID0gV2ViQ29yZTo6TmF0aXZlSW1hZ2U6OmNyZWF0ZShtX2JhY2tCdWZm ZXIuYml0bWFwLT5tYWtlQ0dJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAoY29udGV4dCkK LSAgICAgICAgICAgIGRyYXdJbkNvbnRleHQoKmNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7Cisg ICAgICAgICAgICBkcmF3SW5Db250ZXh0KCpjb250ZXh0LCBXVEZNb3ZlKGJhY2tJbWFnZSkpOwog ICAgIH0KICAgICAKICAgICBtX2xheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNBTGF5ZXJMYXllckRp ZERpc3BsYXkobV9sYXllcik7CkBAIC0yNjksNyArMjY5LDcgQEAgYm9vbCBSZW1vdGVMYXllckJh Y2tpbmdTdG9yZTo6ZGlzcGxheSgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBDR0ltYWdlUmVmIGJhY2tJbWFnZSkKK3ZvaWQgUmVtb3RlTGF5ZXJCYWNraW5n U3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBS ZWZQdHI8V2ViQ29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKQogewogICAgIFdlYkNvcmU6 OkZsb2F0U2l6ZSBzY2FsZWRTaXplID0gbV9zaXplOwogICAgIHNjYWxlZFNpemUuc2NhbGUobV9z Y2FsZSk7CkBAIC0yOTUsMjQgKzI5NSwyNCBAQCB2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3Jl OjpkcmF3SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgQwogICAg ICAgICBtX3BhaW50aW5nUmVjdHMuYXBwZW5kKHNjYWxlZFJlY3QpOwogICAgIH0KIAotICAgIENH UmVjdCBjZ1BhaW50aW5nUmVjdHNbV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjp3ZWJMYXllck1h eFJlY3RzVG9QYWludF07Ci0gICAgZm9yIChzaXplX3QgaSA9IDAsIGRpcnR5UmVjdENvdW50ID0g bV9wYWludGluZ1JlY3RzLnNpemUoKTsgaSA8IGRpcnR5UmVjdENvdW50OyArK2kpIHsKLSAgICAg ICAgV2ViQ29yZTo6RmxvYXRSZWN0IHNjYWxlZFBhaW50aW5nUmVjdCA9IG1fcGFpbnRpbmdSZWN0 c1tpXTsKLSAgICAgICAgc2NhbGVkUGFpbnRpbmdSZWN0LnNjYWxlKG1fc2NhbGUpOwotICAgICAg ICBjZ1BhaW50aW5nUmVjdHNbaV0gPSBzY2FsZWRQYWludGluZ1JlY3Q7Ci0gICAgfQotCi0gICAg Q0dDb250ZXh0UmVmIGNnQ29udGV4dCA9IGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7Ci0KICAg ICBpZiAoYmFja0ltYWdlKSB7Ci0gICAgICAgIFdlYkNvcmU6OkNHQ29udGV4dFN0YXRlU2F2ZXIg c3RhdGVTYXZlcihjZ0NvbnRleHQpOwotICAgICAgICBDR0NvbnRleHRTZXRCbGVuZE1vZGUoY2dD b250ZXh0LCBrQ0dCbGVuZE1vZGVDb3B5KTsKLSAgICAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RN KGNnQ29udGV4dCwgMCwgc2NhbGVkTGF5ZXJCb3VuZHMuaGVpZ2h0KCkpOwotICAgICAgICBDR0Nv bnRleHRTY2FsZUNUTShjZ0NvbnRleHQsIDEsIC0xKTsKLSAgICAgICAgQ0dDb250ZXh0RHJhd0lt YWdlKGNnQ29udGV4dCwgc2NhbGVkTGF5ZXJCb3VuZHMsIGJhY2tJbWFnZSk7CisgICAgICAgIFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKKyAg ICAgICAgY29udGV4dC5zZXRDb21wb3NpdGVPcGVyYXRpb24oV2ViQ29yZTo6Q29tcG9zaXRlT3Bl cmF0b3I6OkNvcHkpOworICAgICAgICBjb250ZXh0LmRyYXdOYXRpdmVJbWFnZSgqYmFja0ltYWdl LCBzY2FsZWRMYXllckJvdW5kcy5zaXplKCksIHNjYWxlZExheWVyQm91bmRzLCBzY2FsZWRMYXll ckJvdW5kcyk7CiAgICAgfQogCi0gICAgQ0dDb250ZXh0Q2xpcFRvUmVjdHMoY2dDb250ZXh0LCBj Z1BhaW50aW5nUmVjdHMsIG1fcGFpbnRpbmdSZWN0cy5zaXplKCkpOworICAgIGlmIChtX3BhaW50 aW5nUmVjdHMuc2l6ZSgpID09IDEpIHsKKyAgICAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHNjYWxl ZFBhaW50aW5nUmVjdCA9IG1fcGFpbnRpbmdSZWN0c1swXTsKKyAgICAgICAgc2NhbGVkUGFpbnRp bmdSZWN0LnNjYWxlKG1fc2NhbGUpOworICAgICAgICBjb250ZXh0LmNsaXAoc2NhbGVkUGFpbnRp bmdSZWN0KTsKKyAgICB9IGVsc2UgeworICAgICAgICBXZWJDb3JlOjpQYXRoIGNsaXBQYXRoOwor ICAgICAgICBmb3IgKGF1dG8gcmVjdCA6IG1fcGFpbnRpbmdSZWN0cykgeworICAgICAgICAgICAg cmVjdC5zY2FsZShtX3NjYWxlKTsKKyAgICAgICAgICAgIGNsaXBQYXRoLmFkZFJlY3QocmVjdCk7 CisgICAgICAgIH0KKyAgICAgICAgY29udGV4dC5jbGlwUGF0aChjbGlwUGF0aCk7CisgICAgfQog CiAgICAgaWYgKCFtX2lzT3BhcXVlKQogICAgICAgICBjb250ZXh0LmNsZWFyUmVjdChzY2FsZWRM YXllckJvdW5kcyk7Cg== 413671 2020-11-09 23:22:00 -0800 2020-11-10 16:09:12 -0800 Patch bug-218738-20201109232159.patch text/plain 8269 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViM2E2YjcyYmIyYmQ1 MjA2YTRkMjRjNDljNzEyYjUwN2I3Y2Y3ZS4uYmNlYjlmNjA2YmU2MDQ0OGNiOTVkNDcwNmU5ZmY4 ZTdmYzBmOTFkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBHcmFwaGlj c0NvbnRleHQgaW5zdGVhZCBvZiBDR0NvbnRleHQgaW4gUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODczOAor CisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBObyBuZXcgdGVz dHM7IGp1c3QgcmVmYWN0b3JpbmcgYSBoZWF2aWx5LXRlc3RlZCBjb2RlcGF0aC4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL1BhdGguaDoKKyAgICAgICAgRXhwb3J0IHNvbWUgdGhpbmdzLgorCiAyMDIw LTExLTA5ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtH UFUgUHJvY2Vzc10gQ29udHJvbCB0aGUgbGlmZSBjeWNsZSBvZiB0aGUgcGxhdGZvcm0gaW1hZ2Ug YnkgYSBuZXcgY2xhc3MgbmFtZWQgTmF0aXZlSW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggODlkZjNjZGY2Zjdm NTcxYWQzOTIyYzI0MjM3YzA2NzRmYjE3ZGM2My4uNGIyNGM5Yjc4NWQ5ZDA2YTc3ZjYwNTc4NzVh NjEwZTAwYzE0MjFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0xMS0wOSAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgR3JhcGhp Y3NDb250ZXh0IGluc3RlYWQgb2YgQ0dDb250ZXh0IGluIFJlbW90ZUxheWVyQmFja2luZ1N0b3Jl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg3MzgK KworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBTaGFyZWQv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6ZHJhd0luQ29udGV4dCk6CisgICAgICAgIE1h a2UgdXNlIG9mIHRoZSBHcmFwaGljc0NvbnRleHQgYWJzdHJhY3Rpb24gaW5zdGVhZCBvZiBkcm9w cGluZyBkb3duCisgICAgICAgIHRvIENHQ29udGV4dCwgaW4gcHJlcGFyYXRpb24gZm9yIERpc3Bs YXlMaXN0IHJlbmRlcmluZy4KKwogMjAyMC0xMS0wOSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlk QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIENvbnRyb2wgdGhlIGxpZmUgY3lj bGUgb2YgdGhlIHBsYXRmb3JtIGltYWdlIGJ5IGEgbmV3IGNsYXNzIG5hbWVkIE5hdGl2ZUltYWdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCmluZGV4IGZjY2FlZWQ3ZjdhYTBjMWQ2YzBjMTcyYmI1NjBkNWYwNTNlOGEzYzQuLjRmOTJj ZGFjZWU0MDUzYWFjMjA4OTk1OTQzZDI2NWM4MjgwNGM1YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC00MDYsNyArNDA2 LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBjbGlwT3V0KGNvbnN0IEZsb2F0UmVjdCYpOwogICAg IHZvaWQgY2xpcE91dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmKTsKLSAgICB2 b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSA9IFdpbmRSdWxlOjpFdmVuT2RkKTsK KyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSA9 IFdpbmRSdWxlOjpFdmVuT2RkKTsKICAgICB2b2lkIGNsaXBUb0ltYWdlQnVmZmVyKEltYWdlQnVm ZmVyJiwgY29uc3QgRmxvYXRSZWN0Jik7CiAKICAgICBlbnVtIGNsYXNzIENsaXBUb0RyYXdpbmdD b21tYW5kc1Jlc3VsdCA6IGJvb2wgeyBTdWNjZXNzLCBGYWlsZWRUb0NyZWF0ZUltYWdlQnVmZmVy IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKaW5kZXggZTVmZTc4MjE0 ZmYzYjUyOGM2OTA3MTI1YzgwYjEzMWYwNDFlY2NjYS4uN2MzYWUyMWM0Zjg0ZmFiOTA1NjY2OGQ2 MDRkZjE1NWM5ZDA2YzJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGgu aApAQCAtMTc1LDcgKzE3NSw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNs b3NlU3VicGF0aCgpOwogCiAgICAgdm9pZCBhZGRBcmMoY29uc3QgRmxvYXRQb2ludCYsIGZsb2F0 IHJhZGl1cywgZmxvYXQgc3RhcnRBbmdsZSwgZmxvYXQgZW5kQW5nbGUsIGJvb2wgYW50aWNsb2Nr d2lzZSk7Ci0gICAgdm9pZCBhZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYpOworICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgYWRkUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2b2lkIGFkZEVsbGlw c2UoRmxvYXRQb2ludCwgZmxvYXQgcmFkaXVzWCwgZmxvYXQgcmFkaXVzWSwgZmxvYXQgcm90YXRp b24sIGZsb2F0IHN0YXJ0QW5nbGUsIGZsb2F0IGVuZEFuZ2xlLCBib29sIGFudGljbG9ja3dpc2Up OwogICAgIHZvaWQgYWRkRWxsaXBzZShjb25zdCBGbG9hdFJlY3QmKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0 b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJC YWNraW5nU3RvcmUuaAppbmRleCBkYjE5NGU3MGE0ZWZkM2JkNDZiY2VmOGMyNTI4ZDM0NWIyMWZl M2I2Li41N2IwZTMyNzY0MjcxN2I0YTQzZWYzZjZlYmY5NjAxNTgxZjM0NmJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5n U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmUuaApAQCAtMzYsNiArMzYsNyBAQCBPQkpDX0NMQVNTIENBTGF5ZXI7 CiAKIC8vIEZJWE1FOiBNYWtlIFBsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAgT2JqZWN0aXZlLUMg c28gd2UgY2FuIGluY2x1ZGUgV2ViTGF5ZXIuaCBoZXJlIGFuZCBzaGFyZSB0aGUgdHlwZWRlZi4K IG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIE5hdGl2ZUltYWdlOwogdHlwZWRlZiBWZWN0b3I8 V2ViQ29yZTo6RmxvYXRSZWN0LCA1PiBSZXBhaW50UmVjdExpc3Q7CiB9CiAKQEAgLTk2LDcgKzk3 LDcgQEAgcHVibGljOgogICAgIE1vbm90b25pY1RpbWUgbGFzdERpc3BsYXlUaW1lKCkgY29uc3Qg eyByZXR1cm4gbV9sYXN0RGlzcGxheVRpbWU7IH0KIAogcHJpdmF0ZToKLSAgICB2b2lkIGRyYXdJ bkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgQ0dJbWFnZVJlZiBiYWNrSW1hZ2Up OworICAgIHZvaWQgZHJhd0luQ29udGV4dChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBSZWZQ dHI8V2ViQ29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKTsKICAgICB2b2lkIGNsZWFyQmFj a2luZ1N0b3JlKCk7CiAgICAgdm9pZCBzd2FwVG9WYWxpZEZyb250QnVmZmVyKCk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllckJh Y2tpbmdTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1v dGVMYXllckJhY2tpbmdTdG9yZS5tbQppbmRleCAwMTBjYTJjNWFiNTJkYWRjOTUzMGU1NTI4NWNi ZGQzNWMxYTAzMGM1Li5lYjhkNGY5NDAzYWE5NzI4NDM1Yjc4NGIxMjdkYzE0YjFmZDM1MWI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC0yMzksMTYgKzIzOSwxNiBAQCBib29s IFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICBzd2FwVG9WYWxpZEZyb250 QnVmZmVyKCk7CiAKICAgICBpZiAobV9hY2NlbGVyYXRlc0RyYXdpbmcpIHsKLSAgICAgICAgUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdlYkNvcmU6Ok5h dGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIuc3VyZmFjZSAm JiAhd2lsbFBhaW50RW50aXJlQmFja2luZ1N0b3JlKQotICAgICAgICAgICAgYmFja0ltYWdlID0g bV9iYWNrQnVmZmVyLnN1cmZhY2UtPmNyZWF0ZUltYWdlKCk7CisgICAgICAgICAgICBiYWNrSW1h Z2UgPSBXZWJDb3JlOjpOYXRpdmVJbWFnZTo6Y3JlYXRlKG1fYmFja0J1ZmZlci5zdXJmYWNlLT5j cmVhdGVJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAobV9mcm9udEJ1ZmZlci5zdXJmYWNl KSB7CiAgICAgICAgICAgICBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQgPSBtX2Zy b250QnVmZmVyLnN1cmZhY2UtPmVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwogCiAgICAgICAgICAg ICBjb250ZXh0LnNjYWxlKFdlYkNvcmU6OkZsb2F0U2l6ZSgxLCAtMSkpOwogICAgICAgICAgICAg Y29udGV4dC50cmFuc2xhdGUoMCwgLWV4cGFuZGVkU2NhbGVkU2l6ZS5oZWlnaHQoKSk7Ci0gICAg ICAgICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7CisgICAgICAg ICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIFdURk1vdmUoYmFja0ltYWdlKSk7CiAKICAgICAg ICAgICAgIG1fZnJvbnRCdWZmZXIuc3VyZmFjZS0+cmVsZWFzZUdyYXBoaWNzQ29udGV4dCgpOwog ICAgICAgICB9CkBAIC0yNTYsMTIgKzI1NiwxMiBAQCBib29sIFJlbW90ZUxheWVyQmFja2luZ1N0 b3JlOjpkaXNwbGF5KCkKICAgICAgICAgQVNTRVJUKCFtX2FjY2VsZXJhdGVzRHJhd2luZyk7CiAg ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGNvbnRleHQg PSBtX2Zyb250QnVmZmVyLmJpdG1hcC0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAKLSAgICAg ICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdlYkNv cmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIuYml0 bWFwICYmICF3aWxsUGFpbnRFbnRpcmVCYWNraW5nU3RvcmUpCi0gICAgICAgICAgICBiYWNrSW1h Z2UgPSBtX2JhY2tCdWZmZXIuYml0bWFwLT5tYWtlQ0dJbWFnZSgpOworICAgICAgICAgICAgYmFj a0ltYWdlID0gV2ViQ29yZTo6TmF0aXZlSW1hZ2U6OmNyZWF0ZShtX2JhY2tCdWZmZXIuYml0bWFw LT5tYWtlQ0dJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAoY29udGV4dCkKLSAgICAgICAg ICAgIGRyYXdJbkNvbnRleHQoKmNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7CisgICAgICAgICAg ICBkcmF3SW5Db250ZXh0KCpjb250ZXh0LCBXVEZNb3ZlKGJhY2tJbWFnZSkpOwogICAgIH0KICAg ICAKICAgICBtX2xheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3BsYXko bV9sYXllcik7CkBAIC0yNjksNyArMjY5LDcgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9y ZTo6ZGlzcGxheSgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUmVtb3RlTGF5ZXJCYWNr aW5nU3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBDR0ltYWdlUmVmIGJhY2tJbWFnZSkKK3ZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRy YXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBSZWZQdHI8V2Vi Q29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKQogewogICAgIFdlYkNvcmU6OkZsb2F0U2l6 ZSBzY2FsZWRTaXplID0gbV9zaXplOwogICAgIHNjYWxlZFNpemUuc2NhbGUobV9zY2FsZSk7CkBA IC0yOTUsMjQgKzI5NSwyNCBAQCB2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5D b250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgQwogICAgICAgICBtX3Bh aW50aW5nUmVjdHMuYXBwZW5kKHNjYWxlZFJlY3QpOwogICAgIH0KIAotICAgIENHUmVjdCBjZ1Bh aW50aW5nUmVjdHNbV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjp3ZWJMYXllck1heFJlY3RzVG9Q YWludF07Ci0gICAgZm9yIChzaXplX3QgaSA9IDAsIGRpcnR5UmVjdENvdW50ID0gbV9wYWludGlu Z1JlY3RzLnNpemUoKTsgaSA8IGRpcnR5UmVjdENvdW50OyArK2kpIHsKLSAgICAgICAgV2ViQ29y ZTo6RmxvYXRSZWN0IHNjYWxlZFBhaW50aW5nUmVjdCA9IG1fcGFpbnRpbmdSZWN0c1tpXTsKLSAg ICAgICAgc2NhbGVkUGFpbnRpbmdSZWN0LnNjYWxlKG1fc2NhbGUpOwotICAgICAgICBjZ1BhaW50 aW5nUmVjdHNbaV0gPSBzY2FsZWRQYWludGluZ1JlY3Q7Ci0gICAgfQotCi0gICAgQ0dDb250ZXh0 UmVmIGNnQ29udGV4dCA9IGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7Ci0KICAgICBpZiAoYmFj a0ltYWdlKSB7Ci0gICAgICAgIFdlYkNvcmU6OkNHQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZl cihjZ0NvbnRleHQpOwotICAgICAgICBDR0NvbnRleHRTZXRCbGVuZE1vZGUoY2dDb250ZXh0LCBr Q0dCbGVuZE1vZGVDb3B5KTsKLSAgICAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGNnQ29udGV4 dCwgMCwgc2NhbGVkTGF5ZXJCb3VuZHMuaGVpZ2h0KCkpOwotICAgICAgICBDR0NvbnRleHRTY2Fs ZUNUTShjZ0NvbnRleHQsIDEsIC0xKTsKLSAgICAgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGNnQ29u dGV4dCwgc2NhbGVkTGF5ZXJCb3VuZHMsIGJhY2tJbWFnZSk7CisgICAgICAgIFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKKyAgICAgICAgY29u dGV4dC5zZXRDb21wb3NpdGVPcGVyYXRpb24oV2ViQ29yZTo6Q29tcG9zaXRlT3BlcmF0b3I6OkNv cHkpOworICAgICAgICBjb250ZXh0LmRyYXdOYXRpdmVJbWFnZSgqYmFja0ltYWdlLCBzY2FsZWRM YXllckJvdW5kcy5zaXplKCksIHNjYWxlZExheWVyQm91bmRzLCBzY2FsZWRMYXllckJvdW5kcyk7 CiAgICAgfQogCi0gICAgQ0dDb250ZXh0Q2xpcFRvUmVjdHMoY2dDb250ZXh0LCBjZ1BhaW50aW5n UmVjdHMsIG1fcGFpbnRpbmdSZWN0cy5zaXplKCkpOworICAgIGlmIChtX3BhaW50aW5nUmVjdHMu c2l6ZSgpID09IDEpIHsKKyAgICAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHNjYWxlZFBhaW50aW5n UmVjdCA9IG1fcGFpbnRpbmdSZWN0c1swXTsKKyAgICAgICAgc2NhbGVkUGFpbnRpbmdSZWN0LnNj YWxlKG1fc2NhbGUpOworICAgICAgICBjb250ZXh0LmNsaXAoc2NhbGVkUGFpbnRpbmdSZWN0KTsK KyAgICB9IGVsc2UgeworICAgICAgICBXZWJDb3JlOjpQYXRoIGNsaXBQYXRoOworICAgICAgICBm b3IgKGF1dG8gcmVjdCA6IG1fcGFpbnRpbmdSZWN0cykgeworICAgICAgICAgICAgcmVjdC5zY2Fs ZShtX3NjYWxlKTsKKyAgICAgICAgICAgIGNsaXBQYXRoLmFkZFJlY3QocmVjdCk7CisgICAgICAg IH0KKyAgICAgICAgY29udGV4dC5jbGlwUGF0aChjbGlwUGF0aCk7CisgICAgfQogCiAgICAgaWYg KCFtX2lzT3BhcXVlKQogICAgICAgICBjb250ZXh0LmNsZWFyUmVjdChzY2FsZWRMYXllckJvdW5k cyk7Cg== 413755 2020-11-10 16:09:13 -0800 2020-11-10 16:47:18 -0800 Patch bug-218738-20201110160912.patch text/plain 8183 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmViM2E2YjcyYmIyYmQ1 MjA2YTRkMjRjNDljNzEyYjUwN2I3Y2Y3ZS4uYmNlYjlmNjA2YmU2MDQ0OGNiOTVkNDcwNmU5ZmY4 ZTdmYzBmOTFkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBHcmFwaGlj c0NvbnRleHQgaW5zdGVhZCBvZiBDR0NvbnRleHQgaW4gUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODczOAor CisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBObyBuZXcgdGVz dHM7IGp1c3QgcmVmYWN0b3JpbmcgYSBoZWF2aWx5LXRlc3RlZCBjb2RlcGF0aC4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL1BhdGguaDoKKyAgICAgICAgRXhwb3J0IHNvbWUgdGhpbmdzLgorCiAyMDIw LTExLTA5ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtH UFUgUHJvY2Vzc10gQ29udHJvbCB0aGUgbGlmZSBjeWNsZSBvZiB0aGUgcGxhdGZvcm0gaW1hZ2Ug YnkgYSBuZXcgY2xhc3MgbmFtZWQgTmF0aXZlSW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggODlkZjNjZGY2Zjdm NTcxYWQzOTIyYzI0MjM3YzA2NzRmYjE3ZGM2My4uNGIyNGM5Yjc4NWQ5ZDA2YTc3ZjYwNTc4NzVh NjEwZTAwYzE0MjFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0xMS0wOSAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgR3JhcGhp Y3NDb250ZXh0IGluc3RlYWQgb2YgQ0dDb250ZXh0IGluIFJlbW90ZUxheWVyQmFja2luZ1N0b3Jl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg3MzgK KworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBTaGFyZWQv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6ZHJhd0luQ29udGV4dCk6CisgICAgICAgIE1h a2UgdXNlIG9mIHRoZSBHcmFwaGljc0NvbnRleHQgYWJzdHJhY3Rpb24gaW5zdGVhZCBvZiBkcm9w cGluZyBkb3duCisgICAgICAgIHRvIENHQ29udGV4dCwgaW4gcHJlcGFyYXRpb24gZm9yIERpc3Bs YXlMaXN0IHJlbmRlcmluZy4KKwogMjAyMC0xMS0wOSAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlk QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIENvbnRyb2wgdGhlIGxpZmUgY3lj bGUgb2YgdGhlIHBsYXRmb3JtIGltYWdlIGJ5IGEgbmV3IGNsYXNzIG5hbWVkIE5hdGl2ZUltYWdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCmluZGV4IGZjY2FlZWQ3ZjdhYTBjMWQ2YzBjMTcyYmI1NjBkNWYwNTNlOGEzYzQuLjRmOTJj ZGFjZWU0MDUzYWFjMjA4OTk1OTQzZDI2NWM4MjgwNGM1YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC00MDYsNyArNDA2 LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBjbGlwT3V0KGNvbnN0IEZsb2F0UmVjdCYpOwogICAg IHZvaWQgY2xpcE91dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmKTsKLSAgICB2 b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSA9IFdpbmRSdWxlOjpFdmVuT2RkKTsK KyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSA9 IFdpbmRSdWxlOjpFdmVuT2RkKTsKICAgICB2b2lkIGNsaXBUb0ltYWdlQnVmZmVyKEltYWdlQnVm ZmVyJiwgY29uc3QgRmxvYXRSZWN0Jik7CiAKICAgICBlbnVtIGNsYXNzIENsaXBUb0RyYXdpbmdD b21tYW5kc1Jlc3VsdCA6IGJvb2wgeyBTdWNjZXNzLCBGYWlsZWRUb0NyZWF0ZUltYWdlQnVmZmVy IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKaW5kZXggZTVmZTc4MjE0 ZmYzYjUyOGM2OTA3MTI1YzgwYjEzMWYwNDFlY2NjYS4uN2MzYWUyMWM0Zjg0ZmFiOTA1NjY2OGQ2 MDRkZjE1NWM5ZDA2YzJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGgu aApAQCAtMTc1LDcgKzE3NSw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNs b3NlU3VicGF0aCgpOwogCiAgICAgdm9pZCBhZGRBcmMoY29uc3QgRmxvYXRQb2ludCYsIGZsb2F0 IHJhZGl1cywgZmxvYXQgc3RhcnRBbmdsZSwgZmxvYXQgZW5kQW5nbGUsIGJvb2wgYW50aWNsb2Nr d2lzZSk7Ci0gICAgdm9pZCBhZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYpOworICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgYWRkUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2b2lkIGFkZEVsbGlw c2UoRmxvYXRQb2ludCwgZmxvYXQgcmFkaXVzWCwgZmxvYXQgcmFkaXVzWSwgZmxvYXQgcm90YXRp b24sIGZsb2F0IHN0YXJ0QW5nbGUsIGZsb2F0IGVuZEFuZ2xlLCBib29sIGFudGljbG9ja3dpc2Up OwogICAgIHZvaWQgYWRkRWxsaXBzZShjb25zdCBGbG9hdFJlY3QmKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0 b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJC YWNraW5nU3RvcmUuaAppbmRleCBkYjE5NGU3MGE0ZWZkM2JkNDZiY2VmOGMyNTI4ZDM0NWIyMWZl M2I2Li41N2IwZTMyNzY0MjcxN2I0YTQzZWYzZjZlYmY5NjAxNTgxZjM0NmJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5n U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmUuaApAQCAtMzYsNiArMzYsNyBAQCBPQkpDX0NMQVNTIENBTGF5ZXI7 CiAKIC8vIEZJWE1FOiBNYWtlIFBsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAgT2JqZWN0aXZlLUMg c28gd2UgY2FuIGluY2x1ZGUgV2ViTGF5ZXIuaCBoZXJlIGFuZCBzaGFyZSB0aGUgdHlwZWRlZi4K IG5hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIE5hdGl2ZUltYWdlOwogdHlwZWRlZiBWZWN0b3I8 V2ViQ29yZTo6RmxvYXRSZWN0LCA1PiBSZXBhaW50UmVjdExpc3Q7CiB9CiAKQEAgLTk2LDcgKzk3 LDcgQEAgcHVibGljOgogICAgIE1vbm90b25pY1RpbWUgbGFzdERpc3BsYXlUaW1lKCkgY29uc3Qg eyByZXR1cm4gbV9sYXN0RGlzcGxheVRpbWU7IH0KIAogcHJpdmF0ZToKLSAgICB2b2lkIGRyYXdJ bkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgQ0dJbWFnZVJlZiBiYWNrSW1hZ2Up OworICAgIHZvaWQgZHJhd0luQ29udGV4dChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBSZWZQ dHI8V2ViQ29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKTsKICAgICB2b2lkIGNsZWFyQmFj a2luZ1N0b3JlKCk7CiAgICAgdm9pZCBzd2FwVG9WYWxpZEZyb250QnVmZmVyKCk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllckJh Y2tpbmdTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1v dGVMYXllckJhY2tpbmdTdG9yZS5tbQppbmRleCAwMTBjYTJjNWFiNTJkYWRjOTUzMGU1NTI4NWNi ZGQzNWMxYTAzMGM1Li5jZWY1YTllZDRlMmQ0ZmUwMWIzYjdjMzYwMGIyNTU3N2M2NjA4YjQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC0yMzksMTYgKzIzOSwxNiBAQCBib29s IFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICBzd2FwVG9WYWxpZEZyb250 QnVmZmVyKCk7CiAKICAgICBpZiAobV9hY2NlbGVyYXRlc0RyYXdpbmcpIHsKLSAgICAgICAgUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdlYkNvcmU6Ok5h dGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIuc3VyZmFjZSAm JiAhd2lsbFBhaW50RW50aXJlQmFja2luZ1N0b3JlKQotICAgICAgICAgICAgYmFja0ltYWdlID0g bV9iYWNrQnVmZmVyLnN1cmZhY2UtPmNyZWF0ZUltYWdlKCk7CisgICAgICAgICAgICBiYWNrSW1h Z2UgPSBXZWJDb3JlOjpOYXRpdmVJbWFnZTo6Y3JlYXRlKG1fYmFja0J1ZmZlci5zdXJmYWNlLT5j cmVhdGVJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAobV9mcm9udEJ1ZmZlci5zdXJmYWNl KSB7CiAgICAgICAgICAgICBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQgPSBtX2Zy b250QnVmZmVyLnN1cmZhY2UtPmVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwogCiAgICAgICAgICAg ICBjb250ZXh0LnNjYWxlKFdlYkNvcmU6OkZsb2F0U2l6ZSgxLCAtMSkpOwogICAgICAgICAgICAg Y29udGV4dC50cmFuc2xhdGUoMCwgLWV4cGFuZGVkU2NhbGVkU2l6ZS5oZWlnaHQoKSk7Ci0gICAg ICAgICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7CisgICAgICAg ICAgICBkcmF3SW5Db250ZXh0KGNvbnRleHQsIFdURk1vdmUoYmFja0ltYWdlKSk7CiAKICAgICAg ICAgICAgIG1fZnJvbnRCdWZmZXIuc3VyZmFjZS0+cmVsZWFzZUdyYXBoaWNzQ29udGV4dCgpOwog ICAgICAgICB9CkBAIC0yNTYsMTIgKzI1NiwxMiBAQCBib29sIFJlbW90ZUxheWVyQmFja2luZ1N0 b3JlOjpkaXNwbGF5KCkKICAgICAgICAgQVNTRVJUKCFtX2FjY2VsZXJhdGVzRHJhd2luZyk7CiAg ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGNvbnRleHQg PSBtX2Zyb250QnVmZmVyLmJpdG1hcC0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAKLSAgICAg ICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGJhY2tJbWFnZTsKKyAgICAgICAgUmVmUHRyPFdlYkNv cmU6Ok5hdGl2ZUltYWdlPiBiYWNrSW1hZ2U7CiAgICAgICAgIGlmIChtX2JhY2tCdWZmZXIuYml0 bWFwICYmICF3aWxsUGFpbnRFbnRpcmVCYWNraW5nU3RvcmUpCi0gICAgICAgICAgICBiYWNrSW1h Z2UgPSBtX2JhY2tCdWZmZXIuYml0bWFwLT5tYWtlQ0dJbWFnZSgpOworICAgICAgICAgICAgYmFj a0ltYWdlID0gV2ViQ29yZTo6TmF0aXZlSW1hZ2U6OmNyZWF0ZShtX2JhY2tCdWZmZXIuYml0bWFw LT5tYWtlQ0dJbWFnZSgpLmdldCgpKTsKIAogICAgICAgICBpZiAoY29udGV4dCkKLSAgICAgICAg ICAgIGRyYXdJbkNvbnRleHQoKmNvbnRleHQsIGJhY2tJbWFnZS5nZXQoKSk7CisgICAgICAgICAg ICBkcmF3SW5Db250ZXh0KCpjb250ZXh0LCBXVEZNb3ZlKGJhY2tJbWFnZSkpOwogICAgIH0KICAg ICAKICAgICBtX2xheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNBTGF5ZXJMYXllckRpZERpc3BsYXko bV9sYXllcik7CkBAIC0yNjksNyArMjY5LDcgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9y ZTo6ZGlzcGxheSgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUmVtb3RlTGF5ZXJCYWNr aW5nU3RvcmU6OmRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBDR0ltYWdlUmVmIGJhY2tJbWFnZSkKK3ZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRy YXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBSZWZQdHI8V2Vi Q29yZTo6TmF0aXZlSW1hZ2U+JiYgYmFja0ltYWdlKQogewogICAgIFdlYkNvcmU6OkZsb2F0U2l6 ZSBzY2FsZWRTaXplID0gbV9zaXplOwogICAgIHNjYWxlZFNpemUuc2NhbGUobV9zY2FsZSk7CkBA IC0yOTUsMjUgKzI5NSwyMiBAQCB2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5D b250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgQwogICAgICAgICBtX3Bh aW50aW5nUmVjdHMuYXBwZW5kKHNjYWxlZFJlY3QpOwogICAgIH0KIAotICAgIENHUmVjdCBjZ1Bh aW50aW5nUmVjdHNbV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjp3ZWJMYXllck1heFJlY3RzVG9Q YWludF07Ci0gICAgZm9yIChzaXplX3QgaSA9IDAsIGRpcnR5UmVjdENvdW50ID0gbV9wYWludGlu Z1JlY3RzLnNpemUoKTsgaSA8IGRpcnR5UmVjdENvdW50OyArK2kpIHsKLSAgICAgICAgV2ViQ29y ZTo6RmxvYXRSZWN0IHNjYWxlZFBhaW50aW5nUmVjdCA9IG1fcGFpbnRpbmdSZWN0c1tpXTsKLSAg ICAgICAgc2NhbGVkUGFpbnRpbmdSZWN0LnNjYWxlKG1fc2NhbGUpOwotICAgICAgICBjZ1BhaW50 aW5nUmVjdHNbaV0gPSBzY2FsZWRQYWludGluZ1JlY3Q7Ci0gICAgfQorICAgIGlmIChiYWNrSW1h Z2UpCisgICAgICAgIGNvbnRleHQuZHJhd05hdGl2ZUltYWdlKCpiYWNrSW1hZ2UsIHNjYWxlZExh eWVyQm91bmRzLnNpemUoKSwgc2NhbGVkTGF5ZXJCb3VuZHMsIHNjYWxlZExheWVyQm91bmRzLCB7 IFdlYkNvcmU6OkNvbXBvc2l0ZU9wZXJhdG9yOjpDb3B5IH0pOwogCi0gICAgQ0dDb250ZXh0UmVm IGNnQ29udGV4dCA9IGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7Ci0KLSAgICBpZiAoYmFja0lt YWdlKSB7Ci0gICAgICAgIFdlYkNvcmU6OkNHQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihj Z0NvbnRleHQpOwotICAgICAgICBDR0NvbnRleHRTZXRCbGVuZE1vZGUoY2dDb250ZXh0LCBrQ0dC bGVuZE1vZGVDb3B5KTsKLSAgICAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGNnQ29udGV4dCwg MCwgc2NhbGVkTGF5ZXJCb3VuZHMuaGVpZ2h0KCkpOwotICAgICAgICBDR0NvbnRleHRTY2FsZUNU TShjZ0NvbnRleHQsIDEsIC0xKTsKLSAgICAgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGNnQ29udGV4 dCwgc2NhbGVkTGF5ZXJCb3VuZHMsIGJhY2tJbWFnZSk7CisgICAgaWYgKG1fcGFpbnRpbmdSZWN0 cy5zaXplKCkgPT0gMSkgeworICAgICAgICBXZWJDb3JlOjpGbG9hdFJlY3Qgc2NhbGVkUGFpbnRp bmdSZWN0ID0gbV9wYWludGluZ1JlY3RzWzBdOworICAgICAgICBzY2FsZWRQYWludGluZ1JlY3Qu c2NhbGUobV9zY2FsZSk7CisgICAgICAgIGNvbnRleHQuY2xpcChzY2FsZWRQYWludGluZ1JlY3Qp OworICAgIH0gZWxzZSB7CisgICAgICAgIFdlYkNvcmU6OlBhdGggY2xpcFBhdGg7CisgICAgICAg IGZvciAoYXV0byByZWN0IDogbV9wYWludGluZ1JlY3RzKSB7CisgICAgICAgICAgICByZWN0LnNj YWxlKG1fc2NhbGUpOworICAgICAgICAgICAgY2xpcFBhdGguYWRkUmVjdChyZWN0KTsKKyAgICAg ICAgfQorICAgICAgICBjb250ZXh0LmNsaXBQYXRoKGNsaXBQYXRoKTsKICAgICB9CiAKLSAgICBD R0NvbnRleHRDbGlwVG9SZWN0cyhjZ0NvbnRleHQsIGNnUGFpbnRpbmdSZWN0cywgbV9wYWludGlu Z1JlY3RzLnNpemUoKSk7Ci0KICAgICBpZiAoIW1faXNPcGFxdWUpCiAgICAgICAgIGNvbnRleHQu Y2xlYXJSZWN0KHNjYWxlZExheWVyQm91bmRzKTsKIAo=