232459 2021-10-28 15:31:44 -0700 Yahoo.com has fragments of wrongly-scaled content throughout when using CGDisplayListImageBufferBackend 2021-10-28 20:50:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton darin dino sabouhallawa simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1809868 0 thorton 2021-10-28 15:31:44 -0700 Yahoo.com has fragments of wrongly-scaled content throughout when using CGDisplayListImageBufferBackend 1809869 1 442753 thorton 2021-10-28 15:33:05 -0700 Created attachment 442753 Patch 1809871 2 442754 thorton 2021-10-28 15:35:16 -0700 Created attachment 442754 Patch 1809877 3 442754 darin 2021-10-28 15:44:32 -0700 Comment on attachment 442754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442754&action=review > Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp:40 > + GraphicsContextCGDisplayList(CGContextRef cgContext, float immutableBaseScaleFactor) Since AffineTransform is based on double, maybe we should store this as a double? Generally speaking not sure how performance critical any of this is, but written like this we have a float to double conversion every time setCTM and getCTM are called. But we also have floating point division in setCTM, and making the same AffineTransform each time the function is called, so I suspect it’s likely not all that performance critical. 1809883 4 thorton 2021-10-28 15:57:14 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 442754 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=442754&action=review > > > Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp:40 > > + GraphicsContextCGDisplayList(CGContextRef cgContext, float immutableBaseScaleFactor) > > Since AffineTransform is based on double, maybe we should store this as a > double? True! I was following all of our deviceScaleFactors, which are float-y, since that's where it *comes* from. > Generally speaking not sure how performance critical any of this is, > but written like this we have a float to double conversion every time setCTM > and getCTM are called. But we also have floating point division in setCTM, > and making the same AffineTransform each time the function is called, so I > suspect it’s likely not all that performance critical. Neither are /very/ hot in my testing, no, but these are both good points. I will adjust slightly to address both :) (in fact, because CGDisplayListImageBufferBackend's context is only ever used as the secondary context in a BifurcatedGraphicsContext, its getCTM is actually never called, I only included it here for completeness's sake and in case we ever want to use it directly). 1809941 5 442774 thorton 2021-10-28 20:07:51 -0700 Created attachment 442774 Patch 1809946 6 ews-feeder 2021-10-28 20:49:32 -0700 Committed r285017 (243661@main): <https://commits.webkit.org/243661@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442774. 1809947 7 webkit-bug-importer 2021-10-28 20:50:18 -0700 <rdar://problem/84792074> 442753 2021-10-28 15:33:05 -0700 2021-10-28 15:35:14 -0700 Patch bug-232459-20211028153304.patch text/plain 7225 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE0MjViMjMwOTMxNjY1 MTJmMzYxMTAyNzhiOTgyN2RiMzI3ZTA5ZC4uNGNkOWQyZjM3ZTRjMWJhYjZhYTEwOWYyNmRkNmYy N2Q2NzZlMjY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEwLTI4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFlhaG9vLmNvbSBo YXMgZnJhZ21lbnRzIG9mIHdyb25nbHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dCB3aGVuIHVz aW5nIENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0Lmg6CisgICAgICAgIEFkZCBhIFdFQkNPUkVfRVhQT1JUIHRoYXQgdGhlIGNvbXBpbGVy IG5vdyB3YW50cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmg6CisgICAgICAgIEFkZCBhIGBmaW5hbGAgdGhhdCB3YXMgbWlzc2luZzsgbm90IHN1 cmUgd2h5IHRoZSBjb21waWxlciBkaWRuJ3QgY29tcGxhaW4KKyAgICAgICAgYWJvdXQgdGhlIGxh Y2sgb2YgYGZpbmFsYCBPUiBgb3ZlcnJpZGVgLCBidXQgaXQgZG9lcyBub3chCisgICAgICAgIENo YW5nZSBnZXRDVE0gYW5kIHNldENUTSB0byBgb3ZlcnJpZGVgIGluc3RlYWQgb2YgYGZpbmFsYCBz byB0aGF0CisgICAgICAgIEdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3QgY2FuIG92ZXJyaWRl IHRoZW0uCisKIDIwMjEtMTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgRE9NIEdQVVA6IFlhaG9vLmNvbSBoYXMgZnJhZ21lbnRzIG9mIHdyb25n bHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYjk3MDZiZTRkNmIxMzll YmNkZWZjMGNlN2Y5ZmVmMjkwZTU2MmI5Li5mZjc3ODgyYmJhYTJiNjZlMGQ4MDM3ZDYyODM0MTM1 OGI1ZDJmODQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEwLTI4ICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFlhaG9vLmNvbSBoYXMg ZnJhZ21lbnRzIG9mIHdyb25nbHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dCB3aGVuIHVzaW5n IENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbWlsYXIgdG8gcjI4NDk5MSwgMkQgdHJhbnNmb3Jt cyB0aGF0IGdldENUTSgpIGZyb20gYSBDR0JpdG1hcCBjb250ZXh0IGFuZCBzZXQKKyAgICAgICAg dGhlIHJlc3VsdCBvbiBhIENHRGlzcGxheUxpc3Qgd2l0aCBzZXRDVE0oKSAodmlhIEJpZnVyY2F0 ZWRHcmFwaGljc0NvbnRleHQpCisgICAgICAgIGNvcnJ1cHQgdGhlIGRpc3BsYXkgbGlzdCdzIENU TSwgYmVjYXVzZSBpdCBzdGFydHMgb3V0IGluIGEgZGlmZmVyZW50IGluaXRpYWwgc3RhdGUsCisg ICAgICAgIGJlY2F1c2UgdGhlIGRpc3BsYXkgbGlzdCBpcyBhbHdheXMgcmVjb3JkZWQgd2l0aCBh IDF4IHNjYWxlLgorCisgICAgICAgIFRvIGZpeCB0aGlzLCBzbmVhayB0aGUgZmFrZSBzY2FsZSBp bnRvIHNldENUTS9nZXRDVE0gKG11bHRpcGx5aW5nIGl0IGluIGluIGdldCwKKyAgICAgICAgZGl2 aWRpbmcgaXQgb3V0IGluIHNldCkgc28gdGhhdCBpdCBhcHBlYXJzIHRvIHRoZSBvdXRzaWRlIGFz IGlmIGl0IGhhcworICAgICAgICB0aGUgc2FtZSBiYXNlIHRyYW5zZm9ybSBhcyB0aGUgQ0dCaXRt YXAgY29udGV4dC4KKworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvQ0dEaXNwbGF5 TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdyYXBoaWNzQ29u dGV4dENHRGlzcGxheUxpc3Q6OkdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3QpOgorICAgICAg ICAoV2ViS2l0OjpDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kOjpjcmVhdGUpOgorICAg ICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KToKKwog MjAyMS0xMC0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBET00gR1BVUDogWWFob28uY29tIGhhcyBmcmFnbWVudHMgb2Ygd3JvbmdseS1zY2FsZWQg Y29udGVudCB0aHJvdWdob3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDA2YjcxMzM4ZWY4ZDkxYWRlNDZjOTIwOWE1OWM3 NzA5NTJkY2E5OTAuLjBjMTQxNDNlZDhkNmEzNmQ4MDRiYTUwMmMyMjQ3ZWFkYzUwNTIyMzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCkBAIC00MTUsNyArNDE1LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZmlsbFJlY3QoY29u c3QgRmxvYXRSZWN0JiwgY29uc3QgQ29sb3ImKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYsIEdyYWRpZW50Jik7CisgICAgV0VCQ09SRV9FWFBPUlQgdmly dHVhbCB2b2lkIGZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIEdyYWRpZW50Jik7CiAgICAgV0VC Q09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIGZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0 IENvbG9yJiwgQ29tcG9zaXRlT3BlcmF0b3IsIEJsZW5kTW9kZSA9IEJsZW5kTW9kZTo6Tm9ybWFs KTsKICAgICB2aXJ0dWFsIHZvaWQgZmlsbFJvdW5kZWRSZWN0SW1wbChjb25zdCBGbG9hdFJvdW5k ZWRSZWN0JiwgY29uc3QgQ29sb3ImKSA9IDA7CiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2 b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiwgY29uc3QgQ29sb3Im LCBCbGVuZE1vZGUgPSBCbGVuZE1vZGU6Ok5vcm1hbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaAppbmRleCBmYzQw YTlmNjFkZGM5YzIyYjg2NWNlYWIzODYzNjc2ZWY4NWI2MWFlLi45YTQ4N2Y4YWY1YjdkZWNiYTFi MjE5Y2M3ZWJmNjViMDFmMWRiNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKQEAgLTgyLDcgKzgyLDcgQEAg cHVibGljOgogCiAgICAgfkdyYXBoaWNzQ29udGV4dENHKCk7CiAKLSAgICBib29sIGhhc1BsYXRm b3JtQ29udGV4dCgpIGNvbnN0OworICAgIGJvb2wgaGFzUGxhdGZvcm1Db250ZXh0KCkgY29uc3Qg ZmluYWw7CiAgICAgQ0dDb250ZXh0UmVmIHBsYXRmb3JtQ29udGV4dCgpIGNvbnN0IGZpbmFsOwog CiAgICAgdm9pZCBzYXZlKCkgZmluYWw7CkBAIC0xNDMsOSArMTQzLDkgQEAgcHVibGljOgogICAg IHZvaWQgdHJhbnNsYXRlKGZsb2F0IHgsIGZsb2F0IHkpIGZpbmFsOwogCiAgICAgdm9pZCBjb25j YXRDVE0oY29uc3QgQWZmaW5lVHJhbnNmb3JtJikgZmluYWw7Ci0gICAgdm9pZCBzZXRDVE0oY29u c3QgQWZmaW5lVHJhbnNmb3JtJikgZmluYWw7CisgICAgdm9pZCBzZXRDVE0oY29uc3QgQWZmaW5l VHJhbnNmb3JtJikgb3ZlcnJpZGU7CiAKLSAgICBBZmZpbmVUcmFuc2Zvcm0gZ2V0Q1RNKEluY2x1 ZGVEZXZpY2VTY2FsZSA9IFBvc3NpYmx5SW5jbHVkZURldmljZVNjYWxlKSBjb25zdCBmaW5hbDsK KyAgICBBZmZpbmVUcmFuc2Zvcm0gZ2V0Q1RNKEluY2x1ZGVEZXZpY2VTY2FsZSA9IFBvc3NpYmx5 SW5jbHVkZURldmljZVNjYWxlKSBjb25zdCBvdmVycmlkZTsKIAogICAgIEZsb2F0UmVjdCByb3Vu ZFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UmVjdCYsIFJvdW5kaW5nTW9kZSA9IFJvdW5kQWxs U2lkZXMpIGZpbmFsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2lvcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzc0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvaW9zL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzSU9TLm1tCmlu ZGV4IGU1MDc4MjMzOWE5NzEwYTVlNzRkMmUzZjJhYzFkNzFiZGQ3MTExYzYuLjI0ZDE4Njk5NzAz NTRmMTQxYWE0Yjg0ZTc0OGFjYjE5NWY5ZGZmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvaW9zL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzSU9TLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvaW9zL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzSU9TLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogCisjaW1wb3J0ICJOZXR3b3JrUHJvY2Vzcy5oIgogI2ltcG9ydCAiTmV0d29ya1Nlc3Np b25Db2NvYS5oIgogI2ltcG9ydCAiUGF5bWVudEF1dGhvcml6YXRpb25Db250cm9sbGVyLmgiCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9DR0Rpc3Bs YXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90 ZUxheWVyVHJlZS9DR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kLmNwcAppbmRleCA0OGZm MTE5YzQ1MjlkOTliNzY5ODUwZmUwM2E1YTYyMWE5MTRkNGFhLi5kZDMwODcxNjdjNWZiMGQ2NmY4 YzllNThkZTFhM2JmNGNkN2NmN2U5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9S ZW1vdGVMYXllclRyZWUvQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL0NHRGlzcGxheUxpc3RJbWFnZUJ1 ZmZlckJhY2tlbmQuY3BwCkBAIC0zNSw2ICszNSwzNCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAorY2xhc3MgR3JhcGhpY3NDb250ZXh0Q0dEaXNwbGF5TGlzdCA6IHB1YmxpYyBXZWJDb3JlOjpH cmFwaGljc0NvbnRleHRDRyB7CitwdWJsaWM6CisgICAgR3JhcGhpY3NDb250ZXh0Q0dEaXNwbGF5 TGlzdChDR0NvbnRleHRSZWYgY2dDb250ZXh0LCBmbG9hdCBpbW11dGFibGVCYXNlU2NhbGVGYWN0 b3IpCisgICAgICAgIDogR3JhcGhpY3NDb250ZXh0Q0coY2dDb250ZXh0KQorICAgICAgICAsIG1f aW1tdXRhYmxlQmFzZVNjYWxlRmFjdG9yKGltbXV0YWJsZUJhc2VTY2FsZUZhY3RvcikKKyAgICB7 CisgICAgfQorCisgICAgdm9pZCBzZXRDVE0oY29uc3QgV2ViQ29yZTo6QWZmaW5lVHJhbnNmb3Jt JiB0cmFuc2Zvcm0pIGZpbmFsCisgICAgeworICAgICAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zv cm0gdW5zY2FsZWRUcmFuc2Zvcm07CisgICAgICAgIHVuc2NhbGVkVHJhbnNmb3JtLnNjYWxlKDEu IC8gbV9pbW11dGFibGVCYXNlU2NhbGVGYWN0b3IpOworICAgICAgICB1bnNjYWxlZFRyYW5zZm9y bS5tdWx0aXBseSh0cmFuc2Zvcm0pOworICAgICAgICBHcmFwaGljc0NvbnRleHRDRzo6c2V0Q1RN KHVuc2NhbGVkVHJhbnNmb3JtKTsKKyAgICB9CisKKyAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zv cm0gZ2V0Q1RNKEluY2x1ZGVEZXZpY2VTY2FsZSBpbmNsdWRlRGV2aWNlU2NhbGUpIGNvbnN0IGZp bmFsCisgICAgeworICAgICAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtOwor ICAgICAgICB0cmFuc2Zvcm0uc2NhbGUobV9pbW11dGFibGVCYXNlU2NhbGVGYWN0b3IpOworICAg ICAgICB0cmFuc2Zvcm0ubXVsdGlwbHkoR3JhcGhpY3NDb250ZXh0Q0c6OmdldENUTShpbmNsdWRl RGV2aWNlU2NhbGUpKTsKKyAgICAgICAgcmV0dXJuIHRyYW5zZm9ybTsKKyAgICB9CisKK3ByaXZh dGU6CisgICAgZmxvYXQgbV9pbW11dGFibGVCYXNlU2NhbGVGYWN0b3I7Cit9OworCiBXVEZfTUFL RV9JU09fQUxMT0NBVEVEX0lNUEwoQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZCk7CiAK IHNpemVfdCBDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kOjpjYWxjdWxhdGVNZW1vcnlD b3N0KGNvbnN0IFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCkBAIC01NSw3ICs4Myw3IEBAIHN0ZDo6 dW5pcXVlX3B0cjxDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kPiBDR0Rpc3BsYXlMaXN0 SW1hZ2VCdWZmZXJCYWNrZW5kCiAgICAgaWYgKCFjZ0NvbnRleHQpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwogCi0gICAgYXV0byBjb250ZXh0ID0gbWFrZVVuaXF1ZTxXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHRDRz4oY2dDb250ZXh0LmdldCgpKTsKKyAgICBhdXRvIGNvbnRleHQgPSBtYWtlVW5p cXVlPEdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3Q+KGNnQ29udGV4dC5nZXQoKSwgcGFyYW1l dGVycy5yZXNvbHV0aW9uU2NhbGUpOwogICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8Q0dEaXNw bGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZD4obmV3IENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJh Y2tlbmQocGFyYW1ldGVycywgV1RGTW92ZShjb250ZXh0KSkpOwogfQogCg== 442754 2021-10-28 15:35:16 -0700 2021-10-28 20:07:50 -0700 Patch bug-232459-20211028153515.patch text/plain 6671 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE0MjViMjMwOTMxNjY1 MTJmMzYxMTAyNzhiOTgyN2RiMzI3ZTA5ZC4uNGNkOWQyZjM3ZTRjMWJhYjZhYTEwOWYyNmRkNmYy N2Q2NzZlMjY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEwLTI4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFlhaG9vLmNvbSBo YXMgZnJhZ21lbnRzIG9mIHdyb25nbHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dCB3aGVuIHVz aW5nIENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0Lmg6CisgICAgICAgIEFkZCBhIFdFQkNPUkVfRVhQT1JUIHRoYXQgdGhlIGNvbXBpbGVy IG5vdyB3YW50cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29u dGV4dENHLmg6CisgICAgICAgIEFkZCBhIGBmaW5hbGAgdGhhdCB3YXMgbWlzc2luZzsgbm90IHN1 cmUgd2h5IHRoZSBjb21waWxlciBkaWRuJ3QgY29tcGxhaW4KKyAgICAgICAgYWJvdXQgdGhlIGxh Y2sgb2YgYGZpbmFsYCBPUiBgb3ZlcnJpZGVgLCBidXQgaXQgZG9lcyBub3chCisgICAgICAgIENo YW5nZSBnZXRDVE0gYW5kIHNldENUTSB0byBgb3ZlcnJpZGVgIGluc3RlYWQgb2YgYGZpbmFsYCBz byB0aGF0CisgICAgICAgIEdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3QgY2FuIG92ZXJyaWRl IHRoZW0uCisKIDIwMjEtMTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5j b20+CiAKICAgICAgICAgRE9NIEdQVVA6IFlhaG9vLmNvbSBoYXMgZnJhZ21lbnRzIG9mIHdyb25n bHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYjk3MDZiZTRkNmIxMzll YmNkZWZjMGNlN2Y5ZmVmMjkwZTU2MmI5Li5mZjc3ODgyYmJhYTJiNjZlMGQ4MDM3ZDYyODM0MTM1 OGI1ZDJmODQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEwLTI4ICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFlhaG9vLmNvbSBoYXMg ZnJhZ21lbnRzIG9mIHdyb25nbHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dCB3aGVuIHVzaW5n IENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbWlsYXIgdG8gcjI4NDk5MSwgMkQgdHJhbnNmb3Jt cyB0aGF0IGdldENUTSgpIGZyb20gYSBDR0JpdG1hcCBjb250ZXh0IGFuZCBzZXQKKyAgICAgICAg dGhlIHJlc3VsdCBvbiBhIENHRGlzcGxheUxpc3Qgd2l0aCBzZXRDVE0oKSAodmlhIEJpZnVyY2F0 ZWRHcmFwaGljc0NvbnRleHQpCisgICAgICAgIGNvcnJ1cHQgdGhlIGRpc3BsYXkgbGlzdCdzIENU TSwgYmVjYXVzZSBpdCBzdGFydHMgb3V0IGluIGEgZGlmZmVyZW50IGluaXRpYWwgc3RhdGUsCisg ICAgICAgIGJlY2F1c2UgdGhlIGRpc3BsYXkgbGlzdCBpcyBhbHdheXMgcmVjb3JkZWQgd2l0aCBh IDF4IHNjYWxlLgorCisgICAgICAgIFRvIGZpeCB0aGlzLCBzbmVhayB0aGUgZmFrZSBzY2FsZSBp bnRvIHNldENUTS9nZXRDVE0gKG11bHRpcGx5aW5nIGl0IGluIGluIGdldCwKKyAgICAgICAgZGl2 aWRpbmcgaXQgb3V0IGluIHNldCkgc28gdGhhdCBpdCBhcHBlYXJzIHRvIHRoZSBvdXRzaWRlIGFz IGlmIGl0IGhhcworICAgICAgICB0aGUgc2FtZSBiYXNlIHRyYW5zZm9ybSBhcyB0aGUgQ0dCaXRt YXAgY29udGV4dC4KKworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvQ0dEaXNwbGF5 TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdyYXBoaWNzQ29u dGV4dENHRGlzcGxheUxpc3Q6OkdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3QpOgorICAgICAg ICAoV2ViS2l0OjpDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kOjpjcmVhdGUpOgorICAg ICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KToKKwog MjAyMS0xMC0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBET00gR1BVUDogWWFob28uY29tIGhhcyBmcmFnbWVudHMgb2Ygd3JvbmdseS1zY2FsZWQg Y29udGVudCB0aHJvdWdob3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDA2YjcxMzM4ZWY4ZDkxYWRlNDZjOTIwOWE1OWM3 NzA5NTJkY2E5OTAuLjBjMTQxNDNlZDhkNmEzNmQ4MDRiYTUwMmMyMjQ3ZWFkYzUwNTIyMzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCkBAIC00MTUsNyArNDE1LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZmlsbFJlY3QoY29u c3QgRmxvYXRSZWN0JiwgY29uc3QgQ29sb3ImKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYsIEdyYWRpZW50Jik7CisgICAgV0VCQ09SRV9FWFBPUlQgdmly dHVhbCB2b2lkIGZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIEdyYWRpZW50Jik7CiAgICAgV0VC Q09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIGZpbGxSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0 IENvbG9yJiwgQ29tcG9zaXRlT3BlcmF0b3IsIEJsZW5kTW9kZSA9IEJsZW5kTW9kZTo6Tm9ybWFs KTsKICAgICB2aXJ0dWFsIHZvaWQgZmlsbFJvdW5kZWRSZWN0SW1wbChjb25zdCBGbG9hdFJvdW5k ZWRSZWN0JiwgY29uc3QgQ29sb3ImKSA9IDA7CiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2 b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiwgY29uc3QgQ29sb3Im LCBCbGVuZE1vZGUgPSBCbGVuZE1vZGU6Ok5vcm1hbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaAppbmRleCBmYzQw YTlmNjFkZGM5YzIyYjg2NWNlYWIzODYzNjc2ZWY4NWI2MWFlLi45YTQ4N2Y4YWY1YjdkZWNiYTFi MjE5Y2M3ZWJmNjViMDFmMWRiNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKQEAgLTgyLDcgKzgyLDcgQEAg cHVibGljOgogCiAgICAgfkdyYXBoaWNzQ29udGV4dENHKCk7CiAKLSAgICBib29sIGhhc1BsYXRm b3JtQ29udGV4dCgpIGNvbnN0OworICAgIGJvb2wgaGFzUGxhdGZvcm1Db250ZXh0KCkgY29uc3Qg ZmluYWw7CiAgICAgQ0dDb250ZXh0UmVmIHBsYXRmb3JtQ29udGV4dCgpIGNvbnN0IGZpbmFsOwog CiAgICAgdm9pZCBzYXZlKCkgZmluYWw7CkBAIC0xNDMsOSArMTQzLDkgQEAgcHVibGljOgogICAg IHZvaWQgdHJhbnNsYXRlKGZsb2F0IHgsIGZsb2F0IHkpIGZpbmFsOwogCiAgICAgdm9pZCBjb25j YXRDVE0oY29uc3QgQWZmaW5lVHJhbnNmb3JtJikgZmluYWw7Ci0gICAgdm9pZCBzZXRDVE0oY29u c3QgQWZmaW5lVHJhbnNmb3JtJikgZmluYWw7CisgICAgdm9pZCBzZXRDVE0oY29uc3QgQWZmaW5l VHJhbnNmb3JtJikgb3ZlcnJpZGU7CiAKLSAgICBBZmZpbmVUcmFuc2Zvcm0gZ2V0Q1RNKEluY2x1 ZGVEZXZpY2VTY2FsZSA9IFBvc3NpYmx5SW5jbHVkZURldmljZVNjYWxlKSBjb25zdCBmaW5hbDsK KyAgICBBZmZpbmVUcmFuc2Zvcm0gZ2V0Q1RNKEluY2x1ZGVEZXZpY2VTY2FsZSA9IFBvc3NpYmx5 SW5jbHVkZURldmljZVNjYWxlKSBjb25zdCBvdmVycmlkZTsKIAogICAgIEZsb2F0UmVjdCByb3Vu ZFRvRGV2aWNlUGl4ZWxzKGNvbnN0IEZsb2F0UmVjdCYsIFJvdW5kaW5nTW9kZSA9IFJvdW5kQWxs U2lkZXMpIGZpbmFsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVM YXllclRyZWUvQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2Vu ZC5jcHAKaW5kZXggNDhmZjExOWM0NTI5ZDk5Yjc2OTg1MGZlMDNhNWE2MjFhOTE0ZDRhYS4uZGQz MDg3MTY3YzVmYjBkNjZmOGM5ZTU4ZGUxYTNiZjRjZDdjZjdlOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL0NHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJh Y2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9DR0Rp c3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kLmNwcApAQCAtMzUsNiArMzUsMzQgQEAKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIEdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3QgOiBw dWJsaWMgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Q0cgeworcHVibGljOgorICAgIEdyYXBoaWNz Q29udGV4dENHRGlzcGxheUxpc3QoQ0dDb250ZXh0UmVmIGNnQ29udGV4dCwgZmxvYXQgaW1tdXRh YmxlQmFzZVNjYWxlRmFjdG9yKQorICAgICAgICA6IEdyYXBoaWNzQ29udGV4dENHKGNnQ29udGV4 dCkKKyAgICAgICAgLCBtX2ltbXV0YWJsZUJhc2VTY2FsZUZhY3RvcihpbW11dGFibGVCYXNlU2Nh bGVGYWN0b3IpCisgICAgeworICAgIH0KKworICAgIHZvaWQgc2V0Q1RNKGNvbnN0IFdlYkNvcmU6 OkFmZmluZVRyYW5zZm9ybSYgdHJhbnNmb3JtKSBmaW5hbAorICAgIHsKKyAgICAgICAgV2ViQ29y ZTo6QWZmaW5lVHJhbnNmb3JtIHVuc2NhbGVkVHJhbnNmb3JtOworICAgICAgICB1bnNjYWxlZFRy YW5zZm9ybS5zY2FsZSgxLiAvIG1faW1tdXRhYmxlQmFzZVNjYWxlRmFjdG9yKTsKKyAgICAgICAg dW5zY2FsZWRUcmFuc2Zvcm0ubXVsdGlwbHkodHJhbnNmb3JtKTsKKyAgICAgICAgR3JhcGhpY3ND b250ZXh0Q0c6OnNldENUTSh1bnNjYWxlZFRyYW5zZm9ybSk7CisgICAgfQorCisgICAgV2ViQ29y ZTo6QWZmaW5lVHJhbnNmb3JtIGdldENUTShJbmNsdWRlRGV2aWNlU2NhbGUgaW5jbHVkZURldmlj ZVNjYWxlKSBjb25zdCBmaW5hbAorICAgIHsKKyAgICAgICAgV2ViQ29yZTo6QWZmaW5lVHJhbnNm b3JtIHRyYW5zZm9ybTsKKyAgICAgICAgdHJhbnNmb3JtLnNjYWxlKG1faW1tdXRhYmxlQmFzZVNj YWxlRmFjdG9yKTsKKyAgICAgICAgdHJhbnNmb3JtLm11bHRpcGx5KEdyYXBoaWNzQ29udGV4dENH OjpnZXRDVE0oaW5jbHVkZURldmljZVNjYWxlKSk7CisgICAgICAgIHJldHVybiB0cmFuc2Zvcm07 CisgICAgfQorCitwcml2YXRlOgorICAgIGZsb2F0IG1faW1tdXRhYmxlQmFzZVNjYWxlRmFjdG9y OworfTsKKwogV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKENHRGlzcGxheUxpc3RJbWFnZUJ1 ZmZlckJhY2tlbmQpOwogCiBzaXplX3QgQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZDo6 Y2FsY3VsYXRlTWVtb3J5Q29zdChjb25zdCBQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQpAQCAtNTUs NyArODMsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8Q0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2Vu ZD4gQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZAogICAgIGlmICghY2dDb250ZXh0KQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIGF1dG8gY29udGV4dCA9IG1ha2VVbmlxdWU8 V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Q0c+KGNnQ29udGV4dC5nZXQoKSk7CisgICAgYXV0byBj b250ZXh0ID0gbWFrZVVuaXF1ZTxHcmFwaGljc0NvbnRleHRDR0Rpc3BsYXlMaXN0PihjZ0NvbnRl eHQuZ2V0KCksIHBhcmFtZXRlcnMucmVzb2x1dGlvblNjYWxlKTsKICAgICByZXR1cm4gc3RkOjp1 bmlxdWVfcHRyPENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQ+KG5ldyBDR0Rpc3BsYXlM aXN0SW1hZ2VCdWZmZXJCYWNrZW5kKHBhcmFtZXRlcnMsIFdURk1vdmUoY29udGV4dCkpKTsKIH0K IAo= 442774 2021-10-28 20:07:51 -0700 2021-10-28 20:49:33 -0700 Patch bug-232459-20211028200751.patch text/plain 6553 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA3YzcwMGI5ODcyODEz NTc0NjI2ZWM1N2MwZjg3OWU5MGE1ZDIyYy4uZjE1OTMxM2FjNDIwNWM3YWU4OTVjZWE3MWJiMmFm NDEzMDNjYTAwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEwLTI4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFlhaG9vLmNvbSBo YXMgZnJhZ21lbnRzIG9mIHdyb25nbHktc2NhbGVkIGNvbnRlbnQgdGhyb3VnaG91dCB3aGVuIHVz aW5nIENHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IERlYW4gSmFja3Nvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5oOgorICAgICAgICBBZGQgYSBXRUJDT1JFX0VYUE9SVCB0aGF0IHRoZSBjb21waWxlciBu b3cgd2FudHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5oOgorICAgICAgICBBZGQgYSBgZmluYWxgIHRoYXQgd2FzIG1pc3Npbmc7IG5vdCBzdXJl IHdoeSB0aGUgY29tcGlsZXIgZGlkbid0IGNvbXBsYWluCisgICAgICAgIGFib3V0IHRoZSBsYWNr IG9mIGBmaW5hbGAgT1IgYG92ZXJyaWRlYCwgYnV0IGl0IGRvZXMgbm93IQorICAgICAgICBDaGFu Z2UgZ2V0Q1RNIGFuZCBzZXRDVE0gdG8gYG92ZXJyaWRlYCBpbnN0ZWFkIG9mIGBmaW5hbGAgc28g dGhhdAorICAgICAgICBHcmFwaGljc0NvbnRleHRDR0Rpc3BsYXlMaXN0IGNhbiBvdmVycmlkZSB0 aGVtLgorCiAyMDIxLTEwLTI4ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbGVhc2UgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGUgd2hlbiBpdCBpcyBub3QgaW4g dXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCmluZGV4IDFlOGM0YTZjNGI2Zjk5YWYyNWM5ZGMyOTVmZGNlOGNlYzQyZGI5MDYu LmI2YmQzOWRmYTQxNjgzMjI3MjFjY2NmMWVkZjc5YjIxYjkzMzAxN2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjUgQEAKKzIwMjEtMTAtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBs ZS5jb20+CisKKyAgICAgICAgWWFob28uY29tIGhhcyBmcmFnbWVudHMgb2Ygd3JvbmdseS1zY2Fs ZWQgY29udGVudCB0aHJvdWdob3V0IHdoZW4gdXNpbmcgQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVy QmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjMyNDU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGVhbiBKYWNrc29uLgorCisgICAgICAgIFNp bWlsYXIgdG8gcjI4NDk5MSwgMkQgdHJhbnNmb3JtcyB0aGF0IGdldENUTSgpIGZyb20gYSBDR0Jp dG1hcCBjb250ZXh0IGFuZCBzZXQKKyAgICAgICAgdGhlIHJlc3VsdCBvbiBhIENHRGlzcGxheUxp c3Qgd2l0aCBzZXRDVE0oKSAodmlhIEJpZnVyY2F0ZWRHcmFwaGljc0NvbnRleHQpCisgICAgICAg IGNvcnJ1cHQgdGhlIGRpc3BsYXkgbGlzdCdzIENUTSwgYmVjYXVzZSBpdCBzdGFydHMgb3V0IGlu IGEgZGlmZmVyZW50IGluaXRpYWwgc3RhdGUsCisgICAgICAgIGJlY2F1c2UgdGhlIGRpc3BsYXkg bGlzdCBpcyBhbHdheXMgcmVjb3JkZWQgd2l0aCBhIDF4IHNjYWxlLgorCisgICAgICAgIFRvIGZp eCB0aGlzLCBzbmVhayB0aGUgZmFrZSBzY2FsZSBpbnRvIHNldENUTS9nZXRDVE0gKG11bHRpcGx5 aW5nIGl0IGluIGluIGdldCwKKyAgICAgICAgZGl2aWRpbmcgaXQgb3V0IGluIHNldCkgc28gdGhh dCBpdCBhcHBlYXJzIHRvIHRoZSBvdXRzaWRlIGFzIGlmIGl0IGhhcworICAgICAgICB0aGUgc2Ft ZSBiYXNlIHRyYW5zZm9ybSBhcyB0aGUgQ0dCaXRtYXAgY29udGV4dC4KKworICAgICAgICAqIFNo YXJlZC9SZW1vdGVMYXllclRyZWUvQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3Q6OkdyYXBoaWNz Q29udGV4dENHRGlzcGxheUxpc3QpOgorICAgICAgICAoV2ViS2l0OjpDR0Rpc3BsYXlMaXN0SW1h Z2VCdWZmZXJCYWNrZW5kOjpjcmVhdGUpOgorICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRy ZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxh eWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KToKKwogMjAyMS0xMC0yOCAgU2lodWkgTGl1ICA8c2lo dWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWxlYXNlIEZpbGVTeXN0ZW1TdG9yYWdlSGFu ZGxlIHdoZW4gaXQgaXMgbm90IGluIHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCAwNmI3MTMzOGVmOGQ5MWFkZTQ2Yzky MDlhNTljNzcwOTUyZGNhOTkwLi4wYzE0MTQzZWQ4ZDZhMzZkODA0YmE1MDJjMjI0N2VhZGM1MDUy MjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuaApAQCAtNDE1LDcgKzQxNSw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9p ZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGZpbGxS ZWN0KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IENvbG9yJikgPSAwOwotICAgIHZpcnR1YWwgdm9p ZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmLCBHcmFkaWVudCYpOworICAgIFdFQkNPUkVfRVhQ T1JUIHZpcnR1YWwgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmLCBHcmFkaWVudCYpOwog ICAgIFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3Qm LCBjb25zdCBDb2xvciYsIENvbXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1vZGUgPSBCbGVuZE1vZGU6 Ok5vcm1hbCk7CiAgICAgdmlydHVhbCB2b2lkIGZpbGxSb3VuZGVkUmVjdEltcGwoY29uc3QgRmxv YXRSb3VuZGVkUmVjdCYsIGNvbnN0IENvbG9yJikgPSAwOwogICAgIFdFQkNPUkVfRVhQT1JUIHZp cnR1YWwgdm9pZCBmaWxsUm91bmRlZFJlY3QoY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYsIGNvbnN0 IENvbG9yJiwgQmxlbmRNb2RlID0gQmxlbmRNb2RlOjpOb3JtYWwpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKaW5k ZXggZmM0MGE5ZjYxZGRjOWMyMmI4NjVjZWFiMzg2MzY3NmVmODViNjFhZS4uOWE0ODdmOGFmNWI3 ZGVjYmExYjIxOWNjN2ViZjY1YjAxZjFkYjc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oCkBAIC04Miw3ICs4 Miw3IEBAIHB1YmxpYzoKIAogICAgIH5HcmFwaGljc0NvbnRleHRDRygpOwogCi0gICAgYm9vbCBo YXNQbGF0Zm9ybUNvbnRleHQoKSBjb25zdDsKKyAgICBib29sIGhhc1BsYXRmb3JtQ29udGV4dCgp IGNvbnN0IGZpbmFsOwogICAgIENHQ29udGV4dFJlZiBwbGF0Zm9ybUNvbnRleHQoKSBjb25zdCBm aW5hbDsKIAogICAgIHZvaWQgc2F2ZSgpIGZpbmFsOwpAQCAtMTQzLDkgKzE0Myw5IEBAIHB1Ymxp YzoKICAgICB2b2lkIHRyYW5zbGF0ZShmbG9hdCB4LCBmbG9hdCB5KSBmaW5hbDsKIAogICAgIHZv aWQgY29uY2F0Q1RNKGNvbnN0IEFmZmluZVRyYW5zZm9ybSYpIGZpbmFsOwotICAgIHZvaWQgc2V0 Q1RNKGNvbnN0IEFmZmluZVRyYW5zZm9ybSYpIGZpbmFsOworICAgIHZvaWQgc2V0Q1RNKGNvbnN0 IEFmZmluZVRyYW5zZm9ybSYpIG92ZXJyaWRlOwogCi0gICAgQWZmaW5lVHJhbnNmb3JtIGdldENU TShJbmNsdWRlRGV2aWNlU2NhbGUgPSBQb3NzaWJseUluY2x1ZGVEZXZpY2VTY2FsZSkgY29uc3Qg ZmluYWw7CisgICAgQWZmaW5lVHJhbnNmb3JtIGdldENUTShJbmNsdWRlRGV2aWNlU2NhbGUgPSBQ b3NzaWJseUluY2x1ZGVEZXZpY2VTY2FsZSkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICBGbG9hdFJl Y3Qgcm91bmRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmLCBSb3VuZGluZ01vZGUgPSBS b3VuZEFsbFNpZGVzKSBmaW5hbDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQv UmVtb3RlTGF5ZXJUcmVlL0NHRGlzcGxheUxpc3RJbWFnZUJ1ZmZlckJhY2tlbmQuY3BwIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL0NHRGlzcGxheUxpc3RJbWFnZUJ1ZmZl ckJhY2tlbmQuY3BwCmluZGV4IDQ4ZmYxMTljNDUyOWQ5OWI3Njk4NTBmZTAzYTVhNjIxYTkxNGQ0 YWEuLmZhMDc1MzIwMmM1ZjhjM2ZkYTk3OWZiMWJiZjdkYzk3NTFmZjdkMjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9DR0Rpc3BsYXlMaXN0SW1hZ2VC dWZmZXJCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRy ZWUvQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZC5jcHAKQEAgLTM1LDYgKzM1LDMwIEBA CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBHcmFwaGljc0NvbnRleHRDR0Rpc3BsYXlM aXN0IDogcHVibGljIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENHIHsKK3B1YmxpYzoKKyAgICBH cmFwaGljc0NvbnRleHRDR0Rpc3BsYXlMaXN0KENHQ29udGV4dFJlZiBjZ0NvbnRleHQsIGRvdWJs ZSBpbW11dGFibGVCYXNlU2NhbGVGYWN0b3IpCisgICAgICAgIDogR3JhcGhpY3NDb250ZXh0Q0co Y2dDb250ZXh0KQorICAgICAgICAsIG1fc2NhbGVUcmFuc2Zvcm0oaW1tdXRhYmxlQmFzZVNjYWxl RmFjdG9yLCAwLCAwLCBpbW11dGFibGVCYXNlU2NhbGVGYWN0b3IsIDAsIDApCisgICAgICAgICwg bV9pbnZlcnNlU2NhbGVUcmFuc2Zvcm0oMS4gLyBpbW11dGFibGVCYXNlU2NhbGVGYWN0b3IsIDAs IDAsIDEuIC8gaW1tdXRhYmxlQmFzZVNjYWxlRmFjdG9yLCAwLCAwKQorICAgIHsKKyAgICB9CisK KyAgICB2b2lkIHNldENUTShjb25zdCBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9y bSkgZmluYWwKKyAgICB7CisgICAgICAgIEdyYXBoaWNzQ29udGV4dENHOjpzZXRDVE0obV9pbnZl cnNlU2NhbGVUcmFuc2Zvcm0gKiB0cmFuc2Zvcm0pOworICAgIH0KKworICAgIFdlYkNvcmU6OkFm ZmluZVRyYW5zZm9ybSBnZXRDVE0oSW5jbHVkZURldmljZVNjYWxlIGluY2x1ZGVEZXZpY2VTY2Fs ZSkgY29uc3QgZmluYWwKKyAgICB7CisgICAgICAgIHJldHVybiBtX3NjYWxlVHJhbnNmb3JtICog R3JhcGhpY3NDb250ZXh0Q0c6OmdldENUTShpbmNsdWRlRGV2aWNlU2NhbGUpOworICAgIH0KKwor cHJpdmF0ZToKKyAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0gbV9zY2FsZVRyYW5zZm9ybTsK KyAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0gbV9pbnZlcnNlU2NhbGVUcmFuc2Zvcm07Cit9 OworCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoQ0dEaXNwbGF5TGlzdEltYWdlQnVmZmVy QmFja2VuZCk7CiAKIHNpemVfdCBDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kOjpjYWxj dWxhdGVNZW1vcnlDb3N0KGNvbnN0IFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCkBAIC01NSw3ICs3 OSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kPiBD R0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXJCYWNrZW5kCiAgICAgaWYgKCFjZ0NvbnRleHQpCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogCi0gICAgYXV0byBjb250ZXh0ID0gbWFrZVVuaXF1ZTxXZWJD b3JlOjpHcmFwaGljc0NvbnRleHRDRz4oY2dDb250ZXh0LmdldCgpKTsKKyAgICBhdXRvIGNvbnRl eHQgPSBtYWtlVW5pcXVlPEdyYXBoaWNzQ29udGV4dENHRGlzcGxheUxpc3Q+KGNnQ29udGV4dC5n ZXQoKSwgcGFyYW1ldGVycy5yZXNvbHV0aW9uU2NhbGUpOwogICAgIHJldHVybiBzdGQ6OnVuaXF1 ZV9wdHI8Q0dEaXNwbGF5TGlzdEltYWdlQnVmZmVyQmFja2VuZD4obmV3IENHRGlzcGxheUxpc3RJ bWFnZUJ1ZmZlckJhY2tlbmQocGFyYW1ldGVycywgV1RGTW92ZShjb250ZXh0KSkpOwogfQogCg==