220460 2021-01-08 05:22:07 -0800 GraphicsContextGLOpenGL::reshapeFBOs() ANGLE variant calls into makeContextCurrent() 2021-01-17 23:41:48 -0800 1 1 1 Unclassified WebKit WebGL WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 218896 1 kkinnunen kkinnunen dino ews-watchlist graouts kondapallykalyan webkit-bug-importer oldest_to_newest 1718272 0 kkinnunen 2021-01-08 05:22:07 -0800 GraphicsContextGLOpenGL::reshapeFBOs() ANGLE variant calls into makeContextCurrent() The calls to makeCurrentContext() should only be made during entering of a public method. The call fails in certain conditions during reshape(), as reshape() is in middle of reshaping the default frame buffer and currently makeContextCurrent() uses the size information to determine if the context is in valid state or not. Long term the " the size information to determine"-part should be removed, but it's a bit tricky to test. Removing the redundant makeContextCurrent() calls should be a goal anyway, so fixing this leaf problem should be a good short term fix. 1718275 1 417265 kkinnunen 2021-01-08 05:25:55 -0800 Created attachment 417265 Patch 1718949 2 417443 kkinnunen 2021-01-12 04:00:08 -0800 Created attachment 417443 Patch 1719841 3 webkit-bug-importer 2021-01-15 05:23:13 -0800 <rdar://problem/73245417> 1720264 4 ews-feeder 2021-01-17 23:41:47 -0800 Committed r271572: <https://trac.webkit.org/changeset/271572> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417443. 417265 2021-01-08 05:25:55 -0800 2021-01-12 04:00:02 -0800 Patch bug-220460-20210108152554.patch text/plain 6043 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY0ZTU4MGFmODY5NWNl OTNiNzVkM2VjOTFhN2FhMzM2NDczMDJjMi4uNmIzOTRmY2I4YzFmNjdmZDU0YWE3MzQ0YjAxNTJk ZTIwMjQzMmM2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAxLTA4ICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgR3JhcGhpY3NDb250 ZXh0R0xPcGVuR0w6OnJlc2hhcGVGQk9zKCkgQU5HTEUgdmFyaWFudCBjYWxscyBpbnRvIG1ha2VD b250ZXh0Q3VycmVudCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjA0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgY2FsbCBpcyBwcm9ibGVtYXRpYyBpZiBpdCBpcyB0YWtlbiwgc2luY2UgaW4g c29tZSBjYXNlcyBtYWtlQ29udGV4dEN1cnJlbnQoKSBmYWlscworICAgICAgICBkdWUgdG8gcmVz aGFwZUZCT3MgYmVpbmcgaW4gbWlkZGxlIG9mIGEgcmVzaGFwZS4gVGhlIHByb2JsZW1hdGljIGNh c2UgaXMgdGFrZW4gaWYKKyAgICAgICAgdGhlIHJlc2hhcGUgY2FsbCBoYXBwZW5zIGJlZm9yZSBm aXJzdCBnZXRFeHRlbnNpb25zKCkuCisKKyAgICAgICAgRml4IGJ5IHJlc29sdmluZyB0aGUgbmVl ZGVkIGRlcHRoLXN0ZW5jaWwgYnVmZmVyIGZvcm1hdCBkdXJpbmcgdmFsaWRhdGVEZXB0aFN0ZW5j aWwuCisKKyAgICAgICAgVGVzdGVkIGJ5IFdlYkdMIDEvMiBjb25mb3JtYW5jZSB0ZXN0cy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBoaWNzQ29udGV4dEdMQU5HTEUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnZhbGlkYXRl QXR0cmlidXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6 cmVzaGFwZUZCT3MpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6 OnZhbGlkYXRlRGVwdGhTdGVuY2lsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaDoKKwogMjAyMS0wMS0wOCAgWGFiaWVyIFJvZHJp Z3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJd W0VNRV1bVGh1bmRlcl0gQWNjZXB0IG5vIHByb3RlY3Rpb24gc3lzdGVtIHNwZWNpZmljIGNhcHMg Zm9yIENFTkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Fu Z2xlL0dyYXBoaWNzQ29udGV4dEdMQU5HTEUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5jcHAKaW5kZXggNGY2NDc5MjU2 MWMxMGRkMmUyNDY3NDNmZmM2YzcwZDIyZTUxYTAxZi4uZjY1NDIxYmI4NzdkY2JlMjJhNjBmMzIx MDY4ZTk2MTZjMjQwMWJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5jcHAKQEAg LTEwMyw2ICsxMDMsOCBAQCBSZWZQdHI8SW1hZ2VEYXRhPiBHcmFwaGljc0NvbnRleHRHTE9wZW5H TDo6cmVhZFBpeGVsc0ZvclBhaW50UmVzdWx0cygpCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0R0xP cGVuR0w6OnZhbGlkYXRlQXR0cmlidXRlcygpCiB7CisgICAgbV9pbnRlcm5hbENvbG9yRm9ybWF0 ID0gY29udGV4dEF0dHJpYnV0ZXMoKS5hbHBoYSA/IEdMX1JHQkE4IDogR0xfUkdCODsKKwogICAg IHZhbGlkYXRlRGVwdGhTdGVuY2lsKHBhY2tlZERlcHRoU3RlbmNpbEV4dGVuc2lvbk5hbWUpOwog fQogCkBAIC0xMTEsMjUgKzExMyw3IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnJl c2hhcGVGQk9zKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgYXV0byBhdHRycyA9IGNvbnRleHRB dHRyaWJ1dGVzKCk7CiAgICAgY29uc3QgaW50IHdpZHRoID0gc2l6ZS53aWR0aCgpOwogICAgIGNv bnN0IGludCBoZWlnaHQgPSBzaXplLmhlaWdodCgpOwotICAgIEdMdWludCBjb2xvckZvcm1hdCwg aW50ZXJuYWxEZXB0aFN0ZW5jaWxGb3JtYXQgPSAwOwotICAgIGlmIChhdHRycy5hbHBoYSkgewot ICAgICAgICBtX2ludGVybmFsQ29sb3JGb3JtYXQgPSBHTF9SR0JBODsKLSAgICAgICAgY29sb3JG b3JtYXQgPSBHTF9SR0JBOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1faW50ZXJuYWxDb2xvckZv cm1hdCA9IEdMX1JHQjg7Ci0gICAgICAgIGNvbG9yRm9ybWF0ID0gR0xfUkdCOwotICAgIH0KLSAg ICBpZiAoYXR0cnMuc3RlbmNpbCB8fCBhdHRycy5kZXB0aCkgewotICAgICAgICAvLyBXZSBkb24n dCBhbGxvdyB0aGUgbG9naWMgd2hlcmUgc3RlbmNpbCBpcyByZXF1aXJlZCBhbmQgZGVwdGggaXMg bm90LgotICAgICAgICAvLyBTZWUgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnZhbGlkYXRlQXR0 cmlidXRlcy4KLQotICAgICAgICBFeHRlbnNpb25zR0wmIGV4dGVuc2lvbnMgPSBnZXRFeHRlbnNp b25zKCk7Ci0gICAgICAgIC8vIFVzZSBhIDI0IGJpdCBkZXB0aCBidWZmZXIgd2hlcmUgd2Uga25v dyB3ZSBoYXZlIGl0LgotICAgICAgICBpZiAoZXh0ZW5zaW9ucy5zdXBwb3J0cyhwYWNrZWREZXB0 aFN0ZW5jaWxFeHRlbnNpb25OYW1lKSkKLSAgICAgICAgICAgIGludGVybmFsRGVwdGhTdGVuY2ls Rm9ybWF0ID0gR0xfREVQVEgyNF9TVEVOQ0lMOF9PRVM7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gR0xfREVQVEhfQ09NUE9ORU5UMTY7Ci0g ICAgfQorICAgIEdMdWludCBjb2xvckZvcm1hdCA9IGF0dHJzLmFscGhhID8gR0xfUkdCQSA6IEdM X1JHQjsKIAogICAgIC8vIFJlc2l6ZSBtdWx0aXNhbXBsZSBGQk8uCiAgICAgaWYgKGF0dHJzLmFu dGlhbGlhcykgewpAQCAtMTQ0LDEwICsxMjgsMTAgQEAgYm9vbCBHcmFwaGljc0NvbnRleHRHTE9w ZW5HTDo6cmVzaGFwZUZCT3MoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICAgICAgZ2w6OkZyYW1l YnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwg R0xfUkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlQ29sb3JCdWZmZXIpOwogICAgICAgICBpZiAo YXR0cnMuc3RlbmNpbCB8fCBhdHRycy5kZXB0aCkgewogICAgICAgICAgICAgZ2w6OkJpbmRSZW5k ZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVy KTsKLSAgICAgICAgICAgIGdsOjpSZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGVBTkdMRShH TF9SRU5ERVJCVUZGRVIsIHNhbXBsZUNvdW50LCBpbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCwg d2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICBnbDo6UmVuZGVyYnVmZmVyU3RvcmFnZU11bHRp c2FtcGxlQU5HTEUoR0xfUkVOREVSQlVGRkVSLCBzYW1wbGVDb3VudCwgbV9pbnRlcm5hbERlcHRo U3RlbmNpbEZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CiAgICAgICAgICAgICAvLyBXZWJHTCAxLjAn cyBydWxlcyBzdGF0ZSB0aGF0IGNvbWJpbmVkIGRlcHRoL3N0ZW5jaWwgcmVuZGVyYnVmZmVycwog ICAgICAgICAgICAgLy8gaGF2ZSB0byBiZSBhdHRhY2hlZCB0byB0aGUgc3ludGhldGljIERFUFRI X1NURU5DSUxfQVRUQUNITUVOVCBwb2ludC4KLSAgICAgICAgICAgIGlmICghaXNHTEVTMkNvbXBs aWFudCgpICYmIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID09IEdMX0RFUFRIMjRfU1RFTkNJ TDhfT0VTKQorICAgICAgICAgICAgaWYgKCFpc0dMRVMyQ29tcGxpYW50KCkgJiYgbV9pbnRlcm5h bERlcHRoU3RlbmNpbEZvcm1hdCA9PSBHTF9ERVBUSDI0X1NURU5DSUw4X09FUykKICAgICAgICAg ICAgICAgICBnbDo6RnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIERFUFRI X1NURU5DSUxfQVRUQUNITUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlRGVwdGhT dGVuY2lsQnVmZmVyKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIGlmIChh dHRycy5zdGVuY2lsKQpAQCAtMjA4LDcgKzE5Miw3IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0R0xP cGVuR0w6OnJlc2hhcGVGQk9zKGNvbnN0IEludFNpemUmIHNpemUpCiAjZW5kaWYKICNlbmRpZiAv LyBQTEFURk9STShDT0NPQSkKIAotICAgIGF0dGFjaERlcHRoQW5kU3RlbmNpbEJ1ZmZlcklmTmVl ZGVkKGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBhdHRh Y2hEZXB0aEFuZFN0ZW5jaWxCdWZmZXJJZk5lZWRlZChtX2ludGVybmFsRGVwdGhTdGVuY2lsRm9y bWF0LCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgIGJvb2wgbXVzdFJlc3RvcmVGQk8gPSB0cnVlOwog ICAgIGlmIChhdHRycy5hbnRpYWxpYXMpIHsKQEAgLTQ2Myw2ICs0NDcsMTMgQEAgdm9pZCBHcmFw aGljc0NvbnRleHRHTE9wZW5HTDo6dmFsaWRhdGVEZXB0aFN0ZW5jaWwoY29uc3QgY2hhciogcGFj a2VkRGVwdGhTdGVuY2kKICAgICAgICAgICAgIGF0dHJzLnN0ZW5jaWwgPSBmYWxzZTsKICAgICAg ICAgc2V0Q29udGV4dEF0dHJpYnV0ZXMoYXR0cnMpOwogICAgIH0KKyAgICBpZiAoYXR0cnMuc3Rl bmNpbCkKKyAgICAgICAgbV9pbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCA9IEdMX0RFUFRIMjRf U1RFTkNJTDhfT0VTOworICAgIGVsc2UgaWYgKGF0dHJzLmRlcHRoKQorICAgICAgICBtX2ludGVy bmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gR0xfREVQVEhfQ09NUE9ORU5UMTY7CisgICAgZWxzZQor ICAgICAgICBtX2ludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gR0xfTk9ORTsKKwogICAgIGlm IChhdHRycy5hbnRpYWxpYXMpIHsKICAgICAgICAgLy8gRklYTUU6IG11c3QgYWRqdXN0IHRoaXMg d2hlbiB1cGdyYWRpbmcgdG8gV2ViR0wgMi4wIC8gT3BlbkdMIEVTIDMuMCBzdXBwb3J0LgogICAg ICAgICBpZiAoIWV4dGVuc2lvbnMuc3VwcG9ydHMoIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX211bHRp c2FtcGxlIikgfHwgIWV4dGVuc2lvbnMuc3VwcG9ydHMoIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX2Js aXQiKSB8fCAhZXh0ZW5zaW9ucy5zdXBwb3J0cygiR0xfT0VTX3JnYjhfcmdiYTgiKSkgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNz Q29udGV4dEdMT3BlbkdMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaAppbmRleCBlZTcxOTQ2MzlhODg0ODExN2NkMjE4 MGVlNzkxMjJmOGNlMDQ1NWE2Li4yYjMxMDM1MDc2MzlkOTk1Zjg5NjQ1ZDZmOTM0MTc0MDM5MGNh MGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv R3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaApAQCAtNjY0LDcgKzY2NCw5 IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fbGF5ZXJDb21wb3NpdGVkIHsgZmFsc2UgfTsKICAg ICBHQ0dMdWludCBtX2ludGVybmFsQ29sb3JGb3JtYXQgeyAwIH07Ci0KKyNpZiBVU0UoQU5HTEUp CisgICAgR0NHTHVpbnQgbV9pbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCB7IDAgfTsKKyNlbmRp ZgogICAgIHN0cnVjdCBHcmFwaGljc0NvbnRleHRHTFN0YXRlIHsKICAgICAgICAgR0NHTHVpbnQg Ym91bmRSZWFkRkJPIHsgMCB9OwogICAgICAgICBHQ0dMdWludCBib3VuZERyYXdGQk8geyAwIH07 Cg== 417443 2021-01-12 04:00:08 -0800 2021-01-17 23:41:47 -0800 Patch bug-220460-20210112140006.patch text/plain 7294 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGIyY2U5OTUzNjg3Yjk1 NWZkY2I2ZGMyY2IzZWY1OGIwYjA3ZjUyNC4uOTA4MDk5ZjNjZjRiNjgyMTc1ZTlhM2FjNTMxYzU0 NmU4YjIyNjMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTA4ICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgR3JhcGhpY3NDb250 ZXh0R0xPcGVuR0w6OnJlc2hhcGVGQk9zKCkgQU5HTEUgdmFyaWFudCBjYWxscyBpbnRvIG1ha2VD b250ZXh0Q3VycmVudCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjA0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBEZWFuIEphY2tzb24uCisKKyAg ICAgICAgVGhlIGNhbGwgaXMgcHJvYmxlbWF0aWMgaWYgaXQgaXMgdGFrZW4sIHNpbmNlIGluIHNv bWUgY2FzZXMgbWFrZUNvbnRleHRDdXJyZW50KCkgZmFpbHMKKyAgICAgICAgZHVlIHRvIHJlc2hh cGVGQk9zIGJlaW5nIGluIG1pZGRsZSBvZiBhIHJlc2hhcGUuIFRoZSBwcm9ibGVtYXRpYyBjYXNl IGlzIHRha2VuIGlmCisgICAgICAgIHRoZSByZXNoYXBlIGNhbGwgaGFwcGVucyBiZWZvcmUgZmly c3QgZ2V0RXh0ZW5zaW9ucygpLgorCisgICAgICAgIEZpeCBieQorICAgICAgICAxKSBSZXNvbHZp bmcgdGhlIG5lZWRlZCBkZXB0aC1zdGVuY2lsIGJ1ZmZlciBmb3JtYXQgZHVyaW5nIHZhbGlkYXRl RGVwdGhTdGVuY2lsLgorICAgICAgICAyKSBBbHdheXMgZW5hYmxlIHRoZSBwYWNrZWQgZGVwdGgt c3RlbmNpbCBleHRlbnNpb24gaWYgaXQgaXMgcHJlc2VudC4gT3RoZXJ3aXNlCisgICAgICAgICAg IGRlcHRoLXN0ZW5jaWwgYmluZGluZ3Mgd2lsbCBub3Qgd29yayBmb3IgdGhlIGNvbnRleHQgdGhh dCBkb2VzIG5vdCBoYXZlCisgICAgICAgICAgIGRlZmF1bHQgc3RlbmNpbCBidWZmZXIsIHNpbmNl IHRoZSBlbmFibGUgY2FsbCB3YXMgbm90IHRha2VuIGJlZm9yZQorICAgICAgICAgICBXZWJHTFJl bmRlcmluZ0NvbnRleHRCYXNlIHVzZXMgdGhlICJpc0VuYWJsZWQiIHRvIGVuYWJsZSBERVBUSF9T VEVOQ0lMCisgICAgICAgICAgIGZlYXR1cmVzLgorCisgICAgICAgIFRlc3RlZCBieSBXZWJHTCAx LzIgY29uZm9ybWFuY2UgdGVzdHMsIGJ1dCBvbmx5IHJldmVhbHMgdGhlIGJ1ZyBhZnRlcgorICAg ICAgICBhcHBseWluZyB0aGUgcGF0Y2ggaW4gdGhlIGRlcGVuZGluZyBidWcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjp2YWxpZGF0ZUF0dHJpYnV0 ZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnJlc2hhcGVG Qk9zKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjp2YWxpZGF0 ZURlcHRoU3RlbmNpbCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBo aWNzQ29udGV4dEdMT3BlbkdMLmg6CisKIDIwMjEtMDEtMTEgIFJpbmkgUGF0ZWwgIDxyaW5pX3Bh dGVsQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIGZ1bmN0aW9ucyBmcm9tIEdy YXBoaWNzQ29udGV4dEdMIGFuZCBFeHRlbnNpb25zR0wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBoaWNzQ29udGV4dEdMQU5HTEUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xB TkdMRS5jcHAKaW5kZXggZDE3OGVhOWUxNmRjMTU0MTBkNmY0NzgzZjk1N2E2OTEwZmJiZjkxZi4u Y2I4YWEzZjQzNzU2YjBiNzI0NGQwNDViNTE1ZmJiOWU1MWUyODYyOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdM RS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhp Y3NDb250ZXh0R0xBTkdMRS5jcHAKQEAgLTEwMyw2ICsxMDMsOCBAQCBSZWZQdHI8SW1hZ2VEYXRh PiBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cmVhZFBpeGVsc0ZvclBhaW50UmVzdWx0cygpCiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnZhbGlkYXRlQXR0cmlidXRlcygpCiB7Cisg ICAgbV9pbnRlcm5hbENvbG9yRm9ybWF0ID0gY29udGV4dEF0dHJpYnV0ZXMoKS5hbHBoYSA/IEdM X1JHQkE4IDogR0xfUkdCODsKKwogICAgIHZhbGlkYXRlRGVwdGhTdGVuY2lsKHBhY2tlZERlcHRo U3RlbmNpbEV4dGVuc2lvbk5hbWUpOwogfQogCkBAIC0xMTEsMjUgKzExMyw3IEBAIGJvb2wgR3Jh cGhpY3NDb250ZXh0R0xPcGVuR0w6OnJlc2hhcGVGQk9zKGNvbnN0IEludFNpemUmIHNpemUpCiAg ICAgYXV0byBhdHRycyA9IGNvbnRleHRBdHRyaWJ1dGVzKCk7CiAgICAgY29uc3QgaW50IHdpZHRo ID0gc2l6ZS53aWR0aCgpOwogICAgIGNvbnN0IGludCBoZWlnaHQgPSBzaXplLmhlaWdodCgpOwot ICAgIEdMdWludCBjb2xvckZvcm1hdCwgaW50ZXJuYWxEZXB0aFN0ZW5jaWxGb3JtYXQgPSAwOwot ICAgIGlmIChhdHRycy5hbHBoYSkgewotICAgICAgICBtX2ludGVybmFsQ29sb3JGb3JtYXQgPSBH TF9SR0JBODsKLSAgICAgICAgY29sb3JGb3JtYXQgPSBHTF9SR0JBOwotICAgIH0gZWxzZSB7Ci0g ICAgICAgIG1faW50ZXJuYWxDb2xvckZvcm1hdCA9IEdMX1JHQjg7Ci0gICAgICAgIGNvbG9yRm9y bWF0ID0gR0xfUkdCOwotICAgIH0KLSAgICBpZiAoYXR0cnMuc3RlbmNpbCB8fCBhdHRycy5kZXB0 aCkgewotICAgICAgICAvLyBXZSBkb24ndCBhbGxvdyB0aGUgbG9naWMgd2hlcmUgc3RlbmNpbCBp cyByZXF1aXJlZCBhbmQgZGVwdGggaXMgbm90LgotICAgICAgICAvLyBTZWUgR3JhcGhpY3NDb250 ZXh0R0xPcGVuR0w6OnZhbGlkYXRlQXR0cmlidXRlcy4KLQotICAgICAgICBFeHRlbnNpb25zR0wm IGV4dGVuc2lvbnMgPSBnZXRFeHRlbnNpb25zKCk7Ci0gICAgICAgIC8vIFVzZSBhIDI0IGJpdCBk ZXB0aCBidWZmZXIgd2hlcmUgd2Uga25vdyB3ZSBoYXZlIGl0LgotICAgICAgICBpZiAoZXh0ZW5z aW9ucy5zdXBwb3J0cyhwYWNrZWREZXB0aFN0ZW5jaWxFeHRlbnNpb25OYW1lKSkKLSAgICAgICAg ICAgIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0gR0xfREVQVEgyNF9TVEVOQ0lMOF9PRVM7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0ID0g R0xfREVQVEhfQ09NUE9ORU5UMTY7Ci0gICAgfQorICAgIEdMdWludCBjb2xvckZvcm1hdCA9IGF0 dHJzLmFscGhhID8gR0xfUkdCQSA6IEdMX1JHQjsKIAogICAgIC8vIFJlc2l6ZSBtdWx0aXNhbXBs ZSBGQk8uCiAgICAgaWYgKGF0dHJzLmFudGlhbGlhcykgewpAQCAtMTQ0LDEwICsxMjgsMTAgQEAg Ym9vbCBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cmVzaGFwZUZCT3MoY29uc3QgSW50U2l6ZSYg c2l6ZSkKICAgICAgICAgZ2w6OkZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVS LCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwgR0xfUkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlQ29s b3JCdWZmZXIpOwogICAgICAgICBpZiAoYXR0cnMuc3RlbmNpbCB8fCBhdHRycy5kZXB0aCkgewog ICAgICAgICAgICAgZ2w6OkJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX211bHRp c2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVyKTsKLSAgICAgICAgICAgIGdsOjpSZW5kZXJidWZmZXJT dG9yYWdlTXVsdGlzYW1wbGVBTkdMRShHTF9SRU5ERVJCVUZGRVIsIHNhbXBsZUNvdW50LCBpbnRl cm5hbERlcHRoU3RlbmNpbEZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICBnbDo6 UmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlQU5HTEUoR0xfUkVOREVSQlVGRkVSLCBzYW1w bGVDb3VudCwgbV9pbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CiAg ICAgICAgICAgICAvLyBXZWJHTCAxLjAncyBydWxlcyBzdGF0ZSB0aGF0IGNvbWJpbmVkIGRlcHRo L3N0ZW5jaWwgcmVuZGVyYnVmZmVycwogICAgICAgICAgICAgLy8gaGF2ZSB0byBiZSBhdHRhY2hl ZCB0byB0aGUgc3ludGhldGljIERFUFRIX1NURU5DSUxfQVRUQUNITUVOVCBwb2ludC4KLSAgICAg ICAgICAgIGlmICghaXNHTEVTMkNvbXBsaWFudCgpICYmIGludGVybmFsRGVwdGhTdGVuY2lsRm9y bWF0ID09IEdMX0RFUFRIMjRfU1RFTkNJTDhfT0VTKQorICAgICAgICAgICAgaWYgKCFpc0dMRVMy Q29tcGxpYW50KCkgJiYgbV9pbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCA9PSBHTF9ERVBUSDI0 X1NURU5DSUw4X09FUykKICAgICAgICAgICAgICAgICBnbDo6RnJhbWVidWZmZXJSZW5kZXJidWZm ZXIoR0xfRlJBTUVCVUZGRVIsIERFUFRIX1NURU5DSUxfQVRUQUNITUVOVCwgR0xfUkVOREVSQlVG RkVSLCBtX211bHRpc2FtcGxlRGVwdGhTdGVuY2lsQnVmZmVyKTsKICAgICAgICAgICAgIGVsc2Ug ewogICAgICAgICAgICAgICAgIGlmIChhdHRycy5zdGVuY2lsKQpAQCAtMjA4LDcgKzE5Miw3IEBA IGJvb2wgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnJlc2hhcGVGQk9zKGNvbnN0IEludFNpemUm IHNpemUpCiAjZW5kaWYKICNlbmRpZiAvLyBQTEFURk9STShDT0NPQSkKIAotICAgIGF0dGFjaERl cHRoQW5kU3RlbmNpbEJ1ZmZlcklmTmVlZGVkKGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0LCB3 aWR0aCwgaGVpZ2h0KTsKKyAgICBhdHRhY2hEZXB0aEFuZFN0ZW5jaWxCdWZmZXJJZk5lZWRlZCht X2ludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0LCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgIGJvb2wg bXVzdFJlc3RvcmVGQk8gPSB0cnVlOwogICAgIGlmIChhdHRycy5hbnRpYWxpYXMpIHsKQEAgLTQ1 MiwxNyArNDM2LDI1IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnJlYWRuUGl4ZWxz SW1wbChHQ0dMaW50IHgsIEdDR0xpbnQgeSwgR0NHTHNpemVpIHdpCiB2b2lkIEdyYXBoaWNzQ29u dGV4dEdMT3BlbkdMOjp2YWxpZGF0ZURlcHRoU3RlbmNpbChjb25zdCBjaGFyKiBwYWNrZWREZXB0 aFN0ZW5jaWxFeHRlbnNpb24pCiB7CiAgICAgRXh0ZW5zaW9uc0dMJiBleHRlbnNpb25zID0gZ2V0 RXh0ZW5zaW9ucygpOwotICAgIGF1dG8gYXR0cnMgPSBjb250ZXh0QXR0cmlidXRlcygpOworICAg IC8vIEZJWE1FOiBTaW5jZSB0aGUgY29uc3RydWN0b3JzIG9mIHZhcmlvdXMgcGxhdGZvcm1zIGFy ZSBub3Qgc2hhcmVkLCB3ZSBpbml0aWFsaXplIHRoaXMgaGVyZS4KKyAgICAvLyBVcG9uIGNvbnN0 cnVjdGluZyB0aGUgY29udGV4dCwgYWx3YXlzIGluaXRpYWxpemUgdGhlIGV4dGVuc2lvbnMgdGhh dCB0aGUgV2ViR0xSZW5kZXJpbmdDb250ZXh0KiB3aWxsCisgICAgLy8gdXNlIHRvIHR1cm4gb24g ZmVhdHVyZSBmbGFncy4KKyAgICBpZiAoZXh0ZW5zaW9ucy5zdXBwb3J0cyhwYWNrZWREZXB0aFN0 ZW5jaWxFeHRlbnNpb24pKSB7CisgICAgICAgIGV4dGVuc2lvbnMuZW5zdXJlRW5hYmxlZChwYWNr ZWREZXB0aFN0ZW5jaWxFeHRlbnNpb24pOworICAgICAgICBtX2ludGVybmFsRGVwdGhTdGVuY2ls Rm9ybWF0ID0gR0xfREVQVEgyNF9TVEVOQ0lMOF9PRVM7CisgICAgfSBlbHNlCisgICAgICAgIG1f aW50ZXJuYWxEZXB0aFN0ZW5jaWxGb3JtYXQgPSBHTF9ERVBUSF9DT01QT05FTlQxNjsKIAorICAg IGF1dG8gYXR0cnMgPSBjb250ZXh0QXR0cmlidXRlcygpOwogICAgIGlmIChhdHRycy5zdGVuY2ls KSB7Ci0gICAgICAgIGlmIChleHRlbnNpb25zLnN1cHBvcnRzKHBhY2tlZERlcHRoU3RlbmNpbEV4 dGVuc2lvbikpIHsKLSAgICAgICAgICAgIGV4dGVuc2lvbnMuZW5zdXJlRW5hYmxlZChwYWNrZWRE ZXB0aFN0ZW5jaWxFeHRlbnNpb24pOworICAgICAgICBpZiAobV9pbnRlcm5hbERlcHRoU3RlbmNp bEZvcm1hdCA9PSBHTF9ERVBUSDI0X1NURU5DSUw4X09FUykgewogICAgICAgICAgICAgLy8gRm9y Y2UgZGVwdGggaWYgc3RlbmNpbCBpcyB0cnVlLgogICAgICAgICAgICAgYXR0cnMuZGVwdGggPSB0 cnVlOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGF0dHJzLnN0ZW5jaWwgPSBmYWxzZTsK ICAgICAgICAgc2V0Q29udGV4dEF0dHJpYnV0ZXMoYXR0cnMpOwogICAgIH0KKwogICAgIGlmIChh dHRycy5hbnRpYWxpYXMpIHsKICAgICAgICAgLy8gRklYTUU6IG11c3QgYWRqdXN0IHRoaXMgd2hl biB1cGdyYWRpbmcgdG8gV2ViR0wgMi4wIC8gT3BlbkdMIEVTIDMuMCBzdXBwb3J0LgogICAgICAg ICBpZiAoIWV4dGVuc2lvbnMuc3VwcG9ydHMoIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX211bHRpc2Ft cGxlIikgfHwgIWV4dGVuc2lvbnMuc3VwcG9ydHMoIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX2JsaXQi KSB8fCAhZXh0ZW5zaW9ucy5zdXBwb3J0cygiR0xfT0VTX3JnYjhfcmdiYTgiKSkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29u dGV4dEdMT3BlbkdMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv R3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaAppbmRleCBlMWRhZjdmNzNlYTJiNThkM2Q4MGJjYTE1 YzkzNTY3OTkyZGUxNTQ0Li5kMzJlYjA2ZTJjZDU3OTI3OWUyYjM5ZTU2YzBmY2M0NzZlNWZhYzQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3Jh cGhpY3NDb250ZXh0R0xPcGVuR0wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaApAQCAtNjcwLDcgKzY3MCw5IEBA IHByaXZhdGU6CiAKICAgICBib29sIG1fbGF5ZXJDb21wb3NpdGVkIHsgZmFsc2UgfTsKICAgICBH Q0dMdWludCBtX2ludGVybmFsQ29sb3JGb3JtYXQgeyAwIH07Ci0KKyNpZiBVU0UoQU5HTEUpCisg ICAgR0NHTHVpbnQgbV9pbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCB7IDAgfTsKKyNlbmRpZgog ICAgIHN0cnVjdCBHcmFwaGljc0NvbnRleHRHTFN0YXRlIHsKICAgICAgICAgR0NHTHVpbnQgYm91 bmRSZWFkRkJPIHsgMCB9OwogICAgICAgICBHQ0dMdWludCBib3VuZERyYXdGQk8geyAwIH07Cg==