232475 2021-10-29 00:32:50 -0700 ANGLE OpenGL: Cherry-pick commit GL: Chunk uploads of texture data >120kb on Mac. 2022-08-11 02:59:11 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Local Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED InRadar P2 Normal --- 232472 232476 1 kkinnunen kkinnunen dino ews-watchlist kbr kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1809989 0 kkinnunen 2021-10-29 00:32:50 -0700 ANGLE OpenGL: Cherry-pick commit GL: Chunk uploads of texture data >120kb on Mac. c12f594a19b18231e5cdc5ccea09a52cdf52500c 1810005 1 442795 kkinnunen 2021-10-29 01:46:24 -0700 Created attachment 442795 Patch 1810006 2 ews-watchlist 2021-10-29 01:47:15 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1811398 3 442795 kbr 2021-11-02 23:38:03 -0700 Comment on attachment 442795 Patch If you've double-checked that this is the entirety of the patch (I didn't have time to), then r+. This was an important one to improve stability. 1811524 4 webkit-bug-importer 2021-11-03 10:45:04 -0700 <rdar://problem/84981524> 1890531 5 kkinnunen 2022-08-11 02:59:11 -0700 This was merged as part of ANGLE update. 442795 2021-10-29 01:46:24 -0700 2021-11-02 23:38:03 -0700 Patch bug-232475-20211029114623.patch text/plain 11416 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggOWI4ZDIzYTZjNzFhYmNkZGNjZWI2N2M0YmZhMjcyYTIyMGQ5YmJlNy4uODI2ZWVmNjJmZWE3 MDNhMzkxNTY1YzMzMjU5YTM5MDg3NDcwN2NlOCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTEwLTI5ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5l bkBhcHBsZS5jb20+CisKKyAgICAgICAgQU5HTEUgT3BlbkdMOiBDaGVycnktcGljayBjb21taXQg R0w6IENodW5rIHVwbG9hZHMgb2YgdGV4dHVyZSBkYXRhID4xMjBrYiBvbiBNYWMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NzUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tIGMxMmY1OTRhMTli MTgyMzFlNWNkYzVjY2VhMDlhNTJjZGY1MjUwMGMgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCisg ICAgICAgIEZyb206IEdlb2ZmIExhbmcgPGdlb2ZmbGFuZ0Bnb29nbGUuY29tPgorICAgICAgICBE YXRlOiBNb24sIDMxIE1heSAyMDIxIDEwOjQ4OjIwIC0wNDAwCisgICAgICAgIEdMOiBDaHVuayB1 cGxvYWRzIG9mIHRleHR1cmUgZGF0YSA+MTIwa2Igb24gTWFjLgorCisgICAgICAgIE1hYyBkcml2 ZXJzIGFyZSBoYW5naW5nIGFuZCBjcmFzaGluZyBhZnRlciBsYXJnZSBnbFRleFN1YkltYWdlIHVw bG9hZHMuCisgICAgICAgIENodW5rIHRob3NlIHVwbG9hZHMgdG8gYXZvaWQgdGhpcyBwcm9ibGVt YXRpYyBwYXRoIGluIHRoZSBkcml2ZXIuCisKKyAgICAgICAgKiBpbmNsdWRlL3BsYXRmb3JtL0Zl YXR1cmVzR0wuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQ29udGV4dEdM Lmg6CisgICAgICAgIChyeDo6Q29udGV4dEdMOjpnZXREZWJ1ZyBjb25zdCk6CisgICAgICAgICog c3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL1RleHR1cmVHTC5jcHA6CisgICAgICAgIChyeDo6VGV4 dHVyZUdMOjpzZXRJbWFnZSk6CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpzZXRTdWJJbWFnZSk6 CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpzZXRTdWJJbWFnZVJvd0J5Um93V29ya2Fyb3VuZCk6 CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL1RleHR1cmVHTC5oOgorICAgICAg ICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmdsX3V0aWxzLmNwcDoKKyAgICAg ICAgKHJ4OjpuYXRpdmVnbF9nbDo6SW5pdGlhbGl6ZUZlYXR1cmVzKToKKwogMjAyMS0xMC0yNyAg S2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKFNhZmFyaSAxNSk6IFBvb3IgV2ViR0wgcGVyZm9ybWFuY2Ugb24gaHR0cHM6Ly9kb3dubG9h ZHMuc2NpcnJhLmNvbS9sYWJzL3BhcnRpY2xlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmggYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaAppbmRleCAwMDJiNzhlYWZjN2E1 Yjg1NmU0NDI4ZmJkODJjN2M3MDFlZDgzMTA5Li4xNzQxNmNlMzhlNDk4OTAxODAwYTgzNjk4ZWMy ODhiMDliOTJhM2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRl L3BsYXRmb3JtL0ZlYXR1cmVzR0wuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNs dWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaApAQCAtNTExLDYgKzUxMSwxMyBAQCBzdHJ1Y3QgRmVh dHVyZXNHTCA6IEZlYXR1cmVTZXRCYXNlCiAgICAgRmVhdHVyZSBwcm9tb3RlUGFja2VkRm9ybWF0 c1RvOEJpdFBlckNoYW5uZWwgPSB7CiAgICAgICAgICJwcm9tb3RlX3BhY2tlZF9mb3JtYXRzX3Rv XzhfYml0X3Blcl9jaGFubmVsIiwgRmVhdHVyZUNhdGVnb3J5OjpPcGVuR0xXb3JrYXJvdW5kcywK ICAgICAgICAgIlBhY2tlZCBjb2xvciBmb3JtYXRzIGFyZSBidWdneSBvbiBNYWNzIHdpdGggQU1E IEdQVXMiLCAmbWVtYmVycywgImh0dHBzOi8vYW5nbGVidWcuY29tLzQ4NDkifTsKKworICAgIC8v IE1hYyBPcGVuR0wgZHJpdmVycyBvZnRlbiBoYW5nIHdoZW4gY2FsbGluZyBnbFRleFN1YkltYWdl IHdpdGggPjEyMGtiIG9mIGRhdGEuIEluc3RlYWQsIHVwbG9hZAorICAgIC8vIHRoZSBkYXRhIGlu IDwxMjBrYiBjaHVua3MuCisgICAgRmVhdHVyZSB1cGxvYWRUZXh0dXJlRGF0YUluQ2h1bmtzID0g eworICAgICAgICAiY2h1bmtlZF90ZXh0dXJlX3VwbG9hZCIsIEZlYXR1cmVDYXRlZ29yeTo6T3Bl bkdMV29ya2Fyb3VuZHMsCisgICAgICAgICJVcGxvYWQgdGV4dHVyZSBkYXRhIGluIDwxMjBrYiBj aHVua3MgdG8gd29yayBhcm91bmQgTWFjIGRyaXZlciBoYW5ncyBhbmQgY3Jhc2hlcy4iLAorICAg ICAgICAmbWVtYmVycywgImh0dHA6Ly9jcmJ1Zy5jb20vMTE4MTA2OCJ9OwogfTsKIAogaW5saW5l IEZlYXR1cmVzR0w6OkZlYXR1cmVzR0woKSAgPSBkZWZhdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0NvbnRleHRHTC5oIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0NvbnRleHRH TC5oCmluZGV4IGVhNTM1M2RiYjU1YjI3ODM2NTYwOWVhNzBiMzE2Njk5MDNkOGNhMmUuLmI3MmUy ZTEwZmZlN2FjNDZjNDYxNGRkZTVkYzA2MTdjMzNhZDhlMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9Db250ZXh0R0wuaAorKysg Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQ29udGV4 dEdMLmgKQEAgLTI3Miw2ICsyNzIsOCBAQCBjbGFzcyBDb250ZXh0R0wgOiBwdWJsaWMgQ29udGV4 dEltcGwKICAgICB2b2lkIHNldE5lZWRzRmx1c2hCZWZvcmVEZWxldGVUZXh0dXJlcygpOwogICAg IHZvaWQgZmx1c2hJZk5lY2Vzc2FyeUJlZm9yZURlbGV0ZVRleHR1cmVzKCk7CiAKKyAgICBjb25z dCBnbDo6RGVidWcgJmdldERlYnVnKCkgY29uc3QgeyByZXR1cm4gbVN0YXRlLmdldERlYnVnKCk7 IH0KKwogICBwcml2YXRlOgogICAgIGFuZ2xlOjpSZXN1bHQgc2V0RHJhd0FycmF5c1N0YXRlKGNv bnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIEdMaW50IGZpcnN0LApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL1RleHR1cmVHTC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAppbmRleCA1NzM5 MDYyZTZkNjMzOGMzNWFhZGQwY2E4MDRmNzJmOWIxMDNjNjMyLi4wY2I4YjZlNjIxYTQxODQ2OTgy ZWUzMDQ5MWM3NzU5YmMyOTMzMzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAorKysgYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcApAQCAt MTg3LDcgKzE4Nyw3IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVyZUdMOjpzZXRJbWFnZShjb25zdCBn bDo6Q29udGV4dCAqY29udGV4dCwKIAogICAgICAgICBnbDo6Qm94IGFyZWEoMCwgMCwgMCwgc2l6 ZS53aWR0aCwgc2l6ZS5oZWlnaHQsIHNpemUuZGVwdGgpOwogICAgICAgICByZXR1cm4gc2V0U3Vi SW1hZ2VSb3dCeVJvd1dvcmthcm91bmQoY29udGV4dCwgdGFyZ2V0LCBsZXZlbCwgYXJlYSwgZm9y bWF0LCB0eXBlLCB1bnBhY2ssCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnBhY2tCdWZmZXIsIHBpeGVscyk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnBhY2tCdWZmZXIsIDAsIHBpeGVscyk7CiAgICAgfQogCiAg ICAgaWYgKGZlYXR1cmVzLnVucGFja0xhc3RSb3dTZXBhcmF0ZWx5Rm9yUGFkZGluZ0luY2x1c2lv bi5lbmFibGVkKQpAQCAtMzM1LDcgKzMzNSw3IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVyZUdMOjpz ZXRTdWJJbWFnZShjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgdW5wYWNrLnJv d0xlbmd0aCAhPSAwICYmIHVucGFjay5yb3dMZW5ndGggPCBhcmVhLndpZHRoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHNldFN1YkltYWdlUm93QnlSb3dXb3JrYXJvdW5kKGNvbnRleHQsIHRhcmdl dCwgbGV2ZWwsIGFyZWEsIGZvcm1hdCwgdHlwZSwgdW5wYWNrLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5wYWNrQnVmZmVyLCBwaXhlbHMpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5wYWNrQnVmZmVyLCAwLCBw aXhlbHMpOwogICAgIH0KIAogICAgIGlmIChmZWF0dXJlcy51bnBhY2tMYXN0Um93U2VwYXJhdGVs eUZvclBhZGRpbmdJbmNsdXNpb24uZW5hYmxlZCkKQEAgLTM1Niw2ICszNTYsMTMgQEAgYW5nbGU6 OlJlc3VsdCBUZXh0dXJlR0w6OnNldFN1YkltYWdlKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0 LAogICAgICAgICB9CiAgICAgfQogCisgICAgaWYgKGZlYXR1cmVzLnVwbG9hZFRleHR1cmVEYXRh SW5DaHVua3MuZW5hYmxlZCkKKyAgICB7CisgICAgICAgIGNvbnN0ZXhwciBjb25zdCBzaXplX3Qg a01heFVwbG9hZENodW5rU2l6ZSA9ICgxMjAgKiAxMDI0KSAtIDE7CisgICAgICAgIHJldHVybiBz ZXRTdWJJbWFnZVJvd0J5Um93V29ya2Fyb3VuZChjb250ZXh0LCB0YXJnZXQsIGxldmVsLCBhcmVh LCBmb3JtYXQsIHR5cGUsIHVucGFjaywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVucGFja0J1ZmZlciwga01heFVwbG9hZENodW5rU2l6ZSwgcGl4ZWxzKTsK KyAgICB9CisKICAgICBpZiAobmF0aXZlZ2w6OlVzZVRleEltYWdlMkQoZ2V0VHlwZSgpKSkKICAg ICB7CiAgICAgICAgIEFTU0VSVChhcmVhLnogPT0gMCAmJiBhcmVhLmRlcHRoID09IDEpOwpAQCAt Mzg1LDE0ICszOTIsMTggQEAgYW5nbGU6OlJlc3VsdCBUZXh0dXJlR0w6OnNldFN1YkltYWdlUm93 QnlSb3dXb3JrYXJvdW5kKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXgKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gdHlwZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBnbDo6UGl4ZWxVbnBhY2tTdGF0ZSAmdW5wYWNrLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpCdWZmZXIgKnVucGFja0J1 ZmZlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzaXplX3QgbWF4Qnl0ZXNVcGxvYWRlZFBlckNodW5rLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHVpbnQ4X3QgKnBpeGVs cykKIHsKLSAgICBDb250ZXh0R0wgKmNvbnRleHRHTCAgICAgICAgID0gR2V0SW1wbEFzPENvbnRl eHRHTD4oY29udGV4dCk7Ci0gICAgY29uc3QgRnVuY3Rpb25zR0wgKmZ1bmN0aW9ucyA9IEdldEZ1 bmN0aW9uc0dMKGNvbnRleHQpOwotICAgIFN0YXRlTWFuYWdlckdMICpzdGF0ZU1hbmFnZXIgPSBH ZXRTdGF0ZU1hbmFnZXJHTChjb250ZXh0KTsKKyAgICBDb250ZXh0R0wgKmNvbnRleHRHTCAgICAg ICAgICAgICAgPSBHZXRJbXBsQXM8Q29udGV4dEdMPihjb250ZXh0KTsKKyAgICBjb25zdCBGdW5j dGlvbnNHTCAqZnVuY3Rpb25zICAgICAgPSBHZXRGdW5jdGlvbnNHTChjb250ZXh0KTsKKyAgICBT dGF0ZU1hbmFnZXJHTCAqc3RhdGVNYW5hZ2VyICAgICAgPSBHZXRTdGF0ZU1hbmFnZXJHTChjb250 ZXh0KTsKKyAgICBjb25zdCBhbmdsZTo6RmVhdHVyZXNHTCAmZmVhdHVyZXMgPSBHZXRGZWF0dXJl c0dMKGNvbnRleHQpOwogCi0gICAgZ2w6OlBpeGVsVW5wYWNrU3RhdGUgZGlyZWN0VW5wYWNrOwot ICAgIGRpcmVjdFVucGFjay5hbGlnbm1lbnQgPSAxOworICAgIGdsOjpQaXhlbFVucGFja1N0YXRl IGRpcmVjdFVucGFjayA9IHVucGFjazsKKyAgICBkaXJlY3RVbnBhY2suc2tpcFJvd3MgICAgICAg ICAgICAgPSAwOworICAgIGRpcmVjdFVucGFjay5za2lwUGl4ZWxzICAgICAgICAgICA9IDA7Cisg ICAgZGlyZWN0VW5wYWNrLnNraXBJbWFnZXMgICAgICAgICAgID0gMDsKICAgICBBTkdMRV9UUlko c3RhdGVNYW5hZ2VyLT5zZXRQaXhlbFVucGFja1N0YXRlKGNvbnRleHQsIGRpcmVjdFVucGFjaykp OwogICAgIEFOR0xFX1RSWShzdGF0ZU1hbmFnZXItPnNldFBpeGVsVW5wYWNrQnVmZmVyKGNvbnRl eHQsIHVucGFja0J1ZmZlcikpOwogCkBAIC00MDksMzMgKzQyMCw0OCBAQCBhbmdsZTo6UmVzdWx0 IFRleHR1cmVHTDo6c2V0U3ViSW1hZ2VSb3dCeVJvd1dvcmthcm91bmQoY29uc3QgZ2w6OkNvbnRl eHQgKmNvbnRleAogICAgIEFOR0xFX0NIRUNLX0dMX01BVEgoY29udGV4dEdMLCBnbEZvcm1hdC5j b21wdXRlU2tpcEJ5dGVzKHR5cGUsIHJvd0J5dGVzLCBpbWFnZUJ5dGVzLCB1bnBhY2ssCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dXNlVGV4SW1hZ2UzRCwgJnNraXBCeXRlcykpOwogCisgICAgR0xpbnQgcm93c1BlckNodW5rID0K KyAgICAgICAgc3RkOjptaW4oc3RkOjptYXgoc3RhdGljX2Nhc3Q8R0xpbnQ+KG1heEJ5dGVzVXBs b2FkZWRQZXJDaHVuayAvIHJvd0J5dGVzKSwgMSksIGFyZWEuaGVpZ2h0KTsKKyAgICBpZiAobWF4 Qnl0ZXNVcGxvYWRlZFBlckNodW5rID4gMCAmJiByb3dzUGVyQ2h1bmsgPCBhcmVhLmhlaWdodCkK KyAgICB7CisgICAgICAgIEFOR0xFX1BFUkZfV0FSTklORyhjb250ZXh0R0wtPmdldERlYnVnKCks IEdMX0RFQlVHX1NFVkVSSVRZX0xPVywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJDaHVu a2luZyB1cGxvYWQgb2YgdGV4dHVyZSBkYXRhIHRvIHdvcmsgYXJvdW5kIGRyaXZlciBoYW5ncy4i KTsKKyAgICB9CisKKyAgICBuYXRpdmVnbDo6VGV4U3ViSW1hZ2VGb3JtYXQgdGV4U3ViSW1hZ2VG b3JtYXQgPQorICAgICAgICBuYXRpdmVnbDo6R2V0VGV4U3ViSW1hZ2VGb3JtYXQoZnVuY3Rpb25z LCBmZWF0dXJlcywgZm9ybWF0LCB0eXBlKTsKKwogICAgIGNvbnN0IHVpbnQ4X3QgKnBpeGVsc1dp dGhTa2lwID0gcGl4ZWxzICsgc2tpcEJ5dGVzOwogICAgIGlmICh1c2VUZXhJbWFnZTNEKQogICAg IHsKICAgICAgICAgZm9yIChHTGludCBpbWFnZSA9IDA7IGltYWdlIDwgYXJlYS5kZXB0aDsgKytp bWFnZSkKICAgICAgICAgewogICAgICAgICAgICAgR0xpbnQgaW1hZ2VCeXRlT2Zmc2V0ID0gaW1h Z2UgKiBpbWFnZUJ5dGVzOwotICAgICAgICAgICAgZm9yIChHTGludCByb3cgPSAwOyByb3cgPCBh cmVhLmhlaWdodDsgKytyb3cpCisgICAgICAgICAgICBmb3IgKEdMaW50IHJvdyA9IDA7IHJvdyA8 IGFyZWEuaGVpZ2h0OyByb3cgKz0gcm93c1BlckNodW5rKQogICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgIEdMaW50IGhlaWdodCAgICAgICAgICAgICA9IHN0ZDo6bWluKHJvd3NQZXJDaHVu aywgYXJlYS5oZWlnaHQgLSByb3cpOwogICAgICAgICAgICAgICAgIEdMaW50IGJ5dGVPZmZzZXQg ICAgICAgICA9IGltYWdlQnl0ZU9mZnNldCArIHJvdyAqIHJvd0J5dGVzOwogICAgICAgICAgICAg ICAgIGNvbnN0IEdMdWJ5dGUgKnJvd1BpeGVscyA9IHBpeGVsc1dpdGhTa2lwICsgYnl0ZU9mZnNl dDsKICAgICAgICAgICAgICAgICBBTkdMRV9HTF9UUlkoY29udGV4dCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZnVuY3Rpb25zLT50ZXhTdWJJbWFnZTNEKFRvR0xlbnVtKHRhcmdldCks IHN0YXRpY19jYXN0PEdMaW50PihsZXZlbCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhcmVhLngsIHJvdyArIGFyZWEueSwgaW1hZ2UgKyBh cmVhLnosCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBhcmVhLndpZHRoLCAxLCAxLCBmb3JtYXQsIHR5cGUsIHJvd1BpeGVscykpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbnMtPnRleFN1YkltYWdlM0QoCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBUb0dMZW51bSh0YXJnZXQpLCBzdGF0aWNfY2FzdDxH TGludD4obGV2ZWwpLCBhcmVhLngsIHJvdyArIGFyZWEueSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGltYWdlICsgYXJlYS56LCBhcmVhLndpZHRoLCBoZWlnaHQsIDEsIHRleFN1 YkltYWdlRm9ybWF0LmZvcm1hdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRl eFN1YkltYWdlRm9ybWF0LnR5cGUsIHJvd1BpeGVscykpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIEFTU0VSVChuYXRpdmVnbDo6VXNl VGV4SW1hZ2UyRChnZXRUeXBlKCkpKTsKLSAgICAgICAgZm9yIChHTGludCByb3cgPSAwOyByb3cg PCBhcmVhLmhlaWdodDsgKytyb3cpCisgICAgICAgIGZvciAoR0xpbnQgcm93ID0gMDsgcm93IDwg YXJlYS5oZWlnaHQ7IHJvdyArPSByb3dzUGVyQ2h1bmspCiAgICAgICAgIHsKKyAgICAgICAgICAg IEdMaW50IGhlaWdodCAgICAgICAgICAgICA9IHN0ZDo6bWluKHJvd3NQZXJDaHVuaywgYXJlYS5o ZWlnaHQgLSByb3cpOwogICAgICAgICAgICAgR0xpbnQgYnl0ZU9mZnNldCAgICAgICAgID0gcm93 ICogcm93Qnl0ZXM7CiAgICAgICAgICAgICBjb25zdCBHTHVieXRlICpyb3dQaXhlbHMgPSBwaXhl bHNXaXRoU2tpcCArIGJ5dGVPZmZzZXQ7CiAgICAgICAgICAgICBBTkdMRV9HTF9UUlkoY29udGV4 dCwgZnVuY3Rpb25zLT50ZXhTdWJJbWFnZTJEKAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBUb0dMZW51bSh0YXJnZXQpLCBzdGF0aWNfY2FzdDxHTGludD4obGV2ZWwpLCBh cmVhLngsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdyArIGFyZWEu eSwgYXJlYS53aWR0aCwgMSwgZm9ybWF0LCB0eXBlLCByb3dQaXhlbHMpKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcm93ICsgYXJlYS55LCBhcmVhLndpZHRoLCBoZWln aHQsIHRleFN1YkltYWdlRm9ybWF0LmZvcm1hdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdGV4U3ViSW1hZ2VGb3JtYXQudHlwZSwgcm93UGl4ZWxzKSk7CiAgICAgICAg IH0KICAgICB9CiAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL1RleHR1 cmVHTC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2ds L1RleHR1cmVHTC5oCmluZGV4IDA2ZDE3Mzc4ZmY4YzBhNTU2YjU2YjVjNDE3NWQ0ZWMzOWU0ZGYy MmIuLjliMmEzNWI2ZDc4MTIyNTQ5NDgyODc1Y2M3NDllNWI0YTAxY2I3NmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9UZXh0dXJl R0wuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv Z2wvVGV4dHVyZUdMLmgKQEAgLTIzNyw2ICsyMzcsNyBAQCBjbGFzcyBUZXh0dXJlR0wgOiBwdWJs aWMgVGV4dHVyZUltcGwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIEdMZW51bSB0eXBlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgZ2w6OlBpeGVsVW5wYWNrU3RhdGUgJnVucGFjaywKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpCdWZmZXIg KnVucGFja0J1ZmZlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNpemVfdCBtYXhCeXRlc1VwbG9hZGVkUGVyQ2h1bmssCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCB1aW50OF90ICpwaXhlbHMpOwog CiAgICAgYW5nbGU6OlJlc3VsdCBzZXRTdWJJbWFnZVBhZGRpbmdXb3JrYXJvdW5kKGNvbnN0IGds OjpDb250ZXh0ICpjb250ZXh0LApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMuY3BwIGIvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMu Y3BwCmluZGV4IDBhOTQ5YTczZDY3NjhiNzNmYmM4NTdiZWM4MDNkZjU5ZGEyNTY4MGYuLmI3OWFk N2U4Zjc2MTY1ZWY2Y2ZlMDYwYTY4MjMwNGI3Njk1OWRlNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmdsX3V0aWxz LmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv Z2wvcmVuZGVyZXJnbF91dGlscy5jcHAKQEAgLTE4NjUsNiArMTg2NSw5IEBAIHZvaWQgSW5pdGlh bGl6ZUZlYXR1cmVzKGNvbnN0IEZ1bmN0aW9uc0dMICpmdW5jdGlvbnMsIGFuZ2xlOjpGZWF0dXJl c0dMICpmZWF0dXJlCiAgICAgQU5HTEVfRkVBVFVSRV9DT05ESVRJT04oZmVhdHVyZXMsIHNldFpl cm9MZXZlbEJlZm9yZUdlbmVyYXRlTWlwbWFwLCBJc0FwcGxlKCkpOwogCiAgICAgQU5HTEVfRkVB VFVSRV9DT05ESVRJT04oZmVhdHVyZXMsIHByb21vdGVQYWNrZWRGb3JtYXRzVG84Qml0UGVyQ2hh bm5lbCwgSXNBcHBsZSgpICYmIGhhc0FNRCk7CisKKyAgICAvLyBodHRwOi8vY3JidWcuY29tLzEx ODEwNjgKKyAgICBBTkdMRV9GRUFUVVJFX0NPTkRJVElPTihmZWF0dXJlcywgdXBsb2FkVGV4dHVy ZURhdGFJbkNodW5rcywgSXNBcHBsZSgpKTsKIH0KIAogdm9pZCBJbml0aWFsaXplRnJvbnRlbmRG ZWF0dXJlcyhjb25zdCBGdW5jdGlvbnNHTCAqZnVuY3Rpb25zLCBhbmdsZTo6RnJvbnRlbmRGZWF0 dXJlcyAqZmVhdHVyZXMpCg==