233327 2021-11-18 12:23:40 -0800 [GTK] Fix ANGLE compilation 2021-12-13 13:18:22 -0800 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 alex alex annulen clord dino ews-watchlist gyuyoung.kim kbr kkinnunen kondapallykalyan ryuan.choi sergio webkit-bug-importer oldest_to_newest 1816558 0 alex 2021-11-18 12:23:40 -0800 We want to fix the prototype implementation we have for GTK, this is not the solution we are going to use in the end but it is a good first step that allows us to collaborate and have reference solution to compare. This is the first patch in the series to enable WebGL support for GTK and WPE using ANGLE. 1816568 1 444719 alex 2021-11-18 12:39:46 -0800 Created attachment 444719 Patch 1816569 2 ews-watchlist 2021-11-18 12:40:25 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1823572 3 447016 alex 2021-12-13 09:28:31 -0800 Created attachment 447016 Patch 1823704 4 447016 kbr 2021-12-13 13:07:18 -0800 Comment on attachment 447016 Patch Looks good; let's get GTK on the ANGLE backend ASAP. r+ 1823714 5 ews-feeder 2021-12-13 13:17:38 -0800 Committed r286978 (?): <https://commits.webkit.org/r286978> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447016. 1823715 6 webkit-bug-importer 2021-12-13 13:18:22 -0800 <rdar://problem/86430088> 444719 2021-11-18 12:39:46 -0800 2021-12-13 09:28:31 -0800 Patch bug-233327-20211118213945.patch text/plain 6534 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNmE3ZDg4NDE2NWQ2MTAyZWY5YjU0ODA1Y2Y3MzQ4NzI5YzlhYjk5MC4uMTg3ZDk4ODVhYzZj YzU5MWExMTljMzc1MDcxYzc3ZDg3NThkNDE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTE4ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxl eEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEZpeCBBTkdMRSBjb21waWxhdGlvbiBhbmQg bWFrZSBjdXJyZW50IHNvbHV0aW9uIHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMzMyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZXJlIGlzIGEgZGVmaW5lIHdpdGggYSB0eXBvIGluIHRoZSBu YW1lIGFuZCBhY3RpdmF0aW5nIEVHTCBhbmQKKyAgICAgICAgWDExIGRvZXMgbm90IHdvcmsgYXQg dGhlIHNhbWUgdGltZS4KKworICAgICAgICAqIFBsYXRmb3JtR1RLLmNtYWtlOgorCiAyMDIxLTEx LTE3ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBTkdMRSBidWls ZCBmYWlsdXJlIC0gc3ByaW50ZiBpcyBkZXByZWNhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjIzZWI0MjQ1 ZDRlMWJkZDc1YzNiZDBjZTA1MWU0ZmJmYTQ4ZTY2MS4uNDMzZjExZWE5MGNmOTJmMzhmZjc5NWVl ZTA1Mzk2MmMxOGIyYzJmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTExLTE4 ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtd IEZpeCBBTkdMRSBjb21waWxhdGlvbiBhbmQgbWFrZSBjdXJyZW50IHNvbHV0aW9uIHdvcmsKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzMyNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIHRlc3RzIHJl cXVpcmVkLgorCisgICAgICAgIEZpeGVkIHRoZSBpc3N1ZXMgdG8gbWFrZSB0aGUgZW5naW5lIHdv cmsgd2l0aCAtRFVTRV9BTkdMRV9XRUJHTD1PTgorICAgICAgICBkZWZpbmVkLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omlu aXRpYWxpemVPcGVuR0xTaGltc0lmTmVlZGVkKTogSW4gY2FzZSBvZiBHVEsgYW5kIFdQRQorICAg ICAgICBpbml0aWFsbHkgd2UgYXJlIGdvaW5nIHRvIGtlZXAgVGV4dHVyZU1hcHBlciB1c2luZyBz eXN0ZW0gR0wKKyAgICAgICAgbGlicmFyaWVzLCBldmVuIHdoZW4gd2UgYXJlIHVzaW5nIEFOR0xF IGZvciBXZWJHTCwgc28gd2UgbmVlZCB0aGUKKyAgICAgICAgc2hpbXMgZGVmaW5pdGlvbnMuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xMYXll ci5jcHA6CisgICAgICAgIChOaWNvc2lhOjpHQ0dMTGF5ZXI6OnN3YXBCdWZmZXJzSWZOZWVkZWQp OiBXZSBuZWVkIHRvIGFsbG9jYXRlIGFuZAorICAgICAgICB1cGRhdGUgdGhlIGxheWVyIGJ1ZmZl ciBpbiB0aGUgY29tcG9zaXRvciB0aHJlYWQgdG8gbWFrZSBzdXJlIGl0CisgICAgICAgIGlzIGhh bmRsZWQgaW4ganVzdCBvbmUgdGhyZWFkLgorCiAyMDIxLTExLTE4ICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RL IGJ1aWxkIHdpdGggQVRTUEkgZW5hbGVkIGFmdGVyIHIyODU5MDQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1RoaXJkUGFydHkv QU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggMDVjYjVjNjQ1ZDM4ODUyNzE4ZTM2NmQ5OTAw YmFjODNkODBlNTFiZi4uZWY5NzZiNTM3YmRjNDA1NmQzZjU0NTY0N2RmOTUzN2YyOWZmNmI2OCAx MDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKKysr IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTQ4LDEwICs0 OCw2IEBAIGlmIChVU0VfQU5HTEVfRUdMIE9SIFVTRV9BTkdMRV9XRUJHTCkKICAgICAgICAgbGlz dChBUFBFTkQgR1RLX0FOR0xFX0RFRklOSVRJT05TIEFOR0xFX1VTRV9YMTEpCiAgICAgZW5kaWYg KCkKIAotICAgIGlmIChFTkFCTEVfV0FZTEFORF9UQVJHRVQpCi0gICAgICAgIGxpc3QoQVBQRU5E IEdLVF9BTkdMRV9ERUZJTklUSU9OUyBXTF9FR0xfUExBVEZPUk0pCi0gICAgZW5kaWYgKCkKLQog ICAgICMgQWxsb3cgYnVpbGRpbmcgQU5HTEUgb24gcGxhdGZvcm1zIHdoaWNoIG1heSBub3QgcHJv dmlkZSBYMTEgaGVhZGVycy4KICAgICBpZiAoTk9UIEdUS19BTkdMRV9ERUZJTklUSU9OUykKICAg ICAgICAgbGlzdChBUFBFTkQgR1RLX0FOR0xFX0RFRklOSVRJT05TIFVTRV9TWVNURU1fRUdMKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHAKaW5kZXgg MzljNjBjZjk3YTVmMDM5MDkwMTllNDZlNTA4Y2ZjODZlYjAzM2Y5Mi4uMGNjMmQ0ZThmMWM2ZWM1 OGY4YjI1Njk4NmQwMGNjZjk5NmM0NzExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HTENvbnRleHQuY3BwCkBAIC01OCw3ICs1OCw3IEBAIGlubGluZSBUaHJlYWRH bG9iYWxHTENvbnRleHQqIGN1cnJlbnRDb250ZXh0KCkKIAogc3RhdGljIGJvb2wgaW5pdGlhbGl6 ZU9wZW5HTFNoaW1zSWZOZWVkZWQoKQogewotI2lmIFVTRShPUEVOR0xfRVMpIHx8IFVTRShMSUJF UE9YWSkgfHwgVVNFKEFOR0xFKQorI2lmIFVTRShPUEVOR0xfRVMpIHx8IFVTRShMSUJFUE9YWSkg fHwgKFVTRShBTkdMRSkgJiYgIShQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQRSkpKQogICAg IHJldHVybiB0cnVlOwogI2Vsc2UKICAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90 ZXhtYXAvTmljb3NpYUdDR0xMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTExheWVyLmNwcAppbmRleCAwMzU3OTQ1OTJk MTZmYmNkZGIxMWQxNTcxYzYzZmNkM2M4YzY0YWE1Li41NDJmYTljZjM2YzM0NzMyYzZlZWIzZGRj ZTIyZDJlYTYwZDg1Y2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTExheWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTExheWVyLmNw cApAQCAtODYsOSArODYsNiBAQCB2b2lkIEdDR0xMYXllcjo6c3dhcEJ1ZmZlcnNJZk5lZWRlZCgp CiAgICAgICAgIHJldHVybjsKIAogICAgIG1fY29udGV4dC5wYWludFJlbmRlcmluZ1Jlc3VsdHNU b0NhbnZhcygqaW1hZ2VCdWZmZXIuZ2V0KCkpOwotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBp bWFnZUJ1ZmZlci0+Y29weUltYWdlKERvbnRDb3B5QmFja2luZ1N0b3JlKTsKLSAgICBpZiAoIWlt YWdlKQotICAgICAgICByZXR1cm47CiAjZWxzZQogICAgIGZsYWdzIHw9IFRleHR1cmVNYXBwZXJH TDo6U2hvdWxkRmxpcFRleHR1cmU7CiAjZW5kaWYKQEAgLTk2LDE3ICs5MywzNCBAQCB2b2lkIEdD R0xMYXllcjo6c3dhcEJ1ZmZlcnNJZk5lZWRlZCgpCiAgICAgewogICAgICAgICBhdXRvJiBwcm94 eSA9IGRvd25jYXN0PE5pY29zaWE6OkNvbnRlbnRMYXllclRleHR1cmVNYXBwZXJJbXBsPihtX2Nv bnRlbnRMYXllci0+aW1wbCgpKS5wcm94eSgpOwogI2lmIFVTRShBTkdMRSkKLSAgICAgICAgc3Rk Ojp1bmlxdWVfcHRyPFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyQnVmZmVyPiBsYXllckJ1ZmZl cjsKLSAgICAgICAgbGF5ZXJCdWZmZXIgPSBwcm94eS5nZXRBdmFpbGFibGVCdWZmZXIodGV4dHVy ZVNpemUsIG1fY29udGV4dC5tX2ludGVybmFsQ29sb3JGb3JtYXQpOwotICAgICAgICBpZiAoIWxh eWVyQnVmZmVyKSB7Ci0gICAgICAgICAgICBhdXRvIHRleHR1cmUgPSBCaXRtYXBUZXh0dXJlR0w6 OmNyZWF0ZShUZXh0dXJlTWFwcGVyQ29udGV4dEF0dHJpYnV0ZXM6OmdldCgpLCBmbGFncywgbV9j b250ZXh0Lm1faW50ZXJuYWxDb2xvckZvcm1hdCk7Ci0gICAgICAgICAgICBzdGF0aWNfY2FzdDxC aXRtYXBUZXh0dXJlR0wmPih0ZXh0dXJlLmdldCgpKS5zZXRQZW5kaW5nQ29udGVudHMoV1RGTW92 ZShpbWFnZSkpOwotICAgICAgICAgICAgbGF5ZXJCdWZmZXIgPSBtYWtlVW5pcXVlPFRleHR1cmVN YXBwZXJQbGF0Zm9ybUxheWVyQnVmZmVyPihXVEZNb3ZlKHRleHR1cmUpLCBmbGFncyk7Ci0gICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgbGF5ZXJCdWZmZXItPnRleHR1cmVHTCgpLnNldFBlbmRp bmdDb250ZW50cyhXVEZNb3ZlKGltYWdlKSk7CisgICAgICAgIGF1dG8gcHJveHlPcGVyYXRpb24g PQorICAgICAgICAgICAgW3RoaXMsIHRleHR1cmVTaXplLCBmbGFncywgaW1hZ2VCdWZmZXIgPSBX VEZNb3ZlKGltYWdlQnVmZmVyKV0gKCkgeworICAgICAgICAgICAgICAgIFJlZlB0cjxJbWFnZT4g aW1hZ2UgPSBpbWFnZUJ1ZmZlci0+Y29weUltYWdlKERvbnRDb3B5QmFja2luZ1N0b3JlKTsKKyAg ICAgICAgICAgICAgICBpZiAoIWltYWdlKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgTG9ja2VyIGxvY2tlciB7IHByb3h5LmxvY2soKSB9OwotICAgICAgICBwcm94eS5w dXNoTmV4dEJ1ZmZlcihXVEZNb3ZlKGxheWVyQnVmZmVyKSk7CisgICAgICAgICAgICAgICAgc3Rk Ojp1bmlxdWVfcHRyPFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyQnVmZmVyPiBsYXllckJ1ZmZl cjsKKyAgICAgICAgICAgICAgICBhdXRvJiBwcm94eSA9IGRvd25jYXN0PE5pY29zaWE6OkNvbnRl bnRMYXllclRleHR1cmVNYXBwZXJJbXBsPihtX2NvbnRlbnRMYXllci0+aW1wbCgpKS5wcm94eSgp OworICAgICAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcm94eS5sb2NrKCkgfTsKKyAgICAg ICAgICAgICAgICBsYXllckJ1ZmZlciA9IHByb3h5LmdldEF2YWlsYWJsZUJ1ZmZlcih0ZXh0dXJl U2l6ZSwgbV9jb250ZXh0Lm1faW50ZXJuYWxDb2xvckZvcm1hdCk7CisKKyAgICAgICAgICAgICAg ICBpZiAoIWxheWVyQnVmZmVyKSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdGV4dHVyZSA9 IEJpdG1hcFRleHR1cmVHTDo6Y3JlYXRlKFRleHR1cmVNYXBwZXJDb250ZXh0QXR0cmlidXRlczo6 Z2V0KCksIGZsYWdzLCBtX2NvbnRleHQubV9pbnRlcm5hbENvbG9yRm9ybWF0KTsKKyAgICAgICAg ICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Qml0bWFwVGV4dHVyZUdMJj4odGV4dHVyZS5nZXQoKSku c2V0UGVuZGluZ0NvbnRlbnRzKFdURk1vdmUoaW1hZ2UpKTsKKyAgICAgICAgICAgICAgICAgICAg bGF5ZXJCdWZmZXIgPSBtYWtlVW5pcXVlPFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyQnVmZmVy PihXVEZNb3ZlKHRleHR1cmUpLCBmbGFncyk7CisgICAgICAgICAgICAgICAgfSBlbHNlCisgICAg ICAgICAgICAgICAgICAgIGxheWVyQnVmZmVyLT50ZXh0dXJlR0woKS5zZXRQZW5kaW5nQ29udGVu dHMoV1RGTW92ZShpbWFnZSkpOworCisgICAgICAgICAgICAgICAgcHJveHkucHVzaE5leHRCdWZm ZXIoV1RGTW92ZShsYXllckJ1ZmZlcikpOworCisgICAgICAgICAgICAgICAgbV9jb250ZXh0Lm1h cmtMYXllckNvbXBvc2l0ZWQoKTsKKyAgICAgICAgICAgIH07CisKKyAgICAgICAgcHJveHkuc2No ZWR1bGVVcGRhdGVPbkNvbXBvc2l0b3JUaHJlYWQoW3Byb3h5T3BlcmF0aW9uXSB7CisgICAgICAg ICAgICBwcm94eU9wZXJhdGlvbigpOworICAgICAgICB9KTsKKworICAgICAgICByZXR1cm47CiAj ZWxzZQogICAgICAgICBMb2NrZXIgbG9ja2VyIHsgcHJveHkubG9jaygpIH07CiAgICAgICAgIHBy b3h5LnB1c2hOZXh0QnVmZmVyKG1ha2VVbmlxdWU8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJC dWZmZXI+KG1fY29udGV4dC5tX2NvbXBvc2l0b3JUZXh0dXJlLCB0ZXh0dXJlU2l6ZSwgZmxhZ3Ms IG1fY29udGV4dC5tX2ludGVybmFsQ29sb3JGb3JtYXQpKTsK 447016 2021-12-13 09:28:31 -0800 2021-12-13 13:17:41 -0800 Patch fix_patch_angle.diff text/plain 7895 alex Y29tbWl0IDI4ZGZkNmI0ZDBiYWJjMWY1ZTk2OTYyYjYzMTg0ZjM5ZDJmYzI1ZjcKQXV0aG9yOiBD aHJpcyBMb3JkIDxjbG9yZEBpZ2FsaWEuY29tPgpEYXRlOiAgIE1vbiBEZWMgMTMgMTQ6Mjg6MzYg MjAyMSArMDAwMAoKICAgIEJ1ZyAyMzMzMjcgLSBbR1RLXSBGaXggQU5HTEUgY29tcGlsYXRpb24g YW5kIG1ha2UgY3VycmVudCBzb2x1dGlvbiB3b3JrCgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ2hhbmdlTG9n CmluZGV4IGFhNTEzNjEyZGQyNy4uOTNmNzdjYzk3ZjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEtMTggIEFsZWphbmRybyBHLiBDYXN0cm8g IDxhbGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRml4IEFOR0xFIGNvbXBpbGF0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzMjcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBp cyBhIGRlZmluZSB3aXRoIGEgdHlwbyBpbiB0aGUgbmFtZSBhbmQgYWN0aXZhdGluZyBFR0wgYW5k CisgICAgICAgIFgxMSBkb2VzIG5vdCB3b3JrIGF0IHRoZSBzYW1lIHRpbWUuCisKKyAgICAgICAg KiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAyMS0xMi0xMCAgS3lsZSBQaWRkaW5ndG9uICA8a3Bp ZGRpbmd0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtBTkdMRV0gQVNUQy1IRFIgaXMgdW5hdmFp bGFibGUgb24gc29tZSBwbGF0Zm9ybXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvUGxhdGZvcm1H VEsuY21ha2UKaW5kZXggMDVjYjVjNjQ1ZDM4Li5lZjk3NmI1MzdiZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC00OCwxMCArNDgsNiBAQCBpZiAoVVNF X0FOR0xFX0VHTCBPUiBVU0VfQU5HTEVfV0VCR0wpCiAgICAgICAgIGxpc3QoQVBQRU5EIEdUS19B TkdMRV9ERUZJTklUSU9OUyBBTkdMRV9VU0VfWDExKQogICAgIGVuZGlmICgpCiAKLSAgICBpZiAo RU5BQkxFX1dBWUxBTkRfVEFSR0VUKQotICAgICAgICBsaXN0KEFQUEVORCBHS1RfQU5HTEVfREVG SU5JVElPTlMgV0xfRUdMX1BMQVRGT1JNKQotICAgIGVuZGlmICgpCi0KICAgICAjIEFsbG93IGJ1 aWxkaW5nIEFOR0xFIG9uIHBsYXRmb3JtcyB3aGljaCBtYXkgbm90IHByb3ZpZGUgWDExIGhlYWRl cnMuCiAgICAgaWYgKE5PVCBHVEtfQU5HTEVfREVGSU5JVElPTlMpCiAgICAgICAgIGxpc3QoQVBQ RU5EIEdUS19BTkdMRV9ERUZJTklUSU9OUyBVU0VfU1lTVEVNX0VHTCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAx MmFkZGFhOGUyZDQuLjU4ZTJmMzQ2NGQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisy MDIxLTExLTE4ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIEZpeCBBTkdMRSBjb21waWxhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMzI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAgRml4 ZWQgdGhlIGlzc3VlcyB0byBtYWtlIHRoZSBlbmdpbmUgd29yayB3aXRoIC1EVVNFX0FOR0xFX1dF QkdMPU9OCisgICAgICAgIGRlZmluZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9H TENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZU9wZW5HTFNoaW1zSWZO ZWVkZWQpOiBJbiBjYXNlIG9mIEdUSyBhbmQgV1BFCisgICAgICAgIGluaXRpYWxseSB3ZSBhcmUg Z29pbmcgdG8ga2VlcCBUZXh0dXJlTWFwcGVyIHVzaW5nIHN5c3RlbSBHTAorICAgICAgICBsaWJy YXJpZXMsIGV2ZW4gd2hlbiB3ZSBhcmUgdXNpbmcgQU5HTEUgZm9yIFdlYkdMLCBzbyB3ZSBuZWVk IHRoZQorICAgICAgICBzaGltcyBkZWZpbml0aW9ucy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTExheWVyLmNwcDoKKyAgICAgICAgKE5pY29z aWE6OkdDR0xMYXllcjo6c3dhcEJ1ZmZlcnNJZk5lZWRlZCk6IFdlIG5lZWQgdG8gYWxsb2NhdGUg YW5kCisgICAgICAgIHVwZGF0ZSB0aGUgbGF5ZXIgYnVmZmVyIGluIHRoZSBjb21wb3NpdG9yIHRo cmVhZCB0byBtYWtlIHN1cmUgaXQKKyAgICAgICAgaXMgaGFuZGxlZCBpbiBqdXN0IG9uZSB0aHJl YWQuCisKIDIwMjEtMTItMTMgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlh LmNvbT4KIAogICAgICAgICBGaXggbm9uLXVuaWZpZWQgYnVpbGRzIGFmdGVyIHIyODY4NTMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3BwCmluZGV4IDM5 YzYwY2Y5N2E1Zi4uMGNjMmQ0ZThmMWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dMQ29udGV4dC5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgaW5saW5lIFRocmVhZEds b2JhbEdMQ29udGV4dCogY3VycmVudENvbnRleHQoKQogCiBzdGF0aWMgYm9vbCBpbml0aWFsaXpl T3BlbkdMU2hpbXNJZk5lZWRlZCgpCiB7Ci0jaWYgVVNFKE9QRU5HTF9FUykgfHwgVVNFKExJQkVQ T1hZKSB8fCBVU0UoQU5HTEUpCisjaWYgVVNFKE9QRU5HTF9FUykgfHwgVVNFKExJQkVQT1hZKSB8 fCAoVVNFKEFOR0xFKSAmJiAhKFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKSkpCiAgICAg cmV0dXJuIHRydWU7CiAjZWxzZQogICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkID0gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw aGljc0NvbnRleHRHTEFOR0xFLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h bmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmgKaW5kZXggOTc0ZWJiMzUxZmM2Li45ZTBjZjAw ZGFhMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xl L0dyYXBoaWNzQ29udGV4dEdMQU5HTEUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmgKQEAgLTQyLDYgKzQyLDcgQEAK IAogI2lmIFVTRShOSUNPU0lBKQogbmFtZXNwYWNlIE5pY29zaWEgeworY2xhc3MgR0NHTEFOR0xF TGF5ZXI7CiBjbGFzcyBHQ0dMTGF5ZXI7CiB9CiAjZW5kaWYKQEAgLTQ0NSw3ICs0NDYsNyBAQCBw cm90ZWN0ZWQ6CiAgICAgR0NHTHVpbnQgbV9pbnRlcm1lZGlhdGVUZXh0dXJlIHsgMCB9OwogI2Vu ZGlmCiAjaWYgVVNFKE5JQ09TSUEpCi0gICAgc3RkOjp1bmlxdWVfcHRyPE5pY29zaWE6OkdDR0xM YXllcj4gbV9uaWNvc2lhTGF5ZXI7CisgICAgc3RkOjp1bmlxdWVfcHRyPE5pY29zaWE6OkdDR0xB TkdMRUxheWVyPiBtX25pY29zaWFMYXllcjsKICNlbGlmIFVTRShURVhUVVJFX01BUFBFUikKICAg ICBzdGQ6OnVuaXF1ZV9wdHI8VGV4dHVyZU1hcHBlckdDR0xQbGF0Zm9ybUxheWVyPiBtX3RleG1h cExheWVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xBTkdMRUxh eWVyLmNwcAppbmRleCBlN2MyOWRkNWNiZmYuLjJiZmY2ZTRmMGJjZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xB TkdMRUxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNv c2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuY3BwCkBAIC0xNDQsNyArMTQ0LDcgQEAg R0NHTEFOR0xFTGF5ZXI6OkFOR0xFQ29udGV4dDo6QU5HTEVDb250ZXh0KEVHTERpc3BsYXkgZGlz cGxheSwgRUdMQ29uZmlnIGNvbmZpZywKIEdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ6On5B TkdMRUNvbnRleHQoKQogewogICAgIGlmIChtX2NvbnRleHQpIHsKLSAgICAgICAgZ2w6OkJpbmRG cmFtZWJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgMCk7CisgICAgICAgIEdMX0JpbmRGcmFtZWJ1ZmZl cihHTF9GUkFNRUJVRkZFUiwgMCk7CiAgICAgICAgIEVHTF9NYWtlQ3VycmVudChtX2Rpc3BsYXks IEVHTF9OT19TVVJGQUNFLCBFR0xfTk9fU1VSRkFDRSwgRUdMX05PX0NPTlRFWFQpOwogICAgICAg ICBFR0xfRGVzdHJveUNvbnRleHQobV9kaXNwbGF5LCBtX2NvbnRleHQpOwogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05p Y29zaWFHQ0dMTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmlj b3NpYS90ZXhtYXAvTmljb3NpYUdDR0xMYXllci5jcHAKaW5kZXggYjdjNzllMWY4OWQwLi5iYzM3 MjY5NmU4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25p Y29zaWEvdGV4bWFwL05pY29zaWFHQ0dMTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFHQ0dMTGF5ZXIuY3BwCkBAIC04 Niw5ICs4Niw2IEBAIHZvaWQgR0NHTExheWVyOjpzd2FwQnVmZmVyc0lmTmVlZGVkKCkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgbV9jb250ZXh0LnBhaW50UmVuZGVyaW5nUmVzdWx0c1RvQ2FudmFz KCppbWFnZUJ1ZmZlci5nZXQoKSk7Ci0gICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IGltYWdlQnVm ZmVyLT5jb3B5SW1hZ2UoRG9udENvcHlCYWNraW5nU3RvcmUpOwotICAgIGlmICghaW1hZ2UpCi0g ICAgICAgIHJldHVybjsKICNlbHNlCiAgICAgZmxhZ3MgfD0gVGV4dHVyZU1hcHBlckdMOjpTaG91 bGRGbGlwVGV4dHVyZTsKICNlbmRpZgpAQCAtOTYsMTcgKzkzLDM0IEBAIHZvaWQgR0NHTExheWVy Ojpzd2FwQnVmZmVyc0lmTmVlZGVkKCkKICAgICB7CiAgICAgICAgIGF1dG8mIHByb3h5ID0gZG93 bmNhc3Q8Tmljb3NpYTo6Q29udGVudExheWVyVGV4dHVyZU1hcHBlckltcGw+KG1fY29udGVudExh eWVyLT5pbXBsKCkpLnByb3h5KCk7CiAjaWYgVVNFKEFOR0xFKQotICAgICAgICBzdGQ6OnVuaXF1 ZV9wdHI8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJCdWZmZXI+IGxheWVyQnVmZmVyOwotICAg ICAgICBsYXllckJ1ZmZlciA9IHByb3h5LmdldEF2YWlsYWJsZUJ1ZmZlcih0ZXh0dXJlU2l6ZSwg bV9jb250ZXh0Lm1faW50ZXJuYWxDb2xvckZvcm1hdCk7Ci0gICAgICAgIGlmICghbGF5ZXJCdWZm ZXIpIHsKLSAgICAgICAgICAgIGF1dG8gdGV4dHVyZSA9IEJpdG1hcFRleHR1cmVHTDo6Y3JlYXRl KFRleHR1cmVNYXBwZXJDb250ZXh0QXR0cmlidXRlczo6Z2V0KCksIGZsYWdzLCBtX2NvbnRleHQu bV9pbnRlcm5hbENvbG9yRm9ybWF0KTsKLSAgICAgICAgICAgIHN0YXRpY19jYXN0PEJpdG1hcFRl eHR1cmVHTCY+KHRleHR1cmUuZ2V0KCkpLnNldFBlbmRpbmdDb250ZW50cyhXVEZNb3ZlKGltYWdl KSk7Ci0gICAgICAgICAgICBsYXllckJ1ZmZlciA9IG1ha2VVbmlxdWU8VGV4dHVyZU1hcHBlclBs YXRmb3JtTGF5ZXJCdWZmZXI+KFdURk1vdmUodGV4dHVyZSksIGZsYWdzKTsKLSAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICBsYXllckJ1ZmZlci0+dGV4dHVyZUdMKCkuc2V0UGVuZGluZ0NvbnRl bnRzKFdURk1vdmUoaW1hZ2UpKTsKKyAgICAgICAgYXV0byBwcm94eU9wZXJhdGlvbiA9CisgICAg ICAgICAgICBbdGhpcywgdGV4dHVyZVNpemUsIGZsYWdzLCBpbWFnZUJ1ZmZlciA9IFdURk1vdmUo aW1hZ2VCdWZmZXIpXSAoKSB7CisgICAgICAgICAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9 IGltYWdlQnVmZmVyLT5jb3B5SW1hZ2UoRG9udENvcHlCYWNraW5nU3RvcmUpOworICAgICAgICAg ICAgICAgIGlmICghaW1hZ2UpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICBMb2NrZXIgbG9ja2VyIHsgcHJveHkubG9jaygpIH07Ci0gICAgICAgIHByb3h5LnB1c2hOZXh0 QnVmZmVyKFdURk1vdmUobGF5ZXJCdWZmZXIpKTsKKyAgICAgICAgICAgICAgICBzdGQ6OnVuaXF1 ZV9wdHI8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJCdWZmZXI+IGxheWVyQnVmZmVyOworICAg ICAgICAgICAgICAgIGF1dG8mIHByb3h5ID0gZG93bmNhc3Q8Tmljb3NpYTo6Q29udGVudExheWVy VGV4dHVyZU1hcHBlckltcGw+KG1fY29udGVudExheWVyLT5pbXBsKCkpLnByb3h5KCk7CisgICAg ICAgICAgICAgICAgTG9ja2VyIGxvY2tlciB7IHByb3h5LmxvY2soKSB9OworICAgICAgICAgICAg ICAgIGxheWVyQnVmZmVyID0gcHJveHkuZ2V0QXZhaWxhYmxlQnVmZmVyKHRleHR1cmVTaXplLCBt X2NvbnRleHQubV9pbnRlcm5hbENvbG9yRm9ybWF0KTsKKworICAgICAgICAgICAgICAgIGlmICgh bGF5ZXJCdWZmZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byB0ZXh0dXJlID0gQml0bWFw VGV4dHVyZUdMOjpjcmVhdGUoVGV4dHVyZU1hcHBlckNvbnRleHRBdHRyaWJ1dGVzOjpnZXQoKSwg ZmxhZ3MsIG1fY29udGV4dC5tX2ludGVybmFsQ29sb3JGb3JtYXQpOworICAgICAgICAgICAgICAg ICAgICBzdGF0aWNfY2FzdDxCaXRtYXBUZXh0dXJlR0wmPih0ZXh0dXJlLmdldCgpKS5zZXRQZW5k aW5nQ29udGVudHMoV1RGTW92ZShpbWFnZSkpOworICAgICAgICAgICAgICAgICAgICBsYXllckJ1 ZmZlciA9IG1ha2VVbmlxdWU8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJCdWZmZXI+KFdURk1v dmUodGV4dHVyZSksIGZsYWdzKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgbGF5ZXJCdWZmZXItPnRleHR1cmVHTCgpLnNldFBlbmRpbmdDb250ZW50cyhXVEZN b3ZlKGltYWdlKSk7CisKKyAgICAgICAgICAgICAgICBwcm94eS5wdXNoTmV4dEJ1ZmZlcihXVEZN b3ZlKGxheWVyQnVmZmVyKSk7CisKKyAgICAgICAgICAgICAgICBtX2NvbnRleHQubWFya0xheWVy Q29tcG9zaXRlZCgpOworICAgICAgICAgICAgfTsKKworICAgICAgICBwcm94eS5zY2hlZHVsZVVw ZGF0ZU9uQ29tcG9zaXRvclRocmVhZChbcHJveHlPcGVyYXRpb25dIHsKKyAgICAgICAgICAgIHBy b3h5T3BlcmF0aW9uKCk7CisgICAgICAgIH0pOworCisgICAgICAgIHJldHVybjsKICNlbHNlCiAg ICAgICAgIExvY2tlciBsb2NrZXIgeyBwcm94eS5sb2NrKCkgfTsKICAgICAgICAgcHJveHkucHVz aE5leHRCdWZmZXIobWFrZVVuaXF1ZTxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4o bV9jb250ZXh0Lm1fY29tcG9zaXRvclRleHR1cmUsIHRleHR1cmVTaXplLCBmbGFncywgbV9jb250 ZXh0Lm1faW50ZXJuYWxDb2xvckZvcm1hdCkpOwo=