227427 2021-06-26 23:46:19 -0700 [GPU Process][MotionMark] Fix the Images test regression 2023-08-04 15:30:48 -0700 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=259436 InRadar P2 Normal --- 1 sabouhallawa sabouhallawa dino mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1772916 0 sabouhallawa 2021-06-26 23:46:19 -0700 Fix the Images test regression which has happened since GPU Process rendering for 2D canvas was enabled. 1772917 1 432346 sabouhallawa 2021-06-26 23:49:02 -0700 Created attachment 432346 Patch for EWS 1773177 2 432418 sabouhallawa 2021-06-28 13:49:27 -0700 Created attachment 432418 Patch 1774704 3 webkit-bug-importer 2021-07-03 23:47:16 -0700 <rdar://problem/80140944> 432346 2021-06-26 23:49:02 -0700 2021-06-28 13:49:25 -0700 Patch for EWS bug-227427-20210626234901.patch text/plain 8680 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI2OTc5MDA0YTVmNzhj YjhmYmRlZmJkYmM4ZGViMGU4ODhmNTk3Mi4uYTM5OGEwMTMyYjA5NjA0OWY2MTQ1N2U5YWZmNGNi ZDgwNzZiMmFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTI2ICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc11b TW90aW9uTWFya10gRml4IHRoZSBJbWFnZXMgdGVzdCByZWdyZXNzaW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc0MjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1Bp eGVsQnVmZmVyRm9ybWF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yPT0pOgorICAg ICAgICAoV2ViQ29yZTo6b3BlcmF0b3IhPSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv UGl4ZWxCdWZmZXJGb3JtYXQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5 bGlzdHMvRGlzcGxheUxpc3RJbWFnZUJ1ZmZlci5oOgorCiAyMDIxLTA2LTI0ICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZl cnRpbmcgcjI3NTYzMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZWFlNzNmNGZiZjBmNDU1YmFjYmNiM2Y5ZDMyNjM0 NmU2ODdhMTY1Zi4uYmVmNzQ1MDE2NGI2NjE3ZjQ5ZGE0ZDFkZDc3MjlhMWFhN2QxNDJmMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNi0yNiAgU2FpZCBBYm91LUhhbGxhd2EgIDxz YWlkQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nlc3NdW01vdGlvbk1hcmtdIEZpeCB0 aGUgSW1hZ2VzIHRlc3QgcmVncmVzc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3NDI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1 ZmZlclByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUltYWdlQnVmZmVyUHJveHk6OnB1 dENhY2hlZFBpeGVsQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW1hZ2VCdWZmZXJQ cm94eTo6Z2V0Q2FjaGVkUGl4ZWxCdWZmZXIgY29uc3QpOgorCiAyMDIxLTA2LTI0ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHJlbGVhc2UgbG9nZ2luZyBp biB0aGUgV2ViUGFnZSBjb25zdHJ1Y3RvciAvIGRlc3RydWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVyRm9ybWF0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVyRm9ybWF0LmNwcAppbmRleCBm OTRkYTVmYjYzMTM4NTFiNjAyNGM5ODdiYTBlOTVjNWRmMDI4MTliLi41MWY3ZWVkZjgzMWQ5NTUw YjdhN2U2ODJkODQ2YjY1ZDk3ZGMxMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9QaXhlbEJ1ZmZlckZvcm1hdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvUGl4ZWxCdWZmZXJGb3JtYXQuY3BwCkBAIC0zMCw2ICszMCwxNiBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2Jvb2wgb3BlcmF0b3I9PShjb25zdCBQaXhlbEJ1 ZmZlckZvcm1hdCYgYSwgY29uc3QgUGl4ZWxCdWZmZXJGb3JtYXQmIGIpCit7CisgICAgcmV0dXJu IGEuYWxwaGFGb3JtYXQgPT0gYi5hbHBoYUZvcm1hdCAmJiBhLnBpeGVsRm9ybWF0ID09IGIucGl4 ZWxGb3JtYXQgJiYgYS5jb2xvclNwYWNlID09IGIuY29sb3JTcGFjZTsKK30KKworYm9vbCBvcGVy YXRvciE9KGNvbnN0IFBpeGVsQnVmZmVyRm9ybWF0JiBhLCBjb25zdCBQaXhlbEJ1ZmZlckZvcm1h dCYgYikKK3sKKyAgICByZXR1cm4gIShhID09IGIpOworfQorCiBUZXh0U3RyZWFtJiBvcGVyYXRv cjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBQaXhlbEJ1ZmZlckZvcm1hdCYgcGl4ZWxCdWZmZXIp CiB7CiAgICAgcmV0dXJuIHRzIDw8IHBpeGVsQnVmZmVyLmFscGhhRm9ybWF0IDw8ICcgJyA8PCBw aXhlbEJ1ZmZlci5waXhlbEZvcm1hdCA8PCAnICcgPDwgcGl4ZWxCdWZmZXIuY29sb3JTcGFjZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVy Rm9ybWF0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QaXhlbEJ1ZmZlckZv cm1hdC5oCmluZGV4IDdmMTkyNGUzNTAzZTA5Y2FkNmM0MWU0NTg1MDVkYWU4YTdhNjhmNDQuLmJm ZGQ4OWFjMTc1NTY5NGUzN2FlMDRhOWY2Y2M4MTcwZDJmODNjODcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVyRm9ybWF0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGl4ZWxCdWZmZXJGb3JtYXQuaApAQCAtNDEs NiArNDEsOSBAQCBzdHJ1Y3QgUGl4ZWxCdWZmZXJGb3JtYXQgewogICAgIHRlbXBsYXRlPGNsYXNz IERlY29kZXI+IHN0YXRpYyBzdGQ6Om9wdGlvbmFsPFBpeGVsQnVmZmVyRm9ybWF0PiBkZWNvZGUo RGVjb2RlciYpOwogfTsKIAorV0VCQ09SRV9FWFBPUlQgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFBp eGVsQnVmZmVyRm9ybWF0JiwgY29uc3QgUGl4ZWxCdWZmZXJGb3JtYXQmKTsKK1dFQkNPUkVfRVhQ T1JUIGJvb2wgb3BlcmF0b3IhPShjb25zdCBQaXhlbEJ1ZmZlckZvcm1hdCYsIGNvbnN0IFBpeGVs QnVmZmVyRm9ybWF0Jik7CisKIFdFQkNPUkVfRVhQT1JUIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwo VGV4dFN0cmVhbSYsIGNvbnN0IFBpeGVsQnVmZmVyRm9ybWF0Jik7CiAKIHRlbXBsYXRlPGNsYXNz IEVuY29kZXI+IHZvaWQgUGl4ZWxCdWZmZXJGb3JtYXQ6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVy KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlz cGxheWxpc3RzL0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmgKaW5kZXgg ODFiOTI0NzRlMjRlY2QyMzZmMjIwNzc0ZWQxY2JjZjg0NjlmMzI3OC4uODYzYjcwNjRjOTQ3MWU0 NDgxZDAwZDA5ZGYwNjQyNjMxYWZjYTU3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxp c3RJbWFnZUJ1ZmZlci5oCkBAIC0zNSwxMCArMzUsMTAgQEAgbmFtZXNwYWNlIERpc3BsYXlMaXN0 IHsKIHRlbXBsYXRlPHR5cGVuYW1lIEJhY2tlbmRUeXBlPgogY2xhc3MgSW1hZ2VCdWZmZXIgOiBw dWJsaWMgQ29uY3JldGVJbWFnZUJ1ZmZlcjxCYWNrZW5kVHlwZT4gewogICAgIHVzaW5nIEJhc2VD b25jcmV0ZUltYWdlQnVmZmVyID0gQ29uY3JldGVJbWFnZUJ1ZmZlcjxCYWNrZW5kVHlwZT47Citw dWJsaWM6CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OmxvZ2ljYWxTaXplOwog ICAgIHVzaW5nIEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyOjpiYXNlVHJhbnNmb3JtOwogCi1wdWJs aWM6CiAgICAgc3RhdGljIGF1dG8gY3JlYXRlKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSwgZmxvYXQg cmVzb2x1dGlvblNjYWxlLCBjb25zdCBEZXN0aW5hdGlvbkNvbG9yU3BhY2UmIGNvbG9yU3BhY2Us IFBpeGVsRm9ybWF0IHBpeGVsRm9ybWF0LCBjb25zdCBIb3N0V2luZG93KiBob3N0V2luZG93KQog ICAgIHsKICAgICAgICAgcmV0dXJuIEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyOjp0ZW1wbGF0ZSBj cmVhdGU8SW1hZ2VCdWZmZXI+KHNpemUsIHJlc29sdXRpb25TY2FsZSwgY29sb3JTcGFjZSwgcGl4 ZWxGb3JtYXQsIGhvc3RXaW5kb3cpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAppbmRleCA2 ZGNmMWQ1MmYxYThhMTk4MTdmNWE1MWMwYmQwMzk3MzQ5YzkxNDdhLi5kNGRhMWZkN2FiOGViNjlh MGM0NGI3Y2MwOTRlYjc3ZGNhYTlkNGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApA QCAtNTIsNiArNTIsNyBAQCBjbGFzcyBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5IDogcHVibGljIFdl YkNvcmU6OkRpc3BsYXlMaXN0OjpJbWFnZUJ1ZmZlcjxCYWNrZW5kVAogICAgIHVzaW5nIEJhc2VE aXNwbGF5TGlzdEltYWdlQnVmZmVyOjptX2JhY2tlbmQ7CiAgICAgdXNpbmcgQmFzZURpc3BsYXlM aXN0SW1hZ2VCdWZmZXI6Om1fZHJhd2luZ0NvbnRleHQ7CiAgICAgdXNpbmcgQmFzZURpc3BsYXlM aXN0SW1hZ2VCdWZmZXI6Om1fcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyOworICAgIHVzaW5n IEJhc2VEaXNwbGF5TGlzdEltYWdlQnVmZmVyOjpsb2dpY2FsU2l6ZTsKICAgICB1c2luZyBCYXNl RGlzcGxheUxpc3RJbWFnZUJ1ZmZlcjo6cmVzb2x1dGlvblNjYWxlOwogCiBwdWJsaWM6CkBAIC0y MDEsNiArMjAyLDM5IEBAIHByb3RlY3RlZDoKICAgICAgICAgcmV0dXJuIGJpdG1hcC0+Y3JlYXRl SW1hZ2UoKTsKICAgICB9CiAKKyAgICBib29sIHB1dENhY2hlZFBpeGVsQnVmZmVyKGNvbnN0IFdl YkNvcmU6OlBpeGVsQnVmZmVyJiBwaXhlbEJ1ZmZlciwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYg c3JjUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGRlc3RQb2ludCkKKyAgICB7CisgICAg ICAgIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IG1heENhY2hlZFBpeGVsQnVmZmVyU2l6ZSA9IDEw ICogS0I7CisgICAgICAgIHNpemVfdCBkYXRhU2l6ZSA9IHBpeGVsQnVmZmVyLmRhdGEoKS5ieXRl TGVuZ3RoKCk7CisgICAgICAgIAorICAgICAgICBpZiAoc3JjUmVjdCAhPSBJbnRSZWN0KHsgfSwg bG9naWNhbFNpemUoKSkgfHwgIWRlc3RQb2ludC5pc1plcm8oKSB8fCBkYXRhU2l6ZSA+IG1heENh Y2hlZFBpeGVsQnVmZmVyU2l6ZSkgeworICAgICAgICAgICAgbV9jYWNoZWRQaXhlbEJ1ZmZlciA9 IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisg ICAgICAgIGlmICghbV9jYWNoZWRQaXhlbEJ1ZmZlciB8fCBtX2NhY2hlZFBpeGVsQnVmZmVyLT5z aXplKCkgIT0gcGl4ZWxCdWZmZXIuc2l6ZSgpKQorICAgICAgICAgICAgbV9jYWNoZWRQaXhlbEJ1 ZmZlciA9IFdlYkNvcmU6OlBpeGVsQnVmZmVyOjp0cnlDcmVhdGUocGl4ZWxCdWZmZXIuZm9ybWF0 KCksIHBpeGVsQnVmZmVyLnNpemUoKSk7CisKKyAgICAgICAgaWYgKCFtX2NhY2hlZFBpeGVsQnVm ZmVyKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAKKyAgICAgICAgbWVtY3B5 KG1fY2FjaGVkUGl4ZWxCdWZmZXItPmRhdGEoKS5kYXRhKCksIHBpeGVsQnVmZmVyLmRhdGEoKS5k YXRhKCksIHBpeGVsQnVmZmVyLmRhdGEoKS5ieXRlTGVuZ3RoKCkpOworICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICB9CisKKyAgICBib29sIGdldENhY2hlZFBpeGVsQnVmZmVyKFdlYkNvcmU6OlBp eGVsQnVmZmVyJiBwaXhlbEJ1ZmZlciwgY29uc3QgV2ViQ29yZTo6UGl4ZWxCdWZmZXJGb3JtYXQm IGRlc3RpbmF0aW9uRm9ybWF0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzcmNSZWN0KSBjb25z dAorICAgIHsKKyAgICAgICAgaWYgKCFtX2NhY2hlZFBpeGVsQnVmZmVyKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgICAgIGlmIChzcmNSZWN0ICE9IEludFJlY3QoeyB9LCBsb2dp Y2FsU2l6ZSgpKSB8fCBkZXN0aW5hdGlvbkZvcm1hdCAhPSBtX2NhY2hlZFBpeGVsQnVmZmVyLT5m b3JtYXQoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBzaXplX3QgZGF0 YVNpemUgPSBwaXhlbEJ1ZmZlci5kYXRhKCkuYnl0ZUxlbmd0aCgpOworICAgICAgICBtZW1jcHko cGl4ZWxCdWZmZXIuZGF0YSgpLmRhdGEoKSwgbV9jYWNoZWRQaXhlbEJ1ZmZlci0+ZGF0YSgpLmRh dGEoKSwgZGF0YVNpemUpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgCiAgICAg c3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQaXhlbEJ1ZmZlcj4gZ2V0UGl4ZWxCdWZmZXIoY29uc3Qg V2ViQ29yZTo6UGl4ZWxCdWZmZXJGb3JtYXQmIGRlc3RpbmF0aW9uRm9ybWF0LCBjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiBzcmNSZWN0KSBjb25zdCBvdmVycmlkZQogICAgIHsKICAgICAgICAgaWYg KFVOTElLRUxZKCFtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSkpCkBAIC0yMTAsNiArMjQ0 LDkgQEAgcHJvdGVjdGVkOgogICAgICAgICBpZiAoIXBpeGVsQnVmZmVyKQogICAgICAgICAgICAg cmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAgICAgc2l6ZV90IGRhdGFTaXplID0gcGl4ZWxCdWZm ZXItPmRhdGEoKS5ieXRlTGVuZ3RoKCk7CisgICAgCisgICAgICAgIGlmIChnZXRDYWNoZWRQaXhl bEJ1ZmZlcihwaXhlbEJ1ZmZlci52YWx1ZSgpLCBkZXN0aW5hdGlvbkZvcm1hdCwgc3JjUmVjdCkp CisgICAgICAgICAgICByZXR1cm4gcGl4ZWxCdWZmZXI7CiAKICAgICAgICAgSVBDOjpUaW1lb3V0 IHRpbWVvdXQgPSA1X3M7CiAgICAgICAgIFNoYXJlZE1lbW9yeSogc2hhcmVkTWVtb3J5ID0gbV9y ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHktPnNoYXJlZE1lbW9yeUZvckdldFBpeGVsQnVmZmVy KGRhdGFTaXplLCB0aW1lb3V0KTsKQEAgLTIzMyw2ICsyNzAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAg ICAgIC8vIFRoaXMgbWVhbnMgdGhhdCBwdXRQaXhlbEJ1ZmZlcigpIGlzIG9ubHkgY2FsbGVkIHdo ZW4gcmVzb2x1dGlvblNjYWxlKCkgPT0gMS4KICAgICAgICAgQVNTRVJUKHJlc29sdXRpb25TY2Fs ZSgpID09IDEpOwogICAgICAgICBtX2RyYXdpbmdDb250ZXh0LnJlY29yZGVyKCkucHV0UGl4ZWxC dWZmZXIocGl4ZWxCdWZmZXIsIHNyY1JlY3QsIGRlc3RQb2ludCwgZGVzdEZvcm1hdCk7CisgICAg ICAgIHB1dENhY2hlZFBpeGVsQnVmZmVyKHBpeGVsQnVmZmVyLCBzcmNSZWN0LCBkZXN0UG9pbnQp OwogICAgIH0KIAogICAgIGJvb2wgcHJlZmVyc1ByZXBhcmF0aW9uRm9yRGlzcGxheSgpIG92ZXJy aWRlIHsgcmV0dXJuIHRydWU7IH0KQEAgLTMwMCwxMSArMzM4LDEzIEBAIHByb3RlY3RlZDoKICAg ICAgICAgbV9kcmF3aW5nQ29udGV4dC5kaXNwbGF5TGlzdCgpLmNsZWFyKCk7CiAgICAgfQogCi0g ICAgYm9vbCBjYW5BcHBlbmRJdGVtT2ZUeXBlKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpJdGVtVHlw ZSkgb3ZlcnJpZGUKKyAgICBib29sIGNhbkFwcGVuZEl0ZW1PZlR5cGUoV2ViQ29yZTo6RGlzcGxh eUxpc3Q6Okl0ZW1UeXBlIHR5cGUpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoVU5MSUtF TFkoIW1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KSkKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHktPndpbGxBcHBlbmRJ dGVtKG1fcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICAgICAgaWYgKFdlYkNvcmU6 OkRpc3BsYXlMaXN0Ojppc0RyYXdpbmdJdGVtKHR5cGUpKQorICAgICAgICAgICAgbV9jYWNoZWRQ aXhlbEJ1ZmZlciA9IHN0ZDo6bnVsbG9wdDsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQog CkBAIC0zNDksNiArMzg5LDcgQEAgcHJvdGVjdGVkOgogICAgIExvY2sgbV9yZWNlaXZlZEZsdXNo SWRlbnRpZmllckxvY2s7CiAgICAgQ29uZGl0aW9uIG1fcmVjZWl2ZWRGbHVzaElkZW50aWZpZXJD aGFuZ2VkQ29uZGl0aW9uOwogICAgIFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpGbHVzaElkZW50aWZp ZXIgbV9yZWNlaXZlZEZsdXNoSWRlbnRpZmllciBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fcmVjZWl2 ZWRGbHVzaElkZW50aWZpZXJMb2NrKTsgLy8gT25seSBtb2RpZmllZCBvbiB0aGUgbWFpbiB0aHJl YWQgYnV0IG1heSBnZXQgcXVlcmllZCBvbiBhIHNlY29uZGFyeSB0aHJlYWQuCisgICAgc3RkOjpv cHRpb25hbDxXZWJDb3JlOjpQaXhlbEJ1ZmZlcj4gbV9jYWNoZWRQaXhlbEJ1ZmZlcjsKICAgICBX ZWFrUHRyPFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eT4gbV9yZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHk7CiB9OwogCg== 432418 2021-06-28 13:49:27 -0700 2021-06-28 13:49:27 -0700 Patch bug-227427-20210628134926.patch text/plain 14279 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI2OTc5MDA0YTVmNzhj YjhmYmRlZmJkYmM4ZGViMGU4ODhmNTk3Mi4uMTVmNDhlOGY4ZDczZDA4Yzc5N2U2NzgxMWMyNDE4 Mzg0NjQ1YWVmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA2LTI4ICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc11b TW90aW9uTWFya10gRml4IHRoZSBJbWFnZXMgdGVzdCByZWdyZXNzaW9uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc0MjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWNoZSB0aGUgYmFja2VuZCBvZiBh IFJlbW90ZUltYWdlQnVmZmVyUHJveHkgaWYgZ2V0UGl4ZWxCdWZmZXIoKSBvcgorICAgICAgICBw dXRQaXhlbEJ1ZmZlcigpIGlzIGNhbGxlZCBmb3IgdGhlIHdob2xlIGJhY2tlbmQgYXJlYS4KKwor ICAgICAgICBUZXN0OiBmYXN0L2NhbnZhcy9nZXRJbWFnZURhdGEtcHV0SW1hZ2VEYXRhLWNhY2hp bmcuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvUGl4ZWxCdWZmZXJGb3JtYXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjpv cGVyYXRvciE9KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QaXhlbEJ1ZmZlckZvcm1h dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlz dEltYWdlQnVmZmVyLmg6CisKIDIwMjEtMDYtMjQgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1 ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjc1NjMzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCBlYWU3M2Y0ZmJmMGY0NTViYWNiY2IzZjlkMzI2MzQ2ZTY4N2ExNjVmLi5hMTFi OGJmMGQ2OGUyNTRmNDRlNDRkNWFmNWExMTcyMzMxODIwNDQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDIxLTA2LTI4ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgor CisgICAgICAgIFtHUFUgUHJvY2Vzc11bTW90aW9uTWFya10gRml4IHRoZSBJbWFnZXMgdGVzdCBy ZWdyZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjc0MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZXVzZSB0aGUgY2FjaGVkIFBpeGVsQnVmZmVyIG9mIGdldFBpeGVsQnVmZmVyKCkgb3IgcHV0 UGl4ZWxCdWZmZXIoKSBpZgorICAgICAgICBubyBkcmF3aW5nIGhhcHBlbnMgdG8gdGhlIFJlbW90 ZUltYWdlQnVmZmVyUHJveHkgc2luY2UgaXQgd2FzIGNhY2hlZC4KKworICAgICAgICAqIFdlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaDoKKyAgICAgICAgKFdl YktpdDo6UmVtb3RlSW1hZ2VCdWZmZXJQcm94eTo6cHV0Q2FjaGVkUGl4ZWxCdWZmZXIpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVJbWFnZUJ1ZmZlclByb3h5OjpnZXRDYWNoZWRQaXhlbEJ1ZmZl ciBjb25zdCk6CisKIDIwMjEtMDYtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgcmVsZWFzZSBsb2dnaW5nIGluIHRoZSBXZWJQYWdlIGNvbnN0cnVjdG9y IC8gZGVzdHJ1Y3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGl4ZWxCdWZmZXJGb3JtYXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGl4ZWxCdWZmZXJGb3JtYXQuY3BwCmluZGV4IGY5NGRhNWZiNjMxMzg1MWI2MDI0Yzk4N2Jh MGU5NWM1ZGYwMjgxOWIuLjUxZjdlZWRmODMxZDk1NTBiN2E3ZTY4MmQ4NDZiNjVkOTdkYzEwZDYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVy Rm9ybWF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QaXhlbEJ1 ZmZlckZvcm1hdC5jcHAKQEAgLTMwLDYgKzMwLDE2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAorYm9vbCBvcGVyYXRvcj09KGNvbnN0IFBpeGVsQnVmZmVyRm9ybWF0JiBhLCBjb25zdCBQaXhl bEJ1ZmZlckZvcm1hdCYgYikKK3sKKyAgICByZXR1cm4gYS5hbHBoYUZvcm1hdCA9PSBiLmFscGhh Rm9ybWF0ICYmIGEucGl4ZWxGb3JtYXQgPT0gYi5waXhlbEZvcm1hdCAmJiBhLmNvbG9yU3BhY2Ug PT0gYi5jb2xvclNwYWNlOworfQorCitib29sIG9wZXJhdG9yIT0oY29uc3QgUGl4ZWxCdWZmZXJG b3JtYXQmIGEsIGNvbnN0IFBpeGVsQnVmZmVyRm9ybWF0JiBiKQoreworICAgIHJldHVybiAhKGEg PT0gYik7Cit9CisKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIGNvbnN0 IFBpeGVsQnVmZmVyRm9ybWF0JiBwaXhlbEJ1ZmZlcikKIHsKICAgICByZXR1cm4gdHMgPDwgcGl4 ZWxCdWZmZXIuYWxwaGFGb3JtYXQgPDwgJyAnIDw8IHBpeGVsQnVmZmVyLnBpeGVsRm9ybWF0IDw8 ICcgJyA8PCBwaXhlbEJ1ZmZlci5jb2xvclNwYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGl4ZWxCdWZmZXJGb3JtYXQuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL1BpeGVsQnVmZmVyRm9ybWF0LmgKaW5kZXggN2YxOTI0ZTM1MDNl MDljYWQ2YzQxZTQ1ODUwNWRhZThhN2E2OGY0NC4uYmZkZDg5YWMxNzU1Njk0ZTM3YWUwNGE5ZjZj YzgxNzBkMmY4M2M4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGl4ZWxCdWZmZXJGb3JtYXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9QaXhlbEJ1ZmZlckZvcm1hdC5oCkBAIC00MSw2ICs0MSw5IEBAIHN0cnVjdCBQaXhlbEJ1 ZmZlckZvcm1hdCB7CiAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIHN0ZDo6b3B0 aW9uYWw8UGl4ZWxCdWZmZXJGb3JtYXQ+IGRlY29kZShEZWNvZGVyJik7CiB9OwogCitXRUJDT1JF X0VYUE9SVCBib29sIG9wZXJhdG9yPT0oY29uc3QgUGl4ZWxCdWZmZXJGb3JtYXQmLCBjb25zdCBQ aXhlbEJ1ZmZlckZvcm1hdCYpOworV0VCQ09SRV9FWFBPUlQgYm9vbCBvcGVyYXRvciE9KGNvbnN0 IFBpeGVsQnVmZmVyRm9ybWF0JiwgY29uc3QgUGl4ZWxCdWZmZXJGb3JtYXQmKTsKKwogV0VCQ09S RV9FWFBPUlQgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiwgY29uc3QgUGl4ZWxC dWZmZXJGb3JtYXQmKTsKIAogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBQaXhlbEJ1ZmZl ckZvcm1hdDo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJbWFn ZUJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3Rz L0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaAppbmRleCA4MWI5MjQ3NGUyNGVjZDIzNmYyMjA3NzRl ZDFjYmNmODQ2OWYzMjc4Li44NjNiNzA2NGM5NDcxZTQ0ODFkMDBkMDlkZjA2NDI2MzFhZmNhNTc2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3RJbWFnZUJ1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmgKQEAgLTM1LDEw ICszNSwxMCBAQCBuYW1lc3BhY2UgRGlzcGxheUxpc3QgewogdGVtcGxhdGU8dHlwZW5hbWUgQmFj a2VuZFR5cGU+CiBjbGFzcyBJbWFnZUJ1ZmZlciA6IHB1YmxpYyBDb25jcmV0ZUltYWdlQnVmZmVy PEJhY2tlbmRUeXBlPiB7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXIgPSBDb25j cmV0ZUltYWdlQnVmZmVyPEJhY2tlbmRUeXBlPjsKK3B1YmxpYzoKICAgICB1c2luZyBCYXNlQ29u Y3JldGVJbWFnZUJ1ZmZlcjo6bG9naWNhbFNpemU7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1h Z2VCdWZmZXI6OmJhc2VUcmFuc2Zvcm07CiAKLXB1YmxpYzoKICAgICBzdGF0aWMgYXV0byBjcmVh dGUoY29uc3QgRmxvYXRTaXplJiBzaXplLCBmbG9hdCByZXNvbHV0aW9uU2NhbGUsIGNvbnN0IERl c3RpbmF0aW9uQ29sb3JTcGFjZSYgY29sb3JTcGFjZSwgUGl4ZWxGb3JtYXQgcGl4ZWxGb3JtYXQs IGNvbnN0IEhvc3RXaW5kb3cqIGhvc3RXaW5kb3cpCiAgICAgewogICAgICAgICByZXR1cm4gQmFz ZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OnRlbXBsYXRlIGNyZWF0ZTxJbWFnZUJ1ZmZlcj4oc2l6ZSwg cmVzb2x1dGlvblNjYWxlLCBjb2xvclNwYWNlLCBwaXhlbEZvcm1hdCwgaG9zdFdpbmRvdyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUlt YWdlQnVmZmVyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCmluZGV4IDZkY2YxZDUyZjFhOGExOTgxN2Y1YTUxYzBi ZDAzOTczNDljOTE0N2EuLmY2YmFhMTBjOTIwMDY0ZGEzMjVkM2UzZWJjYWIyYTYyZDA4OWU0NWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3Rl SW1hZ2VCdWZmZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3Jh cGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCkBAIC01Miw2ICs1Miw3IEBAIGNsYXNzIFJl bW90ZUltYWdlQnVmZmVyUHJveHkgOiBwdWJsaWMgV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkltYWdl QnVmZmVyPEJhY2tlbmRUCiAgICAgdXNpbmcgQmFzZURpc3BsYXlMaXN0SW1hZ2VCdWZmZXI6Om1f YmFja2VuZDsKICAgICB1c2luZyBCYXNlRGlzcGxheUxpc3RJbWFnZUJ1ZmZlcjo6bV9kcmF3aW5n Q29udGV4dDsKICAgICB1c2luZyBCYXNlRGlzcGxheUxpc3RJbWFnZUJ1ZmZlcjo6bV9yZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXI7CisgICAgdXNpbmcgQmFzZURpc3BsYXlMaXN0SW1hZ2VCdWZm ZXI6OmxvZ2ljYWxTaXplOwogICAgIHVzaW5nIEJhc2VEaXNwbGF5TGlzdEltYWdlQnVmZmVyOjpy ZXNvbHV0aW9uU2NhbGU7CiAKIHB1YmxpYzoKQEAgLTIwMSw2ICsyMDIsNDEgQEAgcHJvdGVjdGVk OgogICAgICAgICByZXR1cm4gYml0bWFwLT5jcmVhdGVJbWFnZSgpOwogICAgIH0KIAorICAgIGJv b2wgcHV0Q2FjaGVkUGl4ZWxCdWZmZXIoY29uc3QgV2ViQ29yZTo6UGl4ZWxCdWZmZXImIHBpeGVs QnVmZmVyLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzcmNSZWN0LCBjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgZGVzdFBvaW50KQorICAgIHsKKyAgICAgICAgc3RhdGljIGNvbnN0ZXhwciBzaXpl X3QgbWF4Q2FjaGVkUGl4ZWxCdWZmZXJTaXplID0gNDAgKiBLQjsKKyAgICAgICAgc2l6ZV90IGRh dGFTaXplID0gcGl4ZWxCdWZmZXIuZGF0YSgpLmJ5dGVMZW5ndGgoKTsKKworICAgICAgICAvLyBP bmx5IGNhY2hlIHRoZSB3aG9sZSBiYWNrZW5kIGlmIGl0IGlzIGxlc3MgdGhhbiAxMDB4MTAwIHBp eGVscworICAgICAgICBpZiAoc3JjUmVjdCAhPSBJbnRSZWN0KHsgfSwgbG9naWNhbFNpemUoKSkg fHwgIWRlc3RQb2ludC5pc1plcm8oKSB8fCBkYXRhU2l6ZSA+IG1heENhY2hlZFBpeGVsQnVmZmVy U2l6ZSkgeworICAgICAgICAgICAgbV9jYWNoZWRQaXhlbEJ1ZmZlciA9IHN0ZDo6bnVsbG9wdDsK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghbV9j YWNoZWRQaXhlbEJ1ZmZlcikKKyAgICAgICAgICAgIG1fY2FjaGVkUGl4ZWxCdWZmZXIgPSBXZWJD b3JlOjpQaXhlbEJ1ZmZlcjo6dHJ5Q3JlYXRlKHBpeGVsQnVmZmVyLmZvcm1hdCgpLCBwaXhlbEJ1 ZmZlci5zaXplKCkpOworCisgICAgICAgIGlmICghbV9jYWNoZWRQaXhlbEJ1ZmZlcikKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBBU1NFUlQobV9jYWNoZWRQaXhlbEJ1ZmZl ci0+c2l6ZSgpID09IHBpeGVsQnVmZmVyLnNpemUoKSk7CisgICAgICAgIG1lbWNweShtX2NhY2hl ZFBpeGVsQnVmZmVyLT5kYXRhKCkuZGF0YSgpLCBwaXhlbEJ1ZmZlci5kYXRhKCkuZGF0YSgpLCBt X2NhY2hlZFBpeGVsQnVmZmVyLT5kYXRhKCkuYnl0ZUxlbmd0aCgpKTsKKyAgICAgICAgcmV0dXJu IHRydWU7CisgICAgfQorCisgICAgYm9vbCBnZXRDYWNoZWRQaXhlbEJ1ZmZlcihXZWJDb3JlOjpQ aXhlbEJ1ZmZlciYgcGl4ZWxCdWZmZXIsIGNvbnN0IFdlYkNvcmU6OlBpeGVsQnVmZmVyRm9ybWF0 JiBkZXN0aW5hdGlvbkZvcm1hdCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc3JjUmVjdCkgY29u c3QKKyAgICB7CisgICAgICAgIGlmICghbV9jYWNoZWRQaXhlbEJ1ZmZlcikKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICBpZiAoc3JjUmVjdCAhPSBJbnRSZWN0KHsgfSwgbG9n aWNhbFNpemUoKSkgfHwgZGVzdGluYXRpb25Gb3JtYXQgIT0gbV9jYWNoZWRQaXhlbEJ1ZmZlci0+ Zm9ybWF0KCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgQVNTRVJUKG1f Y2FjaGVkUGl4ZWxCdWZmZXItPnNpemUoKSA9PSBwaXhlbEJ1ZmZlci5zaXplKCkpOworICAgICAg ICBtZW1jcHkocGl4ZWxCdWZmZXIuZGF0YSgpLmRhdGEoKSwgbV9jYWNoZWRQaXhlbEJ1ZmZlci0+ ZGF0YSgpLmRhdGEoKSwgcGl4ZWxCdWZmZXIuZGF0YSgpLmJ5dGVMZW5ndGgoKSk7CisgICAgICAg IHJldHVybiB0cnVlOworICAgIH0KKyAgICAKICAgICBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlBp eGVsQnVmZmVyPiBnZXRQaXhlbEJ1ZmZlcihjb25zdCBXZWJDb3JlOjpQaXhlbEJ1ZmZlckZvcm1h dCYgZGVzdGluYXRpb25Gb3JtYXQsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNyY1JlY3QpIGNv bnN0IG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoVU5MSUtFTFkoIW1fcmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5KSkKQEAgLTIxMCw2ICsyNDYsMTAgQEAgcHJvdGVjdGVkOgogICAgICAg ICBpZiAoIXBpeGVsQnVmZmVyKQogICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAg ICAgICAgc2l6ZV90IGRhdGFTaXplID0gcGl4ZWxCdWZmZXItPmRhdGEoKS5ieXRlTGVuZ3RoKCk7 CisgICAgCisgICAgICAgIC8vIENoZWNrIHRoZSBjYWNoZSBmaXJzdCBhbmQgaWYgaXQgY2FuIGJl IHVzZWQsIGJ5cGFzcyB0aGUgSVBDLgorICAgICAgICBpZiAoZ2V0Q2FjaGVkUGl4ZWxCdWZmZXIo cGl4ZWxCdWZmZXIudmFsdWUoKSwgZGVzdGluYXRpb25Gb3JtYXQsIHNyY1JlY3QpKQorICAgICAg ICAgICAgcmV0dXJuIHBpeGVsQnVmZmVyOwogCiAgICAgICAgIElQQzo6VGltZW91dCB0aW1lb3V0 ID0gNV9zOwogICAgICAgICBTaGFyZWRNZW1vcnkqIHNoYXJlZE1lbW9yeSA9IG1fcmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5LT5zaGFyZWRNZW1vcnlGb3JHZXRQaXhlbEJ1ZmZlcihkYXRhU2l6 ZSwgdGltZW91dCk7CkBAIC0yMjAsMTAgKzI2MCwxNCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIG11 dGFibGVUaGlzLm1fZHJhd2luZ0NvbnRleHQucmVjb3JkZXIoKS5nZXRQaXhlbEJ1ZmZlcihkZXN0 aW5hdGlvbkZvcm1hdCwgc3JjUmVjdCk7CiAgICAgICAgIG11dGFibGVUaGlzLmZsdXNoRHJhd2lu Z0NvbnRleHRBc3luYygpOwogCi0gICAgICAgIGlmIChtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ cm94eS0+d2FpdEZvckdldFBpeGVsQnVmZmVyVG9Db21wbGV0ZSh0aW1lb3V0KSkKKyAgICAgICAg aWYgKG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LT53YWl0Rm9yR2V0UGl4ZWxCdWZmZXJU b0NvbXBsZXRlKHRpbWVvdXQpKSB7CiAgICAgICAgICAgICBtZW1jcHkocGl4ZWxCdWZmZXItPmRh dGEoKS5kYXRhKCksIHNoYXJlZE1lbW9yeS0+ZGF0YSgpLCBkYXRhU2l6ZSk7Ci0gICAgICAgIGVs c2UKKyAgICAgICAgICAgIAorICAgICAgICAgICAgLy8gQ2FjaGUgdGhlIFBpeGVsQnVmZmVyIHRv IGJlIHVzZWQgaW4gdGhlIG5leHQgZ2V0UGl4ZWxCdWZmZXIoKSBpZiB0aGUgYmFja2VuZCBpcyBu b3QgbW9kaWZpZWQgaW4gYmV0d2Vlbi4KKyAgICAgICAgICAgIG11dGFibGVUaGlzLnB1dENhY2hl ZFBpeGVsQnVmZmVyKHBpeGVsQnVmZmVyLnZhbHVlKCksIHNyY1JlY3QsIHsgfSk7CisgICAgICAg IH0gZWxzZQogICAgICAgICAgICAgbWVtc2V0KHBpeGVsQnVmZmVyLT5kYXRhKCkuZGF0YSgpLCAw LCBkYXRhU2l6ZSk7CisgICAgICAgIAogICAgICAgICByZXR1cm4gcGl4ZWxCdWZmZXI7CiAgICAg fQogCkBAIC0yMzMsNiArMjc3LDkgQEAgcHJvdGVjdGVkOgogICAgICAgICAvLyBUaGlzIG1lYW5z IHRoYXQgcHV0UGl4ZWxCdWZmZXIoKSBpcyBvbmx5IGNhbGxlZCB3aGVuIHJlc29sdXRpb25TY2Fs ZSgpID09IDEuCiAgICAgICAgIEFTU0VSVChyZXNvbHV0aW9uU2NhbGUoKSA9PSAxKTsKICAgICAg ICAgbV9kcmF3aW5nQ29udGV4dC5yZWNvcmRlcigpLnB1dFBpeGVsQnVmZmVyKHBpeGVsQnVmZmVy LCBzcmNSZWN0LCBkZXN0UG9pbnQsIGRlc3RGb3JtYXQpOworICAgICAgICAKKyAgICAgICAgLy8g Q2FjaGUgdGhlIFBpeGVsQnVmZmVyIHRvIGJlIHVzZWQgaW4gdGhlIG5leHQgZ2V0UGl4ZWxCdWZm ZXIoKSBpZiB0aGUgYmFja2VuZCBpcyBub3QgbW9kaWZpZWQgaW4gYmV0d2Vlbi4KKyAgICAgICAg cHV0Q2FjaGVkUGl4ZWxCdWZmZXIocGl4ZWxCdWZmZXIsIHNyY1JlY3QsIGRlc3RQb2ludCk7CiAg ICAgfQogCiAgICAgYm9vbCBwcmVmZXJzUHJlcGFyYXRpb25Gb3JEaXNwbGF5KCkgb3ZlcnJpZGUg eyByZXR1cm4gdHJ1ZTsgfQpAQCAtMzAwLDExICszNDcsMTMgQEAgcHJvdGVjdGVkOgogICAgICAg ICBtX2RyYXdpbmdDb250ZXh0LmRpc3BsYXlMaXN0KCkuY2xlYXIoKTsKICAgICB9CiAKLSAgICBi b29sIGNhbkFwcGVuZEl0ZW1PZlR5cGUoV2ViQ29yZTo6RGlzcGxheUxpc3Q6Okl0ZW1UeXBlKSBv dmVycmlkZQorICAgIGJvb2wgY2FuQXBwZW5kSXRlbU9mVHlwZShXZWJDb3JlOjpEaXNwbGF5TGlz dDo6SXRlbVR5cGUgdHlwZSkgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIGlmIChVTkxJS0VMWSgh bV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS0+d2lsbEFwcGVuZEl0ZW0o bV9yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpOworICAgICAgICBpZiAoV2ViQ29yZTo6RGlz cGxheUxpc3Q6OmlzRHJhd2luZ0l0ZW0odHlwZSkpCisgICAgICAgICAgICBtX2NhY2hlZFBpeGVs QnVmZmVyID0gc3RkOjpudWxsb3B0OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAg LTM0OSw2ICszOTgsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgTG9jayBtX3JlY2VpdmVkRmx1c2hJZGVu dGlmaWVyTG9jazsKICAgICBDb25kaXRpb24gbV9yZWNlaXZlZEZsdXNoSWRlbnRpZmllckNoYW5n ZWRDb25kaXRpb247CiAgICAgV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkZsdXNoSWRlbnRpZmllciBt X3JlY2VpdmVkRmx1c2hJZGVudGlmaWVyIFdURl9HVUFSREVEX0JZX0xPQ0sobV9yZWNlaXZlZEZs dXNoSWRlbnRpZmllckxvY2spOyAvLyBPbmx5IG1vZGlmaWVkIG9uIHRoZSBtYWluIHRocmVhZCBi dXQgbWF5IGdldCBxdWVyaWVkIG9uIGEgc2Vjb25kYXJ5IHRocmVhZC4KKyAgICBzdGQ6Om9wdGlv bmFsPFdlYkNvcmU6OlBpeGVsQnVmZmVyPiBtX2NhY2hlZFBpeGVsQnVmZmVyOwogICAgIFdlYWtQ dHI8UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5PiBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ cm94eTsKIH07CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCA4N2NlZDk1ZDhmYzVhYjNkMDU0YjNmODRjODBmZDllYmFlODUz Zjc0Li4yYzI5MDZhZTUzN2QxM2Q4OWQ2YjJlODIzMjZkMTgwZmZmZTNiZDc2IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMjEtMDYtMjggIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5j b20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXVtNb3Rpb25NYXJrXSBGaXggdGhlIEltYWdlcyB0 ZXN0IHJlZ3Jlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzQyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENoZWNrIHRoZSBjYWNoZWQgUGl4ZWxCdWZmZXIgZm9yIGdldFBpeGVsQnVmZmVyKCkg YW5kIHB1dFBpeGVsQnVmZmVyKCkKKyAgICAgICAgaXMgc2V0IGFuZCByZXNldCBjb3JyZWN0bHku CisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy9nZXRJbWFnZURhdGEtcHV0SW1hZ2VEYXRhLWNhY2hp bmctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jYW52YXMvZ2V0SW1hZ2VE YXRhLXB1dEltYWdlRGF0YS1jYWNoaW5nLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA2LTI0ICBBcmNh ZHkgR29sZG1pbnRzLU9ybG92ICA8YWdvbGRtaW50c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH U3RyZWFtZXJdIFVucmV2aWV3ZWQgVGVzdCBnYXJkZW5pbmcsIHdlYnJ0Yy9wZWVyLWNvbm5lY3Rp b24tcmVtb3RlLWF1ZGlvLW11dGUqIGFyZSBubyBsb25nZXIgZmFpbGluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvZ2V0SW1hZ2VEYXRhLXB1dEltYWdlRGF0YS1jYWNoaW5n LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9nZXRJbWFnZURhdGEtcHV0 SW1hZ2VEYXRhLWNhY2hpbmctZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNWYzOWE0ZDJiNjJj ZGU3ZWViY2RiOTI3Yzk3MmI0M2MzOWJhOGY5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvZ2V0SW1hZ2VEYXRhLXB1dEltYWdlRGF0YS1jYWNoaW5nLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPHN0eWxlPgorICAgIC5ib3ggeworICAgICAgICB3aWR0 aDogMTAwcHg7CisgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgIGRpc3BsYXk6IGlubGlu ZS1ibG9jazsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgfQorPC9zdHls ZT4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+CisgICAgPGRpdiBjbGFzcz0i Ym94Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9 ImJveCI+PC9kaXY+CisgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKzwvYm9keT4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2dldEltYWdlRGF0YS1wdXRJbWFnZURhdGEt Y2FjaGluZy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvZ2V0SW1hZ2VEYXRhLXB1dElt YWdlRGF0YS1jYWNoaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTVmMjc5MTVhZjkxNDI1ODQzZjk2YTQ4 NmQ4M2IwNGQ1MzIyYzhkOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2Fu dmFzL2dldEltYWdlRGF0YS1wdXRJbWFnZURhdGEtY2FjaGluZy5odG1sCkBAIC0wLDAgKzEsNjEg QEAKKzxib2R5PgorICAgIDxjYW52YXMgaWQ9ImNhbnZhcy0xIiB3aWR0aD0iMTAwIiBoZWlnaHQ9 IjEwMCI+PC9jYW52YXM+CisgICAgPGNhbnZhcyBpZD0iY2FudmFzLTIiIHdpZHRoPSIxMDAiIGhl aWdodD0iMTAwIj48L2NhbnZhcz4KKyAgICA8Y2FudmFzIGlkPSJjYW52YXMtMyIgd2lkdGg9IjEw MCIgaGVpZ2h0PSIxMDAiPjwvY2FudmFzPgorICAgIDxjYW52YXMgaWQ9ImNhbnZhcy00IiB3aWR0 aD0iMTAwIiBoZWlnaHQ9IjEwMCI+PC9jYW52YXM+CisgICAgPGNhbnZhcyBpZD0iY2FudmFzLTUi IHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48L2NhbnZhcz4KKyAgICA8c2NyaXB0PgorICAgICAg ICB2YXIgY2FudmFzMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMtMScpOworICAg ICAgICB2YXIgY3R4MSA9IGNhbnZhczEuZ2V0Q29udGV4dCgnMmQnKTsKKworICAgICAgICB2YXIg Y2FudmFzMiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMtMicpOworICAgICAgICB2 YXIgY3R4MiA9IGNhbnZhczIuZ2V0Q29udGV4dCgnMmQnKTsKKworICAgICAgICB2YXIgY2FudmFz MyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMtMycpOworICAgICAgICB2YXIgY3R4 MyA9IGNhbnZhczMuZ2V0Q29udGV4dCgnMmQnKTsKKworICAgICAgICB2YXIgY2FudmFzNCA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdjYW52YXMtNCcpOworICAgICAgICB2YXIgY3R4NCA9IGNh bnZhczQuZ2V0Q29udGV4dCgnMmQnKTsKKworICAgICAgICB2YXIgY2FudmFzNSA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdjYW52YXMtNScpOworICAgICAgICB2YXIgY3R4NSA9IGNhbnZhczUu Z2V0Q29udGV4dCgnMmQnKTsKKworICAgICAgICAvLyBDaGVjayBnZXRJbWFnZURhdGEoKSBjYWNo ZQorICAgICAgICBjdHgxLmZpbGxTdHlsZSA9ICJncmVlbiI7CisgICAgICAgIGN0eDEuZmlsbFJl Y3QoMCwgMCwgMTAwLCAxMDApOworICAgICAgICB2YXIgaW1hZ2VkYXRhMSA9IGN0eDEuZ2V0SW1h Z2VEYXRhKDAsIDAsIDEwMCwgMTAwKTsKKyAgICAgICAgdmFyIGltYWdlZGF0YTIgPSBjdHgxLmdl dEltYWdlRGF0YSgwLCAwLCAxMDAsIDEwMCk7CisKKyAgICAgICAgY3R4Mi5wdXRJbWFnZURhdGEo aW1hZ2VkYXRhMiwgMCwgMCk7CisKKyAgICAgICAgLy8gQ2hlY2sgZ2V0SW1hZ2VEYXRhKCkgY2Fj aGUgcmVzZXQKKyAgICAgICAgY3R4MS5maWxsU3R5bGUgPSAicmVkIjsKKyAgICAgICAgY3R4MS5m aWxsUmVjdCgwLCAwLCAxMDAsIDEwMCk7CisgICAgICAgIHZhciBpbWFnZWRhdGEzID0gY3R4MS5n ZXRJbWFnZURhdGEoMCwgMCwgMTAwLCAxMDApOworCisgICAgICAgIGN0eDEuZmlsbFN0eWxlID0g ImdyZWVuIjsKKyAgICAgICAgY3R4MS5maWxsUmVjdCgwLCAwLCAxMDAsIDEwMCk7CisgICAgICAg IHZhciBpbWFnZWRhdGE0ID0gY3R4MS5nZXRJbWFnZURhdGEoMCwgMCwgMTAwLCAxMDApOworCisg ICAgICAgIGN0eDMucHV0SW1hZ2VEYXRhKGltYWdlZGF0YTQsIDAsIDApOworCisgICAgICAgIC8v IENoZWNrIHB1dEltYWdlRGF0YSgpIGNhY2hlCisgICAgICAgIGN0eDEucHV0SW1hZ2VEYXRhKGlt YWdlZGF0YTMsIDAsIDApOworICAgICAgICB2YXIgaW1hZ2VkYXRhNSA9IGN0eDEuZ2V0SW1hZ2VE YXRhKDAsIDAsIDEwMCwgMTAwKTsKKworICAgICAgICBjdHgxLnB1dEltYWdlRGF0YShpbWFnZWRh dGE0LCAwLCAwKTsKKyAgICAgICAgdmFyIGltYWdlZGF0YTYgPSBjdHgxLmdldEltYWdlRGF0YSgw LCAwLCAxMDAsIDEwMCk7CisKKyAgICAgICAgY3R4NC5wdXRJbWFnZURhdGEoaW1hZ2VkYXRhNiwg MCwgMCk7CisKKyAgICAgICAgLy8gQ2hlY2sgcHV0SW1hZ2VEYXRhKCkgY2FjaGUgcmVzZXQKKyAg ICAgICAgY3R4MS5wdXRJbWFnZURhdGEoaW1hZ2VkYXRhNSwgMCwgMCk7CisgICAgICAgIHZhciBp bWFnZWRhdGE3ID0gY3R4MS5nZXRJbWFnZURhdGEoMCwgMCwgMTAwLCAxMDApOworCisgICAgICAg IGN0eDEuZmlsbFN0eWxlID0gImdyZWVuIjsKKyAgICAgICAgY3R4MS5maWxsUmVjdCgwLCAwLCAx MDAsIDEwMCk7CisgICAgICAgIHZhciBpbWFnZWRhdGE4ID0gY3R4MS5nZXRJbWFnZURhdGEoMCwg MCwgMTAwLCAxMDApOworCisgICAgICAgIGN0eDUucHV0SW1hZ2VEYXRhKGltYWdlZGF0YTgsIDAs IDApOworICAgIDwvc2NyaXB0PgorPC9ib2R5Pgo=