240417 2022-05-14 04:29:30 -0700 WebCore::IOSurface has WebCore::GraphicsContext as its property, it should be the other way around 2022-05-19 06:12:16 -0700 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 240385 240452 240645 1 kkinnunen kkinnunen commit-queue dino simon.fraser webkit-bug-importer oldest_to_newest 1868975 0 kkinnunen 2022-05-14 04:29:30 -0700 WebCore::IOSurface has WebCore::GraphicsContext as its property, it should be the other way around 1868977 1 459350 kkinnunen 2022-05-14 04:51:16 -0700 Created attachment 459350 Patch 1869061 2 459377 kkinnunen 2022-05-15 01:01:30 -0700 Created attachment 459377 For landing 1869065 3 ews-feeder 2022-05-15 06:31:57 -0700 Committed r294215 (250573@main): <https://commits.webkit.org/250573@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459377. 1869066 4 webkit-bug-importer 2022-05-15 06:32:13 -0700 <rdar://problem/93308682> 1870351 5 commit-queue 2022-05-19 06:12:16 -0700 Re-opened since this is blocked by bug 240645 459350 2022-05-14 04:51:16 -0700 2022-05-15 01:01:21 -0700 Patch bug-240417-20220514145115.patch text/plain 11276 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY2ZmYwMWZhODZjNTIx MzEyMWY1ZDkxNGNmZWQ2YzM1Y2E2NGQ4Mi4uM2NiZDMzNDgzY2YxNDYzNjZiMzQ0MTViMzUxYjY3 OGQxYWE3ODBhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIyLTA1LTE0ICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZTo6SU9T dXJmYWNlIGhhcyBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQgYXMgaXRzIHByb3BlcnR5LCBpdCBz aG91bGQgYmUgdGhlIG90aGVyIHdheSBhcm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDQxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIERvIG5vdCBzdG9yZSBXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQgaW4gV2ViQ29yZTo6SU9TdXJmYWNlLgorICAgICAgICBFLmcuIGdyYXBoaWNzIGNvbnRleHQg aXMgbm90IHRoZSBwcm9wZXJ0eSBvZiB0aGUgYml0bWFwIHRoYXQKKyAgICAgICAgaXMgYmVpbmcg ZHJhd24gdG8uIFRoZSBiYWNraW5nIGJpdG1hcCBpcyBhIHByb3BlcnR5IG9mIHRoZSBjb250ZXh0 LgorCisgICAgICAgIEluc3RlYWQsIHN0b3JlIHRoZSBHcmFwaGljc0NvbnRleHRDRyBhdCB0aGUg cGxhY2Ugd2hlcmUgdGhlIHVzZXIgaXMsCisgICAgICAgIGUuZy4gaW4gSW1hZ2VCdWZmZXJJT1N1 cmZhY2VCYWNrZW5kLiBUaGlzIGFsbG93cyB0aGUgY29udGV4dCBjbGllbnQKKyAgICAgICAgdG8g Y3JlYXRlIHRoZSBjb250ZXh0IHdpdGggdGhlIG9wdGlvbnMgdGhlIGNsaWVudCBuZWVkcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENHOjpHcmFwaGljc0NvbnRleHRDRyk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRDRzo6ZHJhd05hdGl2ZUltYWdlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SU9TdXJmYWNlUG9vbDo6d2lsbEFkZFN1cmZhY2UpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQ6On5JbWFnZUJ1ZmZlcklPU3VyZmFj ZUJhY2tlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5k Ojpjb250ZXh0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVySU9TdXJmYWNl QmFja2VuZDo6cmVsZWFzZUdyYXBoaWNzQ29udGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kLmg6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvSU9TdXJmYWNlLm1tOgorICAgICAgICAoV2ViQ29yZTo6SU9TdXJmYWNlOjpjcmVh dGUpOgorICAgICAgICAoV2ViQ29yZTo6SU9TdXJmYWNlOjpyZWxlYXNlUGxhdGZvcm1HcmFwaGlj c0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6SU9TdXJmYWNlOjplbnN1cmVHcmFwaGljc0Nv bnRleHQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SU9TdXJmYWNlOjpyZWxlYXNlR3Jh cGhpY3NDb250ZXh0KTogRGVsZXRlZC4KKwogMjAyMi0wNS0xNCAgS2ltbW8gS2lubnVuZW4gIDxr a2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkNvcmU6OklPU3VyZmFjZSByZWZlcnMg dG8gdW51c2VkIGNvbnRleHQgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDRmOTllOTMxYTg2 ZGJjNzBiYjhhNWNjZTFkMzExZmU5Nzk1NDQ0ZmYuLjM2OWJlNmMzZjYzZGNhZGUyOTE1YzdlZTc0 ZjZkMDUzODRiODEwNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNp bmNsdWRlICJGbG9hdENvbnZlcnNpb24uaCIKICNpbmNsdWRlICJHcmFkaWVudC5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNHLmgiCisjaW5jbHVkZSAiSU9TdXJm YWNlLmgiCiAjaW5jbHVkZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJJbWFnZU9yaWVudGF0 aW9uLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgpAQCAtMTk1LDYgKzE5NiwxMiBAQCBHcmFwaGlj c0NvbnRleHRDRzo6R3JhcGhpY3NDb250ZXh0Q0coQ0dDb250ZXh0UmVmIGNnQ29udGV4dCkKICAg ICBkaWRVcGRhdGVTdGF0ZShtX3N0YXRlKTsKIH0KIAorR3JhcGhpY3NDb250ZXh0Q0c6OkdyYXBo aWNzQ29udGV4dENHKElPU3VyZmFjZSYgaW9zdXJmYWNlKQorICAgIDogR3JhcGhpY3NDb250ZXh0 Q0coaW9zdXJmYWNlLmVuc3VyZVBsYXRmb3JtQ29udGV4dCgpKQoreworICAgIHNldElzQWNjZWxl cmF0ZWRDb250ZXh0KHRydWUpOworfQorCiBHcmFwaGljc0NvbnRleHRDRzo6fkdyYXBoaWNzQ29u dGV4dENHKCkKIHsKICAgICBkZWxldGUgbV9kYXRhOwpAQCAtMjY3LDggKzI3NCw4IEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0Q0c6OmRyYXdOYXRpdmVJbWFnZShOYXRpdmVJbWFnZSYgbmF0aXZlSW1h Z2UsIGNvbnN0IEZsb2F0U2l6CiAgICAgICAgICAgICAvLyBpbWFnZS4gV2UgbmVlZCB0byBjb252 ZXJ0IHN1YmltYWdlUmVjdCB0byBwaHlzaWNhbCBpbWFnZSBjb29yZGluYXRlcy4KICAgICAgICAg ICAgIGlmIChhdXRvIHRyYW5zZm9ybSA9IG9wdGlvbnMub3JpZW50YXRpb24oKS50cmFuc2Zvcm1G cm9tRGVmYXVsdChpbWFnZVNpemUpLmludmVyc2UoKSkKICAgICAgICAgICAgICAgICBwaHlzaWNh bFN1YmltYWdlUmVjdCA9IHRyYW5zZm9ybS52YWx1ZSgpLm1hcFJlY3QocGh5c2ljYWxTdWJpbWFn ZVJlY3QpOwotICAgICAgICB9CiAKKyAgICAgICAgfQogI2lmIENBQ0hFX1NVQklNQUdFUwogICAg ICAgICByZXR1cm4gU3ViaW1hZ2VDYWNoZVdpdGhUaW1lcjo6Z2V0U3ViaW1hZ2UoaW1hZ2UsIHBo eXNpY2FsU3ViaW1hZ2VSZWN0KTsKICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaAppbmRleCBhMWEyNmJmZDI4 NGQ4NDQ2M2VjMjBmYjAxNGZhMzM2OWM4OGM5OTZhLi5mYTUzYmRiNjg4OGNhZGY4ODFmN2YyNzUw Njc0NWE2ZGE3MzQyNDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKQEAgLTMyLDkgKzMyLDEyIEBACiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgSU9TdXJmYWNlOworCiBjbGFzcyBXRUJDT1JFX0VY UE9SVCBHcmFwaGljc0NvbnRleHRDRyA6IHB1YmxpYyBHcmFwaGljc0NvbnRleHQgewogcHVibGlj OgogICAgIEdyYXBoaWNzQ29udGV4dENHKENHQ29udGV4dFJlZik7CisgICAgZXhwbGljaXQgR3Jh cGhpY3NDb250ZXh0Q0coSU9TdXJmYWNlJik7CiAKICNpZiBQTEFURk9STShXSU4pCiAgICAgR3Jh cGhpY3NDb250ZXh0Q0coSERDLCBib29sIGhhc0FscGhhID0gZmFsc2UpOyAvLyBGSVhNRTogVG8g YmUgcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NnL0lPU3VyZmFjZVBvb2wuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvSU9TdXJmYWNlUG9vbC5jcHAKaW5kZXggNWExNjQ3MGMzNTc4YmQwOTI5MTAyYjNiNGRiODM0 ZDczNzBhNzliMy4uNGNkZmJhYzYwYTE0ZTVjODUxNGZkNmQ5M2VhODA0NGYwZjAzY2Y1YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9v bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNl UG9vbC5jcHAKQEAgLTgyLDcgKzgyLDcgQEAgdm9pZCBJT1N1cmZhY2VQb29sOjp3aWxsQWRkU3Vy ZmFjZShJT1N1cmZhY2UmIHN1cmZhY2UsIGJvb2wgaW5Vc2UpCiAgICAgQ2FjaGVkU3VyZmFjZURl dGFpbHMmIGRldGFpbHMgPSBtX3N1cmZhY2VEZXRhaWxzLmFkZCgmc3VyZmFjZSwgQ2FjaGVkU3Vy ZmFjZURldGFpbHMoKSkuaXRlcmF0b3ItPnZhbHVlOwogICAgIGRldGFpbHMucmVzZXRMYXN0VXNl VGltZSgpOwogCi0gICAgc3VyZmFjZS5yZWxlYXNlR3JhcGhpY3NDb250ZXh0KCk7CisgICAgc3Vy ZmFjZS5yZWxlYXNlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQoKTsKIAogICAgIHNpemVfdCBzdXJm YWNlQnl0ZXMgPSBzdXJmYWNlLnRvdGFsQnl0ZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJm YWNlQmFja2VuZC5jcHAKaW5kZXggZjZjYmExYzU3NGY1OWUyZTQ4NzdlZjdhMzAxODNjYWYzYThj NDk4ZS4uNWUzODAyZWFhMWE0OGZhNzkxMWE3NjcyOWQ4ZDViM2E0OGRlNzk0YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJJT1N1cmZh Y2VCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9J bWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuY3BwCkBAIC0xMjUsMTcgKzEyNSwxNyBAQCBJbWFn ZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQ6OkltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZChjb25z dCBQYXJhbWV0ZXJzJiBwYXJhbQogCiBJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQ6On5JbWFn ZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQoKQogeworICAgIG1fY29udGV4dCA9IHN0ZDo6bnVsbG9w dDsgLy8gTWFrZSBzdXJlIHRoZSBjb250ZXh0IGRvZXMgbm90IGludGVyZmVyZSB3aXRoIG1vdmlu ZyB0byBwb29sLgogICAgIElPU3VyZmFjZTo6bW92ZVRvUG9vbChXVEZNb3ZlKG1fc3VyZmFjZSks IG1faW9TdXJmYWNlUG9vbC5nZXQoKSk7CiB9CiAKIEdyYXBoaWNzQ29udGV4dCYgSW1hZ2VCdWZm ZXJJT1N1cmZhY2VCYWNrZW5kOjpjb250ZXh0KCkgY29uc3QKIHsKLSAgICBHcmFwaGljc0NvbnRl eHQmIGNvbnRleHQgPSBtX3N1cmZhY2UtPmVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwotICAgIGlm IChtX25lZWRzU2V0dXBDb250ZXh0KSB7Ci0gICAgICAgIG1fbmVlZHNTZXR1cENvbnRleHQgPSBm YWxzZTsKKyAgICBpZiAoIW1fY29udGV4dCkgeworICAgICAgICBtX2NvbnRleHQuZW1wbGFjZSgq bV9zdXJmYWNlKTsKICAgICAgICAgYXBwbHlCYXNlVHJhbnNmb3JtVG9Db250ZXh0KCk7CiAgICAg fQotICAgIHJldHVybiBjb250ZXh0OworICAgIHJldHVybiAqbV9jb250ZXh0OwogfQogCiB2b2lk IEltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZDo6Zmx1c2hDb250ZXh0KCkKQEAgLTIzOCw4ICsy MzgsOCBAQCBib29sIEltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZDo6aXNJblVzZSgpIGNvbnN0 CiAKIHZvaWQgSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kOjpyZWxlYXNlR3JhcGhpY3NDb250 ZXh0KCkKIHsKLSAgICBtX25lZWRzU2V0dXBDb250ZXh0ID0gdHJ1ZTsKLSAgICByZXR1cm4gbV9z dXJmYWNlLT5yZWxlYXNlR3JhcGhpY3NDb250ZXh0KCk7CisgICAgbV9jb250ZXh0ID0gc3RkOjpu dWxsb3B0OworICAgIG1fc3VyZmFjZS0+cmVsZWFzZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KCk7 CiB9CiAKIGJvb2wgSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kOjpzZXRWb2xhdGlsZSgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZl cklPU3VyZmFjZUJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nn L0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5oCmluZGV4IDgxMjMzZDVkNmQwMDY4NDE4ODY1 NDMzYTUyM2RmZTM4ZTQ1MThiYmMuLjkxYmIxOTBmMDM2YjYxZjYzZTBjOGNhZWQ2YWU3MmU3N2Qz NzBkYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lt YWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5oCkBAIC0yNywxMyArMjcs MTcgQEAKIAogI2lmIEhBVkUoSU9TVVJGQUNFKQogCisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0 Q0cuaCIKICNpbmNsdWRlICJJbWFnZUJ1ZmZlckNHQmFja2VuZC5oIgogI2luY2x1ZGUgIklPU3Vy ZmFjZS5oIgogI2luY2x1ZGUgIklPU3VyZmFjZVBvb2wuaCIKKyNpbmNsdWRlIDxvcHRpb25hbD4K ICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9jLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xh c3MgR3JhcGhpY3NDb250ZXh0Q0c7CisKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEltYWdlQnVmZmVy SU9TdXJmYWNlQmFja2VuZCA6IHB1YmxpYyBJbWFnZUJ1ZmZlckNHQmFja2VuZCB7CiAgICAgV1RG X01BS0VfSVNPX0FMTE9DQVRFRChJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQpOwogICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKEltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZCk7CkBAIC05MSw3 ICs5NSw3IEBAIHByb3RlY3RlZDoKICAgICBJT1N1cmZhY2VTZWVkIG1fbGFzdFNlZWRXaGVuRHJh d2luZ0ltYWdlIHsgMCB9OwogICAgIG11dGFibGUgYm9vbCBtX3JlcXVpcmVzRHJhd0FmdGVyUHV0 UGl4ZWxCdWZmZXIgeyBmYWxzZSB9OwogCi0gICAgbXV0YWJsZSBib29sIG1fbmVlZHNTZXR1cENv bnRleHQgeyBmYWxzZSB9OworICAgIG11dGFibGUgc3RkOjpvcHRpb25hbDxHcmFwaGljc0NvbnRl eHRDRz4gbV9jb250ZXh0OwogICAgIFZvbGF0aWxpdHlTdGF0ZSBtX3ZvbGF0aWxpdHlTdGF0ZSB7 IFZvbGF0aWxpdHlTdGF0ZTo6Tm9uVm9sYXRpbGUgfTsKIAogICAgIFJlZlB0cjxJT1N1cmZhY2VQ b29sPiBtX2lvU3VyZmFjZVBvb2w7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0lPU3VyZmFjZS5oCmluZGV4IDMyYTE0MWNkY2I4ZDNmOTEyYmFiNzUyODk1 ZDJhYmNhOWEyMWNlOWMuLmQ0Y2EzNDc3ODRhZjBhMThiZDc0ZDFmYzE3YmRjNzYwZjA2NzdiY2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3Vy ZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3Vy ZmFjZS5oCkBAIC00Myw3ICs0Myw2IEBAIGNsYXNzIFRleHRTdHJlYW07CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogY2xhc3MgSG9zdFdpbmRvdzsKIGNs YXNzIElPU3VyZmFjZVBvb2w7CiBjbGFzcyBQcm9jZXNzSWRlbnRpdHk7CkBAIC0xMjcsOCArMTI2 LDEwIEBAIHB1YmxpYzoKICAgICBpZCBhc0xheWVyQ29udGVudHMoKSBjb25zdCB7IHJldHVybiAo X19icmlkZ2UgaWQpbV9zdXJmYWNlLmdldCgpOyB9CiAjZW5kaWYKICAgICBJT1N1cmZhY2VSZWYg c3VyZmFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VyZmFjZS5nZXQoKTsgfQotICAgIFdFQkNPUkVf RVhQT1JUIEdyYXBoaWNzQ29udGV4dCYgZW5zdXJlR3JhcGhpY3NDb250ZXh0KCk7CiAgICAgV0VC Q09SRV9FWFBPUlQgQ0dDb250ZXh0UmVmIGVuc3VyZVBsYXRmb3JtQ29udGV4dChjb25zdCBIb3N0 V2luZG93KiA9IG51bGxwdHIpOworICAgIC8vIFRoZSBncmFwaGljcyBjb250ZXh0IGNhY2hlZCBv biB0aGUgc3VyZmFjZSBjb3VudHMgYXMgYSAidXNlciIsIHNvIHRvIGdldAorICAgIC8vIGFuIGFj Y3VyYXRlIHJlc3VsdCBmcm9tIGlzSW5Vc2UoKSwgaXQgbmVlZHMgdG8gYmUgcmVsZWFzZWQuCisg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZWxlYXNlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQoKTsK IAogICAgIC8vIFF1ZXJ5aW5nIHZvbGF0aWxpdHkgY2FuIGJlIGV4cGVuc2l2ZSwgc28gaW4gY2Fz ZXMgd2hlcmUgdGhlIHN1cmZhY2UgaXMKICAgICAvLyBnb2luZyB0byBiZSB1c2VkIGltbWVkaWF0 ZWx5LCB1c2UgdGhlIHJldHVybiB2YWx1ZSBvZiBzZXRWb2xhdGlsZSB0bwpAQCAtMTUwLDEwICsx NTEsNiBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzSW5Vc2UoKSBjb25z dDsKIAotICAgIC8vIFRoZSBncmFwaGljcyBjb250ZXh0IGNhY2hlZCBvbiB0aGUgc3VyZmFjZSBj b3VudHMgYXMgYSAidXNlciIsIHNvIHRvIGdldAotICAgIC8vIGFuIGFjY3VyYXRlIHJlc3VsdCBm cm9tIGlzSW5Vc2UoKSwgaXQgbmVlZHMgdG8gYmUgcmVsZWFzZWQuCi0gICAgV0VCQ09SRV9FWFBP UlQgdm9pZCByZWxlYXNlR3JhcGhpY3NDb250ZXh0KCk7Ci0KICNpZiBIQVZFKElPU1VSRkFDRV9B Q0NFTEVSQVRPUikKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBhbGxvd0NvbnZlcnNp b25Gcm9tRm9ybWF0VG9Gb3JtYXQoRm9ybWF0LCBGb3JtYXQpOwogICAgIFdFQkNPUkVfRVhQT1JU IHN0YXRpYyB2b2lkIGNvbnZlcnRUb0Zvcm1hdChJT1N1cmZhY2VQb29sKiwgc3RkOjp1bmlxdWVf cHRyPFdlYkNvcmU6OklPU3VyZmFjZT4mJiBpblN1cmZhY2UsIEZvcm1hdCwgRnVuY3Rpb248dm9p ZChzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6SU9TdXJmYWNlPik+JiYpOwpAQCAtMTcyLDcgKzE2 OSw2IEBAIHByaXZhdGU6CiAgICAgSW50U2l6ZSBtX3NpemU7CiAgICAgc2l6ZV90IG1fdG90YWxC eXRlczsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxHcmFwaGljc0NvbnRleHQ+IG1fZ3JhcGhpY3ND b250ZXh0OwogICAgIFJldGFpblB0cjxDR0NvbnRleHRSZWY+IG1fY2dDb250ZXh0OwogCiAgICAg UmV0YWluUHRyPElPU3VyZmFjZVJlZj4gbV9zdXJmYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCmluZGV4IGNjNjBiYzI2MmU4 NGZhNmFlNmMwOWM3MjA5YTg3MDgxNWNjMDg5NGQuLjdlMDEyMDk0ZjQ1MjkyNTlkNzI0MGYzY2Zk NGM0ZGFhYjZlMGFkNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0lPU3VyZmFjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9JT1N1cmZhY2UubW0KQEAgLTI3LDcgKzI3LDYgQEAKICNpbXBvcnQgIklPU3Vy ZmFjZS5oIgogCiAjaW1wb3J0ICJEZXN0aW5hdGlvbkNvbG9yU3BhY2UuaCIKLSNpbXBvcnQgIkdy YXBoaWNzQ29udGV4dENHLmgiCiAjaW1wb3J0ICJIb3N0V2luZG93LmgiCiAjaW1wb3J0ICJJT1N1 cmZhY2VQb29sLmgiCiAjaW1wb3J0ICJMb2dnaW5nLmgiCkBAIC00Nyw3ICs0Niw3IEBAIHN0ZDo6 dW5pcXVlX3B0cjxJT1N1cmZhY2U+IElPU3VyZmFjZTo6Y3JlYXRlKElPU3VyZmFjZVBvb2wqIHBv b2wsIEludFNpemUgc2l6ZSwKIHsKICAgICBpZiAocG9vbCkgewogICAgICAgICBpZiAoYXV0byBj YWNoZWRTdXJmYWNlID0gcG9vbC0+dGFrZVN1cmZhY2Uoc2l6ZSwgY29sb3JTcGFjZSwgcGl4ZWxG b3JtYXQpKSB7Ci0gICAgICAgICAgICBjYWNoZWRTdXJmYWNlLT5yZWxlYXNlR3JhcGhpY3NDb250 ZXh0KCk7CisgICAgICAgICAgICBjYWNoZWRTdXJmYWNlLT5yZWxlYXNlUGxhdGZvcm1HcmFwaGlj c0NvbnRleHQoKTsKICAgICAgICAgICAgIExPR19XSVRIX1NUUkVBTShJT1N1cmZhY2UsIHN0cmVh bSA8PCAiSU9TdXJmYWNlOjpjcmVhdGUgdG9vayBmcm9tIHBvb2w6ICIgPDwgKmNhY2hlZFN1cmZh Y2UpOwogICAgICAgICAgICAgcmV0dXJuIGNhY2hlZFN1cmZhY2U7CiAgICAgICAgIH0KQEAgLTM1 MiwxNyArMzUxLDYgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgcmV0 dXJuIG1fY2dDb250ZXh0LmdldCgpOwogfQogCi1HcmFwaGljc0NvbnRleHQmIElPU3VyZmFjZTo6 ZW5zdXJlR3JhcGhpY3NDb250ZXh0KCkKLXsKLSAgICBpZiAobV9ncmFwaGljc0NvbnRleHQpCi0g ICAgICAgIHJldHVybiAqbV9ncmFwaGljc0NvbnRleHQ7Ci0KLSAgICBtX2dyYXBoaWNzQ29udGV4 dCA9IG1ha2VVbmlxdWU8R3JhcGhpY3NDb250ZXh0Q0c+KGVuc3VyZVBsYXRmb3JtQ29udGV4dCgp KTsKLSAgICBtX2dyYXBoaWNzQ29udGV4dC0+c2V0SXNBY2NlbGVyYXRlZENvbnRleHQodHJ1ZSk7 Ci0KLSAgICByZXR1cm4gKm1fZ3JhcGhpY3NDb250ZXh0OwotfQotCiBTZXROb25Wb2xhdGlsZVJl c3VsdCBJT1N1cmZhY2U6OnN0YXRlKCkgY29uc3QKIHsKICAgICB1aW50MzJfdCBwcmV2aW91c1N0 YXRlID0gMDsKQEAgLTQzOCw5ICs0MjYsOCBAQCBib29sIElPU3VyZmFjZTo6aXNJblVzZSgpIGNv bnN0CiAgICAgcmV0dXJuIElPU3VyZmFjZUlzSW5Vc2UobV9zdXJmYWNlLmdldCgpKTsKIH0KIAot dm9pZCBJT1N1cmZhY2U6OnJlbGVhc2VHcmFwaGljc0NvbnRleHQoKQordm9pZCBJT1N1cmZhY2U6 OnJlbGVhc2VQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCgpCiB7Ci0gICAgbV9ncmFwaGljc0NvbnRl eHQgPSBudWxscHRyOwogICAgIG1fY2dDb250ZXh0ID0gbnVsbHB0cjsKIH0KIAo= 459377 2022-05-15 01:01:30 -0700 2022-05-15 06:31:59 -0700 For landing bug-240417-20220515110128.patch text/plain 12100 kkinnunen RnJvbSA1OGRhOTk5ZjJhZWU4NmFkMDFlMmFhNzcyMzI4MGM3YjcyYjEyYTVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLaW1tbyBLaW5udW5lbiA8a2tpbm51bmVuQGFwcGxlLmNvbT4K RGF0ZTogU2F0LCAxNCBNYXkgMjAyMiAxNDoyODoxMyArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIGRv bmUtZ3JhcGhpY3Njb250ZXh0LWZyb20taW9zdXJmYWNlCgotLS0KIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8IDMzICsrKysrKysrKysrKysrKysrKysKIC4u Li9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAgICAgICAgICB8ICAyICstCiAuLi4v cGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaCAgfCAgOCArKysrLQogLi4u L3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwICAgIHwgIDIgKy0KIC4uLi9j Zy9JbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuY3BwICAgICAgICB8IDEyICsrKy0tLS0KIC4u Li9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuaCB8ICA2ICsrKy0KIC4u Li9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbSAgICB8ICA3ICsrKysKIC4u Li9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaCAgICAgICB8IDEwICsrLS0tLQog Li4uL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbSAgICAgIHwgMTcgKystLS0t LS0tLQogOSBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggZjI3NzRhZjYzZDdiLi44MGY4MDU2NTJiYTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwzNiBAQAorMjAyMi0wNS0xNCAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBw bGUuY29tPgorCisgICAgICAgIFdlYkNvcmU6OklPU3VyZmFjZSBoYXMgV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0IGFzIGl0cyBwcm9wZXJ0eSwgaXQgc2hvdWxkIGJlIHRoZSBvdGhlciB3YXkgYXJv dW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDA0 MTcKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgRG8gbm90 IHN0b3JlIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCBpbiBXZWJDb3JlOjpJT1N1cmZhY2UuCisg ICAgICAgIEUuZy4gZ3JhcGhpY3MgY29udGV4dCBpcyBub3QgdGhlIHByb3BlcnR5IG9mIHRoZSBi aXRtYXAgdGhhdAorICAgICAgICBpcyBiZWluZyBkcmF3biB0by4gVGhlIGJhY2tpbmcgYml0bWFw IGlzIGEgcHJvcGVydHkgb2YgdGhlIGNvbnRleHQuCisKKyAgICAgICAgSW5zdGVhZCwgc3RvcmUg dGhlIEdyYXBoaWNzQ29udGV4dENHIGF0IHRoZSBwbGFjZSB3aGVyZSB0aGUgdXNlciBpcywKKyAg ICAgICAgZS5nLiBpbiBJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuIFRoaXMgYWxsb3dzIHRo ZSBjb250ZXh0IGNsaWVudAorICAgICAgICB0byBjcmVhdGUgdGhlIGNvbnRleHQgd2l0aCB0aGUg b3B0aW9ucyB0aGUgY2xpZW50IG5lZWRzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0Q0c6OkdyYXBoaWNzQ29udGV4dENHKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dENHOjpkcmF3TmF0aXZlSW1hZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nn L0dyYXBoaWNzQ29udGV4dENHLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9T dXJmYWNlUG9vbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJT1N1cmZhY2VQb29sOjp3aWxsQWRk U3VyZmFjZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJJT1N1 cmZhY2VCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVySU9TdXJmYWNl QmFja2VuZDo6fkltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQ6OmNvbnRleHQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kOjpyZWxlYXNlR3JhcGhpY3NDb250 ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlcklPU3VyZmFj ZUJhY2tlbmQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2Uu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW06CisgICAg ICAgIChXZWJDb3JlOjpJT1N1cmZhY2U6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJT1N1 cmZhY2U6OnJlbGVhc2VQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCk6CisgICAgICAgIChXZWJDb3Jl OjpJT1N1cmZhY2U6OmVuc3VyZUdyYXBoaWNzQ29udGV4dCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpJT1N1cmZhY2U6OnJlbGVhc2VHcmFwaGljc0NvbnRleHQpOiBEZWxldGVkLgorCiAy MDIyLTA1LTA4ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAg UHV0IFRocmVhZEdsb2JhbERhdGEgaW4gVGhyZWFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKaW5kZXggNGY5 OWU5MzFhODZkLi43OGIxOTMyOTk3YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTI2Nyw4ICsy NjcsOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dENHOjpkcmF3TmF0aXZlSW1hZ2UoTmF0aXZlSW1h Z2UmIG5hdGl2ZUltYWdlLCBjb25zdCBGbG9hdFNpegogICAgICAgICAgICAgLy8gaW1hZ2UuIFdl IG5lZWQgdG8gY29udmVydCBzdWJpbWFnZVJlY3QgdG8gcGh5c2ljYWwgaW1hZ2UgY29vcmRpbmF0 ZXMuCiAgICAgICAgICAgICBpZiAoYXV0byB0cmFuc2Zvcm0gPSBvcHRpb25zLm9yaWVudGF0aW9u KCkudHJhbnNmb3JtRnJvbURlZmF1bHQoaW1hZ2VTaXplKS5pbnZlcnNlKCkpCiAgICAgICAgICAg ICAgICAgcGh5c2ljYWxTdWJpbWFnZVJlY3QgPSB0cmFuc2Zvcm0udmFsdWUoKS5tYXBSZWN0KHBo eXNpY2FsU3ViaW1hZ2VSZWN0KTsKLSAgICAgICAgfQogCisgICAgICAgIH0KICNpZiBDQUNIRV9T VUJJTUFHRVMKICAgICAgICAgcmV0dXJuIFN1YmltYWdlQ2FjaGVXaXRoVGltZXI6OmdldFN1Ymlt YWdlKGltYWdlLCBwaHlzaWNhbFN1YmltYWdlUmVjdCk7CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKaW5k ZXggYTFhMjZiZmQyODRkLi5kMjFlM2E4ZmM0YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuaApAQCAtMzIsMTAg KzMyLDE2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorI2lmIEhBVkUoSU9TVVJGQUNFKQor Y2xhc3MgSU9TdXJmYWNlOworI2VuZGlmCisKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEdyYXBoaWNz Q29udGV4dENHIDogcHVibGljIEdyYXBoaWNzQ29udGV4dCB7CiBwdWJsaWM6CiAgICAgR3JhcGhp Y3NDb250ZXh0Q0coQ0dDb250ZXh0UmVmKTsKLQorI2lmIEhBVkUoSU9TVVJGQUNFKQorICAgIGV4 cGxpY2l0IEdyYXBoaWNzQ29udGV4dENHKElPU3VyZmFjZSYpOworI2VuZGlmCiAjaWYgUExBVEZP Uk0oV0lOKQogICAgIEdyYXBoaWNzQ29udGV4dENHKEhEQywgYm9vbCBoYXNBbHBoYSA9IGZhbHNl KTsgLy8gRklYTUU6IFRvIGJlIHJlbW92ZWQuCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9vbC5jcHAKaW5kZXggNWExNjQ3 MGMzNTc4Li40Y2RmYmFjNjBhMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwCkBAIC04Miw3ICs4Miw3IEBAIHZvaWQg SU9TdXJmYWNlUG9vbDo6d2lsbEFkZFN1cmZhY2UoSU9TdXJmYWNlJiBzdXJmYWNlLCBib29sIGlu VXNlKQogICAgIENhY2hlZFN1cmZhY2VEZXRhaWxzJiBkZXRhaWxzID0gbV9zdXJmYWNlRGV0YWls cy5hZGQoJnN1cmZhY2UsIENhY2hlZFN1cmZhY2VEZXRhaWxzKCkpLml0ZXJhdG9yLT52YWx1ZTsK ICAgICBkZXRhaWxzLnJlc2V0TGFzdFVzZVRpbWUoKTsKIAotICAgIHN1cmZhY2UucmVsZWFzZUdy YXBoaWNzQ29udGV4dCgpOworICAgIHN1cmZhY2UucmVsZWFzZVBsYXRmb3JtR3JhcGhpY3NDb250 ZXh0KCk7CiAKICAgICBzaXplX3Qgc3VyZmFjZUJ5dGVzID0gc3VyZmFjZS50b3RhbEJ5dGVzKCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdl QnVmZmVySU9TdXJmYWNlQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jZy9JbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuY3BwCmluZGV4IGY2Y2JhMWM1NzRm NS4uNWUzODAyZWFhMWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jZy9JbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5jcHAK QEAgLTEyNSwxNyArMTI1LDE3IEBAIEltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZDo6SW1hZ2VC dWZmZXJJT1N1cmZhY2VCYWNrZW5kKGNvbnN0IFBhcmFtZXRlcnMmIHBhcmFtCiAKIEltYWdlQnVm ZmVySU9TdXJmYWNlQmFja2VuZDo6fkltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZCgpCiB7Cisg ICAgbV9jb250ZXh0ID0gc3RkOjpudWxsb3B0OyAvLyBNYWtlIHN1cmUgdGhlIGNvbnRleHQgZG9l cyBub3QgaW50ZXJmZXJlIHdpdGggbW92aW5nIHRvIHBvb2wuCiAgICAgSU9TdXJmYWNlOjptb3Zl VG9Qb29sKFdURk1vdmUobV9zdXJmYWNlKSwgbV9pb1N1cmZhY2VQb29sLmdldCgpKTsKIH0KIAog R3JhcGhpY3NDb250ZXh0JiBJbWFnZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQ6OmNvbnRleHQoKSBj b25zdAogewotICAgIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCA9IG1fc3VyZmFjZS0+ZW5zdXJl R3JhcGhpY3NDb250ZXh0KCk7Ci0gICAgaWYgKG1fbmVlZHNTZXR1cENvbnRleHQpIHsKLSAgICAg ICAgbV9uZWVkc1NldHVwQ29udGV4dCA9IGZhbHNlOworICAgIGlmICghbV9jb250ZXh0KSB7Cisg ICAgICAgIG1fY29udGV4dC5lbXBsYWNlKCptX3N1cmZhY2UpOwogICAgICAgICBhcHBseUJhc2VU cmFuc2Zvcm1Ub0NvbnRleHQoKTsKICAgICB9Ci0gICAgcmV0dXJuIGNvbnRleHQ7CisgICAgcmV0 dXJuICptX2NvbnRleHQ7CiB9CiAKIHZvaWQgSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kOjpm bHVzaENvbnRleHQoKQpAQCAtMjM4LDggKzIzOCw4IEBAIGJvb2wgSW1hZ2VCdWZmZXJJT1N1cmZh Y2VCYWNrZW5kOjppc0luVXNlKCkgY29uc3QKIAogdm9pZCBJbWFnZUJ1ZmZlcklPU3VyZmFjZUJh Y2tlbmQ6OnJlbGVhc2VHcmFwaGljc0NvbnRleHQoKQogewotICAgIG1fbmVlZHNTZXR1cENvbnRl eHQgPSB0cnVlOwotICAgIHJldHVybiBtX3N1cmZhY2UtPnJlbGVhc2VHcmFwaGljc0NvbnRleHQo KTsKKyAgICBtX2NvbnRleHQgPSBzdGQ6Om51bGxvcHQ7CisgICAgbV9zdXJmYWNlLT5yZWxlYXNl UGxhdGZvcm1HcmFwaGljc0NvbnRleHQoKTsKIH0KIAogYm9vbCBJbWFnZUJ1ZmZlcklPU3VyZmFj ZUJhY2tlbmQ6OnNldFZvbGF0aWxlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNrZW5kLmgK aW5kZXggODEyMzNkNWQ2ZDAwLi45MWJiMTkwZjAzNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVySU9TdXJm YWNlQmFja2VuZC5oCkBAIC0yNywxMyArMjcsMTcgQEAKIAogI2lmIEhBVkUoSU9TVVJGQUNFKQog CisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0Q0cuaCIKICNpbmNsdWRlICJJbWFnZUJ1ZmZlckNH QmFja2VuZC5oIgogI2luY2x1ZGUgIklPU3VyZmFjZS5oIgogI2luY2x1ZGUgIklPU3VyZmFjZVBv b2wuaCIKKyNpbmNsdWRlIDxvcHRpb25hbD4KICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9jLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgR3JhcGhpY3NDb250ZXh0Q0c7CisKIGNsYXNz IFdFQkNPUkVfRVhQT1JUIEltYWdlQnVmZmVySU9TdXJmYWNlQmFja2VuZCA6IHB1YmxpYyBJbWFn ZUJ1ZmZlckNHQmFja2VuZCB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRChJbWFnZUJ1ZmZl cklPU3VyZmFjZUJhY2tlbmQpOwogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEltYWdlQnVmZmVy SU9TdXJmYWNlQmFja2VuZCk7CkBAIC05MSw3ICs5NSw3IEBAIHByb3RlY3RlZDoKICAgICBJT1N1 cmZhY2VTZWVkIG1fbGFzdFNlZWRXaGVuRHJhd2luZ0ltYWdlIHsgMCB9OwogICAgIG11dGFibGUg Ym9vbCBtX3JlcXVpcmVzRHJhd0FmdGVyUHV0UGl4ZWxCdWZmZXIgeyBmYWxzZSB9OwogCi0gICAg bXV0YWJsZSBib29sIG1fbmVlZHNTZXR1cENvbnRleHQgeyBmYWxzZSB9OworICAgIG11dGFibGUg c3RkOjpvcHRpb25hbDxHcmFwaGljc0NvbnRleHRDRz4gbV9jb250ZXh0OwogICAgIFZvbGF0aWxp dHlTdGF0ZSBtX3ZvbGF0aWxpdHlTdGF0ZSB7IFZvbGF0aWxpdHlTdGF0ZTo6Tm9uVm9sYXRpbGUg fTsKIAogICAgIFJlZlB0cjxJT1N1cmZhY2VQb29sPiBtX2lvU3VyZmFjZVBvb2w7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRl eHRDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0dyYXBo aWNzQ29udGV4dENvY29hLm1tCmluZGV4IDdjMjljYmIyNTA1Ni4uYjBmNGUzMmI2OTQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0Nv bnRleHRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv YS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQpAQCAtMjksNiArMjksNyBAQAogI2ltcG9ydCAiRGlz cGxheUxpc3RSZWNvcmRlci5oIgogI2ltcG9ydCAiR3JhcGhpY3NDb250ZXh0Q0cuaCIKICNpbXBv cnQgIkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNHLmgiCisjaW1wb3J0ICJJT1N1cmZh Y2UuaCIKICNpbXBvcnQgIkludFJlY3QuaCIKICNpbXBvcnQgPHBhbC9zcGkvY2cvQ29yZUdyYXBo aWNzU1BJLmg+CiAjaW1wb3J0IDxwYWwvc3BpL21hYy9OU0dyYXBoaWNzU1BJLmg+CkBAIC0xMTUs NiArMTE2LDEyIEBAIHN0YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmdUb0NvbnRleHQoQ0dDb250ZXh0 UmVmIGNvbnRleHQsIENHUGF0aFJlZiBmb2N1c1JpbmdQYXRoCiAgICAgZHJhd0ZvY3VzUmluZyhj b250ZXh0LCBjb2xvcik7CiB9CiAKK0dyYXBoaWNzQ29udGV4dENHOjpHcmFwaGljc0NvbnRleHRD RyhJT1N1cmZhY2UmIGlvc3VyZmFjZSkKKyAgICA6IEdyYXBoaWNzQ29udGV4dENHKGlvc3VyZmFj ZS5lbnN1cmVQbGF0Zm9ybUNvbnRleHQoKSkKK3sKKyAgICBzZXRJc0FjY2VsZXJhdGVkQ29udGV4 dCh0cnVlKTsKK30KKwogdm9pZCBHcmFwaGljc0NvbnRleHRDRzo6ZHJhd0ZvY3VzUmluZyhjb25z dCBQYXRoJiBwYXRoLCBmbG9hdCwgZmxvYXQsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBp ZiAocGF0aC5pc051bGwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0lPU3VyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvSU9TdXJmYWNlLmgKaW5kZXggMzJhMTQxY2RjYjhkLi5kNGNhMzQ3Nzg0YWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFj ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFj ZS5oCkBAIC00Myw3ICs0Myw2IEBAIGNsYXNzIFRleHRTdHJlYW07CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogY2xhc3MgSG9zdFdpbmRvdzsKIGNsYXNz IElPU3VyZmFjZVBvb2w7CiBjbGFzcyBQcm9jZXNzSWRlbnRpdHk7CkBAIC0xMjcsOCArMTI2LDEw IEBAIHB1YmxpYzoKICAgICBpZCBhc0xheWVyQ29udGVudHMoKSBjb25zdCB7IHJldHVybiAoX19i cmlkZ2UgaWQpbV9zdXJmYWNlLmdldCgpOyB9CiAjZW5kaWYKICAgICBJT1N1cmZhY2VSZWYgc3Vy ZmFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VyZmFjZS5nZXQoKTsgfQotICAgIFdFQkNPUkVfRVhQ T1JUIEdyYXBoaWNzQ29udGV4dCYgZW5zdXJlR3JhcGhpY3NDb250ZXh0KCk7CiAgICAgV0VCQ09S RV9FWFBPUlQgQ0dDb250ZXh0UmVmIGVuc3VyZVBsYXRmb3JtQ29udGV4dChjb25zdCBIb3N0V2lu ZG93KiA9IG51bGxwdHIpOworICAgIC8vIFRoZSBncmFwaGljcyBjb250ZXh0IGNhY2hlZCBvbiB0 aGUgc3VyZmFjZSBjb3VudHMgYXMgYSAidXNlciIsIHNvIHRvIGdldAorICAgIC8vIGFuIGFjY3Vy YXRlIHJlc3VsdCBmcm9tIGlzSW5Vc2UoKSwgaXQgbmVlZHMgdG8gYmUgcmVsZWFzZWQuCisgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCByZWxlYXNlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQoKTsKIAog ICAgIC8vIFF1ZXJ5aW5nIHZvbGF0aWxpdHkgY2FuIGJlIGV4cGVuc2l2ZSwgc28gaW4gY2FzZXMg d2hlcmUgdGhlIHN1cmZhY2UgaXMKICAgICAvLyBnb2luZyB0byBiZSB1c2VkIGltbWVkaWF0ZWx5 LCB1c2UgdGhlIHJldHVybiB2YWx1ZSBvZiBzZXRWb2xhdGlsZSB0bwpAQCAtMTUwLDEwICsxNTEs NiBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGlzSW5Vc2UoKSBjb25zdDsK IAotICAgIC8vIFRoZSBncmFwaGljcyBjb250ZXh0IGNhY2hlZCBvbiB0aGUgc3VyZmFjZSBjb3Vu dHMgYXMgYSAidXNlciIsIHNvIHRvIGdldAotICAgIC8vIGFuIGFjY3VyYXRlIHJlc3VsdCBmcm9t IGlzSW5Vc2UoKSwgaXQgbmVlZHMgdG8gYmUgcmVsZWFzZWQuCi0gICAgV0VCQ09SRV9FWFBPUlQg dm9pZCByZWxlYXNlR3JhcGhpY3NDb250ZXh0KCk7Ci0KICNpZiBIQVZFKElPU1VSRkFDRV9BQ0NF TEVSQVRPUikKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBhbGxvd0NvbnZlcnNpb25G cm9tRm9ybWF0VG9Gb3JtYXQoRm9ybWF0LCBGb3JtYXQpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0 YXRpYyB2b2lkIGNvbnZlcnRUb0Zvcm1hdChJT1N1cmZhY2VQb29sKiwgc3RkOjp1bmlxdWVfcHRy PFdlYkNvcmU6OklPU3VyZmFjZT4mJiBpblN1cmZhY2UsIEZvcm1hdCwgRnVuY3Rpb248dm9pZChz dGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6SU9TdXJmYWNlPik+JiYpOwpAQCAtMTcyLDcgKzE2OSw2 IEBAIHByaXZhdGU6CiAgICAgSW50U2l6ZSBtX3NpemU7CiAgICAgc2l6ZV90IG1fdG90YWxCeXRl czsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxHcmFwaGljc0NvbnRleHQ+IG1fZ3JhcGhpY3NDb250 ZXh0OwogICAgIFJldGFpblB0cjxDR0NvbnRleHRSZWY+IG1fY2dDb250ZXh0OwogCiAgICAgUmV0 YWluUHRyPElPU3VyZmFjZVJlZj4gbV9zdXJmYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tCmluZGV4IGNjNjBiYzI2MmU4NC4u N2UwMTIwOTRmNDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9JT1N1cmZhY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvSU9TdXJmYWNlLm1tCkBAIC0yNyw3ICsyNyw2IEBACiAjaW1wb3J0ICJJT1N1cmZh Y2UuaCIKIAogI2ltcG9ydCAiRGVzdGluYXRpb25Db2xvclNwYWNlLmgiCi0jaW1wb3J0ICJHcmFw aGljc0NvbnRleHRDRy5oIgogI2ltcG9ydCAiSG9zdFdpbmRvdy5oIgogI2ltcG9ydCAiSU9TdXJm YWNlUG9vbC5oIgogI2ltcG9ydCAiTG9nZ2luZy5oIgpAQCAtNDcsNyArNDYsNyBAQCBzdGQ6OnVu aXF1ZV9wdHI8SU9TdXJmYWNlPiBJT1N1cmZhY2U6OmNyZWF0ZShJT1N1cmZhY2VQb29sKiBwb29s LCBJbnRTaXplIHNpemUsCiB7CiAgICAgaWYgKHBvb2wpIHsKICAgICAgICAgaWYgKGF1dG8gY2Fj aGVkU3VyZmFjZSA9IHBvb2wtPnRha2VTdXJmYWNlKHNpemUsIGNvbG9yU3BhY2UsIHBpeGVsRm9y bWF0KSkgewotICAgICAgICAgICAgY2FjaGVkU3VyZmFjZS0+cmVsZWFzZUdyYXBoaWNzQ29udGV4 dCgpOworICAgICAgICAgICAgY2FjaGVkU3VyZmFjZS0+cmVsZWFzZVBsYXRmb3JtR3JhcGhpY3ND b250ZXh0KCk7CiAgICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oSU9TdXJmYWNlLCBzdHJlYW0g PDwgIklPU3VyZmFjZTo6Y3JlYXRlIHRvb2sgZnJvbSBwb29sOiAiIDw8ICpjYWNoZWRTdXJmYWNl KTsKICAgICAgICAgICAgIHJldHVybiBjYWNoZWRTdXJmYWNlOwogICAgICAgICB9CkBAIC0zNTIs MTcgKzM1MSw2IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIHJldHVy biBtX2NnQ29udGV4dC5nZXQoKTsKIH0KIAotR3JhcGhpY3NDb250ZXh0JiBJT1N1cmZhY2U6OmVu c3VyZUdyYXBoaWNzQ29udGV4dCgpCi17Ci0gICAgaWYgKG1fZ3JhcGhpY3NDb250ZXh0KQotICAg ICAgICByZXR1cm4gKm1fZ3JhcGhpY3NDb250ZXh0OwotCi0gICAgbV9ncmFwaGljc0NvbnRleHQg PSBtYWtlVW5pcXVlPEdyYXBoaWNzQ29udGV4dENHPihlbnN1cmVQbGF0Zm9ybUNvbnRleHQoKSk7 Ci0gICAgbV9ncmFwaGljc0NvbnRleHQtPnNldElzQWNjZWxlcmF0ZWRDb250ZXh0KHRydWUpOwot Ci0gICAgcmV0dXJuICptX2dyYXBoaWNzQ29udGV4dDsKLX0KLQogU2V0Tm9uVm9sYXRpbGVSZXN1 bHQgSU9TdXJmYWNlOjpzdGF0ZSgpIGNvbnN0CiB7CiAgICAgdWludDMyX3QgcHJldmlvdXNTdGF0 ZSA9IDA7CkBAIC00MzgsOSArNDI2LDggQEAgYm9vbCBJT1N1cmZhY2U6OmlzSW5Vc2UoKSBjb25z dAogICAgIHJldHVybiBJT1N1cmZhY2VJc0luVXNlKG1fc3VyZmFjZS5nZXQoKSk7CiB9CiAKLXZv aWQgSU9TdXJmYWNlOjpyZWxlYXNlR3JhcGhpY3NDb250ZXh0KCkKK3ZvaWQgSU9TdXJmYWNlOjpy ZWxlYXNlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQoKQogewotICAgIG1fZ3JhcGhpY3NDb250ZXh0 ID0gbnVsbHB0cjsKICAgICBtX2NnQ29udGV4dCA9IG51bGxwdHI7CiB9CiAKLS0gCjIuMzIuMCAo QXBwbGUgR2l0LTEzMikKCg==